summaryrefslogtreecommitdiff
path: root/plugins/Clist_modern
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-03-30 19:09:34 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-03-30 19:09:34 +0300
commitd1cdf52cb78309f294e84bc1bbc12457b24cb573 (patch)
treea9dba6a70e06aae007411d7884605c41aa617283 /plugins/Clist_modern
parent64303ec8f7d8fd491247a2c06ee133e4f5f3c942 (diff)
another common option removed from dialogs
Diffstat (limited to 'plugins/Clist_modern')
-rw-r--r--plugins/Clist_modern/res/resource.rc28
-rw-r--r--plugins/Clist_modern/src/modern_clistopts.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_defsettings.h1
-rw-r--r--plugins/Clist_modern/src/resource.h1
4 files changed, 22 insertions, 10 deletions
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index bbb59d7968..038d21db4a 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -608,17 +608,16 @@ BEGIN
CONTROL "Hide icon when showing avatar",IDC_HIDE_ICON_ON_AVATAR,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,24,246,8
CONTROL "Ignore size for row height calcs",IDC_NOTCHECKICONSIZE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,246,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,246,8
CONTROL "Draw icon in avatar space",IDC_DRAW_ON_AVATAR_SPACE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,36,234,8
- CONTROL "Disable icon blinking",IDC_ICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,246,10
- CONTROL "Hide groups icon",IDC_HIDE_GROUPSICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,75,127,8
+ CONTROL "Hide groups icon",IDC_HIDE_GROUPSICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,127,8
CONTROL "Always show ""Always visible"" icon",IDC_ALWAYS_VISIBLEICON,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,88,127,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,127,8
CONTROL "Use extra status icon instead protocol",IDC_USEXSTATUS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,101,236,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,236,8
CONTROL "Draw normal status as overlay",IDC_DRAWSTATUSOVERLAY,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,114,222,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,103,222,8
END
IDD_OPT_ITEM_TEXT DIALOGEX 0, 0, 260, 160
@@ -833,6 +832,18 @@ BEGIN
VERTGUIDE, 268
VERTGUIDE, 276
END
+
+ IDD_OPT_CLC, DIALOG
+ BEGIN
+ END
+
+ IDD_OPT_CLUI, DIALOG
+ BEGIN
+ END
+
+ IDD_OPT_ITEM_ICON, DIALOG
+ BEGIN
+ END
END
#endif // APSTUDIO_INVOKED
@@ -852,6 +863,11 @@ BEGIN
0
END
+IDD_OPT_ITEM_ICON AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
#endif // Russian (Russia) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 3332536da5..7641099828 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -415,7 +415,6 @@ static INT_PTR CALLBACK DlgProcItemIconOpts(HWND hwndDlg, UINT msg, WPARAM wPara
TranslateDialogDefault(hwndDlg);
CheckDlgButton(hwndDlg, IDC_HIDE_ICON_ON_AVATAR, g_plugin.getByte("IconHideOnAvatar", SETTING_HIDEICONONAVATAR_DEFAULT) == 1);
CheckDlgButton(hwndDlg, IDC_DRAW_ON_AVATAR_SPACE, g_plugin.getByte("IconDrawOnAvatarSpace", SETTING_ICONONAVATARPLACE_DEFAULT) == 1);
- CheckDlgButton(hwndDlg, IDC_ICONBLINK, g_plugin.getByte("NoIconBlink", SETTING_NOICONBLINF_DEFAULT) == 1);
CheckDlgButton(hwndDlg, IDC_HIDE_GROUPSICON, g_plugin.getByte("HideGroupsIcon", SETTING_HIDEGROUPSICON_DEFAULT) == 1);
CheckDlgButton(hwndDlg, IDC_NOTCHECKICONSIZE, g_plugin.getByte("IconIgnoreSizeForRownHeight", SETTING_ICONIGNORESIZE_DEFAULT) == 1);
CheckDlgButton(hwndDlg, IDC_ALWAYS_VISIBLEICON, g_plugin.getByte("AlwaysShowAlwaysVisIcon", SETTING_ALWAYSVISICON_DEFAULT) == 1);
@@ -448,7 +447,6 @@ static INT_PTR CALLBACK DlgProcItemIconOpts(HWND hwndDlg, UINT msg, WPARAM wPara
g_plugin.setByte("IconHideOnAvatar", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDE_ICON_ON_AVATAR));
g_plugin.setByte("IconDrawOnAvatarSpace", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DRAW_ON_AVATAR_SPACE));
g_plugin.setByte("HideGroupsIcon", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDE_GROUPSICON));
- g_plugin.setByte("NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK));
g_plugin.setByte("IconIgnoreSizeForRownHeight", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_NOTCHECKICONSIZE));
g_plugin.setByte("AlwaysShowAlwaysVisIcon", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYS_VISIBLEICON));
{
diff --git a/plugins/Clist_modern/src/modern_defsettings.h b/plugins/Clist_modern/src/modern_defsettings.h
index 979baa5aee..72d9a87bea 100644
--- a/plugins/Clist_modern/src/modern_defsettings.h
+++ b/plugins/Clist_modern/src/modern_defsettings.h
@@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define SETTING_WINDOWSHADOW_DEFAULT 0
#define SETTING_ONDESKTOP_DEFAULT 0
#define SETTING_DISABLEWORKINGSET_DEFAULT 1
-#define SETTING_NOICONBLINF_DEFAULT 0
#define SETTING_ALWAYSVISICON_DEFAULT 0
#define SETTING_SHOWMAINMENU_DEFAULT 1
diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h
index 527d5a1309..3351ae4ae6 100644
--- a/plugins/Clist_modern/src/resource.h
+++ b/plugins/Clist_modern/src/resource.h
@@ -434,7 +434,6 @@
#define IDC_CLSORT1 6666
#define IDC_CLSORT2 6667
#define IDC_CLSORT3 6668
-#define IDC_ICONBLINK 11720
#define IDC_SHOW_AVATARS 11721
#define IDC_SHOW_ANIAVATARS 11722
#define IDC_HIDE_ICON_ON_AVATAR 11723