summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2022-09-24 13:30:26 +0300
committerGeorge Hazan <ghazan@miranda.im>2022-09-24 13:30:26 +0300
commit355c813420090d59be0e098b29f2351c42e1d4ad (patch)
tree6988e85edf55c541053172bf7dadd7cdc28767e5
parentc0fe9d2fcc2b9760333cd195b771ca704728f6cd (diff)
fixes #3196 ("Disable icon blinking" - get rid of inverted logic)
-rw-r--r--src/mir_app/res/resource.rc2
-rw-r--r--src/mir_app/src/clistopts.cpp9
-rw-r--r--src/mir_app/src/resource.h2
3 files changed, 8 insertions, 5 deletions
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index c3a41e8def..099e9a58ed 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -796,7 +796,7 @@ BEGIN
CONTROL "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,53,166,10
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 "Enable icon blinking",IDC_ENABLE_ICON_BLINK,"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
diff --git a/src/mir_app/src/clistopts.cpp b/src/mir_app/src/clistopts.cpp
index a10e3ab132..ad34053cb2 100644
--- a/src/mir_app/src/clistopts.cpp
+++ b/src/mir_app/src/clistopts.cpp
@@ -61,7 +61,7 @@ static const offlineValues[] =
class ClistCommonOptsDlg : public CDlgBase
{
- CCtrlCheck chkUseGroups, chkHideOffline, chkConfirmDelete, chkHideEmptyGroups, chkRemoveTempContacts, chkDisableIconBlink, chkFilterSearch;
+ CCtrlCheck chkUseGroups, chkHideOffline, chkConfirmDelete, chkHideEmptyGroups, chkRemoveTempContacts, chkEnableIconBlink, chkFilterSearch;
CCtrlCheck chkAlwaysStatus, chkOneClick;
CCtrlTreeView hideStatuses;
@@ -76,7 +76,7 @@ public:
chkAlwaysStatus(this, IDC_ALWAYSSTATUS),
chkConfirmDelete(this, IDC_CONFIRMDELETE),
chkHideEmptyGroups(this, IDC_HIDEEMPTYGROUPS),
- chkDisableIconBlink(this, IDC_DISABLEICONBLINK),
+ chkEnableIconBlink(this, IDC_ENABLE_ICON_BLINK),
chkRemoveTempContacts(this, IDC_REMOVETEMP)
{
CreateLink(chkOneClick, Clist::Tray1Click);
@@ -86,7 +86,6 @@ public:
CreateLink(chkAlwaysStatus, Clist::TrayAlwaysStatus);
CreateLink(chkConfirmDelete, Clist::ConfirmDelete);
CreateLink(chkHideEmptyGroups, Clist::HideEmptyGroups);
- CreateLink(chkDisableIconBlink, Clist::DisableIconBlink);
CreateLink(chkRemoveTempContacts, Clist::RemoveTempContacts);
}
@@ -95,6 +94,8 @@ public:
SetWindowLongPtr(hideStatuses.GetHwnd(), GWL_STYLE,
GetWindowLongPtr(hideStatuses.GetHwnd(), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES);
+ chkEnableIconBlink.SetState(!Clist::DisableIconBlink);
+
int style = Clist::OfflineModes;
TVINSERTSTRUCT tvis;
@@ -126,6 +127,8 @@ public:
}
Clist::OfflineModes = flags;
+ Clist::DisableIconBlink = !chkEnableIconBlink.IsChecked();
+
Clist_ClcOptionsChanged();
Clist_LoadContactTree();
Clist_InitAutoRebuild(g_clistApi.hwndContactTree);
diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 377188f3f7..f181ae7729 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -241,7 +241,7 @@
#define IDC_URL 1041
#define IDC_FONTGROUP 1042
#define IDC_TXT_SIMPLE 1043
-#define IDC_DISABLEICONBLINK 1044
+#define IDC_ENABLE_ICON_BLINK 1044
#define IDC_BTN_RESET 1045
#define IDC_REASON 1046
#define IDC_BTN_UNDO 1047