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

List:       kde-commits
Subject:    kdebase/kicker/extensions/kasbar
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2005-01-30 12:41:41
Message-ID: 20050130124141.58BF41D051 () office ! kde ! org
[Download RAW message or body]

CVS commit by lukas: 

- make the standalone kasbar app show translated
- use KLocale to format user visible dates/times

Rich: you might want to check the whatsthis in kasprefsdlg.cpp:420,
it doesn't make any sense to me


  M +4 -1      kasbarapp.cpp   1.5
  M +3 -3      kasclockitem.cpp   1.7


--- kdebase/kicker/extensions/kasbar/kasbarapp.cpp  #1.4:1.5
@@ -58,4 +58,6 @@
 #include <dcopclient.h>
 #include <kwin.h>
+#include <kglobal.h>
+#include <klocale.h>
 
 #include "kasitem.h"
@@ -74,6 +76,7 @@ static KCmdLineOptions options[] =
 int main( int argc, char **argv )
 {
-  KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", "An alternative task manager", \
VERSION_STRING ); +  KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( \
"An alternative task manager" ), VERSION_STRING );  KCmdLineArgs::addCmdLineOptions( \
options ); +  KGlobal::locale()->setMainCatalogue( "kasbarextension" );
   KApplication app;
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();

--- kdebase/kicker/extensions/kasbar/kasclockitem.cpp  #1.6:1.7
@@ -76,6 +76,6 @@ KasPopup *KasClockItem::createPopup()
 void KasClockItem::updateTime()
 {
-    setText( QDate::currentDate().toString("d MMM") );
-    lcd->display( QTime::currentTime().toString("hh:mm") );
+    setText( KGlobal::locale()->formatDate( QDate::currentDate(), true /* \
shortFormat */ ) ); +    lcd->display( KGlobal::locale()->formatTime( \
QTime::currentTime(), false /* includeSecs */, false /* isDuration */) );  
     update();


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