fixes #3127 (tabSRMM: сделать настройки про добавление двоеточия и запятой взаимоисключающими)

3 files changed, 16 insertions, 4 deletions

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