diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-08-14 12:30:04 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-08-14 12:30:04 +0300 |
| commit | e17ab7d1d4fbe0a32e3153235b8316a1f38ddef3 (patch) | |
| tree | 7d8755c3c341516ab65011ab6c38cdff643323eb | |
| parent | af45a65dec00f4af9617d817285b859cc98e4171 (diff) | |
IconFlashTime - old option converted to CMOption
| -rw-r--r-- | include/m_clistint.h | 1 | ||||
| -rw-r--r-- | libs/win32/mir_app.lib | bin | 269824 -> 270144 bytes | |||
| -rw-r--r-- | libs/win64/mir_app.lib | bin | 268960 -> 269280 bytes | |||
| -rw-r--r-- | src/mir_app/src/clistopts.cpp | 10 | ||||
| -rw-r--r-- | src/mir_app/src/clisttray.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 |
7 files changed, 8 insertions, 7 deletions
diff --git a/include/m_clistint.h b/include/m_clistint.h index 2661700b13..168d8fb0ec 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -456,6 +456,7 @@ namespace Clist TrayAlwaysStatus;
extern MIR_APP_EXPORT CMOption<uint32_t>
+ IconFlashTime,
OfflineModes;
};
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 674ab1edcf..45524f0c83 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex fa0772e1ae..7ed07dbdef 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib 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<bool> Clist::RemoveTempContacts(MODULENAME, "RemoveTempContacts", true) CMOption<bool> Clist::Tray1Click(MODULENAME, "Tray1Click", IsWinVer7Plus());
CMOption<bool> Clist::TrayAlwaysStatus(MODULENAME, "AlwaysStatus", false);
+CMOption<uint32_t> Clist::IconFlashTime(MODULENAME, "IconFlashTime", 550);
CMOption<bool> Clist::FilterSearch("CLC", "FilterSearch", false);
CMOption<uint32_t> 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
|