added a combobox to switch datetime format between classic behaviour, ISO 8601 and system locale;

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

19 files changed, 347 insertions, 73 deletions

diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index ef277e192..ff631cc1d 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -645,7 +645,8 @@ KviUIntOption g_uintOptionsTable[KVI_NUM_UINT_OPTIONS]=
 	UINT_OPTION("SpacesToExpandTabulationInput",4,KviOption_sectFlagInput),
 	UINT_OPTION("UserIrcViewOwnForeground",4,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
 	UINT_OPTION("UserIrcViewOwnBackground",8,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
-	UINT_OPTION("NotifierPixmapAlign",0,KviOption_sectFlagNotifier | KviOption_groupTheme)
+	UINT_OPTION("NotifierPixmapAlign",0,KviOption_sectFlagNotifier | KviOption_groupTheme),
+	UINT_OPTION("OutputDatetimeFormat",0,KviOption_sectFlagIrcView),
 };
 
 #define FONT_OPTION(_name,_face,_size,_flags) \
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index f6a6b19bc..e855e9a13 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -583,7 +583,8 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_uintUserIrcViewOwnForeground 74                /* look & feel::ircview */
 #define KviOption_uintUserIrcViewOwnBackground 75                /* look & feel::ircview */
 #define KviOption_uintNotifierPixmapAlign 76
-#define KVI_NUM_UINT_OPTIONS 77
+#define KviOption_uintOutputDatetimeFormat 77                    /* irc::verbosity */
+#define KVI_NUM_UINT_OPTIONS 78
 
 namespace KviIdentdOutputMode {
 	enum Mode {
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index f466fe72b..b4ac2a1f2 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1326,7 +1326,21 @@ void KviServerParser::parseCtcpRequestTime(KviCtcpMessage *msg)
 	{
 		if(!KVI_OPTION_BOOL(KviOption_boolIgnoreCtcpTime))
 		{
-			replyCtcp(msg,QDateTime::currentDateTime().toString());
+			QString szTmp;
+			QDateTime date = QDateTime::currentDateTime();
+			switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+			{
+				case 0:
+					szTmp = date.toString();
+					break;
+				case 1:
+					szTmp = date.toString(Qt::ISODate);
+					break;
+				case 2:
+					szTmp = date.toString(Qt::SystemLocaleDate);
+					break;
+			}
+			replyCtcp(msg,szTmp);
 		} else msg->bIgnored = true;
 	}
 
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index 6d16b82b2..7a0af6dc4 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -1410,8 +1410,22 @@ void KviServerParser::parseLiteralTopic(KviIrcMessage *msg)
 
 	chan->topicWidget()->setTopic(szTopic);
 	chan->topicWidget()->setTopicSetBy(szNick);
-	QString tmp = QDateTime::currentDateTime().toString();
-	chan->topicWidget()->setTopicSetAt(tmp);
+	
+	QString szTmp;
+	QDateTime date = QDateTime::currentDateTime();
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szTmp = date.toString();
+			break;
+		case 1:
+			szTmp = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szTmp = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
+	chan->topicWidget()->setTopicSetAt(szTmp);
 
 	chan->userAction(szNick,szUser,szHost,KVI_USERACTION_TOPIC);
 
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 68473ccf9..15bca7339 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -536,10 +536,23 @@ void KviServerParser::parseNumericTopicWhoTime(KviIrcMessage *msg)
 	unsigned long t = 0;
 	if(tmp.hasData())t = tmp.toUInt(&bOk);
 
-	QDateTime dt;
-	dt.setTime_t(t);
+	QString szDate;
+	QDateTime date;
+	date.setTime_t(t);
+	
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szDate = date.toString();
+			break;
+		case 1:
+			szDate = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szDate = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
 
-	QString szDate = dt.toString();
 	QString szWho = msg->connection()->decodeText(msg->safeParam(2));
 	KviIrcMask who(szWho);
 	QString szDisplayableWho;
@@ -598,16 +611,29 @@ void KviServerParser::parseNumericChannelModeIs(KviIrcMessage *msg)
 	}
 }
 
-void getDateTimeStringFromCharTimeT(QString &buffer,const char *time_t_string)
+void getDateTimeStringFromCharTimeT(QString & szBuffer, const char * time_t_string)
 {
-	KviStr tmp=time_t_string;
-	bool bOk=false;
-	unsigned int uTime = tmp.toUInt(&bOk);
-	if(bOk){
-		QDateTime dt;
-		dt.setTime_t(uTime);
-		buffer = dt.toString();
-	} else buffer = __tr2qs("(Unknown)");
+	KviStr szTmp = time_t_string;
+	bool bOk = false;
+	unsigned int uTime = szTmp.toUInt(&bOk);
+	if(bOk)
+	{
+		QDateTime date;
+		date.setTime_t(uTime);
+		
+		switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+		{
+			case 0:
+				szBuffer = date.toString();
+				break;
+			case 1:
+				szBuffer = date.toString(Qt::ISODate);
+				break;
+			case 2:
+				szBuffer = date.toString(Qt::SystemLocaleDate);
+				break;
+		}
+	} else szBuffer = __tr2qs("(Unknown)");
 }
 
 #define PARSE_NUMERIC_ENDOFLIST(__funcname,__setGotIt,__didSendRequest,__setDone,__daicon,__szWhatQString) \
@@ -1275,12 +1301,26 @@ void KviServerParser::parseNumericWhoisIdle(KviIrcMessage *msg)
 		uTime = sign.toUInt(&bOk);
 		if(bOk)
 		{
-			QDateTime dt;
-			dt.setTime_t((time_t)uTime);
-			QString tmp = dt.toString();
+			QString szTmp;
+			QDateTime date;
+			date.setTime_t((time_t)uTime);
+			
+			switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+			{
+				case 0:
+					szTmp = date.toString();
+					break;
+				case 1:
+					szTmp = date.toString(Qt::ISODate);
+					break;
+				case 2:
+					szTmp = date.toString(Qt::SystemLocaleDate);
+					break;
+			}
+
 			pOut->output(
 				KVI_OUT_WHOISIDLE,__tr2qs("%c\r!n\r%Q\r%c's signon time: %Q"),KVI_TEXT_BOLD,
-				&szNick,KVI_TEXT_BOLD,&tmp);
+				&szNick,KVI_TEXT_BOLD,&szTmp);
 		}
 	}
 }
