From af45a65dec00f4af9617d817285b859cc98e4171 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 14 Aug 2023 12:21:51 +0300 Subject: Clist_blind: duplicate options removed --- plugins/Clist_blind/res/resource.rc | 28 ++++++++++++---------------- plugins/Clist_blind/src/clistopts.cpp | 18 +----------------- plugins/Clist_blind/src/resource.h | 1 - 3 files changed, 13 insertions(+), 34 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc index 762d8d2d2f..0b96b4050a 100644 --- a/plugins/Clist_blind/res/resource.rc +++ b/plugins/Clist_blind/res/resource.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // Dialog // -IDD_OPT_CLIST DIALOGEX 0, 0, 314, 167 +IDD_OPT_CLIST DIALOGEX 0, 0, 314, 124 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -33,21 +33,16 @@ BEGIN CONTROL "Sort contacts by name",IDC_SORTBYNAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,14,246,10 CONTROL "Sort contacts by status",IDC_SORTBYSTATUS,"Button",BS_AUTORADIOBUTTON,10,26,246,10 CONTROL "Sort contacts by protocol",IDC_SORTBYPROTO,"Button",BS_AUTORADIOBUTTON,10,38,246,10 - CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,68,86,9 - EDITTEXT IDC_BLINKTIME,11,82,35,12,ES_NUMBER - CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,39,83,11,8 - LTEXT "ms delay",IDC_STMSDELAY,51,83,113,8 - CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,113,97,10 - COMBOBOX IDC_PRIMARYSTATUS,107,112,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "icon when statuses differ",IDC_STATIC,189,114,116,8,NOT WS_GROUP - CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,130,97,10 - EDITTEXT IDC_CYCLETIME,107,129,30,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,134,128,10,14 - LTEXT "seconds, when statuses differ",IDC_STATIC,140,131,165,8,NOT WS_GROUP - CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,147,98,10 - CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,147,198,10 - GROUPBOX "System tray icon",IDC_STATIC,2,57,310,43 - GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,101,310,61 + CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,69,97,10 + COMBOBOX IDC_PRIMARYSTATUS,107,68,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "icon when statuses differ",IDC_STATIC,189,70,116,8,NOT WS_GROUP + CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,86,97,10 + EDITTEXT IDC_CYCLETIME,107,85,30,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,124,84,11,14 + LTEXT "seconds, when statuses differ",IDC_STATIC,140,87,165,8,NOT WS_GROUP + CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,103,98,10 + CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,103,198,10 + GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,57,310,61 GROUPBOX "Contact list sorting",IDC_STATIC,2,2,310,54,WS_GROUP END @@ -151,6 +146,7 @@ BEGIN VERTGUIDE, 10 VERTGUIDE, 107 TOPMARGIN, 2 + BOTTOMMARGIN, 123 END IDD_OPT_CLUI, DIALOG diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index 28352cce7c..8c87cec294 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -25,17 +25,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. class CGenOptsDlg : public CDlgBase { - CCtrlCheck chkBlink, chkCycle, chkDontCycle, chkMultiTray; + CCtrlCheck chkCycle, chkDontCycle, chkMultiTray; public: CGenOptsDlg() : CDlgBase(g_plugin, IDD_OPT_CLIST), - chkBlink(this, IDC_DISABLEBLINK), chkCycle(this, IDC_CYCLE), chkDontCycle(this, IDC_DONTCYCLE), chkMultiTray(this, IDC_MULTITRAY) { - chkBlink.OnChange = Callback(this, &CGenOptsDlg::onChange_Blink); chkCycle.OnChange = chkDontCycle.OnChange = chkMultiTray.OnChange = Callback(this, &CGenOptsDlg::onChange_Cycle); } @@ -50,7 +48,6 @@ public: chkDontCycle.SetState(iTrayIcon == SETTING_TRAYICON_SINGLE); CheckDlgButton(m_hwnd, IDC_ALWAYSMULTI, !g_plugin.getByte("AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(m_hwnd, IDC_DISABLEBLINK, g_plugin.getByte("DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_SETRANGE, 0, MAKELONG(120, 1)); SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(g_plugin.getWord("CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); @@ -72,9 +69,6 @@ public: if (CB_ERR == (int)SendDlgItemMessage(m_hwnd, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0)) SendDlgItemMessage(m_hwnd, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0); - SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(m_hwnd, IDC_BLINKTIME), 0); // set buddy - SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250)); - SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(g_plugin.getWord("IconFlashTime", 550), 0)); return true; } @@ -87,8 +81,6 @@ public: g_plugin.setByte("AlwaysMulti", (uint8_t)!IsDlgButtonChecked(m_hwnd, IDC_ALWAYSMULTI)); g_plugin.setByte("TrayIcon", iTrayIcon); g_plugin.setWord("CycleTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0)); - g_plugin.setWord("IconFlashTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_GETPOS, 0, 0)); - g_plugin.setByte("DisableTrayFlash", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_DISABLEBLINK)); int cur = SendDlgItemMessage(m_hwnd, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0); PROTOACCOUNT *pa = (PROTOACCOUNT *)SendDlgItemMessage(m_hwnd, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0); @@ -110,14 +102,6 @@ public: EnableWindow(GetDlgItem(m_hwnd, IDC_CYCLETIMESPIN), chkCycle.IsChecked()); EnableWindow(GetDlgItem(m_hwnd, IDC_ALWAYSMULTI), chkMultiTray.IsChecked()); } - - void onChange_Blink(CCtrlCheck *pCheck) - { - bool bEnabled = !pCheck->IsChecked(); - EnableWindow(GetDlgItem(m_hwnd, IDC_BLINKTIME), bEnabled); - EnableWindow(GetDlgItem(m_hwnd, IDC_BLINKSPIN), bEnabled); - EnableWindow(GetDlgItem(m_hwnd, IDC_STMSDELAY), bEnabled); - } }; /****************************************************************************************/ diff --git a/plugins/Clist_blind/src/resource.h b/plugins/Clist_blind/src/resource.h index a774d67a4e..e8cd6ee636 100644 --- a/plugins/Clist_blind/src/resource.h +++ b/plugins/Clist_blind/src/resource.h @@ -62,7 +62,6 @@ #define IDC_BRINGTOFRONT 1579 #define IDC_BLINKTIME 1607 #define IDC_BLINKSPIN 1608 -#define IDC_DISABLEBLINK 1609 #define IDC_IDLE 1610 #define IDC_SBPANELBEVEL 1611 #define IDC_DROPSHADOW 1612 -- cgit v1.2.3