[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/extragear/kde3/network/konversation/src
From:       Peter Simonsson <psn () linux ! se>
Date:       2007-07-07 9:19:02
Message-ID: 1183799942.731672.17679.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 684814 by psn:

Don't translate timestamp choices. Patch by Spiros Georgaras.
BUG:139577


 M  +1 -16     chatwindowappearance_preferences.ui  
 M  +4 -0      konvisettingsdialog.cpp  


--- branches/extragear/kde3/network/konversation/src/chatwindowappearance_preferences.ui #684813:684814
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ChatWindowAppearance_Config</class>
 <comment>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -57,21 +57,6 @@
                     </property>
                 </widget>
                 <widget class="QComboBox" row="0" column="1">
-                    <item>
-                        <property name="text">
-                            <string>hh:mm</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property name="text">
-                            <string>hh:mm:ss</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property name="text">
-                            <string>h:m ap</string>
-                        </property>
-                    </item>
                     <property name="name">
                         <cstring>kcfg_TimestampFormat</cstring>
                     </property>
--- branches/extragear/kde3/network/konversation/src/konvisettingsdialog.cpp #684813:684814
@@ -35,6 +35,7 @@
 #include "tabnotifications_preferences.h"
 
 #include <qsplitter.h>
+#include <qcombobox.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -69,6 +70,9 @@
 
   //Interface/Chat Window
   m_confChatWindowAppearanceWdg = new ChatWindowAppearance_Config( 0, "ChatWindowAppearance" );
+  m_confChatWindowAppearanceWdg->kcfg_TimestampFormat->insertItem("hh:mm");
+  m_confChatWindowAppearanceWdg->kcfg_TimestampFormat->insertItem("hh:mm:ss");
+  m_confChatWindowAppearanceWdg->kcfg_TimestampFormat->insertItem("h:m ap");
   pagePath.clear();
   pagePath << i18n("Interface") << i18n("Chat Window");
   addPage ( m_confChatWindowAppearanceWdg, pagePath, "view_text", i18n("Chat Window") );
[prev in list] [next in list] [prev in thread] [next in thread]