fixes #3240 (StdClist: get rid of inverted logic)

1 files changed, 25 insertions, 34 deletions

diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc
index 45f06891dc..22ccc72edc 100644
--- a/src/core/stdclist/res/resource.rc
+++ b/src/core/stdclist/res/resource.rc
@@ -45,27 +45,22 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

+    GROUPBOX        "Contact list sorting",IDC_STATIC,2,2,310,68,WS_GROUP

     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         "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,

+    CONTROL         "Move offline users to bottom",IDC_MOVE_OFFLINE_BOTTOM,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,53,287,10

+    CONTROL         "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,83,90,10

+    COMBOBOX        IDC_PRIMARYSTATUS,104,82,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "icon when statuses differ",IDC_STATIC,189,84,116,8,NOT WS_GROUP

+    CONTROL         "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,100,89,10

+    EDITTEXT        IDC_CYCLETIME,103,99,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,98,11,14

+    LTEXT           "seconds, when statuses differ",IDC_STATIC,141,101,165,8,NOT WS_GROUP

+    CONTROL         "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,117,91,10

+    CONTROL         "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,117,198,10

+    GROUPBOX        "System tray icon when using multiple protocols",IDC_STATIC,2,71,310,61

 END

 

 IDD_OPT_CLUI DIALOGEX 0, 0, 313, 233

@@ -129,7 +124,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,59,179,10

     CONTROL         "Make selection highlight translucent",IDC_NOTNOTRANSLUCENTSEL,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,71,179,10

-    CONTROL         "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,83,155,10

+    CONTROL         "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,83,153,10

     GROUPBOX        "Groups",IDC_STATIC,2,99,148,117

     CONTROL         "Draw a line alongside group names",IDC_LINEWITHGROUPS,

                     "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,109,131,16

@@ -142,26 +137,26 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,181,131,16

     LTEXT           "Indent groups by:",IDC_STATIC,9,201,67,8

     EDITTEXT        IDC_GROUPINDENT,78,199,31,12,ES_RIGHT | ES_NUMBER

-    CONTROL         "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,103,204,10,14

+    CONTROL         "Spin1",IDC_GROUPINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,103,198,10,14

     LTEXT           "pixels",IDC_STATIC,112,201,36,8

     GROUPBOX        "Visual",IDC_STATIC,156,99,156,131

-    CONTROL         "Scroll list smoothly",IDC_NOTNOSMOOTHSCROLLING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,110,139,10

+    CONTROL         "Scroll list smoothly",IDC_NOTNOSMOOTHSCROLLING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,110,139,10

     LTEXT           "Time:",IDC_STATIC11,174,122,42,8

     EDITTEXT        IDC_SMOOTHTIME,216,120,31,12,ES_RIGHT | ES_NUMBER

-    CONTROL         "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,126,10,14

+    CONTROL         "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,119,10,14

     LTEXT           "milliseconds",IDC_STATIC12,250,122,56,8,SS_CENTERIMAGE

-    CONTROL         "Hide vertical scroll bar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,135,140,10

-    LTEXT           "Left margin:",IDC_STATIC,164,148,51,8

+    CONTROL         "Hide vertical scroll bar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,135,140,10

+    LTEXT           "Left margin:",IDC_STATIC,162,148,51,8

     EDITTEXT        IDC_LEFTMARGIN,215,146,31,12,ES_RIGHT | ES_NUMBER

-    CONTROL         "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,152,10,14

+    CONTROL         "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,145,10,14

     LTEXT           "pixels",IDC_STATIC,250,148,54,8

-    LTEXT           "Row height:",IDC_STATIC,164,163,51,8

+    LTEXT           "Row height:",IDC_STATIC,162,163,51,8

     EDITTEXT        IDC_ROWHEIGHT,215,161,31,12,ES_RIGHT | ES_NUMBER

-    CONTROL         "Spin1",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,167,10,14

+    CONTROL         "Spin1",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,161,10,14

     LTEXT           "pixels",IDC_STATIC,250,163,54,8

-    CONTROL         "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,174,140,10

-    CONTROL         "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,185,139,10

-    CONTROL         "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,164,195,141,32

+    CONTROL         "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,174,140,10

+    CONTROL         "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,185,139,10

+    CONTROL         "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,162,195,141,32

 END

 

 IDD_OPT_CLCBKG DIALOGEX 0, 0, 235, 154

@@ -257,13 +252,9 @@ BEGIN
         LEFTMARGIN, 2

         RIGHTMARGIN, 312

         VERTGUIDE, 9

-        VERTGUIDE, 164

-        VERTGUIDE, 216

+        VERTGUIDE, 162

         TOPMARGIN, 2

         BOTTOMMARGIN, 232

-        HORZGUIDE, 145

-        HORZGUIDE, 163

-        HORZGUIDE, 222

     END

 

     IDD_OPT_CLCBKG, DIALOG