diff options
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/res/resource.rc | 10 | ||||
| -rw-r--r-- | src/mir_app/src/clc.h | 5 | ||||
| -rw-r--r-- | src/mir_app/src/clistevents.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/clistopts.cpp | 7 | ||||
| -rw-r--r-- | src/mir_app/src/resource.h | 1 |
5 files changed, 18 insertions, 7 deletions
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index c3890aec81..ef3b779726 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -783,8 +783,10 @@ BEGIN CONTROL "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,29,124,10
CONTROL "Enable groups",IDC_USEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,41,124,10
CONTROL "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,53,124,10
- GROUPBOX "Contact list",IDC_STATIC,6,5,289,77
- CONTROL "Remove temporary contacts on exit",IDC_REMOVETEMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,65,276,10
+ GROUPBOX "Contact list",IDC_STATIC,6,5,289,90
+ CONTROL "Remove temporary contacts on exit",IDC_REMOVETEMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,65,276,10
+ CONTROL "Disable icon blinking",IDC_DISABLEICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,78,276,10
END
IDD_EMPTY DIALOGEX 0, 0, 212, 131
@@ -793,6 +795,7 @@ CAPTION "Hidden window" BEGIN
END
+
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
@@ -1101,8 +1104,7 @@ END 1 TEXTINCLUDE
BEGIN
- "#include ""../src/resource.h""\r\n"
- "\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index fc7805ab4a..7e5bbbb19a 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -93,6 +93,11 @@ int GetDropTargetInformation(HWND hwnd, ClcData *dat, POINT pt); /* clcopts.c */
int ClcOptInit(WPARAM, LPARAM);
+namespace Clist
+{
+ extern CMOption<bool> RemoveTempContacts, DisableIconBlink;
+};
+
/* clistmenus.c */
void RebuildMenuOrder(void);
diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp index 2455170a4c..19ede131ce 100644 --- a/src/mir_app/src/clistevents.cpp +++ b/src/mir_app/src/clistevents.cpp @@ -350,7 +350,7 @@ int InitCListEvents(void) g_clistApi.events = &g_cliEvents;
disableTrayFlash = db_get_b(0, "CList", "DisableTrayFlash", 0);
- disableIconFlash = db_get_b(0, "CList", "NoIconBlink", 0);
+ disableIconFlash = Clist::DisableIconBlink;
HookEvent(ME_DB_CONTACT_SETTINGCHANGED, CListEventSettingsChanged);
return 0;
diff --git a/src/mir_app/src/clistopts.cpp b/src/mir_app/src/clistopts.cpp index ed7bf9baad..5678fd1da6 100644 --- a/src/mir_app/src/clistopts.cpp +++ b/src/mir_app/src/clistopts.cpp @@ -31,11 +31,12 @@ CMOption<bool> Clist::UseGroups(MODULENAME, "UseGroups", true); CMOption<bool> Clist::HideOffline(MODULENAME, "HideOffline", false); CMOption<bool> Clist::ConfirmDelete(MODULENAME, "ConfirmDelete", true); CMOption<bool> Clist::HideEmptyGroups(MODULENAME, "HideEmptyGroups", false); +CMOption<bool> Clist::DisableIconBlink(MODULENAME, "NoIconBlink", false); CMOption<bool> Clist::RemoveTempContacts(MODULENAME, "RemoveTempContacts", true); class ClistCommonOptsDlg : public CDlgBase { - CCtrlCheck chkUseGroups, chkHideOffline, chkConfirmDelete, chkHideEmptyGroups, chkRemoveTempContacts; + CCtrlCheck chkUseGroups, chkHideOffline, chkConfirmDelete, chkHideEmptyGroups, chkRemoveTempContacts, chkDisableIconBlink; public: ClistCommonOptsDlg() : @@ -44,12 +45,14 @@ public: chkHideOffline(this, IDC_HIDEOFFLINE), chkConfirmDelete(this, IDC_CONFIRMDELETE), chkHideEmptyGroups(this, IDC_HIDEEMPTYGROUPS), - chkRemoveTempContacts(this, IDC_REMOVETEMP) + chkDisableIconBlink(this, IDC_DISABLEICONBLINK), + chkRemoveTempContacts(this, IDC_REMOVETEMP) { CreateLink(chkUseGroups, Clist::UseGroups); CreateLink(chkHideOffline, Clist::HideOffline); CreateLink(chkConfirmDelete, Clist::ConfirmDelete); CreateLink(chkHideEmptyGroups, Clist::HideEmptyGroups); + CreateLink(chkDisableIconBlink, Clist::DisableIconBlink); CreateLink(chkRemoveTempContacts, Clist::RemoveTempContacts); } diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index 781b5bb44a..98992615d5 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -220,6 +220,7 @@ #define IDC_URL 1041
#define IDC_FONTGROUP 1042
#define IDC_TXT_SIMPLE 1043
+#define IDC_DISABLEICONBLINK 1044
#define IDC_BTN_RESET 1045
#define IDC_REASON 1046
#define IDC_BTN_UNDO 1047
|