From fb74b51d6642fcf4c34a5594873eec152cc48b05 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 22 Jan 2021 22:03:31 +0300 Subject: further clist options optimization --- src/core/stdclist/res/resource.rc | 38 +++++++++++++++++-------------------- src/core/stdclist/src/clistopts.cpp | 4 ---- src/core/stdclist/src/resource.h | 2 -- 3 files changed, 17 insertions(+), 27 deletions(-) (limited to 'src/core/stdclist') diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc index 614c54ac26..45f06891dc 100644 --- a/src/core/stdclist/res/resource.rc +++ b/src/core/stdclist/res/resource.rc @@ -40,7 +40,7 @@ BEGIN LTEXT "This will erase all history and settings for this contact!",IDC_STATIC,7,18,239,16 END -IDD_OPT_CLIST DIALOGEX 0, 0, 314, 219 +IDD_OPT_CLIST DIALOGEX 0, 0, 314, 189 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -48,23 +48,21 @@ BEGIN CONTROL "Sort contacts by name",IDC_SORTBYNAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,14,287,10 CONTROL "Sort contacts by status",IDC_SORTBYSTATUS,"Button",BS_AUTORADIOBUTTON,10,26,287,10 CONTROL "Sort contacts by protocol",IDC_SORTBYPROTO,"Button",BS_AUTORADIOBUTTON,10,38,287,10 - CONTROL "Single click interface",IDC_ONECLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,83,298,10 - CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,10,96,151,11 - CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,110,86,9 - EDITTEXT IDC_BLINKTIME,12,123,35,12,ES_NUMBER - CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,39,123,11,14 - LTEXT "ms delay",IDC_STMSDELAY,52,126,113,8 - CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,158,90,10 - COMBOBOX IDC_PRIMARYSTATUS,104,157,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "icon when statuses differ",IDC_STATIC,189,159,116,8,NOT WS_GROUP - CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,175,89,10 - EDITTEXT IDC_CYCLETIME,103,174,30,12,ES_RIGHT | ES_NUMBER - CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,127,158,10,14 - LTEXT "seconds, when statuses differ",IDC_STATIC,141,176,165,8,NOT WS_GROUP - CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,192,91,10 - CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,192,198,10 - GROUPBOX "System tray icon",IDC_STATIC,2,72,310,70 - GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,146,310,66 + CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,86,86,9 + EDITTEXT IDC_BLINKTIME,12,99,35,12,ES_NUMBER + CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,43,99,11,14 + LTEXT "ms delay",IDC_STMSDELAY,52,102,113,8 + CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,133,90,10 + COMBOBOX IDC_PRIMARYSTATUS,104,132,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "icon when statuses differ",IDC_STATIC,189,134,116,8,NOT WS_GROUP + CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,150,89,10 + EDITTEXT IDC_CYCLETIME,103,149,30,12,ES_RIGHT | ES_NUMBER + CONTROL "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,127,133,10,14 + LTEXT "seconds, when statuses differ",IDC_STATIC,141,151,165,8,NOT WS_GROUP + CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,167,91,10 + CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,167,198,10 + GROUPBOX "System tray icon",IDC_STATIC,2,72,310,47 + GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,121,310,61 GROUPBOX "Contact list sorting",IDC_STATIC,2,2,310,68,WS_GROUP CONTROL "Don't move offline user to bottom",IDC_NOOFFLINEMOVE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,53,287,10 @@ -230,9 +228,7 @@ BEGIN VERTGUIDE, 2 VERTGUIDE, 308 TOPMARGIN, 2 - BOTTOMMARGIN, 217 - HORZGUIDE, 179 - HORZGUIDE, 196 + BOTTOMMARGIN, 187 END IDD_OPT_CLUI, DIALOG diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index 9f7ee3c2b6..fa86e449df 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -57,8 +57,6 @@ public: sortByStatus.SetState(g_plugin.getByte("SortByStatus", SETTING_SORTBYSTATUS_DEFAULT)); chkOfflineBottom.SetState(g_plugin.getByte("NoOfflineBottom")); - CheckDlgButton(m_hwnd, IDC_ONECLK, g_plugin.getByte("Tray1Click", SETTING_TRAY1CLICK_DEFAULT)); - CheckDlgButton(m_hwnd, IDC_ALWAYSSTATUS, g_plugin.getByte("AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT)); CheckDlgButton(m_hwnd, IDC_ALWAYSMULTI, !g_plugin.getByte("AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT)); int iTrayIcon = g_plugin.getByte("TrayIcon", SETTING_TRAYICON_DEFAULT); @@ -92,8 +90,6 @@ public: g_plugin.setByte("SortByStatus", g_bSortByStatus = sortByStatus.GetState()); g_plugin.setByte("SortByProto", g_bSortByProto = sortByProto.GetState()); g_plugin.setByte("NoOfflineBottom", g_bNoOfflineBottom = chkOfflineBottom.GetState()); - g_plugin.setByte("Tray1Click", IsDlgButtonChecked(m_hwnd, IDC_ONECLK)); - g_plugin.setByte("AlwaysStatus", IsDlgButtonChecked(m_hwnd, IDC_ALWAYSSTATUS)); g_plugin.setByte("AlwaysMulti", !IsDlgButtonChecked(m_hwnd, IDC_ALWAYSMULTI)); g_plugin.setByte("TrayIcon", (chkDontCycle.GetState() ? SETTING_TRAYICON_SINGLE : (chkCycle.GetState() ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI))); g_plugin.setWord("CycleTime", cycleTime.GetPosition()); diff --git a/src/core/stdclist/src/resource.h b/src/core/stdclist/src/resource.h index 76473f5926..6f22f577d9 100644 --- a/src/core/stdclist/src/resource.h +++ b/src/core/stdclist/src/resource.h @@ -18,7 +18,6 @@ #define IDC_SHOWMAINMENU 1075 #define IDC_CLIENTDRAG 1076 #define IDC_TOOLWND 1097 -#define IDC_ONECLK 1098 #define IDC_SHOWCAPTION 1098 #define IDC_SHOWHIDE 1100 #define IDC_SORTBYSTATUS 1101 @@ -26,7 +25,6 @@ #define IDC_READMSG 1102 #define IDC_AUTOSIZE 1102 #define IDC_AUTOSIZEUPWARD 1103 -#define IDC_ALWAYSSTATUS 1103 #define IDC_NETSEARCH 1104 #define IDC_SORTBYPROTO 1105 #define IDC_SHOWOPTIONS 1105 -- cgit v1.2.3