TabSRMM: Make default settings more user friendly and use nicer templates

This also fixes problem where TabSRMM wasn't correctly initialized until first applying of options, and resulted in "broken" text in message log (missing some items so it looked very ugly).

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

5 files changed, 17 insertions, 17 deletions

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 8efb343740..51fb9ecea7 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -219,7 +219,7 @@ void CGlobals::reloadAdv()
 		SkinAddNewSoundEx("SoundOnTyping", LPGEN("Other"), LPGEN("TabSRMM: typing"));

 		m_TypingSoundAdded = true;

 	}

-	m_bAllowOfflineMultisend = M.GetBool("AllowOfflineMultisend", false);

+	m_bAllowOfflineMultisend = M.GetBool("AllowOfflineMultisend", true);

 }

 

 const HMENU CGlobals::getMenuBar()

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index ac5bf6b4ce..ddf7c16651 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1470,7 +1470,7 @@ static INT_PTR CALLBACK DlgProcTabSrmmModernOptions(HWND hwndDlg, UINT msg, WPAR
 		{ IDC_AUTOSWITCHTABS, TRUE, 0, DBVT_BYTE, SRMSGMOD_T, "autoswitchtabs" },

 		//{IDC_SENDCTRLENTER, , 0, DBVT_BYTE, SRMSGMOD_T, },

 		{ IDC_SENDSHIFTENTER, FALSE, 0, DBVT_BYTE, SRMSGMOD_T, "sendonshiftenter" },

-		{ IDC_SENDENTER, FALSE, 0, DBVT_BYTE, SRMSGMOD_T, SRMSGSET_SENDONENTER },

+		{ IDC_SENDENTER, TRUE, 0, DBVT_BYTE, SRMSGMOD_T, SRMSGSET_SENDONENTER },

 		{ IDC_SENDDBLENTER, FALSE, 0, DBVT_BYTE, SRMSGMOD_T, "SendOnDblEnter" },

 		{ IDC_MINSEND, FALSE, 0, DBVT_BYTE, SRMSGMOD_T, SRMSGSET_AUTOMIN },

 		{ IDC_NOOPENNOTIFY, FALSE, 0, DBVT_BYTE, "tabSRMM_NEN", OPT_WINDOWCHECK, CBVT_BOOL, &nen_options.bWindowCheck },

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 5ce30b3ae6..74c40c9e68 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -482,7 +482,7 @@ struct TNewWindowData
  		MWF_LOG_RTL | MWF_LOG_BBCODE | MWF_LOG_LOCALTIME/*MAD:*/ | \

 		MWF_LOG_NEWLINE|MWF_LOG_UNDERLINE|MWF_LOG_SWAPNICK /*_MAD*/)

 

-#define MWF_LOG_DEFAULT (MWF_LOG_SHOWTIME | MWF_LOG_NORMALTEMPLATES | MWF_LOG_SHOWDATES | MWF_LOG_SYMBOLS | MWF_LOG_GRID | MWF_LOG_INOUTICONS)

+#define MWF_LOG_DEFAULT (MWF_LOG_GROUPMODE | MWF_LOG_SHOWTIME | MWF_LOG_NORMALTEMPLATES | MWF_LOG_SHOWDATES | MWF_LOG_SYMBOLS | MWF_LOG_GRID | MWF_LOG_INOUTICONS)

 

 /*

  * custom dialog window messages

@@ -670,7 +670,7 @@ struct CREOleCallback2 : public CREOleCallback
 #define SRMSGSET_AUTOMIN           "AutoMin"

 #define SRMSGDEFSET_AUTOMIN        0

 #define SRMSGSET_SENDONENTER       "SendOnEnter"

-#define SRMSGDEFSET_SENDONENTER    false

+#define SRMSGDEFSET_SENDONENTER    true

 #define SRMSGSET_MSGTIMEOUT        "MessageTimeout"

 #define SRMSGDEFSET_MSGTIMEOUT     30000

 #define SRMSGSET_MSGTIMEOUT_MIN    5000 // minimum value (5 seconds)

diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp
index 7112227e4e..91c4cd1e79 100644
--- a/plugins/TabSRMM/src/templates.cpp
+++ b/plugins/TabSRMM/src/templates.cpp
@@ -45,26 +45,26 @@ char *TemplateNames[] = {
 };
 
 TTemplateSet LTR_Default = { TRUE,
-L"%I %S %N  %?&D%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
-L"%I %S %N  %?&D%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
-L"%I %S %N  %?&D%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
-L"%I %S %N  %?&D%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
+L"%I %N  %?&r%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
+L"%I %N  %?&r%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
+L"%I %N  %?&r%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
+L"%I %N  %?&r%\\&E%\\!, %\\T%\\!: %?n%?S %?T%?|%M",
 L"%S %T%|%M",
 L"%S %T%|%M",
-L"%I %S %&D, %&T, %N %M%! ",
-L"%I%S %D, %T, %e%l%M",
+L"%I %S %&r, %&T, %N %M%! ",
+L"%I%S %r, %T, %e%l%M",
 "Default LTR"
 };
 
 TTemplateSet RTL_Default = { TRUE,
-L"%I %S %N  %D%n%S %T%|%M",
-L"%I %S %N  %D%n%S %T%|%M",
-L"%I %S %N  %D%n%S %T%|%M",
-L"%I %S %N  %D%n%S %T%|%M",
+L"%I %N  %r%n%S %T%|%M",
+L"%I %N  %r%n%S %T%|%M",
+L"%I %N  %r%n%S %T%|%M",
+L"%I %N  %r%n%S %T%|%M",
 L"%S %T%|%M",
 L"%S %T%|%M",
-L"%I%S %D, %T, %N %M%! ",
-L"%I%S %D, %T, %e%l%M",
+L"%I%S %r, %T, %N %M%! ",
+L"%I%S %r, %T, %e%l%M",
 "Default RTL"
 };
 
diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index cd4653b191..cc08051f92 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -280,7 +280,7 @@ int TSAPI LoadLocalFlags(TWindowData *dat)
 	int i = 0;

 	DWORD	dwMask = M.GetDword(dat->hContact, "mwmask", 0);

 	DWORD	dwLocal = M.GetDword(dat->hContact, "mwflags", 0);

-	DWORD	dwGlobal = M.GetDword("mwflags", 0);

+	DWORD	dwGlobal = M.GetDword("mwflags", MWF_LOG_DEFAULT);

 

 	dat->dwFlags &= ~MWF_LOG_ALL;

 	if (dat->pContainer->theme.isPrivate)