@@ -1491,15 +1531,29 @@ void KviServerParser::parseNumericCreationTime(KviIrcMessage *msg)
 	QString szChan = msg->connection()->decodeText(msg->safeParam(1));
 	KviChannel * chan = msg->connection()->findChannel(szChan);
 	KviStr tmstr = msg->safeParam(2);
-	QDateTime dt;
-	dt.setTime_t((time_t)tmstr.toUInt());
+	QDateTime date;
+	date.setTime_t((time_t)tmstr.toUInt());
 
 	if(!tmstr.isUnsignedNum())
 	{
 		UNRECOGNIZED_MESSAGE(msg,__tr2qs("Can't evaluate creation time"));
 		return;
 	}
-	QString szDate = dt.toString();
+	
+	QString szDate;
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szDate = date.toString();
+			break;
+		case 1:
+			szDate = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szDate = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
+	
 	if(chan)
 	{
 		if(!msg->haltOutput())
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index b87279125..5a73158b4 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -1232,8 +1232,21 @@ void KviConsole::getWindowListTipText(QString &buffer)
 			buffer += "</td></tr>";
 		}
 
-		QDateTime dt;
-		dt.setTime_t(connection()->statistics()->connectionStartTime());
+		QString szTmp;
+		QDateTime date;
+		date.setTime_t(connection()->statistics()->connectionStartTime());
+		switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+		{
+			case 0:
+				szTmp = date.toString();
+				break;
+			case 1:
+				szTmp = date.toString(Qt::ISODate);
+				break;
+			case 2:
+				szTmp = date.toString(Qt::SystemLocaleDate);
+				break;
+		}
 
 		buffer += START_TABLE_NORMAL_ROW;
 
