From 2a1a54d04cde0d40c2e59e91de9b6bf1fe040df8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 31 Jul 2023 14:19:25 +0300
Subject: fixes #3604 (tabSRMM: move "Automatically copy selected text" option
 from common tabSRMM settings)

---
 plugins/TabSRMM/src/msgoptions.cpp | 10 ++++++----
 plugins/TabSRMM/src/userprefs.cpp  | 28 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index ae463d94cf..293b4a0aec 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -407,7 +407,6 @@ public:
 		pwszSection = LPGENW("Other options");
 		treeOpts.AddOption(pwszSection, LPGENW("Automatically split long messages (experimental, use with care)"), g_plugin.bAutoSplit);
 		treeOpts.AddOption(pwszSection, LPGENW("Use the same splitter height for all sessions"), g_plugin.bUseSameSplitSize);
-		treeOpts.AddOption(pwszSection, LPGENW("Automatically copy selected text"), g_plugin.bAutoCopy);
 	}
 
 	bool OnInitDialog() override
@@ -768,16 +767,19 @@ public:
 
 		auto *pwszSection = LPGENW("Message log appearance");
 		logOpts.AddOption(pwszSection, LPGENW("Draw grid lines"), m_flags, MWF_LOG_GRID);
-		logOpts.AddOption(pwszSection, LPGENW("Log status changes"), g_plugin.bLogStatusChanges);
 		logOpts.AddOption(pwszSection, LPGENW("Use message grouping"), m_flags, MWF_LOG_GROUPMODE);
 		logOpts.AddOption(pwszSection, LPGENW("Indent message body"), m_flags, MWF_LOG_INDENT);
 		logOpts.AddOption(pwszSection, LPGENW("Simple text formatting (*bold*, etc.)"), m_flags, MWF_LOG_TEXTFORMAT);
 		logOpts.AddOption(pwszSection, LPGENW("Support BBCode formatting"), m_flags, MWF_LOG_BBCODE);
-		logOpts.AddOption(pwszSection, LPGENW("Place a separator in the log after a window lost its foreground status"), g_plugin.bUseDividers);
-		logOpts.AddOption(pwszSection, LPGENW("Only place a separator when an incoming event is announced with a popup"), g_plugin.bDividersUsePopupConfig);
 		logOpts.AddOption(pwszSection, LPGENW("RTL is default text direction"), m_flags, MWF_LOG_RTL);
 		logOpts.AddOption(pwszSection, LPGENW("Use normal templates (uncheck to use simple templates if your template set supports them)"), m_flags, MWF_LOG_NORMALTEMPLATES);
 
+		auto *pwszSection = LPGENW("Message log options");
+		logOpts.AddOption(pwszSection, LPGENW("Log status changes"), g_plugin.bLogStatusChanges);
+		logOpts.AddOption(pwszSection, LPGENW("Automatically copy selected text"), g_plugin.bAutoCopy);
+		logOpts.AddOption(pwszSection, LPGENW("Place a separator in the log after a window lost its foreground status"), g_plugin.bUseDividers);
+		logOpts.AddOption(pwszSection, LPGENW("Only place a separator when an incoming event is announced with a popup"), g_plugin.bDividersUsePopupConfig);
+
 		pwszSection = LPGENW("Support for external plugins");
 		logOpts.AddOption(pwszSection, LPGENW("Show events at the new line (IEView Compatibility Mode)"), m_flags, MWF_LOG_NEWLINE);
 		logOpts.AddOption(pwszSection, LPGENW("Underline timestamp/nickname (IEView Compatibility Mode)"), m_flags, MWF_LOG_UNDERLINE);
diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index b6304c3114..f57df61ef9 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -183,20 +183,20 @@ static struct _checkboxes
 	UINT	uFlag;
 }
 checkboxes[] = {
-	IDC_UPREFS_GRID, MWF_LOG_GRID,
-	IDC_UPREFS_SHOWICONS, MWF_LOG_SHOWICONS,
-	IDC_UPREFS_SHOWSYMBOLS, MWF_LOG_SYMBOLS,
-	IDC_UPREFS_INOUTICONS, MWF_LOG_INOUTICONS,
-	IDC_UPREFS_SHOWTIMESTAMP, MWF_LOG_SHOWTIME,
-	IDC_UPREFS_SHOWDATES, MWF_LOG_SHOWDATES,
-	IDC_UPREFS_SHOWSECONDS, MWF_LOG_SHOWSECONDS,
-	IDC_UPREFS_LOCALTIME, MWF_LOG_LOCALTIME,
-	IDC_UPREFS_INDENT, MWF_LOG_INDENT,
-	IDC_UPREFS_GROUPING, MWF_LOG_GROUPMODE,
-	IDC_UPREFS_BBCODE, MWF_LOG_BBCODE,
-	IDC_UPREFS_RTL, MWF_LOG_RTL,
-	IDC_UPREFS_NORMALTEMPLATES, MWF_LOG_NORMALTEMPLATES,
-	0, 0
+	{ IDC_UPREFS_GRID,            MWF_LOG_GRID            },
+	{ IDC_UPREFS_SHOWICONS,       MWF_LOG_SHOWICONS       },
+	{ IDC_UPREFS_SHOWSYMBOLS,     MWF_LOG_SYMBOLS         },
+	{ IDC_UPREFS_INOUTICONS,      MWF_LOG_INOUTICONS      },
+	{ IDC_UPREFS_SHOWTIMESTAMP,   MWF_LOG_SHOWTIME        },
+	{ IDC_UPREFS_SHOWDATES,       MWF_LOG_SHOWDATES       },
+	{ IDC_UPREFS_SHOWSECONDS,     MWF_LOG_SHOWSECONDS     },
+	{ IDC_UPREFS_LOCALTIME,       MWF_LOG_LOCALTIME       },
+	{ IDC_UPREFS_INDENT,          MWF_LOG_INDENT          },
+	{ IDC_UPREFS_GROUPING,        MWF_LOG_GROUPMODE       },
+	{ IDC_UPREFS_BBCODE,          MWF_LOG_BBCODE          },
+	{ IDC_UPREFS_RTL,             MWF_LOG_RTL             },
+	{ IDC_UPREFS_NORMALTEMPLATES, MWF_LOG_NORMALTEMPLATES },
+	{ 0, 0 },
 };
 
 int CMsgDialog::LoadLocalFlags()
-- 
cgit v1.2.3