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

List:       kde-commits
Subject:    [kde-workspace/KDE/4.8] plasma/generic/applets/digital-clock: Reset
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2011-12-27 12:50:38
Message-ID: 20111227125038.2A436A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 8bd86323cdbd11ffafb71b6d8f4836d0d4339af3 by Lamarque V. Souza.
Committed on 19/12/2011 at 16:15.
Pushed by lvsouza into branch 'KDE/4.8'.

Reset time format upon user request.

CCBUG: 289094
REVIEW: 103434

M  +12   -0    plasma/generic/applets/digital-clock/clock.cpp
M  +1    -0    plasma/generic/applets/digital-clock/clock.h

http://commits.kde.org/kde-workspace/8bd86323cdbd11ffafb71b6d8f4836d0d4339af3

diff --git a/plasma/generic/applets/digital-clock/clock.cpp \
b/plasma/generic/applets/digital-clock/clock.cpp index dd03692..0af6a03 100644
--- a/plasma/generic/applets/digital-clock/clock.cpp
+++ b/plasma/generic/applets/digital-clock/clock.cpp
@@ -79,6 +79,7 @@ void Clock::init()
     dataEngine("time")->connectSource(currentTimezone(), this, updateInterval(), \
                intervalAlignment());
     connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, \
                SLOT(updateColors()));
     connect(KGlobalSettings::self(), SIGNAL(appearanceChanged()), \
SLOT(resetSize())); +    connect(KGlobalSettings::self(), \
SIGNAL(settingsChanged(int)), SLOT(updateClock(int)));  }
 
 void Clock::constraintsEvent(Plasma::Constraints constraints)
@@ -90,6 +91,17 @@ void Clock::constraintsEvent(Plasma::Constraints constraints)
     }
 }
 
+// In case time format has changed, e.g. from 24h to 12h format.
+void Clock::updateClock(int category)
+{
+    if (category != KGlobalSettings::SETTINGS_LOCALE) {
+        return;
+    }
+
+    generatePixmap();
+    update();
+}
+
 void Clock::resetSize()
 {
     // Called when the size of the applet may change externally, such as on
diff --git a/plasma/generic/applets/digital-clock/clock.h \
b/plasma/generic/applets/digital-clock/clock.h index 4aec3fd..f4822ec 100644
--- a/plasma/generic/applets/digital-clock/clock.h
+++ b/plasma/generic/applets/digital-clock/clock.h
@@ -55,6 +55,7 @@ class Clock : public ClockApplet
         void clockConfigChanged();
         void constraintsEvent(Plasma::Constraints constraints);
         void resetSize();
+        void updateClock(int category);
 
     protected:
         void createClockConfigurationInterface(KConfigDialog *parent);


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