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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-06-22 22:00:18
Message-ID: 1214172018.096886.24746.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 823259 by aseigo:

ClockApplet usage fixes


 M  +13 -21    analog-clock/clock.cpp  
 M  +0 -1      analog-clock/clock.h  
 M  +3 -4      digital-clock/clock.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/analog-clock/clock.cpp #823258:823259
@@ -77,7 +77,7 @@
     m_showTimeString = cg.readEntry("showTimeString", false);
     m_showSecondHand = cg.readEntry("showSecondHand", false);
     m_fancyHands = cg.readEntry("fancyHands", false);
-    m_timezone = cg.readEntry("timezone", "Local");
+    setCurrentTimezone(cg.readEntry("timezone", localTimezone()));
 
     connectToEngine();
 }
@@ -86,9 +86,9 @@
 {
     Plasma::DataEngine* timeEngine = dataEngine("time");
     if (m_showSecondHand) {
-        timeEngine->connectSource(m_timezone, this, 500);
+        timeEngine->connectSource(currentTimezone(), this, 500);
     } else {
-        timeEngine->connectSource(m_timezone, this, 6000, Plasma::AlignToMinute);
+        timeEngine->connectSource(currentTimezone(), this, 6000, Plasma::AlignToMinute);
     }
 }
 
@@ -137,9 +137,9 @@
     connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
     parent->addPage(widget, parent->windowTitle(), icon());
 
-    ui.timeZones->setSelected(m_timezone, true);
-    ui.timeZones->setEnabled(m_timezone != "Local");
-    ui.localTimeZone->setChecked(m_timezone == "Local");
+    ui.localTimeZone->setChecked(isLocalTimezone());
+    ui.timeZones->setSelected(currentTimezone(), true);
+    ui.timeZones->setEnabled(!isLocalTimezone());
     ui.showTimeStringCheckBox->setChecked(m_showTimeString);
     ui.showSecondHandCheckBox->setChecked(m_showSecondHand);
 }
@@ -155,24 +155,16 @@
     update();
     QStringList tzs = ui.timeZones->selection();
 
-    if (ui.localTimeZone->checkState() == Qt::Checked) {
-        dataEngine("time")->disconnectSource(m_timezone, this);
-        m_timezone = "Local";
-        cg.writeEntry("timezone", m_timezone);
-    } else if (tzs.count() > 0) {
+    dataEngine("time")->disconnectSource(currentTimezone(), this);
+    QString newTimezone = localTimezone();
+    if (!ui.localTimeZone->isChecked() && !tzs.isEmpty()) {
         //TODO: support multiple timezones
-        QString tz = tzs.at(0);
-        if (tz != m_timezone) {
-            dataEngine("time")->disconnectSource(m_timezone, this);
-            m_timezone = tz;
-            cg.writeEntry("timezone", m_timezone);
-        }
-    } else if (m_timezone != "Local") {
-        dataEngine("time")->disconnectSource(m_timezone, this);
-        m_timezone = "Local";
-        cg.writeEntry("timezone", m_timezone);
+        newTimezone = tzs.at(0);
     }
 
+    setCurrentTimezone(newTimezone);
+    cg.writeEntry("timezone", currentTimezone());
+
     connectToEngine();
     //TODO: why we don't call updateConstraints()?
     constraintsEvent(Plasma::AllConstraints);
--- trunk/KDE/kdebase/workspace/plasma/applets/analog-clock/clock.h #823258:823259
@@ -77,7 +77,6 @@
         bool m_showTimeString;
         bool m_showSecondHand;
         bool m_fancyHands;
-        QString m_timezone;
         Plasma::Svg* m_theme;
         QTime m_time;
         QTime m_lastTimeSeen;
--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.cpp #823258:823259
@@ -196,10 +196,9 @@
     cg.writeEntry("timeZones", m_timeZones);
 
     dataEngine("time")->disconnectSource(currentTimezone(), this);
-    QString newTimezone;
-    if (ui.localTimeZone->isChecked()) {
-        newTimezone = localTimezone();
-    } else {
+    QString newTimezone = localTimezone();
+
+    if (!ui.localTimeZone->isChecked() && !m_timeZones.isEmpty()) {
         newTimezone = m_timeZones.at(0);
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]