From e17ab7d1d4fbe0a32e3153235b8316a1f38ddef3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 14 Aug 2023 12:30:04 +0300 Subject: IconFlashTime - old option converted to CMOption --- src/mir_app/src/clistopts.cpp | 10 ++++------ src/mir_app/src/clisttray.cpp | 2 +- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/clistopts.cpp b/src/mir_app/src/clistopts.cpp index 8df408c45e..2f46c03aa2 100644 --- a/src/mir_app/src/clistopts.cpp +++ b/src/mir_app/src/clistopts.cpp @@ -35,6 +35,7 @@ CMOption Clist::RemoveTempContacts(MODULENAME, "RemoveTempContacts", true) CMOption Clist::Tray1Click(MODULENAME, "Tray1Click", IsWinVer7Plus()); CMOption Clist::TrayAlwaysStatus(MODULENAME, "AlwaysStatus", false); +CMOption Clist::IconFlashTime(MODULENAME, "IconFlashTime", 550); CMOption Clist::FilterSearch("CLC", "FilterSearch", false); CMOption Clist::OfflineModes("CLC", "OfflineModes", MODEF_OFFLINE); @@ -60,7 +61,7 @@ static const offlineValues[] = class ClistCommonOptsDlg : public CDlgBase { - CCtrlSpin blink; + CCtrlSpin spinBlink; CCtrlCheck chkUseGroups, chkHideOffline, chkConfirmDelete, chkHideEmptyGroups, chkRemoveTempContacts, chkEnableIconBlink, chkFilterSearch; CCtrlCheck chkAlwaysStatus, chkOneClick, chkEnableTrayBlink; CCtrlTreeView hideStatuses; @@ -68,7 +69,7 @@ class ClistCommonOptsDlg : public CDlgBase public: ClistCommonOptsDlg() : CDlgBase(g_plugin, IDD_OPT_CLIST), - blink(this, IDC_BLINKSPIN, 0x3FFF, 250), + spinBlink(this, IDC_BLINKSPIN, 0x3FFF, 250), hideStatuses(this, IDC_HIDEOFFLINEOPTS), chkOneClick(this, IDC_ONECLK), chkUseGroups(this, IDC_USEGROUPS), @@ -83,6 +84,7 @@ public: { chkEnableTrayBlink.OnChange = Callback(this, &ClistCommonOptsDlg::onChange_TrayBlink); + CreateLink(spinBlink, Clist::IconFlashTime); CreateLink(chkOneClick, Clist::Tray1Click); CreateLink(chkUseGroups, Clist::UseGroups); CreateLink(chkHideOffline, Clist::HideOffline); @@ -97,8 +99,6 @@ public: bool OnInitDialog() override { - blink.SetPosition(db_get_w(0, MODULENAME, "IconFlashTime", 550)); - SetWindowLongPtr(hideStatuses.GetHwnd(), GWL_STYLE, GetWindowLongPtr(hideStatuses.GetHwnd(), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES); @@ -120,8 +120,6 @@ public: bool OnApply() override { - db_set_w(0, MODULENAME, "IconFlashTime", blink.GetPosition()); - uint32_t flags = 0; TVITEMEX tvi; diff --git a/src/mir_app/src/clisttray.cpp b/src/mir_app/src/clisttray.cpp index 007074cffe..454c15fbff 100644 --- a/src/mir_app/src/clisttray.cpp +++ b/src/mir_app/src/clisttray.cpp @@ -367,7 +367,7 @@ int TrayIconUpdate(HICON hNewIcon, const wchar_t *szNewTip, const char *szPrefer g_clistApi.trayIcon[i].isBase = isBase; if (db_get_b(0, MODULENAME, "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI) { uint32_t time1 = db_get_w(0, MODULENAME, "CycleTime", SETTING_CYCLETIME_DEFAULT) * 200; - uint32_t time2 = db_get_w(0, MODULENAME, "IconFlashTime", 550) + 1000; + uint32_t time2 = Clist::IconFlashTime + 1000; uint32_t time = max(max(uint32_t(2000), time1), time2); if (RefreshTimerId) KillTimer(nullptr, RefreshTimerId); diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 10f24a17e6..eef3369c58 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -901,3 +901,4 @@ Clist_GroupSaveExpanded @1003 NONAME ??_7MAsyncObject@@6B@ @1018 NONAME ?bEnableCustomLogs@Chat@@3V?$CMOption@_N@@A @1019 NONAME ?Srmm_IsCustomLogUsed@@YG_NXZ @1020 NONAME +?IconFlashTime@Clist@@3V?$CMOption@I@@A @1021 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 11ad367219..cee812529b 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -901,3 +901,4 @@ Clist_GroupSaveExpanded @1003 NONAME ??_7MAsyncObject@@6B@ @1018 NONAME ?bEnableCustomLogs@Chat@@3V?$CMOption@_N@@A @1019 NONAME ?Srmm_IsCustomLogUsed@@YA_NXZ @1020 NONAME +?IconFlashTime@Clist@@3V?$CMOption@I@@A @1021 NONAME -- cgit v1.2.3