Contact lists:

- all common options moved to the Clist namespace;
- fixes #2281 (Add option to not clear "NotOnList" group at start);

9 files changed, 441 insertions, 76 deletions

diff --git a/plugins/Clist_nicer/clist_nicer.vcxproj b/plugins/Clist_nicer/clist_nicer.vcxproj
index 5ce4a6fb8b..9544f8e18b 100644
--- a/plugins/Clist_nicer/clist_nicer.vcxproj
+++ b/plugins/Clist_nicer/clist_nicer.vcxproj
@@ -18,6 +18,40 @@
       <Platform>x64</Platform>

     </ProjectConfiguration>

   </ItemGroup>

+  <ItemGroup>

+    <Image Include="..\..\src\mir_app\res\_blank.ico" />

+    <Image Include="res\accounts.ico" />

+    <Image Include="res\arrow-down.ico" />

+    <Image Include="res\clist.ico" />

+    <Image Include="res\connecting.ico" />

+    <Image Include="res\delete.ico" />

+    <Image Include="res\find.ico" />

+    <Image Include="res\groups.ico" />

+    <Image Include="res\menu.ico" />

+    <Image Include="res\minimize.ico" />

+    <Image Include="res\online.ico" />

+    <Image Include="res\options.ico" />

+    <Image Include="res\options_clvm.ico" />

+    <Image Include="res\overlay\away.ico" />

+    <Image Include="res\overlay\dnd.ico" />

+    <Image Include="res\overlay\invisible.ico" />

+    <Image Include="res\overlay\na.ico" />

+    <Image Include="res\overlay\occupied.ico" />

+    <Image Include="res\overlay\offline.ico" />

+    <Image Include="res\overlay\online.ico" />

+    <Image Include="res\slist.ico" />

+    <Image Include="res\sounds_off.ico" />

+    <Image Include="res\sounds_on.ico" />

+    <Image Include="res\tabsrmm_menu.ico" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\src\mir_app\res\cursor_drag_copy.cur" />

+    <None Include="..\..\src\mir_app\res\cursor_drop_user.cur" />

+    <None Include="..\..\src\mir_app\res\cursor_hyperlink.cur" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\include\resource.h" />

+  </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectName>Clist_nicer</ProjectName>

     <ProjectGuid>{3C42510C-A29E-4A53-899C-203BFA874E0B}</ProjectGuid>

diff --git a/plugins/Clist_nicer/clist_nicer.vcxproj.filters b/plugins/Clist_nicer/clist_nicer.vcxproj.filters
index 7ef90967de..382996ad02 100644
--- a/plugins/Clist_nicer/clist_nicer.vcxproj.filters
+++ b/plugins/Clist_nicer/clist_nicer.vcxproj.filters
@@ -5,14 +5,379 @@
     <ClInclude Include="src\*.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClCompile Include="src\*.cpp;src\*.cxx">

+    <ClCompile Include="src\clc.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\CLCButton.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clcitems.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clcmsgs.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clcopts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clcpaint.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clcutils.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clistevents.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clistmenus.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clistmod.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clistopts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clistsettings.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clisttray.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clnplus.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\clui.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\cluiframes.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\cluiopts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\cluiservices.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\config.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\contact.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\coolsblib.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\coolscroll.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Docking.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\extBackg.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\groupmenu.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\init.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\rowheight_funcs.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\statusbar.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\viewmodes.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\wallpaper.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\stdafx.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\arrow-down.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\clist.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\connecting.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\delete.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\find.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\groups.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\menu.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\minimize.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\online.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\options.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\options_clvm.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\rename.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\slist.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\sounds_off.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\sounds_on.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\tabsrmm_menu.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\include\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="src\stdafx.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\*.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

     <ResourceCompile Include="res\*.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+  </ItemGroup>

+  <ItemGroup>

+    <Image Include="res\clist.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\delete.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\options_clvm.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\arrow-down.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="..\..\src\mir_app\res\_blank.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\overlay\offline.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\overlay\online.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\overlay\away.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\overlay\dnd.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\overlay\na.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\overlay\occupied.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\overlay\invisible.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\online.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\groups.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\sounds_on.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\find.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\options.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\minimize.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\sounds_off.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\slist.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\tabsrmm_menu.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\connecting.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\menu.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\accounts.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\src\mir_app\res\cursor_hyperlink.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="..\..\src\mir_app\res\cursor_drag_copy.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="..\..\src\mir_app\res\cursor_drop_user.cur">

       <Filter>Resource Files</Filter>

     </None>

   </ItemGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index 7f4918c797..b9b57d1b32 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -53,46 +53,41 @@ 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, 305, 226

