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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Rafał Miłecki <zajec5 () gmail ! com>
Date:       2008-09-10 7:57:22
Message-ID: 1221033442.250664.19532.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 859381 by rmilecki:

Move m_prettyTimezone into libplasmaclock as every clock will need it.


 M  +0 -2      digital-clock/clock.cpp  
 M  +0 -1      digital-clock/clock.h  
 M  +4 -0      libplasmaclock/clockapplet.cpp  
 M  +2 -0      libplasmaclock/clockapplet.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.cpp #859380:859381
@@ -161,8 +161,6 @@
     Q_UNUSED(source);
     m_time = data["Time"].toTime();
     m_date = data["Date"].toDate();
-    m_prettyTimezone = data["Timezone City"].toString();
-    m_prettyTimezone.replace("_", " ");
 
     if (Plasma::ToolTipManager::self()->isWidgetToolTipDisplayed(this)) {
         updateToolTipContent();
--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.h #859380:859381
@@ -74,7 +74,6 @@
         int updateInterval() const;
         Plasma::IntervalAlignment intervalAlignment() const;
 
-        QString m_prettyTimezone;
         QTime m_time;
         QDate m_date;
         QVBoxLayout *m_layout;
--- trunk/KDE/kdebase/workspace/plasma/applets/libplasmaclock/clockapplet.cpp #859380:859381
@@ -237,6 +237,8 @@
     KConfigGroup cg = config();
     d->selectedTimezones = cg.readEntry("timeZones", QStringList());
     d->timezone = cg.readEntry("timezone", d->timezone);
+    QStringList tzParts = d->timezone.split("/");
+    m_prettyTimezone = tzParts.value(1);
 
     Plasma::Extender *extender = new Plasma::Extender(this);
     containment()->corona()->addOffscreenWidget(extender);
@@ -284,6 +286,8 @@
     }
 
     d->timezone = tz;
+    QStringList tzParts = tz.split("/");
+    m_prettyTimezone = tzParts.value(1);
 
     KConfigGroup cg = config();
     cg.writeEntry("timezone", tz);
--- trunk/KDE/kdebase/workspace/plasma/applets/libplasmaclock/clockapplet.h #859380:859381
@@ -54,6 +54,8 @@
 
         static QString localTimezone();
 
+	QString m_prettyTimezone;
+
     protected:
         void mousePressEvent(QGraphicsSceneMouseEvent *event);
         void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
[prev in list] [next in list] [prev in thread] [next in thread]