fixes #2630 (Clist blind: Filter search option moved to Options - Contact list - Common)

6 files changed, 9 insertions, 352 deletions

diff --git a/src/mir_app/mir_app.vcxproj b/src/mir_app/mir_app.vcxproj
index 0f55a19c5f..3241cf4fc9 100644
--- a/src/mir_app/mir_app.vcxproj
+++ b/src/mir_app/mir_app.vcxproj
@@ -208,98 +208,10 @@
     <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\cursor_drag_copy.cur" />

-    <None Include="res\cursor_drop_user.cur" />

-    <None Include="res\cursor_hyperlink.cur" />

     <None Include="src\mir_app.def" />

     <None Include="src\mir_app64.def" />

   </ItemGroup>

   <ItemGroup>

     <Text Include="..\docs\contributors.txt" />

   </ItemGroup>

-  <ItemGroup>

-    <Image Include="res\addgroup.ico" />

-    <Image Include="res\always_visible.ico" />

-    <Image Include="res\auth_add.ico" />

-    <Image Include="res\auth_grant.ico" />

-    <Image Include="res\auth_request.ico" />

-    <Image Include="res\auth_revoke.ico" />

-    <Image Include="res\chat_channel.ico" />

-    <Image Include="res\chat_join.ico" />

-    <Image Include="res\chat_leave.ico" />

-    <Image Include="res\check_off.ico" />

-    <Image Include="res\check_on.ico" />

-    <Image Include="res\contact_add.ico" />

-    <Image Include="res\contact_delete.ico" />

-    <Image Include="res\contact_groups.ico" />

-    <Image Include="res\contact_rename.ico" />

-    <Image Include="res\contact_view_details.ico" />

-    <Image Include="res\female.ico" />

-    <Image Include="res\group_closed.ico" />

-    <Image Include="res\group_opened.ico" />

-    <Image Include="res\icon_accmgr.ico" />

-    <Image Include="res\icon_all.ico" />

-    <Image Include="res\icon_ansi.ico" />

-    <Image Include="res\icon_auth_request.ico" />

-    <Image Include="res\icon_connecting.ico" />

-    <Image Include="res\icon_down_arrow.ico" />

-    <Image Include="res\icon_error.ico" />

-    <Image Include="res\Icon_exit.ico" />

-    <Image Include="res\icon_fatal.ico" />

-    <Image Include="res\icon_file.ico" />

-    <Image Include="res\icon_find_user.ico" />

-    <Image Include="res\icon_frame.ico" />

-    <Image Include="res\icon_help.ico" />

-    <Image Include="res\icon_history.ico" />

-    <Image Include="res\icon_loaded_gray.ico" />

-    <Image Include="res\icon_mail.ico" />

-    <Image Include="res\icon_mainmenu.ico" />

-    <Image Include="res\icon_message.ico" />

-    <Image Include="res\icon_notify.ico" />

-    <Image Include="res\icon_notloaded.ico" />

-    <Image Include="res\icon_notloaded_gray.ico" />

-    <Image Include="res\icon_options.ico" />

-    <Image Include="res\icon_password.ico" />

-    <Image Include="res\icon_popup.ico" />

-    <Image Include="res\icon_popup_no.ico" />

-    <Image Include="res\icon_search_all.ico" />

-    <Image Include="res\Icon_show_hide.ico" />

-    <Image Include="res\icon_small_dot.ico" />

-    <Image Include="res\icon_sms.ico" />

-    <Image Include="res\icon_typing.ico" />

-    <Image Include="res\icon_undo.ico" />

-    <Image Include="res\icon_unicode.ico" />

-    <Image Include="res\icon_url.ico" />

-    <Image Include="res\icon_warning.ico" />

-    <Image Include="res\icon_window.ico" />

-    <Image Include="res\icon_windows.ico" />

-    <Image Include="res\male.ico" />

-    <Image Include="res\meta_add.ico" />

-    <Image Include="res\meta_convert.ico" />

-    <Image Include="res\meta_edit.ico" />

-    <Image Include="res\meta_menu.ico" />