+IDD_OPT_CLIST DIALOGEX 0, 0, 305, 209

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Contact list",IDC_STCLISTGROUP,1,0,163,91

-    CONTROL         "Hide offline users",IDC_HIDEOFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,12,147,10

-    CONTROL         "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,147,10

-    CONTROL         "Disable groups",IDC_DISABLEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,38,147,10

-    CONTROL         "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,51,147,10

-    CONTROL         "Disable icon blinking",IDC_ICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,64,147,10

+    GROUPBOX        "Contact list",IDC_STCLISTGROUP,1,0,301,67

+    CONTROL         "Disable icon blinking",IDC_ICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,38,147,10

     CONTROL         "Apply last active view mode",IDC_APPLYLASTVIEWMODE,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,77,147,10

-    GROUPBOX        "Contact list layout",IDC_STATIC,169,0,133,91

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,51,147,10

     CONTROL         "Show menu and status buttons",IDC_SHOWBOTTOMBUTTONS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,12,121,10

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

-    GROUPBOX        "System tray icon",IDC_STATIC,1,91,163,63

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

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

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

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

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

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

-    GROUPBOX        "Event area",IDC_STATIC,169,91,133,63

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

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

-    CONTROL         "Draw sunken edge",IDC_EVENTAREASUNKEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,138,121,10

-    GROUPBOX        "System tray icon when using multiple protocols",IDC_STATIC,1,154,302,71

-    CONTROL         "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,166,92,10

-    COMBOBOX        IDC_PRIMARYSTATUS,107,165,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "icon when statuses differ",IDC_STATIC,189,167,113,8,NOT WS_GROUP

-    CONTROL         "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,180,92,10

-    EDITTEXT        IDC_CYCLETIME,107,180,30,12,ES_RIGHT | ES_NUMBER

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

-    LTEXT           "seconds, when statuses differ",IDC_STATIC,140,182,155,8,NOT WS_GROUP

-    CONTROL         "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,194,92,10

-    CONTROL         "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,194,186,10

+                    "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,69,163,63

+    CONTROL         "Single click interface",IDC_ONECLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,79,147,10

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

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

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

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

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

+    GROUPBOX        "Event area",IDC_STATIC,169,69,133,63

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

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

+    CONTROL         "Draw sunken edge",IDC_EVENTAREASUNKEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,116,121,10

+    GROUPBOX        "System tray icon when using multiple protocols",IDC_STATIC,1,135,302,71

+    CONTROL         "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,147,92,10

+    COMBOBOX        IDC_PRIMARYSTATUS,107,146,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "icon when statuses differ",IDC_STATIC,189,148,113,8,NOT WS_GROUP

+    CONTROL         "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,161,92,10

+    EDITTEXT        IDC_CYCLETIME,107,161,30,12,ES_RIGHT | ES_NUMBER

+    CONTROL         "Spin1",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,128,162,11,14

+    LTEXT           "seconds, when statuses differ",IDC_STATIC,140,163,155,8,NOT WS_GROUP

+    CONTROL         "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,175,92,10

+    CONTROL         "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,175,186,10

     CONTROL         "Do not show system tray icon tooltips on mouse over",IDC_NOTRAYINFOTIPS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,208,284,12

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,189,284,12

 END

 

 IDD_OPT_DSPGROUPS DIALOGEX 0, 0, 305, 205

@@ -443,6 +438,7 @@ BEGIN
     PUSHBUTTON      "Export to skin file",IDC_EXPORT,19,229,125,15

 END

 

+

 #ifdef APSTUDIO_INVOKED

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

 //

diff --git a/plugins/Clist_nicer/src/CLCButton.cpp b/plugins/Clist_nicer/src/CLCButton.cpp
index 38bb6e0e2d..aefe2bb6bf 100644
--- a/plugins/Clist_nicer/src/CLCButton.cpp
+++ b/plugins/Clist_nicer/src/CLCButton.cpp
@@ -32,7 +32,7 @@ struct CluiTopButton BTNS[] =
 	{ IDC_TBFINDANDADD,        "CLN_findadd",      nullptr, LPGEN("Find and add contacts"),      1, 1, 0 },

 	{ IDC_TBACCOUNTS,          "CLN_accounts",     nullptr, LPGEN("Accounts"),                   1, 1, 0 },

 	{ IDC_TBOPTIONS,           "CLN_options",      nullptr, LPGEN("Open preferences"),           1, 1, 0 },

