Clist_modern:

- fixes #3512 (Clist: "Hide empty groups" in "Setup view mode");
- fixes #3511 (Clist: "Show groups folded/unfolded" in "Setup view mode")

1 files changed, 23 insertions, 21 deletions

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 397b1f2593..fca73ca0c9 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -167,33 +167,35 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Available view modes",IDC_STATIC,7,2,158,85

-    LISTBOX         IDC_VIEWMODES,10,12,123,71,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE

+    GROUPBOX        "Available view modes",IDC_STATIC,7,2,158,52

     GROUPBOX        "Include protocols",IDC_STATIC,169,2,130,85

-    CONTROL         "",IDC_PROTOCOLS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,175,10,121,72

-    CONTROL         "",IDC_ADDVIEWMODE,"MButtonClass",WS_TABSTOP,140,22,18,16

-    CONTROL         "",IDC_RENAMEVIEWMODE,"MButtonClass",WS_TABSTOP,140,42,18,16

-    CONTROL         "",IDC_DELETEVIEWMODE,"MButtonClass",WS_TABSTOP,140,62,18,16

-    GROUPBOX        "Include groups",IDC_STATIC,6,87,159,89,0,WS_EX_TRANSPARENT

-    CONTROL         "",IDC_GROUPS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,10,98,122,57

-    CONTROL         "Show contacts in groups",IDC_USEGROUPS,"Button",BS_AUTO3STATE | WS_TABSTOP,10,160,122,11

-    GROUPBOX        "Include status modes",IDC_STATIC,171,87,130,89,0,WS_EX_TRANSPARENT

-    CONTROL         "",IDC_STATUSMODES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,173,98,121,73

-    LTEXT           "Protocol",IDC_STATIC,31,187,49,12

-    COMBOBOX        IDC_PROTOGROUPOP,85,185,37,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    CTEXT           "Group",IDC_STATIC,129,187,44,12

-    COMBOBOX        IDC_GROUPSTATUSOP,177,185,37,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    RTEXT           "Status mode",IDC_STATIC,221,187,54,12

+    CONTROL         "",IDC_PROTOCOLS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,176,12,117,70

+    CONTROL         "",IDC_ADDVIEWMODE,"MButtonClass",WS_TABSTOP,43,32,18,16

+    CONTROL         "",IDC_RENAMEVIEWMODE,"MButtonClass",WS_TABSTOP,73,32,18,16

+    CONTROL         "",IDC_DELETEVIEWMODE,"MButtonClass",WS_TABSTOP,102,32,18,16

+    GROUPBOX        "Include groups",IDC_STATIC,6,54,159,121,0,WS_EX_TRANSPARENT

+    CONTROL         "",IDC_GROUPS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,12,66,146,57

+    CONTROL         "Show contacts in groups",IDC_USEGROUPS,"Button",BS_AUTO3STATE | WS_TABSTOP,15,130,143,11

+    CONTROL         "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTO3STATE | WS_TABSTOP,24,144,132,11

+    CONTROL         "Show groups folded",IDC_FOLD_GROUPS,"Button",BS_AUTO3STATE | WS_TABSTOP,24,158,132,11

+    GROUPBOX        "Include status modes",IDC_STATIC,169,87,130,89,0,WS_EX_TRANSPARENT

+    CONTROL         "",IDC_STATUSMODES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,176,98,117,73

+    LTEXT           "Protocol",IDC_STATIC,31,189,49,9

+    COMBOBOX        IDC_PROTOGROUPOP,85,187,37,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    CTEXT           "Group",IDC_STATIC,129,189,44,9

+    COMBOBOX        IDC_GROUPSTATUSOP,177,187,37,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    RTEXT           "Status mode",IDC_STATIC,221,189,54,9

     CONTROL         "Automatically clear this view mode after",IDC_AUTOCLEAR,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,225,172,11

-    EDITTEXT        IDC_AUTOCLEARVAL,222,224,29,12,ES_AUTOHSCROLL

-    CONTROL         "",IDC_AUTOCLEARSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,246,224,8,13

-    LTEXT           "seconds",IDC_STATIC,262,225,28,12

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,227,172,11

+    EDITTEXT        IDC_AUTOCLEARVAL,222,226,29,12,ES_AUTOHSCROLL

+    CONTROL         "",IDC_AUTOCLEARSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,248,225,8,13

+    LTEXT           "seconds",IDC_STATIC,262,227,28,11

     GROUPBOX        "View mode options",IDC_STATIC,8,176,293,68

     CONTROL         "Last message",IDC_LASTMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,208,86,11

     COMBOBOX        IDC_LASTMESSAGEOP,106,208,81,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    EDITTEXT        IDC_LASTMSGVALUE,193,208,31,13,ES_AUTOHSCROLL

+    EDITTEXT        IDC_LASTMSGVALUE,193,208,31,12,ES_AUTOHSCROLL

     COMBOBOX        IDC_LASTMESSAGEUNIT,229,208,68,56,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    COMBOBOX        IDC_VIEWMODES,15,14,144,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

 END

 

 IDD_OPT_VIEWMODES2 DIALOGEX 0, 0, 309, 244