From ef592f945f28b8167b88ef8a81cadc1a5846495e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 23 Dec 2013 21:52:01 +0000 Subject: - added fullscreen detection into AAA; - removed bunch of old clutches from it; - version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@7362 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/StatusPlugins/AdvancedAutoAway/options.cpp | 499 ++++++++++----------- 1 file changed, 247 insertions(+), 252 deletions(-) (limited to 'plugins/StatusPlugins/AdvancedAutoAway/options.cpp') diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp index ce92e9aaac..b77e1b8036 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp @@ -1,27 +1,28 @@ /* - AdvancedAutoAway Plugin for Miranda-IM (www.miranda-im.org) - Copyright 2003-2006 P. Boon - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +AdvancedAutoAway Plugin for Miranda-IM (www.miranda-im.org) +Copyright 2003-2006 P. Boon + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include "../commonstatus.h" #include "advancedautoaway.h" #include "../resource.h" #include -int LoadAutoAwaySetting(TAAAProtoSetting& autoAwaySetting, char* protoName); +int LoadAutoAwaySetting(TAAAProtoSetting &autoAwaySetting, char* protoName); INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); @@ -30,94 +31,103 @@ static BOOL bSettingSame = FALSE; ///////////////////////////////////////////////////////////////////////////////////////// // Dialog service functions -static int WriteAutoAwaySetting(TAAAProtoSetting& autoAwaySetting, char* protoName) +static int WriteAutoAwaySetting(TAAAProtoSetting &autoAwaySetting, char *protoName) { char setting[128]; mir_snprintf(setting, sizeof(setting), "%s_OptionFlags", protoName); - db_set_b(NULL,MODULENAME,setting,(BYTE)autoAwaySetting.optionFlags); + db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.optionFlags); mir_snprintf(setting, sizeof(setting), "%s_AwayTime", protoName); - db_set_w(NULL,MODULENAME,setting,(WORD)autoAwaySetting.awayTime); + db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.awayTime); mir_snprintf(setting, sizeof(setting), "%s_NATime", protoName); - db_set_w(NULL,MODULENAME,setting,(WORD)autoAwaySetting.naTime); + db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.naTime); mir_snprintf(setting, sizeof(setting), "%s_StatusFlags", protoName); - db_set_w(NULL,MODULENAME,setting,(WORD)autoAwaySetting.statusFlags); + db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.statusFlags); mir_snprintf(setting, sizeof(setting), "%s_Lv1Status", protoName); - db_set_w(NULL,MODULENAME,setting,(WORD)autoAwaySetting.lv1Status); + db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.lv1Status); mir_snprintf(setting, sizeof(setting), "%s_Lv2Status", protoName); - db_set_w(NULL,MODULENAME,setting,(WORD)autoAwaySetting.lv2Status); + db_set_w(NULL, MODULENAME, setting, (WORD)autoAwaySetting.lv2Status); return 0; } -static void SetDialogItems(HWND hwndDlg, TAAAProtoSetting* setting) +static void SetDialogItems(HWND hwndDlg, TAAAProtoSetting *setting) { - CheckDlgButton(hwndDlg, IDC_SCREENSAVE, setting->optionFlags&FLAG_ONSAVER ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONLOCK, setting->optionFlags&FLAG_ONLOCK ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_TIMED, setting->optionFlags&FLAG_ONMOUSE ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SETNA, setting->optionFlags&FLAG_SETNA ? BST_CHECKED : BST_UNCHECKED); - SetDlgItemInt(hwndDlg,IDC_AWAYTIME, setting->awayTime,FALSE); - SetDlgItemInt(hwndDlg,IDC_NATIME, setting->naTime,FALSE); - CheckDlgButton(hwndDlg, IDC_CONFIRM, setting->optionFlags&FLAG_CONFIRM ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_RESETSTATUS, setting->optionFlags&FLAG_RESET ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MONITORMIRANDA, setting->optionFlags&FLAG_MONITORMIRANDA ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_LV2ONINACTIVE, setting->optionFlags&FLAG_LV2ONINACTIVE ? BST_CHECKED : BST_UNCHECKED); - EnableWindow(GetDlgItem(hwndDlg,IDC_SETNA),IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_LV2ONINACTIVE),(IsDlgButtonChecked(hwndDlg,IDC_TIMED)) && (IsDlgButtonChecked(hwndDlg,IDC_SETNA))); - EnableWindow(GetDlgItem(hwndDlg,IDC_MONITORMIRANDA),IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_AWAYTIME),IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_LV1AFTERSTR),IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_LV1STATUS),IsDlgButtonChecked(hwndDlg,IDC_TIMED)||IsDlgButtonChecked(hwndDlg,IDC_SCREENSAVE)); - EnableWindow(GetDlgItem(hwndDlg,IDC_STATUSLIST),IsDlgButtonChecked(hwndDlg,IDC_TIMED)||IsDlgButtonChecked(hwndDlg,IDC_SCREENSAVE)); - EnableWindow(GetDlgItem(hwndDlg,IDC_RESETSTATUS),(IsDlgButtonChecked(hwndDlg,IDC_TIMED)||IsDlgButtonChecked(hwndDlg,IDC_SCREENSAVE))&&(IsDlgButtonChecked(hwndDlg, IDC_LV2ONINACTIVE))); - EnableWindow(GetDlgItem(hwndDlg,IDC_CONFIRM),(IsDlgButtonChecked(hwndDlg,IDC_TIMED)||IsDlgButtonChecked(hwndDlg,IDC_SCREENSAVE))&&(IsDlgButtonChecked(hwndDlg, IDC_LV2ONINACTIVE)&&(IsDlgButtonChecked(hwndDlg,IDC_RESETSTATUS)))); - EnableWindow(GetDlgItem(hwndDlg,IDC_NATIME),IsDlgButtonChecked(hwndDlg,IDC_SETNA)&&IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_SETNASTR),IsDlgButtonChecked(hwndDlg,IDC_SETNA)&&IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_SETNASTR),IsDlgButtonChecked(hwndDlg,IDC_SETNA)&&IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_LV2STATUS),IsDlgButtonChecked(hwndDlg,IDC_SETNA)&&IsDlgButtonChecked(hwndDlg,IDC_TIMED)); - EnableWindow(GetDlgItem(hwndDlg,IDC_PROTOCOL), !bSettingSame);//db_get_b(NULL, MODULENAME, SETTING_SAMESETTINGS, FALSE)); + bool bIsTimed = (setting->optionFlags & FLAG_ONMOUSE) != 0; + bool bSetNA = (setting->optionFlags & FLAG_SETNA) != 0; + bool bSaver = (setting->optionFlags & FLAG_ONSAVER) != 0; + bool bFullScr = (setting->optionFlags & FLAG_FULLSCREEN) != 0; + + CheckDlgButton(hwndDlg, IDC_FULLSCREEN, bFullScr); + CheckDlgButton(hwndDlg, IDC_SCREENSAVE, bSaver); + CheckDlgButton(hwndDlg, IDC_ONLOCK, (setting->optionFlags & FLAG_ONLOCK) != 0); + CheckDlgButton(hwndDlg, IDC_TIMED, bIsTimed); + CheckDlgButton(hwndDlg, IDC_SETNA, bSetNA); + CheckDlgButton(hwndDlg, IDC_CONFIRM, (setting->optionFlags & FLAG_CONFIRM) != 0); + CheckDlgButton(hwndDlg, IDC_RESETSTATUS, (setting->optionFlags & FLAG_RESET) != 0); + CheckDlgButton(hwndDlg, IDC_MONITORMIRANDA, (setting->optionFlags & FLAG_MONITORMIRANDA) != 0); + CheckDlgButton(hwndDlg, IDC_LV2ONINACTIVE, (setting->optionFlags & FLAG_LV2ONINACTIVE) != 0); + + SetDlgItemInt(hwndDlg, IDC_AWAYTIME, setting->awayTime, FALSE); + SetDlgItemInt(hwndDlg, IDC_NATIME, setting->naTime, FALSE); + + EnableWindow(GetDlgItem(hwndDlg, IDC_SETNA), bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_LV2ONINACTIVE), bIsTimed && bSetNA); + EnableWindow(GetDlgItem(hwndDlg, IDC_MONITORMIRANDA), bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_AWAYTIME), bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_LV1AFTERSTR), bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_LV1STATUS), bIsTimed || bSaver || bFullScr); + EnableWindow(GetDlgItem(hwndDlg, IDC_STATUSLIST), bIsTimed || bSaver || bFullScr); + EnableWindow(GetDlgItem(hwndDlg, IDC_RESETSTATUS), (bIsTimed || bSaver || bFullScr) && IsDlgButtonChecked(hwndDlg, IDC_LV2ONINACTIVE)); + EnableWindow(GetDlgItem(hwndDlg, IDC_CONFIRM), (bIsTimed || bSaver || bFullScr) && IsDlgButtonChecked(hwndDlg, IDC_LV2ONINACTIVE) && IsDlgButtonChecked(hwndDlg, IDC_RESETSTATUS)); + EnableWindow(GetDlgItem(hwndDlg, IDC_NATIME), bSetNA && bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_SETNASTR), bSetNA && bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_SETNASTR), bSetNA && bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_LV2STATUS), bSetNA && bIsTimed); + EnableWindow(GetDlgItem(hwndDlg, IDC_PROTOCOL), !bSettingSame); } -static TAAAProtoSetting* GetSetting(HWND hwndDlg, TAAAProtoSetting* sameSetting) +static TAAAProtoSetting* GetSetting(HWND hwndDlg, TAAAProtoSetting *sameSetting) { - if ( bSettingSame ) + if (bSettingSame) return sameSetting; int iItem = SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_GETCURSEL, 0, 0); - if ( iItem == -1 ) + if (iItem == -1) return NULL; INT_PTR iData = (INT_PTR)SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_GETITEMDATA, iItem, 0); - return ( iData == -1 ) ? NULL : (TAAAProtoSetting*)iData; + return (iData == -1) ? NULL : (TAAAProtoSetting*)iData; } -static void SetDialogStatus(HWND hwndDlg, TAAAProtoSetting* sameSetting) +static void SetDialogStatus(HWND hwndDlg, TAAAProtoSetting *sameSetting) { - TAAAProtoSetting* setting = GetSetting(hwndDlg, sameSetting); - if ( setting ) { - - // create columns - HWND hList = GetDlgItem(hwndDlg,IDC_STATUSLIST); - ListView_SetExtendedListViewStyleEx(hList, LVS_EX_FULLROWSELECT|LVS_EX_CHECKBOXES, LVS_EX_FULLROWSELECT|LVS_EX_CHECKBOXES); - - LVCOLUMN lvCol = { 0 }; - lvCol.mask = LVCF_WIDTH|LVCF_TEXT; - lvCol.pszText = TranslateT("Status"); - lvCol.cx = 118; - ListView_InsertColumn(hList, 0, &lvCol); - - // get pointer to settings - SetDialogItems(hwndDlg, setting); -} } - + TAAAProtoSetting *setting = GetSetting(hwndDlg, sameSetting); + if (setting == NULL) + return; + + // create columns + HWND hList = GetDlgItem(hwndDlg, IDC_STATUSLIST); + ListView_SetExtendedListViewStyleEx(hList, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES); + + LVCOLUMN lvCol = { 0 }; + lvCol.mask = LVCF_WIDTH | LVCF_TEXT; + lvCol.pszText = TranslateT("Status"); + lvCol.cx = 118; + ListView_InsertColumn(hList, 0, &lvCol); + + // get pointer to settings + SetDialogItems(hwndDlg, setting); +} ///////////////////////////////////////////////////////////////////////////////////////// // Rules dialog window procedure -static OBJLIST *optionSettings; +static TAAAProtoSettingList optionSettings(10, CompareSettings); static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { static TAAAProtoSetting* sameSetting; + TAAAProtoSetting *setting; static int init; switch (msg) { @@ -126,22 +136,21 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM TranslateDialogDefault(hwndDlg); // copy the settings - optionSettings = new OBJLIST(10, CompareSettings); - *optionSettings = *autoAwaySettings; + optionSettings = autoAwaySettings; - sameSetting = ( TAAAProtoSetting* )malloc(sizeof(TAAAProtoSetting)); + sameSetting = (TAAAProtoSetting*)malloc(sizeof(TAAAProtoSetting)); LoadAutoAwaySetting(*sameSetting, SETTING_ALL); // fill list from currentProtoSettings { - for ( int i=0; i < optionSettings->getCount(); i++ ) { - TAAAProtoSetting& p = (*optionSettings)[i]; - int item = SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_ADDSTRING, 0, (LPARAM)p.tszAccName ); - SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_SETITEMDATA, item, (LPARAM)&p ); + for (int i = 0; i < optionSettings.getCount(); i++) { + TAAAProtoSetting &p = optionSettings[i]; + int item = SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_ADDSTRING, 0, (LPARAM)p.tszAccName); + SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_SETITEMDATA, item, (LPARAM)&p); } } // set cursor to first protocol - SendDlgItemMessage(hwndDlg,IDC_PROTOCOL,CB_SETCURSEL,0,0); + SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_SETCURSEL, 0, 0); // status list SetDialogStatus(hwndDlg, sameSetting); @@ -151,154 +160,145 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM break; case WM_COMMAND: - if (( HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == BN_CLICKED ) && (HWND)lParam == GetFocus()) - SendMessage(GetParent(hwndDlg),PSM_CHANGED,0,0); - { - TAAAProtoSetting* setting = GetSetting(hwndDlg, sameSetting); - if ( !setting ) - break; + if ((HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == BN_CLICKED) && (HWND)lParam == GetFocus()) + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - switch(LOWORD(wParam)) { - case IDC_PROTOCOL: - // status listview - { - int i, flags; - LVITEM lvItem; - HWND hList=GetDlgItem(hwndDlg,IDC_STATUSLIST); - - init = TRUE; - ListView_DeleteAllItems(hList); - memset(&lvItem,0,sizeof(lvItem)); - lvItem.mask=LVIF_TEXT|LVIF_PARAM; - lvItem.cchTextMax = 256; - lvItem.iItem=0; - lvItem.iSubItem=0; - if (!bSettingSame) - flags = CallProtoService(setting->szName, PS_GETCAPS,PFLAGNUM_2,0)&~CallProtoService(setting->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0); - else - flags = 0; - for(i=0;ipfnGetStatusModeDescription(statusModeList[i], 0); - lvItem.lParam = (LPARAM)statusModePf2List[i]; - ListView_InsertItem(hList,&lvItem); - ListView_SetCheckState(hList, lvItem.iItem, setting->statusFlags&statusModePf2List[i]?TRUE:FALSE); - lvItem.iItem++; - } + setting = GetSetting(hwndDlg, sameSetting); + if (!setting) + break; + + switch (LOWORD(wParam)) { + case IDC_PROTOCOL: + // status listview + init = TRUE; + { + HWND hList = GetDlgItem(hwndDlg, IDC_STATUSLIST); + ListView_DeleteAllItems(hList); + + int flags = 0; + if (!bSettingSame) + flags = CallProtoService(setting->szName, PS_GETCAPS, PFLAGNUM_2, 0)&~CallProtoService(setting->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0); + + LVITEM lvItem = { 0 }; + lvItem.mask = LVIF_TEXT | LVIF_PARAM; + lvItem.cchTextMax = 256; + lvItem.iItem = 0; + lvItem.iSubItem = 0; + for (int i = 0; i < SIZEOF(statusModeList); i++) { + if ((flags & statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame)) { + lvItem.pszText = pcli->pfnGetStatusModeDescription(statusModeList[i], 0); + lvItem.lParam = (LPARAM)statusModePf2List[i]; + ListView_InsertItem(hList, &lvItem); + ListView_SetCheckState(hList, lvItem.iItem, setting->statusFlags & statusModePf2List[i] ? TRUE : FALSE); + lvItem.iItem++; } - init = FALSE; } - // status dropdown boxes - { - int i, item; - int flags; - if (!bSettingSame) - flags = CallProtoService(setting->szName, PS_GETCAPS,PFLAGNUM_2,0)&~CallProtoService(setting->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0); - else - flags = 0; - - // clear box and add new status, loop status and check if compatible with proto - SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_RESETCONTENT, 0, 0); - SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_RESETCONTENT, 0, 0); - for ( i=0; i < SIZEOF(statusModeList); i++ ) { - if ( (flags & statusModePf2List[i]) || statusModePf2List[i] == PF2_OFFLINE || bSettingSame ) { - TCHAR *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0); - item = SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode); - SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]); - item = SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode); - SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]); - if (statusModeList[i] == setting->lv1Status) { - SendDlgItemMessage(hwndDlg,IDC_LV1STATUS,CB_SETCURSEL,(WPARAM)item,0); - - TCHAR setNaStr[256]; - mir_sntprintf( setNaStr, SIZEOF(setNaStr), TranslateT("minutes of %s mode"), statusMode ); - SetDlgItemText( hwndDlg, IDC_SETNASTR, setNaStr ); - } - if (statusModeList[i] == setting->lv2Status) - SendDlgItemMessage(hwndDlg,IDC_LV2STATUS,CB_SETCURSEL,(WPARAM)item,0); + } + init = FALSE; + // status dropdown boxes + { + int flags = 0; + if (!bSettingSame) + flags = CallProtoService(setting->szName, PS_GETCAPS, PFLAGNUM_2, 0)&~CallProtoService(setting->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0); + + // clear box and add new status, loop status and check if compatible with proto + SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_RESETCONTENT, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_RESETCONTENT, 0, 0); + for (int i=0; i < SIZEOF(statusModeList); i++) { + if ((flags & statusModePf2List[i]) || statusModePf2List[i] == PF2_OFFLINE || bSettingSame) { + TCHAR *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0); + int item = SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode); + SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]); + item = SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode); + SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]); + if (statusModeList[i] == setting->lv1Status) { + SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_SETCURSEL, (WPARAM)item, 0); + SetDlgItemText(hwndDlg, IDC_SETNASTR, CMString().Format(TranslateT("minutes of %s mode"), statusMode)); } + if (statusModeList[i] == setting->lv2Status) + SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_SETCURSEL, (WPARAM)item, 0); } } - SetDialogItems(hwndDlg, setting); - break; + } + SetDialogItems(hwndDlg, setting); + break; - case IDC_LV1STATUS: - if (HIWORD(wParam) == CBN_SELCHANGE) - SendMessage(GetParent(hwndDlg),PSM_CHANGED,0,0); + case IDC_LV1STATUS: + if (HIWORD(wParam) == CBN_SELCHANGE) + SendMessage(GetParent(hwndDlg),PSM_CHANGED,0,0); - setting->lv1Status = (int)SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETCURSEL, 0, 0), 0); - { - TCHAR setNaStr[256]; - mir_sntprintf(setNaStr, SIZEOF(setNaStr), TranslateT("minutes of %s mode"), pcli->pfnGetStatusModeDescription(setting->lv1Status, 0)); - SetDlgItemText(hwndDlg, IDC_SETNASTR, setNaStr); - } - break; + setting->lv1Status = (int)SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETCURSEL, 0, 0), 0); + SetDlgItemText(hwndDlg, IDC_SETNASTR, CMString().Format(TranslateT("minutes of %s mode"), pcli->pfnGetStatusModeDescription(setting->lv1Status, 0))); + break; - case IDC_LV2STATUS: - if (HIWORD(wParam) == CBN_SELCHANGE) - SendMessage(GetParent(hwndDlg),PSM_CHANGED,0,0); + case IDC_LV2STATUS: + if (HIWORD(wParam) == CBN_SELCHANGE) + SendMessage(GetParent(hwndDlg),PSM_CHANGED,0,0); - setting->lv2Status = (int)SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_GETCURSEL, 0, 0), 0); - break; + setting->lv2Status = (int)SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_GETCURSEL, 0, 0), 0); + break; - case IDC_SCREENSAVE: - setting->optionFlags^=FLAG_ONSAVER; - SetDialogItems(hwndDlg, setting); - break; + case IDC_FULLSCREEN: + setting->optionFlags ^= FLAG_FULLSCREEN; + SetDialogItems(hwndDlg, setting); + break; - case IDC_ONLOCK: - setting->optionFlags^=FLAG_ONLOCK; - SetDialogItems(hwndDlg, setting); - break; + case IDC_SCREENSAVE: + setting->optionFlags ^= FLAG_ONSAVER; + SetDialogItems(hwndDlg, setting); + break; - case IDC_TIMED: - setting->optionFlags^=FLAG_ONMOUSE; - SetDialogItems(hwndDlg, setting); - break; + case IDC_ONLOCK: + setting->optionFlags ^= FLAG_ONLOCK; + SetDialogItems(hwndDlg, setting); + break; - case IDC_SETNA: - setting->optionFlags^=FLAG_SETNA; - SetDialogItems(hwndDlg, setting); - break; + case IDC_TIMED: + setting->optionFlags ^= FLAG_ONMOUSE; + SetDialogItems(hwndDlg, setting); + break; - case IDC_AWAYTIME: - setting->awayTime = GetDlgItemInt(hwndDlg,IDC_AWAYTIME, NULL, FALSE); - break; + case IDC_SETNA: + setting->optionFlags ^= FLAG_SETNA; + SetDialogItems(hwndDlg, setting); + break; - case IDC_NATIME: - setting->naTime = GetDlgItemInt(hwndDlg,IDC_NATIME, NULL, FALSE); - break; + case IDC_AWAYTIME: + setting->awayTime = GetDlgItemInt(hwndDlg,IDC_AWAYTIME, NULL, FALSE); + break; - case IDC_LV2ONINACTIVE: - setting->optionFlags^=FLAG_LV2ONINACTIVE; - SetDialogItems(hwndDlg, setting); - break; + case IDC_NATIME: + setting->naTime = GetDlgItemInt(hwndDlg,IDC_NATIME, NULL, FALSE); + break; - case IDC_CONFIRM: - setting->optionFlags^=FLAG_CONFIRM; - SetDialogItems(hwndDlg, setting); - break; + case IDC_LV2ONINACTIVE: + setting->optionFlags^=FLAG_LV2ONINACTIVE; + SetDialogItems(hwndDlg, setting); + break; - case IDC_RESETSTATUS: - setting->optionFlags^=FLAG_RESET; - SetDialogItems(hwndDlg, setting); - break; + case IDC_CONFIRM: + setting->optionFlags^=FLAG_CONFIRM; + SetDialogItems(hwndDlg, setting); + break; - case IDC_MONITORMIRANDA: - setting->optionFlags^=FLAG_MONITORMIRANDA; - SetDialogItems(hwndDlg, setting); - break; - } + case IDC_RESETSTATUS: + setting->optionFlags^=FLAG_RESET; + SetDialogItems(hwndDlg, setting); + break; + + case IDC_MONITORMIRANDA: + setting->optionFlags^=FLAG_MONITORMIRANDA; + SetDialogItems(hwndDlg, setting); break; } + break; case WM_SHOWWINDOW: init = TRUE; - { - TAAAProtoSetting* setting = GetSetting(hwndDlg, sameSetting); - if ( setting ) - SetDialogItems(hwndDlg, setting); - } + + if (setting = GetSetting(hwndDlg, sameSetting)) + SetDialogItems(hwndDlg, setting); + SendMessage(hwndDlg, WM_COMMAND, (WPARAM)IDC_PROTOCOL, (LPARAM)0x11111111); init = FALSE; break; @@ -311,24 +311,21 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM switch(((NMHDR*)lParam)->code) { case LVN_ITEMCHANGED: - { - NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; - if (IsWindowVisible(GetDlgItem(hwndDlg,IDC_STATUSLIST)) && ((nmlv->uNewState^nmlv->uOldState)&LVIS_STATEIMAGEMASK)) { - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - - TAAAProtoSetting* setting = GetSetting(hwndDlg, sameSetting); - if ( setting ) { - HWND hList=GetDlgItem(hwndDlg,IDC_STATUSLIST); - LVITEM lvItem = { 0 }; - lvItem.mask = LVIF_PARAM; - lvItem.iItem = nmlv->iItem; - ListView_GetItem(hList, &lvItem); - int pf2Status = lvItem.lParam; - if (ListView_GetCheckState(hList, lvItem.iItem)) - setting->statusFlags |= pf2Status; - else - setting->statusFlags &= ~pf2Status; - } + NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam; + if (IsWindowVisible(GetDlgItem(hwndDlg, IDC_STATUSLIST)) && ((nmlv->uNewState ^ nmlv->uOldState) & LVIS_STATEIMAGEMASK)) { + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + + if (setting = GetSetting(hwndDlg, sameSetting)) { + HWND hList = GetDlgItem(hwndDlg, IDC_STATUSLIST); + LVITEM lvItem = { 0 }; + lvItem.mask = LVIF_PARAM; + lvItem.iItem = nmlv->iItem; + ListView_GetItem(hList, &lvItem); + int pf2Status = lvItem.lParam; + if (ListView_GetCheckState(hList, lvItem.iItem)) + setting->statusFlags |= pf2Status; + else + setting->statusFlags &= ~pf2Status; } } break; @@ -341,15 +338,15 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM if (bSettingSame) WriteAutoAwaySetting(*sameSetting, SETTING_ALL); else { - for (int i=0; i < optionSettings->getCount(); i++ ) - WriteAutoAwaySetting((*optionSettings)[i], (*optionSettings)[i].szName); + for (int i=0; i < optionSettings.getCount(); i++ ) + WriteAutoAwaySetting(optionSettings[i], optionSettings[i].szName); } - LoadOptions(*autoAwaySettings, FALSE); + LoadOptions(autoAwaySettings, FALSE); } break; case WM_DESTROY: - optionSettings->destroy(); + optionSettings.destroy(); free(sameSetting); break; } @@ -364,15 +361,15 @@ static INT_PTR CALLBACK DlgProcAutoAwayGeneralOpts(HWND hwndDlg, UINT msg, WPARA switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_IGNLOCK, db_get_b(NULL, MODULENAME, SETTING_IGNLOCK, FALSE)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_IGNSYSKEYS, db_get_b(NULL, MODULENAME, SETTING_IGNSYSKEYS, FALSE)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_IGNALTCOMBO, db_get_b(NULL, MODULENAME, SETTING_IGNALTCOMBO, FALSE)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_IGNLOCK, db_get_b(NULL, MODULENAME, SETTING_IGNLOCK, FALSE) != 0); + CheckDlgButton(hwndDlg, IDC_IGNSYSKEYS, db_get_b(NULL, MODULENAME, SETTING_IGNSYSKEYS, FALSE) != 0); + CheckDlgButton(hwndDlg, IDC_IGNALTCOMBO, db_get_b(NULL, MODULENAME, SETTING_IGNALTCOMBO, FALSE) != 0); + CheckDlgButton(hwndDlg, IDC_MONITORMOUSE, db_get_b(NULL, MODULENAME, SETTING_MONITORMOUSE, TRUE) != 0); + CheckDlgButton(hwndDlg, IDC_MONITORKEYBOARD, db_get_b(NULL, MODULENAME, SETTING_MONITORKEYBOARD, TRUE) != 0); SetDlgItemInt(hwndDlg, IDC_AWAYCHECKTIMEINSECS, db_get_w(NULL, MODULENAME, SETTING_AWAYCHECKTIMEINSECS, 5), FALSE); SetDlgItemInt(hwndDlg, IDC_CONFIRMDELAY, db_get_w(NULL, MODULENAME, SETTING_CONFIRMDELAY, 5), FALSE); - CheckDlgButton(hwndDlg, bSettingSame?IDC_SAMESETTINGS:IDC_PERPROTOCOLSETTINGS, BST_CHECKED); - CheckDlgButton(hwndDlg, IDC_MONITORMOUSE, db_get_b(NULL, MODULENAME, SETTING_MONITORMOUSE, TRUE)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MONITORKEYBOARD, db_get_b(NULL, MODULENAME, SETTING_MONITORKEYBOARD, TRUE)?BST_CHECKED:BST_UNCHECKED); - ShowWindow(GetDlgItem(hwndDlg, IDC_IDLEWARNING), (db_get_b(NULL, "Idle", "AAEnable", 0))); + CheckDlgButton(hwndDlg, bSettingSame ? IDC_SAMESETTINGS : IDC_PERPROTOCOLSETTINGS, BST_CHECKED); + ShowWindow(GetDlgItem(hwndDlg, IDC_IDLEWARNING), db_get_b(NULL, "Idle", "AAEnable", 0)); break; case WM_SHOWWINDOW: @@ -409,7 +406,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayGeneralOpts(HWND hwndDlg, UINT msg, WPARA db_set_w(NULL, MODULENAME, SETTING_CONFIRMDELAY, (WORD)GetDlgItemInt(hwndDlg, IDC_CONFIRMDELAY, NULL, FALSE)); db_set_b(NULL, MODULENAME, SETTING_MONITORMOUSE, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MONITORMOUSE)); db_set_b(NULL, MODULENAME, SETTING_MONITORKEYBOARD, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MONITORKEYBOARD)); - LoadOptions(*autoAwaySettings, FALSE); + LoadOptions(autoAwaySettings, FALSE); } break; } @@ -423,24 +420,22 @@ static INT_PTR CALLBACK DlgProcAutoAwayTabs(HWND hwndDlg, UINT msg, WPARAM wPara { switch(msg) { case WM_INITDIALOG: + TranslateDialogDefault(hwndDlg); { - int tabCount; - HWND hTab, hShow, hPage; - TCITEM tci; RECT rcTabs, rcOptions, rcPage; - - TranslateDialogDefault(hwndDlg); bSettingSame = db_get_b(NULL, MODULENAME, SETTING_SAMESETTINGS, FALSE); + // set tabs - tabCount = 0; - hTab = GetDlgItem(hwndDlg, IDC_TABS); + int tabCount = 0; + HWND hTab = GetDlgItem(hwndDlg, IDC_TABS); GetWindowRect(hTab, &rcTabs); GetWindowRect(hwndDlg, &rcOptions); - ZeroMemory(&tci, sizeof(TCITEM)); + // general tab - tci.mask = TCIF_TEXT|TCIF_PARAM; + TCITEM tci = { 0 }; + tci.mask = TCIF_TEXT | TCIF_PARAM; tci.pszText = TranslateT("General"); - hPage = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_OPT_GENAUTOAWAY), hwndDlg, DlgProcAutoAwayGeneralOpts, (LPARAM)GetParent(hwndDlg)); + HWND hPage = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_OPT_GENAUTOAWAY), hwndDlg, DlgProcAutoAwayGeneralOpts, (LPARAM)GetParent(hwndDlg)); EnableThemeDialogTexture(hPage, ETDT_ENABLETAB); tci.lParam = (LPARAM)hPage; @@ -448,7 +443,8 @@ static INT_PTR CALLBACK DlgProcAutoAwayTabs(HWND hwndDlg, UINT msg, WPARAM wPara MoveWindow(hPage, (rcTabs.left - rcOptions.left) + ((rcTabs.right-rcTabs.left)-(rcPage.right-rcPage.left))/2, 10 + (rcTabs.top - rcOptions.top) + ((rcTabs.bottom-rcTabs.top)-(rcPage.bottom-rcPage.top))/2, rcPage.right-rcPage.left, rcPage.bottom-rcPage.top, TRUE); ShowWindow(hPage, SW_HIDE); TabCtrl_InsertItem(hTab, tabCount++, &tci); - hShow = hPage; + HWND hShow = hPage; + // rules tab tci.mask = TCIF_TEXT|TCIF_PARAM; tci.pszText = TranslateT("Rules"); @@ -460,6 +456,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayTabs(HWND hwndDlg, UINT msg, WPARAM wPara MoveWindow(hPage, (rcTabs.left - rcOptions.left) + ((rcTabs.right-rcTabs.left)-(rcPage.right-rcPage.left))/2, 10 + (rcTabs.top - rcOptions.top) + ((rcTabs.bottom-rcTabs.top)-(rcPage.bottom-rcPage.top))/2, rcPage.right-rcPage.left, rcPage.bottom-rcPage.top, TRUE); ShowWindow(hPage, SW_HIDE); TabCtrl_InsertItem(hTab, tabCount++, &tci); + // messages tab tci.mask = TCIF_TEXT|TCIF_PARAM; tci.pszText = TranslateT("Status messages"); @@ -481,7 +478,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayTabs(HWND hwndDlg, UINT msg, WPARAM wPara break; case WM_NOTIFY: - if ( (((NMHDR*)lParam)->idFrom == IDC_TABS)) { + if ((((NMHDR*)lParam)->idFrom == IDC_TABS)) { if (((NMHDR*)lParam)->code == TCN_SELCHANGING) { TCITEM tci; @@ -499,15 +496,13 @@ static INT_PTR CALLBACK DlgProcAutoAwayTabs(HWND hwndDlg, UINT msg, WPARAM wPara } if (((LPNMHDR)lParam)->code == PSN_APPLY) { TCITEM tci; - int i, count; - tci.mask = TCIF_PARAM; - count = TabCtrl_GetItemCount(GetDlgItem(hwndDlg, IDC_TABS)); - for (i=0; i < count; i++ ) { - TabCtrl_GetItem(GetDlgItem(hwndDlg,IDC_TABS), i, &tci); + int count = TabCtrl_GetItemCount(GetDlgItem(hwndDlg, IDC_TABS)); + for (int i = 0; i < count; i++) { + TabCtrl_GetItem(GetDlgItem(hwndDlg, IDC_TABS), i, &tci); SendMessage((HWND)tci.lParam, WM_NOTIFY, 0, lParam); - } } - + } + } break; } -- cgit v1.2.3