@@ -1242,7 +1255,7 @@ void KviConsole::getWindowListTipText(QString &buffer)
 		buffer += html_br;
 		buffer += html_tab;
 		buffer += html_bold;
-		buffer += dt.toString();
+		buffer += szTmp;
 		buffer += html_eofbold;
 		buffer += html_br;
 
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
index 3400d0074..b434c975c 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
@@ -27,6 +27,7 @@
 #include "kvi_locale.h"
 #include "kvi_app.h"
 #include "kvi_iconmanager.h"
+#include "kvi_options.h"
 
 #include <QDateTime>
 #include <QLayout>
@@ -85,7 +86,20 @@ void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,cons
 	QLabel * l = new QLabel(this);
 	l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
 	//l->setMaximumWidth(600);
-	QString date = QDateTime::currentDateTime().toString();
+	QString szDate;
+	QDateTime date = QDateTime::currentDateTime();
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szDate = date.toString();
+			break;
+		case 1:
+			szDate = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szDate = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
 
 	QString tmp = "<center>";
 	tmp += __tr2qs("You have been paged by");
@@ -98,7 +112,7 @@ void KviCtcpPageDialog::addPage(const QString &szNick,const QString &szUser,cons
 	tmp += "]</b>:<br><br><b>";
 	tmp += szMsg;
 	tmp += "</b><br><br>[";
-	tmp += date;
+	tmp += szDate;
 	tmp += "]</center>";
 
 	l->setText(tmp);
diff --git a/src/kvirc/ui/kvi_ircview_gettextline.cpp b/src/kvirc/ui/kvi_ircview_gettextline.cpp
index 7d2e5a595..a18ad6322 100644
--- a/src/kvirc/ui/kvi_ircview_gettextline.cpp
+++ b/src/kvirc/ui/kvi_ircview_gettextline.cpp
@@ -1000,9 +1000,23 @@ void KviIrcView::appendText(int iMsgType,const kvi_wchar_t *data_ptr,int iFlags)
 
 		if(!KVI_OPTION_BOOL(KviOption_boolStripControlCodesInLogs))
 		{
-			QString szBuffer;
+			QString szBuffer, szDate;
+			
+			QDateTime date = QDateTime::currentDateTime();
+			switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+			{
+				case 0:
+					szDate = date.toString("[hh:mm:ss] ");
+					break;
+				case 1:
+					szDate = date.toString(Qt::ISODate);
+					break;
+				case 2:
+					szDate = date.toString(Qt::SystemLocaleDate);
+					break;
+			}
 			kvi_appendWCharToQStringWithLength(&szBuffer,data_ptr,kvi_wstrlen(data_ptr));
-			szBuffer.prepend(QDateTime::currentDateTime().toString("[h:mm:ss] "));
+			szBuffer.prepend(szDate);
 			if(m_pLogFile && KVI_OPTION_MSGTYPE(iMsgType).logEnabled())
 			{
 				add2Log(szBuffer,iMsgType);
diff --git a/src/kvirc/ui/kvi_ircview_loghandling.cpp b/src/kvirc/ui/kvi_ircview_loghandling.cpp
index 78536f504..6150a74d5 100644
--- a/src/kvirc/ui/kvi_ircview_loghandling.cpp
+++ b/src/kvirc/ui/kvi_ircview_loghandling.cpp
@@ -47,7 +47,22 @@ void KviIrcView::stopLogging()
 {
 	if(m_pLogFile)
 	{
-		QString szLogEnd = QString(__tr2qs("### Log session terminated at %1 ###")).arg(QDateTime::currentDateTime().toString());
+		QString szDate;
+		QDateTime date = QDateTime::currentDateTime();
+		switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+		{
+			case 0:
+				szDate = date.toString();
+				break;
+			case 1:
+				szDate = date.toString(Qt::ISODate);
+				break;
+			case 2:
+				szDate = date.toString(Qt::SystemLocaleDate);
+				break;
+		}
+		
+		QString szLogEnd = QString(__tr2qs("### Log session terminated at %1 ###")).arg(szDate);
 		add2Log(szLogEnd);
 		m_pLogFile->close();
 #ifdef COMPILE_ZLIB_SUPPORT
@@ -201,7 +216,22 @@ bool KviIrcView::startLogging(const QString& fname,bool bPrependCurBuffer)
 		}
 	}
 
-	QString szLogStart = QString(__tr2qs("### Log session started at %1 ###")).arg(QDateTime::currentDateTime().toString());
+	QString szDate;
+	QDateTime date = QDateTime::currentDateTime();
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szDate = date.toString();
+			break;
+		case 1:
+			szDate = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szDate = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
+	
+	QString szLogStart = QString(__tr2qs("### Log session started at %1 ###")).arg(szDate);
 	add2Log(szLogStart);
 	if(bPrependCurBuffer)
 	{
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 891ec363c..a35f3abc6 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -31,19 +31,33 @@
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_toolwindows_container.h"
 #include "kvi_channel.h"
+#include "kvi_options.h"
 
 #include <QLayout>
 #include <QLabel>
 #include <QValidator>
 
-KviMaskItem::KviMaskItem(QTreeWidget* parent,KviMaskEntry* entry)
-:QTreeWidgetItem(parent), m_Mask(*entry)
+KviMaskItem::KviMaskItem(QTreeWidget * pParent, KviMaskEntry * pEntry)
+:QTreeWidgetItem(pParent), m_Mask(*pEntry)
 {
+	QString szDate;
 	QDateTime date;
 	date.setTime_t(mask()->uSetAt);
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szDate = date.toString();
+			break;
+		case 1:
+			szDate = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szDate = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
 	setText(0,mask()->szMask);
 	setText(1,mask()->szSetBy);
-	setText(2,date.toString());
+	setText(2,szDate);
 }
 
 KviMaskItem::~KviMaskItem()
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index 24d6cae28..6d98ed5d6 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -1573,10 +1573,25 @@ void KviUserListView::maybeTip(KviUserListToolTip * pTip, const QPoint & pnt)
 
 			if(pEntry->m_joinTime != 0)
 			{
-				QDateTime dt;
-				dt.setTime_t(pEntry->m_joinTime);
+				QString szTmp;
+				QDateTime date;
+				date.setTime_t(pEntry->m_joinTime);
+				
+				switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+				{
+					case 0:
+						szTmp = date.toString();
+						break;
+					case 1:
+						szTmp = date.toString(Qt::ISODate);
+						break;
+					case 2:
+						szTmp = date.toString(Qt::SystemLocaleDate);
+						break;
+				}
+				
 				szBuffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr><font color=\"#000000\">";
-				szBuffer += __tr2qs("Joined on <b>%1</b>").arg(dt.toString());
+				szBuffer += __tr2qs("Joined on <b>%1</b>").arg(szTmp);
 				szBuffer += "</font></nobr></td></tr>";
 			}
 
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 1f140bf1b..5fe49dc34 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -528,9 +528,22 @@ void KviWindow::getConfigGroupName(QString &buf)
 void KviWindow::getDefaultLogFileName(QString &buffer)
 {
 	// FIXME: #warning "Make it configurable ?"
-	QString date;
-	QDate dt(QDate::currentDate());
-	date=dt.toString("yyyy.MM.dd");
+	QString szDate;
+	QDate date(QDate::currentDate());
+	
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szDate = date.toString("yyyy-MM-dd");
+			break;
+		case 1:
+			szDate = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szDate = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
+
 	QString base;
 	getBaseLogFileName(base);
 	KviFileUtils::encodeFileName(base);
@@ -538,9 +551,11 @@ void KviWindow::getDefaultLogFileName(QString &buffer)
 	base=base.toLower();
 	QString tmp;
 	if(KVI_OPTION_BOOL(KviOption_boolGzipLogs))
-		KviQString::sprintf(tmp,"%s_%s_%s.log.gz",typeString(),base.toUtf8().data(),date.toUtf8().data());
-	else
-		KviQString::sprintf(tmp,"%s_%s_%s.log",typeString(),base.toUtf8().data(),date.toUtf8().data());
+	{
+		KviQString::sprintf(tmp,"%s_%s_%s.log.gz",typeString(),base.toUtf8().data(),szDate.toUtf8().data());
+	} else {
+		KviQString::sprintf(tmp,"%s_%s_%s.log",typeString(),base.toUtf8().data(),szDate.toUtf8().data());
+	}
 	g_pApp->getLocalKvircDirectory(buffer,KviApp::Log,tmp);
 }
 
diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp
index 861da3ad4..0a662091f 100644
--- a/src/modules/addon/packaddondialog.cpp
+++ b/src/modules/addon/packaddondialog.cpp
@@ -32,6 +32,7 @@
 #include "kvi_packagefile.h"
 #include "kvi_fileextensions.h"
 #include "kvi_sourcesdate.h"
+#include "kvi_options.h"
 
 #include <QTextEdit>
 #include <QLineEdit>
@@ -322,8 +323,22 @@ bool KviPackAddonDialog::packAddon()
 	m_szDirPath.replace("\\","/");
 	m_szSavePath.replace("\\","/");
 
-	QString szTmp = QDateTime::currentDateTime().toString();
+	QString szTmp;
+	QDateTime date = QDateTime::currentDateTime();
 
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szTmp = date.toString();
+			break;
+		case 1:
+			szTmp = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szTmp = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
+		
 	KviPackageWriter pw;
 	pw.addInfoField("PackageType","AddonPack");
 	pw.addInfoField("AddonPackVersion",KVI_CURRENT_ADDONS_ENGINE_VERSION);
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 2dc445c82..c607c32cb 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -323,7 +323,21 @@ void KviListWindow::exportList()
 	QString szFile;
 	if(connection())
 	{
-		QString szDate = QDateTime::currentDateTime().toString("d MMM yyyy hh-mm");
+		QString szDate;
+		QDateTime date = QDateTime::currentDateTime();
+
+		switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+		{
+			case 0:
+				szDate = date.toString("d MMM yyyy hh-mm");
+				break;
+			case 1:
+				szDate = date.toString(Qt::ISODate);
+				break;
+			case 2:
+				szDate = date.toString(Qt::SystemLocaleDate);
+				break;
+		}
 		KviQString::sprintf(szFile,__tr2qs("Channel list for %Q - %Q"),
 			&(connection()->networkName()),&(szDate));
 	} else {
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index a06a5d4e1..81724f829 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -95,7 +95,7 @@ KviLogListViewItemType::KviLogListViewItemType(QTreeWidget * par, KviLogFile::Kv
 KviLogListViewLog::KviLogListViewLog(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
 : KviLogListViewItem(par,type,fileData)
 {
-	setText(0, m_pFileData->date().toString("dd.MM.yyyy"));
+	setText(0, m_pFileData->date().toString("yyyy-MM-dd"));
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 777356b2e..707c70469 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -34,45 +34,55 @@
 #include <QLabel>
 
 
-KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * pParent)
+: KviOptionsWidget(pParent)
 {
 	setObjectName("ircoutput_options_widget");
 	createLayout();
 
-	QLabel * l =new QLabel(__tr2qs_ctx("Output verbosity","options"),this);
-	addWidgetToLayout(l,0,0,0,0);
+	QLabel * pLabel = new QLabel(__tr2qs_ctx("Output verbosity","options"),this);
+	addWidgetToLayout(pLabel,0,0,0,0);
 
 	m_pVerbosityCombo = new QComboBox(this);
-	addWidgetToLayout(m_pVerbosityCombo,1,0,1,0);
-
 	m_pVerbosityCombo->addItem(__tr2qs_ctx("Mute","options"));
 	m_pVerbosityCombo->addItem(__tr2qs_ctx("Quiet","options"));
 	m_pVerbosityCombo->addItem(__tr2qs_ctx("Normal","options"));
 	m_pVerbosityCombo->addItem(__tr2qs_ctx("Verbose","options"));
 	m_pVerbosityCombo->addItem(__tr2qs_ctx("Paranoic","options"));
+	addWidgetToLayout(m_pVerbosityCombo,1,0,1,0);
 
 	if(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) > KVI_VERBOSITY_LEVEL_PARANOIC)
 		KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL;
 	m_pVerbosityCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel));
+	
+	pLabel = new QLabel(__tr2qs_ctx("Datetime format","options"),this);
+	addWidgetToLayout(pLabel,0,1,0,1);
+
+	m_pDatetimeCombo = new QComboBox(this);
+	m_pDatetimeCombo->addItem(__tr2qs_ctx("Classic format","options"));
+	m_pDatetimeCombo->addItem(__tr2qs_ctx("ISO 8601 format","options"));
+	m_pDatetimeCombo->addItem(__tr2qs_ctx("System locale format","options"));
+	addWidgetToLayout(m_pDatetimeCombo,1,1,1,1);
+	
+	m_pDatetimeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat));
 
-	KviTalGroupBox * g = addGroupBox(0,1,1,1,Qt::Horizontal,__tr2qs_ctx("Show in active window","options"));
-	addBoolSelector(g,__tr2qs_ctx("External messages","options"),KviOption_boolExternalMessagesToActiveWindow);
-	addBoolSelector(g,__tr2qs_ctx("External CTCP replies","options"),KviOption_boolCtcpRepliesToActiveWindow);
-	addBoolSelector(g,__tr2qs_ctx("Whois replies","options"),KviOption_boolWhoisRepliesToActiveWindow);
-	addBoolSelector(g,__tr2qs_ctx("ChanServ and NickServ notices","options"),KviOption_boolServicesNoticesToActiveWindow);
-	addBoolSelector(g,__tr2qs_ctx("Invite messages","options"),KviOption_boolInvitesToActiveWindow);
-	addBoolSelector(g,__tr2qs_ctx("Server replies","options"),KviOption_boolServerRepliesToActiveWindow);
-	addBoolSelector(g,__tr2qs_ctx("Server notices","options"),KviOption_boolServerNoticesToActiveWindow);
-	addBoolSelector(g,__tr2qs_ctx("Broadcast and WALLOPS messages","options"),KviOption_boolOperatorMessagesToActiveWindow);
+	KviTalGroupBox * pGroup = addGroupBox(0,2,1,2,Qt::Horizontal,__tr2qs_ctx("Show in active window","options"));
+	addBoolSelector(pGroup,__tr2qs_ctx("External messages","options"),KviOption_boolExternalMessagesToActiveWindow);
+	addBoolSelector(pGroup,__tr2qs_ctx("External CTCP replies","options"),KviOption_boolCtcpRepliesToActiveWindow);
+	addBoolSelector(pGroup,__tr2qs_ctx("Whois replies","options"),KviOption_boolWhoisRepliesToActiveWindow);
+	addBoolSelector(pGroup,__tr2qs_ctx("ChanServ and NickServ notices","options"),KviOption_boolServicesNoticesToActiveWindow);
+	addBoolSelector(pGroup,__tr2qs_ctx("Invite messages","options"),KviOption_boolInvitesToActiveWindow);
+	addBoolSelector(pGroup,__tr2qs_ctx("Server replies","options"),KviOption_boolServerRepliesToActiveWindow);
+	addBoolSelector(pGroup,__tr2qs_ctx("Server notices","options"),KviOption_boolServerNoticesToActiveWindow);
+	addBoolSelector(pGroup,__tr2qs_ctx("Broadcast and WALLOPS messages","options"),KviOption_boolOperatorMessagesToActiveWindow);
 //	if(KVI_OPTION_UINT(KviOption_uintUserExperienceLevel)>=2)
 //	{
-		addBoolSelector(0,2,1,2,__tr2qs_ctx("Show extended server information","options"),KviOption_boolShowExtendedServerInfo);
-		addBoolSelector(0,3,1,3,__tr2qs_ctx("Show server pings","options"),KviOption_boolShowPingPong);
-		addBoolSelector(0,4,1,4,__tr2qs_ctx("Show own parts in the console","options"),KviOption_boolShowOwnParts);
-		addBoolSelector(0,5,1,5,__tr2qs_ctx("Show compact mode changes","options"),KviOption_boolShowCompactModeChanges);
+		addBoolSelector(0,3,1,3,__tr2qs_ctx("Show extended server information","options"),KviOption_boolShowExtendedServerInfo);
+		addBoolSelector(0,4,1,4,__tr2qs_ctx("Show server pings","options"),KviOption_boolShowPingPong);
+		addBoolSelector(0,5,1,5,__tr2qs_ctx("Show own parts in the console","options"),KviOption_boolShowOwnParts);
+		addBoolSelector(0,6,1,6,__tr2qs_ctx("Show compact mode changes","options"),KviOption_boolShowCompactModeChanges);
 
-		addRowSpacer(0,6,1,6);
+		addRowSpacer(0,7,1,7);
 //	} else {
 //		addRowSpacer(0,2,1,2);
 //	}
@@ -86,9 +96,14 @@ void KviIrcOutputOptionsWidget::commit()
 {
 	KviOptionsWidget::commit();
 
-	int i = m_pVerbosityCombo->currentIndex();
-	if((i < 0) || (i > KVI_VERBOSITY_LEVEL_PARANOIC))i = KVI_VERBOSITY_LEVEL_NORMAL;
-	KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i;
+	int iIdx = m_pVerbosityCombo->currentIndex();
+	if((iIdx < 0) || (iIdx > KVI_VERBOSITY_LEVEL_PARANOIC))
+	{
+		iIdx = KVI_VERBOSITY_LEVEL_NORMAL;
+	}
+	KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = iIdx;
+	
+	KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat) = m_pDatetimeCombo->currentIndex();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/optw_ircoutput.h
index e1937c5a6..c0c6e8108 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/optw_ircoutput.h
@@ -43,6 +43,7 @@ public:
 	~KviIrcOutputOptionsWidget();
 protected:
 	QComboBox * m_pVerbosityCombo;
+	QComboBox * m_pDatetimeCombo;
 protected:
 	virtual void commit();
 };
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index e9cbd1ff6..8b19ce450 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -384,7 +384,21 @@ bool KviPackThemeDialog::packTheme()
 
 	KviPackageWriter f;
 
-	QString szTmp = QDateTime::currentDateTime().toString();
+	QString szTmp;
+	QDateTime date = QDateTime::currentDateTime();
+	
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szTmp = date.toString();
+			break;
+		case 1:
+			szTmp = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szTmp = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
 
 	f.addInfoField("PackageType","ThemePack");
 	f.addInfoField("ThemePackVersion",KVI_CURRENT_THEME_ENGINE_VERSION);
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index efc0064da..8c93d9edc 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -237,7 +237,23 @@ bool KviSaveThemeDialog::saveTheme()
 
 	sto.setAuthor(m_pAuthorNameEdit->text());
 	sto.setDescription(m_pThemeDescriptionEdit->toPlainText());
-	sto.setDate(QDateTime::currentDateTime().toString());
+	
+	QString szTmp;
+	QDateTime date = QDateTime::currentDateTime();
+	switch(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat))
+	{
+		case 0:
+			szTmp = date.toString();
+			break;
+		case 1:
+			szTmp = date.toString(Qt::ISODate);
+			break;
+		case 2:
+			szTmp = date.toString(Qt::SystemLocaleDate);
+			break;
+	}
+	
+	sto.setDate(szTmp);
 	sto.setVersion(m_pThemeVersionEdit->text());
 	sto.setApplication("KVIrc " KVI_VERSION "." KVI_SOURCES_DATE);