-    <Image Include="res\meta_menuof.ico" />

-    <Image Include="res\meta_remove2.ico" />

-    <Image Include="res\meta_set_as_default.ico" />

-    <Image Include="res\miranda_home.ico" />

-    <Image Include="res\miranda_logo.ico" />

-    <Image Include="res\miranda_manager.ico" />

-    <Image Include="res\never_visible.ico" />

-    <Image Include="res\Off.ico" />

-    <Image Include="res\On.ico" />

-    <Image Include="res\sound.ico" />

-    <Image Include="res\status_away.ico" />

-    <Image Include="res\status_DND.ico" />

-    <Image Include="res\status_free4chat.ico" />

-    <Image Include="res\status_invisible.ico" />

-    <Image Include="res\status_locked.ico" />

-    <Image Include="res\status_NA.ico" />

-    <Image Include="res\status_occupied.ico" />

-    <Image Include="res\status_offline.ico" />

-    <Image Include="res\status_online.ico" />

-    <Image Include="res\status_on_the_phone.ico" />

-    <Image Include="res\status_out2lunch.ico" />

-    <Image Include="res\status_user_online.ico" />

-    <Image Include="res\_blank.ico" />

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/mir_app/mir_app.vcxproj.filters b/src/mir_app/mir_app.vcxproj.filters
index a41d536dd7..927addb7c9 100644
--- a/src/mir_app/mir_app.vcxproj.filters
+++ b/src/mir_app/mir_app.vcxproj.filters
@@ -463,268 +463,8 @@
   <ItemGroup>

     <None Include="src\mir_app.def" />

     <None Include="src\mir_app64.def" />

-    <None Include="res\cursor_hyperlink.cur">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\cursor_drag_copy.cur">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\cursor_drop_user.cur">

-      <Filter>Resource Files</Filter>

-    </None>

   </ItemGroup>

   <ItemGroup>

     <Text Include="..\docs\contributors.txt" />

   </ItemGroup>

-  <ItemGroup>

-    <Image Include="res\miranda_logo.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\miranda_home.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\miranda_manager.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_view_details.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_add.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_rename.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_delete.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\group_closed.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\group_opened.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_user_online.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_online.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_away.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_NA.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_occupied.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_DND.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_free4chat.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_invisible.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_on_the_phone.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_out2lunch.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_offline.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_connecting.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_typing.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_find_user.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_search_all.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_options.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_accmgr.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_mainmenu.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_help.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_message.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_file.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_history.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_url.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_sms.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_mail.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_small_dot.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_auth_request.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_all.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_down_arrow.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\check_off.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\check_on.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_unicode.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_ansi.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_loaded_gray.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_notloaded.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_notloaded_gray.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_frame.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_fatal.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_error.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_warning.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_notify.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\_blank.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_undo.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_window.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_windows.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat_join.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat_leave.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_locked.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\Icon_show_hide.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\Icon_exit.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_groups.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\On.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\Off.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\always_visible.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\never_visible.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat_channel.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\male.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\female.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_add.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_grant.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_request.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_revoke.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_menu.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_menuof.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_edit.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_remove2.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_convert.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_add.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_set_as_default.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\addgroup.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_popup.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_popup_no.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_password.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\sound.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index 4cb7074fd7..fcf22c2dd8 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -789,6 +789,7 @@ BEGIN
     CONTROL         "Remove temporary contacts on exit",IDC_REMOVETEMP,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,65,166,10

     CONTROL         "Disable icon blinking",IDC_DISABLEICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,77,166,10

+    CONTROL         "Search works as filter",IDC_FILTER_SEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,89,166,10

     CTEXT           "'Hide offline' means to hide:",IDC_STATIC,183,14,105,8

     CONTROL         "",IDC_HIDEOFFLINEOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,183,24,105,104

 END

diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index 2b61772a09..9e4ebaaed7 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -741,7 +741,7 @@ void fnLoadClcOptions(HWND hwnd, ClcData *dat, BOOL bFirst)
 	dat->gammaCorrection = db_get_b(0, "CLC", "GammaCorrect", CLCDEFAULT_GAMMACORRECT);

 	dat->bShowIdle = db_get_b(0, "CLC", "ShowIdle", CLCDEFAULT_SHOWIDLE) != 0;

 	dat->bNoVScrollbar = db_get_b(0, "CLC", "NoVScrollBar", false) != 0;

