From 07464892e2e68bf816fa0f96590a812ec67b75f3 Mon Sep 17 00:00:00 2001 From: George Hazan <ghazan@miranda.im> Date: Fri, 29 Jul 2022 14:40:05 +0300 Subject: =?UTF-8?q?fixes=20#3127=20(tabSRMM:=20=D1=81=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D1=80=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B2=D0=BE=D0=B5?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=B8=D1=8F=20=D0=B8=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=8F=D1=82=D0=BE=D0=B9=20=D0=B2=D0=B7=D0=B0=D0=B8=D0=BC=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D1=8E=D1=89=D0=B8?= =?UTF-8?q?=D0=BC=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/TabSRMM/src/chat.h | 4 +++- plugins/TabSRMM/src/chat_options.cpp | 12 +++++++++++- plugins/TabSRMM/src/resource.h | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/chat.h b/plugins/TabSRMM/src/chat.h index c8c24bc843..a326144485 100644 --- a/plugins/TabSRMM/src/chat.h +++ b/plugins/TabSRMM/src/chat.h @@ -75,9 +75,11 @@ struct TMUCSettings : public GlobalLogSettingsBase bool bLogClassicIndicators, bAlternativeSorting, bAnnoyingHighlight, bCreateWindowOnHighlight; bool bLogSymbols, bClassicIndicators, bClickableNicks, bColorizeNicks, bColorizeNicksInLog; - bool bScaleIcons, bUseCommaAsColon, bNewLineAfterNames; + bool bScaleIcons, bNewLineAfterNames; CMUCHighlight *Highlight; + + wchar_t *pwszAutoText; }; extern TMUCSettings g_Settings; diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp index 5829a29ef3..1e9dee98e3 100644 --- a/plugins/TabSRMM/src/chat_options.cpp +++ b/plugins/TabSRMM/src/chat_options.cpp @@ -531,12 +531,13 @@ class CChatSettingsDlg : public CChatBaseOptionDlg HTREEITEM hListHeading2 = nullptr; CCtrlTreeView treeCheck; - CCtrlEdit edtGroup; + CCtrlEdit edtGroup, edtAutocomplete; public: CChatSettingsDlg() : CChatBaseOptionDlg(IDD_OPTIONS1), edtGroup(this, IDC_GROUP), + edtAutocomplete(this, IDC_AUTOCOMPLETE), treeCheck(this, IDC_CHECKBOXES) {} @@ -546,6 +547,9 @@ public: TreeViewInit(treeCheck, lvGroupsChat, lvItemsChat, CHAT_MODULE); + if (mir_wstrlen(g_Settings.pwszAutoText)) + edtAutocomplete.SetText(g_Settings.pwszAutoText); + edtGroup.SetText(ptrW(Chat_GetGroup())); return true; } @@ -554,6 +558,12 @@ public: { Chat_SetGroup(ptrW(edtGroup.GetText())); + replaceStrW(g_Settings.pwszAutoText, edtAutocomplete.GetText()); + if (mir_wstrlen(g_Settings.pwszAutoText)) + db_set_ws(0, CHAT_MODULE, "TextAutocomplete", g_Settings.pwszAutoText); + else + db_unset(0, CHAT_MODULE, "TextAutocomplete"); + TreeViewToDB(treeCheck, lvItemsChat, CHAT_MODULE, nullptr); return true; } diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h index c28f3a31a0..be0770e65d 100644 --- a/plugins/TabSRMM/src/resource.h +++ b/plugins/TabSRMM/src/resource.h @@ -128,6 +128,7 @@ #define IDC_GROUP 1057 #define IDC_CHKMERGEPOPUP 1058 #define IDC_IMGTAG 1058 +#define IDC_AUTOCOMPLETE 1058 #define IDC_SHOWURLS 1059 #define IDC_ANIAVATAR 1059 #define IDC_SCROLLFIX 1060 @@ -155,7 +156,6 @@ #define IDC_LOADCOUNTN 1074 #define IDC_TEXTO5 1074 #define IDC_LOADCOUNTSPIN 1076 -#define IDC_STATIC_ADD 1077 #define IDC_SHOWINFOLINE 1078 #define IDC_STATIC_ULIST 1078 #define IDC_STATIC_OTHER 1079 @@ -792,7 +792,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 +#define _APS_NEXT_RESOURCE_VALUE 106 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 -- cgit v1.2.3