diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-08-09 13:22:54 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-08-09 13:22:54 +0300 |
| commit | 002cd89c27ead6c16027a51a4314c7e766f0bb18 (patch) | |
| tree | ad4f0f4bd9d00b966659b8eca32446b290027df2 /src/mir_app | |
| parent | 49c1cd8e49395fdd10050c176df63a4c548deb87 (diff) | |
fixes #3625 (Скрывать настройки шрифтов и цветов встроенного журнала плагина сообщений, если в качестве журнала выбран сторонний журнал)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat_svc.cpp | 7 | ||||
| -rw-r--r-- | src/mir_app/src/ei_defaulticons.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_log.cpp | 22 |
5 files changed, 22 insertions, 13 deletions
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index 2f94b557f8..73c6eb540a 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -29,6 +29,7 @@ CMOption<bool> Chat::bPopupOnJoin(CHAT_MODULE, "PopupOnJoin", false); CMOption<bool> Chat::bDoubleClick4Privat(CHAT_MODULE, "DoubleClick4Privat", false);
CMOption<bool> Chat::bShowContactStatus(CHAT_MODULE, "ShowContactStatus", true);
CMOption<bool> Chat::bContactStatusFirst(CHAT_MODULE, "ContactStatusFirst", false);
+CMOption<bool> Chat::bEnableCustomLogs(SRMM_MODULE, "EnableCustomLogs", false);
CMOption<bool> Chat::bFlashWindow(CHAT_MODULE, "FlashWindow", false);
CMOption<bool> Chat::bFlashWindowHighlight(CHAT_MODULE, "FlashWindowHighlight", false);
@@ -778,15 +779,15 @@ MIR_APP_DLL(void) Chat_UpdateOptions() MIR_APP_DLL(int) Chat_IsMuted(MCONTACT hContact)
{
- return db_get_b(hContact, "SRMM", "MuteMode", CHATMODE_NORMAL);
+ return db_get_b(hContact, SRMM_MODULE, "MuteMode", CHATMODE_NORMAL);
}
MIR_APP_DLL(void) Chat_Mute(MCONTACT hContact, int mode)
{
if (mode != CHATMODE_NORMAL)
- db_set_b(hContact, "SRMM", "MuteMode", mode);
+ db_set_b(hContact, SRMM_MODULE, "MuteMode", mode);
else
- db_unset(hContact, "SRMM", "MuteMode");
+ db_unset(hContact, SRMM_MODULE, "MuteMode");
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mir_app/src/ei_defaulticons.cpp b/src/mir_app/src/ei_defaulticons.cpp index 763150027c..680572479d 100644 --- a/src/mir_app/src/ei_defaulticons.cpp +++ b/src/mir_app/src/ei_defaulticons.cpp @@ -184,7 +184,7 @@ static int SettingChanged(WPARAM hContact, LPARAM lParam) return 0;
}
- if (!strcmp(cws->szModule, "SRMM") && !strcmp(cws->szSetting, "MuteMode")) {
+ if (!strcmp(cws->szModule, SRMM_MODULE) && !strcmp(cws->szSetting, "MuteMode")) {
SetChatMute(hContact, cws->value.type == DBVT_DELETED ? CHATMODE_NORMAL : cws->value.bVal);
return 0;
}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index a16c766518..10f24a17e6 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -899,3 +899,5 @@ Clist_GroupSaveExpanded @1003 NONAME ??0MAsyncObject@@QAE@XZ @1016 NONAME
??1MAsyncObject@@UAE@XZ @1017 NONAME
??_7MAsyncObject@@6B@ @1018 NONAME
+?bEnableCustomLogs@Chat@@3V?$CMOption@_N@@A @1019 NONAME
+?Srmm_IsCustomLogUsed@@YG_NXZ @1020 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index ac7492986a..11ad367219 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -899,3 +899,5 @@ Clist_GroupSaveExpanded @1003 NONAME ??0MAsyncObject@@QEAA@XZ @1016 NONAME
??1MAsyncObject@@UEAA@XZ @1017 NONAME
??_7MAsyncObject@@6B@ @1018 NONAME
+?bEnableCustomLogs@Chat@@3V?$CMOption@_N@@A @1019 NONAME
+?Srmm_IsCustomLogUsed@@YA_NXZ @1020 NONAME
diff --git a/src/mir_app/src/srmm_log.cpp b/src/mir_app/src/srmm_log.cpp index 3821b78b59..bbbcc7fac0 100644 --- a/src/mir_app/src/srmm_log.cpp +++ b/src/mir_app/src/srmm_log.cpp @@ -44,7 +44,7 @@ struct LoggerClass static OBJLIST<LoggerClass> g_arLogClasses(1, PtrKeySortT);
-static CMOption<uint8_t> g_bEnableCustomLogs("SRMM", "EnableCustomLogs", 0);
+static CMOption<char *> g_logger(SRMM_MODULE, "Logger", "built-in");
/////////////////////////////////////////////////////////////////////////////////////////
@@ -55,14 +55,14 @@ static bool sttEnableCustomLogs(CMsgDialog *pDlg) return true;
// if custom log viewers are disable, use build-in one
- if (!g_bEnableCustomLogs)
+ if (!Chat::bEnableCustomLogs)
return false;
// check if custom viewers are forbidden for this particular account
auto *szProto = Proto_GetBaseAccountName(pDlg->m_hContact);
if (szProto) {
// hidden setting !!!!!!!!
- CMStringA szProtoList(db_get_sm(0, "SRMM", "DisableCustomLogsForProto"));
+ CMStringA szProtoList(db_get_sm(0, SRMM_MODULE, "DisableCustomLogsForProto"));
int iStart = 0;
while (true) {
@@ -84,7 +84,7 @@ CSrmmLogWindow* Srmm_GetLogWindow(CMsgDialog *pDlg) if (sttEnableCustomLogs(pDlg)) {
CMStringA szViewerName(db_get_sm(pDlg->m_hContact, SRMSGMOD, "Logger"));
if (szViewerName.IsEmpty())
- szViewerName = db_get_sm(0, "SRMM", "Logger", "built-in");
+ szViewerName = g_logger;
for (auto &it : g_arLogClasses)
if (szViewerName == it->szShortName)
@@ -98,6 +98,11 @@ CSrmmLogWindow* Srmm_GetLogWindow(CMsgDialog *pDlg) return nullptr; // shall never happen
}
+MIR_APP_DLL(bool) Srmm_IsCustomLogUsed()
+{
+ return mir_strcmp(g_logger, "built-in") != 0;
+}
+
/////////////////////////////////////////////////////////////////////////////////////////
// options dialog
@@ -114,7 +119,7 @@ public: m_list(this, IDC_LIST),
chkCustomLogs(this, IDC_ENABLE_CUSTOM)
{
- CreateLink(chkCustomLogs, g_bEnableCustomLogs);
+ CreateLink(chkCustomLogs, Chat::bEnableCustomLogs);
m_list.OnSelChange = Callback(this, &CSrmmLogOptionsDlg::onChange_List);
}
@@ -122,11 +127,10 @@ public: bool OnInitDialog() override
{
pDialog = this;
- ptrA szCurr(db_get_sa(0, "SRMM", "Logger", "built-in"));
for (auto &it : g_arLogClasses) {
int idx = m_list.AddString(TranslateW_LP(it->wszScreenName, it->pPlugin), LPARAM(it));
- if (!mir_strcmp(szCurr, it->szShortName))
+ if (!mir_strcmp(g_logger, it->szShortName))
m_list.SetCurSel(idx);
}
@@ -139,8 +143,8 @@ public: if (idx == -1)
return false;
- auto *pLogger = (LoggerClass *)m_list.GetItemData(idx);
- db_set_s(0, "SRMM", "Logger", pLogger->szShortName);
+ if (auto *pLogger = (LoggerClass *)m_list.GetItemData(idx))
+ g_logger = pLogger->szShortName;
return true;
}
|