From e567cbd887f33004c3c3adab00b5d8e50e891a33 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 30 Nov 2020 17:13:35 +0300 Subject: fixes #2630 (Clist blind: Filter search option moved to Options - Contact list - Common) --- include/m_clistint.h | 2 +- plugins/Clist_modern/res/resource.rc | 2 - plugins/Clist_modern/src/modern_clcopts.cpp | 2 - plugins/Clist_modern/src/modern_defsettings.h | 1 - plugins/Clist_modern/src/resource.h | 1 - src/mir_app/mir_app.vcxproj | 88 --------- src/mir_app/mir_app.vcxproj.filters | 260 -------------------------- src/mir_app/res/resource.rc | 1 + src/mir_app/src/clcutils.cpp | 2 +- src/mir_app/src/clistopts.cpp | 7 +- src/mir_app/src/resource.h | 3 +- 11 files changed, 10 insertions(+), 359 deletions(-) diff --git a/include/m_clistint.h b/include/m_clistint.h index 592174e550..aee62feab3 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -447,12 +447,12 @@ namespace Clist extern MIR_APP_EXPORT CMOption HideOffline, UseGroups, + FilterSearch, HideEmptyGroups, ConfirmDelete; extern MIR_APP_EXPORT CMOption OfflineModes; - }; #endif // M_CLISTINT_H__ diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index eead268fb7..c15fa12b88 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -454,8 +454,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,38,201,10 CONTROL "Remove status message if contact became offline",IDC_REMOVE_OFFLINE_AWAYMSG, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,50,201,10 - CONTROL "Use improved search method in contact list",IDC_FILTER_SEARCH, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,62,201,10 GROUPBOX "Metacontacts stuff",IDC_FRAME_META,2,81,218,88 CONTROL "Use 'Meta' protocol icons for metacontacts",IDC_META, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,95,201,10 diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index e2a38d164a..506908d989 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -310,7 +310,6 @@ static INT_PTR CALLBACK DlgProcClistAdditionalOpts(HWND hwndDlg, UINT msg, WPARA CheckDlgButton(hwndDlg, IDC_METAEXPAND, db_get_b(0, "CLC", "MetaExpanding", SETTING_METAEXPANDING_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR CheckDlgButton(hwndDlg, IDC_DISCOVER_AWAYMSG, db_get_b(0, "ModernData", "InternalAwayMsgDiscovery", SETTING_INTERNALAWAYMSGREQUEST_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR CheckDlgButton(hwndDlg, IDC_REMOVE_OFFLINE_AWAYMSG, db_get_b(0, "ModernData", "RemoveAwayMessageForOffline", SETTING_REMOVEAWAYMSGFOROFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by FYR - CheckDlgButton(hwndDlg, IDC_FILTER_SEARCH, db_get_b(0, "CLC", "FilterSearch", SETTING_FILTERSEARCH_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); /// by Robyer SendDlgItemMessage(hwndDlg, IDC_SUBINDENTSPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_SUBINDENT), 0); SendDlgItemMessage(hwndDlg, IDC_SUBINDENTSPIN, UDM_SETRANGE, 0, MAKELONG(50, 0)); @@ -339,7 +338,6 @@ static INT_PTR CALLBACK DlgProcClistAdditionalOpts(HWND hwndDlg, UINT msg, WPARA db_set_b(0, "CLC", "MetaExpanding", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_METAEXPAND)); db_set_b(0, "ModernData", "InternalAwayMsgDiscovery", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISCOVER_AWAYMSG)); db_set_b(0, "ModernData", "RemoveAwayMessageForOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_REMOVE_OFFLINE_AWAYMSG)); - db_set_b(0, "CLC", "FilterSearch", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FILTER_SEARCH)); db_set_b(0, "CLC", "SubIndent", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SUBINDENTSPIN, UDM_GETPOS, 0, 0)); ClcOptionsChanged(); diff --git a/plugins/Clist_modern/src/modern_defsettings.h b/plugins/Clist_modern/src/modern_defsettings.h index b9de0e9246..92b85723d2 100644 --- a/plugins/Clist_modern/src/modern_defsettings.h +++ b/plugins/Clist_modern/src/modern_defsettings.h @@ -105,7 +105,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SETTING_INTERNALAWAYMSGREQUEST_DEFAULT 1 #define SETTING_REMOVEAWAYMSGFOROFFLINE_DEFAULT 1 -#define SETTING_FILTERSEARCH_DEFAULT 0 #define SETTING_METAAVOIDDBLCLICK_DEFAULT 1 #define SETTING_METAIGNOREEMPTYEXTRA_DEFAULT 1 #define SETTING_METAHIDEEXTRA_DEFAULT 0 diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h index 2da51322ab..4c0ab1f200 100644 --- a/plugins/Clist_modern/src/resource.h +++ b/plugins/Clist_modern/src/resource.h @@ -296,7 +296,6 @@ #define IDC_REMOVE_OFFLINE_AWAYMSG 1767 #define IDC_SC_STATIC 1768 #define IDC_TRANSPARENTOVERLAY 1768 -#define IDC_FILTER_SEARCH 1768 #define IDC_SHOWUNREADEMAIL 1769 #define IDC_IDC_MULTI_COUNT 1771 #define IDC_MULTI_COUNT 1771 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - Resource Files - - - Resource Files - - - Resource Files - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - \ 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 Clist::HideEmptyGroups(MODULENAME, "HideEmptyGroups", false); CMOption Clist::DisableIconBlink(MODULENAME, "NoIconBlink", false); CMOption Clist::RemoveTempContacts(MODULENAME, "RemoveTempContacts", true); +CMOption Clist::FilterSearch("CLC", "FilterSearch", false); CMOption 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 -- cgit v1.2.3