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

7 files changed, 103 insertions, 28 deletions

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);