-	{ IDC_TBSOUND,         "CLN_sound", "CLN_soundsoff", LPGEN("Enable/Disable sounds"),      0, 1, 0 },

+	{ IDC_TBSOUND,            "CLN_sound", "CLN_soundsoff", LPGEN("Enable/Disable sounds"),      0, 1, 0 },

 	{ IDC_TBMINIMIZE,          "CLN_minimize",     nullptr, LPGEN("Minimize contact list"),      1, 0, 0 },

 	{ IDC_TBTOPSTATUS,         "CLN_topstatus",    nullptr, LPGEN("Status menu"),                1, 0, 1 },

 

@@ -65,8 +65,8 @@ static void InitDefaultButtons()
 	}

 	g_index = -1;

 

-	ClcSetButtonState(IDC_TBHIDEOFFLINE, g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT));

-	ClcSetButtonState(IDC_TBHIDEGROUPS, g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT));

+	ClcSetButtonState(IDC_TBHIDEOFFLINE, Clist::HideOffline);

+	ClcSetButtonState(IDC_TBHIDEGROUPS, Clist::UseGroups);

 	ClcSetButtonState(IDC_TBSOUND, db_get_b(0, "Skin", "UseSound", 1) ? BST_UNCHECKED : BST_CHECKED);

 }

 

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index d95f6edce2..b74caf29f5 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -133,7 +133,7 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam)
 				if (!__strcmp(cws->szSetting, "Status")) {

 					if (!Contact_IsHidden(hContact))

 						if (cws->value.wVal == ID_STATUS_OFFLINE)

-							if (g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT))

+							if (Clist::HideOffline)

 								return 0;

 

 					SendMessage(g_clistApi.hwndContactTree, INTM_STATUSCHANGED, hContact, lParam);

@@ -161,7 +161,7 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam)
 		SetButtonStates();

 	}

 	else if (!__strcmp(cws->szModule, "CList") && !__strcmp(cws->szSetting, "UseGroups")) {

-		ClcSetButtonState(IDC_TBHIDEGROUPS, db_get_b(0, cws->szModule, cws->szSetting, SETTING_USEGROUPS_DEFAULT));

+		ClcSetButtonState(IDC_TBHIDEGROUPS, cws->value.bVal);

 		SetButtonStates();

 	}

 	else if (!__strcmp(cws->szModule, "TopToolBar") && !__strcmp(cws->szSetting, "UseFlatButton")) {

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index cca420dd0a..9aefd129fe 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -34,27 +34,9 @@ static void __setFlag(DWORD dwFlag, int iMode)
 INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg) {

-	case WM_USER + 1:

-		{

-			MCONTACT hContact = wParam;

-			DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *)lParam;

-			if (hContact == NULL && ws != nullptr && ws->szModule != nullptr && ws->szSetting != nullptr && strcmp(ws->szModule, "CList") == 0 && strcmp(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg))

-				CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, ws->value.bVal == 0 ? BST_CHECKED : BST_UNCHECKED);

-		}

-		break;

-

-	case WM_DESTROY:

-		UnhookEvent((HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA));

-		break;

-

 	case WM_INITDIALOG:

 		opt_gen_opts_changed = 0;

 		TranslateDialogDefault(hwndDlg);

-		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1));

