summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Clist_blind/res/resource.rc4
-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
-rw-r--r--plugins/Clist_nicer/res/resource.rc49
-rw-r--r--plugins/Clist_nicer/src/clistopts.cpp2
-rw-r--r--plugins/Clist_nicer/src/resource.h1
8 files changed, 48 insertions, 40 deletions
diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc
index a0bd8c9d68..1829012b75 100644
--- a/plugins/Clist_blind/res/resource.rc
+++ b/plugins/Clist_blind/res/resource.rc
@@ -71,7 +71,8 @@ BEGIN
CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,10,81,274,11
CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,95,86,9
EDITTEXT IDC_BLINKTIME,11,109,35,12,ES_NUMBER
- LTEXT "ms delay",IDC_STMSDELAY,192,110,113,8
+ CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,35,110,11,8
+ LTEXT "ms delay",IDC_STMSDELAY,51,110,113,8
CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,143,97,10
COMBOBOX IDC_PRIMARYSTATUS,107,142,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "icon when statuses differ",IDC_STATIC,189,144,116,8,NOT WS_GROUP
@@ -84,7 +85,6 @@ BEGIN
GROUPBOX "System tray icon",IDC_STATIC,2,57,310,70
GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,131,310,66
GROUPBOX "Contact list sorting",IDC_STATIC,2,2,310,54,WS_GROUP
- CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,173,97,11,21
END
IDD_OPT_CLUI DIALOGEX 0, 0, 313, 245
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
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index b9b57d1b32..e28a325ac4 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -53,41 +53,40 @@ 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, 209
+IDD_OPT_CLIST DIALOGEX 0, 0, 305, 193
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,301,67
- CONTROL "Disable icon blinking",IDC_ICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,38,147,10
+ GROUPBOX "Contact list",IDC_STCLISTGROUP,1,0,301,53
CONTROL "Apply last active view mode",IDC_APPLYLASTVIEWMODE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,51,147,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,38,147,10
CONTROL "Show menu and status buttons",IDC_SHOWBOTTOMBUTTONS,
"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
+ GROUPBOX "System tray icon",IDC_STATIC,1,54,163,63
+ CONTROL "Single click interface",IDC_ONECLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,64,147,10
+ CONTROL "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,10,76,147,10
+ CONTROL "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,88,147,10
+ EDITTEXT IDC_BLINKTIME,69,99,57,12,ES_RIGHT | ES_NUMBER
+ CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,116,97,11,16
+ LTEXT "ms",IDC_STATIC,131,101,24,8
+ GROUPBOX "Event area",IDC_STATIC,169,54,133,63
+ LTEXT "Set base visibility on the frames menu",IDC_STATIC,176,65,121,20
+ CONTROL "Auto mode",IDC_EVENTAREAAUTOHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,88,121,10
+ CONTROL "Draw sunken edge",IDC_EVENTAREASUNKEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,101,121,10
+ GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,1,118,302,71
+ CONTROL "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,130,92,10
+ COMBOBOX IDC_PRIMARYSTATUS,107,129,78,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "icon when statuses differ",IDC_STATIC,189,131,113,8,NOT WS_GROUP
+ CONTROL "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON,10,144,92,10
+ EDITTEXT IDC_CYCLETIME,107,144,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
+ LTEXT "seconds, when statuses differ",IDC_STATIC,140,146,155,8,NOT WS_GROUP
+ CONTROL "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON,10,158,92,10
+ CONTROL "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,158,186,10
CONTROL "Do not show system tray icon tooltips on mouse over",IDC_NOTRAYINFOTIPS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,189,284,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,172,284,12
END
IDD_OPT_DSPGROUPS DIALOGEX 0, 0, 305, 205
diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index 9aefd129fe..03fe6d51ee 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -48,7 +48,6 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
CheckDlgButton(hwndDlg, IDC_CYCLE, g_plugin.getByte("TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_CYCLE ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_MULTITRAY, g_plugin.getByte("TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_DISABLEBLINK, g_plugin.getByte("DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwndDlg, IDC_ICONBLINK, g_plugin.getByte("NoIconBlink", 0) == 1 ? BST_CHECKED : BST_UNCHECKED);
if (IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE)) {
Utils::enableDlgControl(hwndDlg, IDC_CYCLETIMESPIN, FALSE);
Utils::enableDlgControl(hwndDlg, IDC_CYCLETIME, FALSE);
@@ -124,7 +123,6 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
g_plugin.setWord("CycleTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));
g_plugin.setWord("IconFlashTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));
g_plugin.setByte("DisableTrayFlash", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK));
- g_plugin.setByte("NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK));
g_plugin.setByte("AutoApplyLastViewMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_APPLYLASTVIEWMODE));
__setFlag(CLUI_FRAME_EVENTAREASUNKEN, IsDlgButtonChecked(hwndDlg, IDC_EVENTAREASUNKEN));
diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h
index ab925ce8cd..caa128069a 100644
--- a/plugins/Clist_nicer/src/resource.h
+++ b/plugins/Clist_nicer/src/resource.h
@@ -201,7 +201,6 @@
#define IDC_DSP_LOADDEFAULT 1636
#define IDC_ONDESKTOP 1657
#define IDC_WINCOLOUR 1659
-#define IDC_ICONBLINK 1660
#define IDC_APPLYLASTVIEWMODE 1661
#define IDC_IGNORESELFORGROUPS 1722
#define IDC_CLISTAVATARS 1729
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 13:47:16 +0000