-	dat->bFilterSearch = db_get_b(0, "CLC", "FilterSearch", false) != 0;

+	dat->bFilterSearch = Clist::FilterSearch;

 	SendMessage(hwnd, INTM_SCROLLBARCHANGED, 0, 0);

 

 	dat->greyoutFlags = db_get_dw(0, "CLC", "GreyoutFlags", CLCDEFAULT_GREYOUTFLAGS);

diff --git a/src/mir_app/src/clistopts.cpp b/src/mir_app/src/clistopts.cpp
index b7c0ec7463..f11c7c531a 100644
--- a/src/mir_app/src/clistopts.cpp
+++ b/src/mir_app/src/clistopts.cpp
@@ -34,6 +34,7 @@ CMOption<bool> Clist::HideEmptyGroups(MODULENAME, "HideEmptyGroups", false);
 CMOption<bool> Clist::DisableIconBlink(MODULENAME, "NoIconBlink", false);
 CMOption<bool> Clist::RemoveTempContacts(MODULENAME, "RemoveTempContacts", true);
 
+CMOption<bool>  Clist::FilterSearch("CLC", "FilterSearch", false);
 CMOption<DWORD> Clist::OfflineModes("CLC", "OfflineModes", MODEF_OFFLINE);
 
 struct
@@ -57,7 +58,7 @@ static const offlineValues[] =
 
 class ClistCommonOptsDlg : public CDlgBase
 {
-	CCtrlCheck chkUseGroups, chkHideOffline, chkConfirmDelete, chkHideEmptyGroups, chkRemoveTempContacts, chkDisableIconBlink;
+	CCtrlCheck chkUseGroups, chkHideOffline, chkConfirmDelete, chkHideEmptyGroups, chkRemoveTempContacts, chkDisableIconBlink, chkFilterSearch;
 	CCtrlTreeView hideStatuses;
 
 public:
@@ -66,13 +67,15 @@ public:
 		hideStatuses(this, IDC_HIDEOFFLINEOPTS),
 		chkUseGroups(this, IDC_USEGROUPS),
 		chkHideOffline(this, IDC_HIDEOFFLINE),
+		chkFilterSearch(this, IDC_FILTER_SEARCH),
 		chkConfirmDelete(this, IDC_CONFIRMDELETE), 
 		chkHideEmptyGroups(this, IDC_HIDEEMPTYGROUPS), 
 		chkDisableIconBlink(this, IDC_DISABLEICONBLINK),
-		chkRemoveTempContacts(this, IDC_REMOVETEMP)		
+		chkRemoveTempContacts(this, IDC_REMOVETEMP)
 	{
 		CreateLink(chkUseGroups, Clist::UseGroups);
 		CreateLink(chkHideOffline, Clist::HideOffline);
+		CreateLink(chkFilterSearch, Clist::FilterSearch);
 		CreateLink(chkConfirmDelete, Clist::ConfirmDelete);
 		CreateLink(chkHideEmptyGroups, Clist::HideEmptyGroups);
 		CreateLink(chkDisableIconBlink, Clist::DisableIconBlink);
diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index adeb0c7925..4224f26fa6 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -566,6 +566,7 @@
 #define IDC_GENMENU_MODULE              1748

 #define IDC_LOGROTATE                   1749

 #define IDC_RIGHTCLICK                  1751

+#define IDC_FILTER_SEARCH               1752

 #define IDC_EFFECT_COLOUR_TEXT1         1853

 #define IDC_EFFECT_COLOUR_SPIN1         1854

 #define IDC_EXTRAORDER                  1889

@@ -674,7 +675,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        333

 #define _APS_NEXT_COMMAND_VALUE         40018

-#define _APS_NEXT_CONTROL_VALUE         1752

+#define _APS_NEXT_CONTROL_VALUE         1753

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif