implemented option for #479

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3295 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 19 insertions, 8 deletions

diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 5a80dded3..7c394d03e 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -315,7 +315,8 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("PasteLastLogOnQueryJoin",false,KviOption_sectFlagLogging),
 	BOOL_OPTION("UseSpecifiedSmartColorForOwnNick",false,KviOption_sectFlagIrcView | KviOption_groupTheme),
 	BOOL_OPTION("UseFullWordHighlighting",false,KviOption_sectFlagIrcView),
-	BOOL_OPTION("ZshLikeNickCompletion",false,KviOption_sectFlagInput)
+	BOOL_OPTION("ZshLikeNickCompletion",false,KviOption_sectFlagInput),
+	BOOL_OPTION("StripMsgTypeInLogs",false,KviOption_sectFlagLogging)
 };
 
 #define STRING_OPTION(_txt,_val,_flags) KviStringOption(KVI_STRING_OPTIONS_PREFIX _txt,_val,_flags)
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 8c7b2b2c8..5a71e51c4 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -323,7 +323,8 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolUseSpecifiedSmartColorForOwnNick 229 /* interface::ircview */
 #define KviOption_boolUseFullWordHighlighting 230 /* highlight */
 #define KviOption_boolZshLikeNickCompletion 231
-#define KVI_NUM_BOOL_OPTIONS 232
+#define KviOption_boolStripMsgTypeInLogs 232			/* log */
+#define KVI_NUM_BOOL_OPTIONS 233
 
 
 #define KVI_STRING_OPTIONS_PREFIX "string"
diff --git a/src/kvirc/ui/kvi_ircview_loghandling.cpp b/src/kvirc/ui/kvi_ircview_loghandling.cpp
index 1117cc8b8..638905e3f 100644
--- a/src/kvirc/ui/kvi_ircview_loghandling.cpp
+++ b/src/kvirc/ui/kvi_ircview_loghandling.cpp
@@ -218,7 +218,15 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer)
 
 void KviIrcView::add2Log(const QString &szBuffer,int iMsgType)
 {
-	QString szToWrite=QString("%1 %2\n").arg(iMsgType).arg(szBuffer);
-	KviQCString szTmp = KviQString::toUtf8(szToWrite);
-	if(m_pLogFile->write(szTmp.data(),szTmp.length())==-1) debug("WARNING : Can not write to the log file.");
+	KviQCString szTmp;
+	QString szToWrite;
+	if(KVI_OPTION_BOOL(KviOption_boolStripMsgTypeInLogs))
+	{
+		szToWrite = QString("%1\n").arg(szBuffer);
+	} else {
+		QString szToWrite = QString("%1 %2\n").arg(iMsgType).arg(szBuffer);
+	}
+	szTmp = KviQString::toUtf8(szToWrite);
+	if(m_pLogFile->write(szTmp.data(),szTmp.length())==-1)
+		debug("WARNING : Can not write to the log file.");
 }
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index 32a1385b0..ddafc8a4a 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -45,13 +45,14 @@ KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
 #ifdef COMPILE_ZLIB_SUPPORT
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Gzip logs","options"),KviOption_boolGzipLogs); 
 #endif
-	addBoolSelector(0,2,0,2,__tr2qs_ctx("Strip colors in logs","options"),KviOption_boolStripControlCodesInLogs); 
-	KviUIntSelector* us = addUIntSelector(0,3,0,3,__tr2qs_ctx("Auto flush logs every","options"),KviOption_uintAutoFlushLogs,0,99999,0);
+	addBoolSelector(0,2,0,2,__tr2qs_ctx("Strip message type numbers in logs","options"),KviOption_boolStripMsgTypeInLogs);
+	addBoolSelector(0,3,0,3,__tr2qs_ctx("Strip colors in logs","options"),KviOption_boolStripControlCodesInLogs);
+	KviUIntSelector* us = addUIntSelector(0,4,0,4,__tr2qs_ctx("Auto flush logs every","options"),KviOption_uintAutoFlushLogs,0,99999,0);
 	us->setSuffix(__tr2qs_ctx(" min","options"));
 	mergeTip(us,
 		__tr2qs_ctx("<center>Save logs with the current interval<br>" \
 			"Set to 0 to disable this feature</center>","options"));
-	addRowSpacer(0,4,0,4);
+	addRowSpacer(0,5,0,5);
 }
 
 KviLoggingOptionsWidget::~KviLoggingOptionsWidget()