Tabsrmm:

- Added settings for r16070 to GUI
- warning fixed

git-svn-id: http://svn.miranda-ng.org/main/trunk@16099 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 10 insertions, 5 deletions

diff --git a/plugins/TabSRMM/src/chat/chat.h b/plugins/TabSRMM/src/chat/chat.h
index c760121a4a..a9a6f92ff9 100644
--- a/plugins/TabSRMM/src/chat/chat.h
+++ b/plugins/TabSRMM/src/chat/chat.h
@@ -88,7 +88,7 @@ struct TMUCSettings : public GlobalLogSettingsBase
 

 	bool        bLogClassicIndicators, bAlternativeSorting, bAnnoyingHighlight, bCreateWindowOnHighlight;

 	bool        bLogSymbols, bClassicIndicators, bClickableNicks, bColorizeNicks, bColorizeNicksInLog;

-	bool        bScaleIcons, bUseDividers, bDividersUsePopupConfig;

+	bool        bScaleIcons, bUseDividers, bDividersUsePopupConfig, bUseCommaAsColon, bNewLineAfterNames;

 

 	CMUCHighlight* Highlight;

 };

diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index e191ecdbca..5ec32871ae 100644
--- a/plugins/TabSRMM/src/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -805,7 +805,7 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 						str.AppendFormat("\\cf%u ", OPTIONS_FONTCOUNT + streamData->crCount + crNickIndex);

 				}

 

-				if (db_get_b(0, CHAT_MODULE, "NewlineAfterNames"))

+				if (g_Settings.bNewLineAfterNames)

 					pszTemp.AppendChar('\n');

 

 				Log_AppendRTF(streamData, TRUE, str, pszTemp, lin->ptszNick);

diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index 22e20484cc..f401e72309 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -153,6 +153,9 @@ static void OnLoadSettings()
 	g_Settings.bShowContactStatus = M.GetBool(CHAT_MODULE, "ShowContactStatus", true);

 	g_Settings.bContactStatusFirst = M.GetBool(CHAT_MODULE, "ContactStatusFirst", false);

 

+	g_Settings.bNewLineAfterNames = M.GetBool(CHAT_MODULE, "NewlineAfterNames", false);

+	g_Settings.bUseCommaAsColon = M.GetBool(CHAT_MODULE, "UseCommaAsColon", false);

+

 	replaceStrT(g_Settings.pszLogDir, M.getChatLogPath());

 

 	g_Settings.LogIconSize = (g_Settings.bScaleIcons) ? 12 : 16;

diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 37be685850..2da965d14e 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -151,9 +151,9 @@ static branch_t branch1[] = {
 	{ LPGENT("Show contact's status modes if supported by the protocol"), "ShowContactStatus", 0, 1, NULL },

 	{ LPGENT("Display contact's status icon before user role icon"), "ContactStatusFirst", 0, 0, NULL },

 	{ LPGENT("Use IRC style status indicators in the nick list"), "ClassicIndicators", 0, 0, NULL },

-	{ LPGENT("Use alternative sorting method in member list"), "AlternativeSorting", 0, 1, NULL },

-

+	{ LPGENT("Use alternative sorting method in member list"), "AlternativeSorting", 0, 1, NULL }

 };

+

 static branch_t branch2[] = {

 	{ LPGENT("Prefix all events with a timestamp"), "ShowTimeStamp", 0, 1, NULL },

 	{ LPGENT("Timestamp only when event time differs"), "ShowTimeStampIfChanged", 0, 0, NULL },

@@ -161,11 +161,13 @@ static branch_t branch2[] = {
 	{ LPGENT("Indent the second line of a message"), "LogIndentEnabled", 0, 1, NULL },

 	{ LPGENT("Limit user names in the message log to 20 characters"), "LogLimitNames", 0, 1, NULL },

 	{ LPGENT("Add a colon (:) to auto-completed user names"), "AddColonToAutoComplete", 0, 1, NULL },

+	{ LPGENT("Add a comma instead of a colon to auto-completed user names"), "UseCommaAsColon", 0, 0, NULL },

 	{ LPGENT("Start private conversation on double click in nick list (insert nick if unchecked)"), "DoubleClick4Privat", 0, 0, NULL },

 	{ LPGENT("Strip colors from messages in the log"), "StripFormatting", 0, 0, NULL },

 	{ LPGENT("Enable the 'event filter' for new rooms"), "FilterEnabled", 0, 0, NULL },

 	{ LPGENT("Use IRC style status indicators in the log"), "LogClassicIndicators", 0, 0, NULL },

 	{ LPGENT("Allow clickable user names in the message log"), "ClickableNicks", 0, 1, NULL },

+	{ LPGENT("Add new line after names"), "NewlineAfterNames", 0, 0, NULL },

 	{ LPGENT("Colorize user names in message log"), "ColorizeNicksInLog", 0, 1, NULL },

 	{ LPGENT("Scale down icons to 10x10 pixels in the chat log"), "ScaleIcons", 0, 1, NULL },

 	{ LPGENT("Place a separator in the log after a window lost its foreground status"), "UseDividers", 0, 1, NULL },

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index fc199c52be..152a9278d4 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -497,7 +497,7 @@ LBL_SkipEnd:
 			if (!isRoom && !isTopic && g_Settings.bAddColonToAutoComplete && start == 0) {
 				szReplace = (TCHAR*)mir_alloc((mir_wstrlen(pszName) + 4) * sizeof(TCHAR));
 				mir_wstrcpy(szReplace, pszName);
-				mir_wstrcat(szReplace, db_get_b(NULL, CHAT_MODULE, "UseCommaAsColon") ? L", " : L": ");
+				mir_wstrcat(szReplace, g_Settings.bUseCommaAsColon ? L", " : L": ");
 				pszName = szReplace;
 			}
 			SendMessage(hwnd, EM_SETSEL, start, end);