-		CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, g_plugin.getByte("HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED);

-		CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, g_plugin.getByte("ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_SHOWBOTTOMBUTTONS, cfg::dat.dwFlags & CLUI_FRAME_SHOWBOTTOMBUTTONS ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CLISTSUNKEN, cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? BST_CHECKED : BST_UNCHECKED);

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

@@ -135,10 +117,6 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (!opt_gen_opts_changed)

 					return TRUE;

 

-				g_plugin.setByte("HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE));

-				g_plugin.setByte("HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS));

-				g_plugin.setByte("UseGroups", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS));

-				g_plugin.setByte("ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE));

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

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

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

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index a1d45b2638..58c9ccfc3a 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -160,11 +160,7 @@ static int FS_FontsChanged(WPARAM, LPARAM)
 static HWND PreCreateCLC(HWND parent)
 {
 	g_clistApi.hwndContactTree = CreateWindow(CLISTCONTROL_CLASSW, L"",
-		WS_CHILD | CLS_CONTACTLIST
-		| (g_plugin.getByte("UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0)
-		| (g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0)
-		| (g_plugin.getByte("HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? CLS_HIDEEMPTYGROUPS : 0)
-		| CLS_MULTICOLUMN,
+		WS_CHILD | CLS_CONTACTLIST | (Clist::UseGroups ? CLS_USEGROUPS : 0) | (Clist::HideOffline ? CLS_HIDEOFFLINE : 0) | (Clist::HideEmptyGroups ? CLS_HIDEEMPTYGROUPS : 0) | CLS_MULTICOLUMN,
 		0, 0, 0, 0, parent, nullptr, g_plugin.getInst(), (LPVOID)0xff00ff00);
 
 	cfg::clcdat = (struct ClcData *)GetWindowLongPtr(g_clistApi.hwndContactTree, 0);
@@ -450,10 +446,10 @@ void SetButtonStates()
 					SendMessage(buttonItem->hWnd, BM_SETCHECK, cfg::dat.soundsOff ? BST_CHECKED : BST_UNCHECKED, 0);
 					break;
 				case IDC_STBHIDEOFFLINE:
-					SendMessage(buttonItem->hWnd, BM_SETCHECK, g_plugin.getByte("HideOffline", 0) ? BST_CHECKED : BST_UNCHECKED, 0);
+					SendMessage(buttonItem->hWnd, BM_SETCHECK, Clist::HideOffline, 0);
 					break;
 				case IDC_STBHIDEGROUPS:
-					SendMessage(buttonItem->hWnd, BM_SETCHECK, g_plugin.getByte("UseGroups", 0) ? BST_CHECKED : BST_UNCHECKED, 0);
+					SendMessage(buttonItem->hWnd, BM_SETCHECK, Clist::UseGroups, 0);
 					break;
 				}
 			}
@@ -1816,7 +1812,7 @@ void LoadCLUIModule(void)
 	wndclass.lpszClassName = L"EventAreaClass";
 	RegisterClass(&wndclass);
 
-	oldhideoffline = g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT);
+	oldhideoffline = Clist::HideOffline;
 	cluiPos.left = g_plugin.getDword("x", 600);
 	cluiPos.top = g_plugin.getDword("y", 200);
 	cluiPos.right = g_plugin.getDword("Width", 150);
diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h
index c530f2f768..ab925ce8cd 100644
--- a/plugins/Clist_nicer/src/resource.h
+++ b/plugins/Clist_nicer/src/resource.h
@@ -50,12 +50,10 @@
 #define IDC_LASTMSG                     1023

 #define IDC_IGN_AUTH                    1023

 #define IDC_IGN_ADD                     1024

-#define IDC_CONFIRMDELETE               1025

 #define IDC_IGN_ONLINE                  1025

 #define IDC_IGN_ALWAYSONLINE            1026

 #define IDC_IGN_ALWAYSOFFLINE           1027

 #define IDC_IGN_PRIORITY                1028

-#define IDC_DISABLEGROUPS               1030

 #define IDC_DROPSHADOW                  1035

 #define IDC_EQUALSELECTION              1040

 #define IDC_USEPERPROTO                 1041

@@ -79,12 +77,10 @@
 #define IDC_ONTOP                       1074

 #define IDC_SHOWMAINMENU                1075

 #define IDC_CLIENTDRAG                  1076

-#define IDC_HIDEEMPTYGROUPS             1077

 #define IDC_CTOPSPIN                    1077

 #define IDC_CBOTTOM                     1078

 #define IDC_CBOTTOMSPIN                 1079

 #define IDC_CRIGHT                      1080

-#define IDC_HIDEOFFLINE                 1081

 #define IDC_CRIGHTSPIN                  1081

 #define IDC_HIDEOFFLINEOPTS             1082

 #define IDC_LEFTMARGINSPIN              1092

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index cc4ffe31a9..8b05e1ef22 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -1100,7 +1100,7 @@ void ApplyViewMode(const char *name)
 		cfg::dat.bFilterEffective |= CLVM_STICKY_CONTACTS;

 

 	if (cfg::dat.boldHideOffline == (BYTE)-1)

-		cfg::dat.boldHideOffline = g_plugin.getByte("HideOffline", 0);

+		cfg::dat.boldHideOffline = Clist::HideOffline;

 

 	g_clistApi.pfnSetHideOffline(false);

 	if (name == nullptr) {