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

1 files changed, 38 insertions, 23 deletions

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