further clist options optimization

3 files changed, 5 insertions, 107 deletions

diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index 572da15180..6f7edb34de 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -65,12 +65,10 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,12,121,10

     CONTROL         "Draw sunken edge",IDC_CLISTSUNKEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,121,10

     GROUPBOX        "System tray icon",IDC_STATIC,1,54,163,63

-    CONTROL         "Single click interface",IDC_ONECLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,64,147,10

-    CONTROL         "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,10,76,147,10

-    CONTROL         "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,88,147,10

-    EDITTEXT        IDC_BLINKTIME,69,99,57,12,ES_RIGHT | ES_NUMBER

-    CONTROL         "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,116,97,11,16

-    LTEXT           "ms",IDC_STATIC,131,101,24,8

+    CONTROL         "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,67,147,10

+    EDITTEXT        IDC_BLINKTIME,69,78,57,12,ES_RIGHT | ES_NUMBER

+    CONTROL         "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,120,77,11,16

+    LTEXT           "ms",IDC_STATIC,131,80,24,8

     GROUPBOX        "Event area",IDC_STATIC,169,54,133,63

     LTEXT           "Set base visibility on the frames menu",IDC_STATIC,176,65,121,20

     CONTROL         "Auto mode",IDC_EVENTAREAAUTOHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,88,121,10

@@ -444,7 +442,7 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "..\\src\\include\\resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

@@ -530,100 +528,6 @@ IDC_DROP                CURSOR                  "..\\..\\..\\src\\mir_app\\res\\
 

 IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drop_user.cur"

 

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO

-BEGIN

-    IDD_EXCEPTION, DIALOG

-    BEGIN

-    END

-

-    IDD_DELETECONTACT, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_CLIST, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_DSPGROUPS, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_DSPITEMS, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_DSPADVANCED, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_ICONS, DIALOG

-    BEGIN

-        VERTGUIDE, 5

-        VERTGUIDE, 11

-        VERTGUIDE, 20

-        VERTGUIDE, 288

-        VERTGUIDE, 298

-    END

-

-    IDD_OPT_CLUI, DIALOG

-    BEGIN

-        HORZGUIDE, 127

-    END

-

-    IDD_OPT_CLC, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_CLCBKG, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_SBAR, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_VIEWMODES, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_SKIN, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT, DIALOG

-    BEGIN

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// AFX_DIALOG_LAYOUT

-//

-

-IDD_OPT_SKIN AFX_DIALOG_LAYOUT

-BEGIN

-    0

-END

-

-IDD_OPT_CLIST AFX_DIALOG_LAYOUT

-BEGIN

-    0

-END

-

-IDD_OPT_CLC AFX_DIALOG_LAYOUT

-BEGIN

-    0

-END

-

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index ad572e27a1..f89078344c 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -53,8 +53,6 @@ public:
 		CheckDlgButton(m_hwnd, IDC_CLISTSUNKEN, cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(m_hwnd, IDC_EVENTAREAAUTOHIDE, cfg::dat.dwFlags & CLUI_FRAME_AUTOHIDENOTIFY ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(m_hwnd, IDC_EVENTAREASUNKEN, (cfg::dat.dwFlags & CLUI_FRAME_EVENTAREASUNKEN) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(m_hwnd, IDC_ONECLK, g_plugin.getByte("Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(m_hwnd, IDC_ALWAYSSTATUS, g_plugin.getByte("AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		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);

 

@@ -92,8 +90,6 @@ public:
 

 	bool OnApply() override

 	{

-		g_plugin.setByte("Tray1Click", (BYTE)IsDlgButtonChecked(m_hwnd, IDC_ONECLK));

-		g_plugin.setByte("AlwaysStatus", (BYTE)IsDlgButtonChecked(m_hwnd, IDC_ALWAYSSTATUS));

 		g_plugin.setByte("AlwaysMulti", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(m_hwnd, IDC_ALWAYSMULTI));

 		g_plugin.setByte("TrayIcon", (BYTE)(chkDontCycle.GetState() ? SETTING_TRAYICON_SINGLE : (chkCycle.GetState() ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI)));

 		g_plugin.setWord("CycleTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));

diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h
index 851b1edcc3..18610d4d7e 100644
--- a/plugins/Clist_nicer/src/resource.h
+++ b/plugins/Clist_nicer/src/resource.h
@@ -28,7 +28,6 @@
 #define IDD_OPT_DSPGROUPS               303

 #define IDC_ACTIVEPERC                  1000

 #define IDC_OPTIONSTAB                  1000

-#define IDC_ALWAYSSTATUS                1009

 #define IDC_APPLY                       1011

 #define IDC_AUTOSIZE                    1013

 #define IDC_AUTOSIZEUPWARD              1014

@@ -84,7 +83,6 @@
 #define IDC_CRIGHTSPIN                  1081

 #define IDC_LEFTMARGINSPIN              1092

 #define IDC_NOGROUPICON                 1102

-#define IDC_ONECLK                      1105

 #define IDC_RIGHTMARGIN                 1121

 #define IDC_ROWGAP                      1122

 #define IDC_TRANSPARENT                 1124