KDE/kdebase/workspace/plasma/applets/digital-clock

Sebastian Kügler sebas at kde.nl
Tue Mar 18 12:55:53 CET 2008


SVN commit 786980 by sebas:

Revert David Bettio's avoid to show timezone when using local timezone.

Some use cases have been ignored. If something like this is to go in, we'll
need solutions for those first. (Especially thinking of multiple clocks where
"Local Timezone" is actually useful and needed information.

Please use review board for anything non-trivial, especially changes in
the UI of a default Plasmoids. And please also be responsive afterwards :)

CCMAIL: panel-devel at kde.org
CCMAIL: davbet at aliceposta.it


 M  +3 -4      clock.cpp  
 M  +9 -25     clockConfig.ui  


--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.cpp #786979:786980
@@ -184,7 +184,6 @@
     ui.showDay->setChecked(m_showDay);
     ui.secondsCheckbox->setChecked(m_showSeconds);
     ui.showTimezone->setChecked(m_showTimezone);
-    ui.showTimezone->setEnabled(m_timezone != "Local");
     ui.plainClockFontBold->setChecked(m_plainClockFontBold);
     ui.plainClockFontItalic->setChecked(m_plainClockFontItalic);
     ui.plainClockFont->setCurrentFont(m_plainClockFont);
@@ -290,7 +289,7 @@
 
         // Paint the date, conditionally, and let us know afterwards how much
         // space is left for painting the time on top of it.
-        if (m_showDate || (m_showTimezone && (m_timezone != "Local"))) {
+        if (m_showDate || m_showTimezone) {
             QString dateString;
             if (m_showDate) {
                 QString day = m_date.toString("d");
@@ -314,14 +313,14 @@
                                        "%1, %2", weekday, dateString);
                 }
 
-                if (m_showTimezone && (m_timezone != "Local")) {
+                if (m_showTimezone) {
                     QString timezone = m_prettyTimezone;
                     timezone.replace("_", " ");
                     dateString = i18nc("@label Date with timezone: "
                                        "%1 day of the week with date, %2 timezone",
                                        "%1 %2", dateString, timezone);
                 }
-            } else if (m_showTimezone && (m_timezone != "Local")) {
+            } else if (m_showTimezone) {
                 dateString = m_prettyTimezone;
                 dateString.replace("_", " ");
             }
--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clockConfig.ui #786979:786980
@@ -94,7 +94,14 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0" >
+       <item row="7" column="0" colspan="2" >
+        <widget class="QCheckBox" name="showTimezone" >
+         <property name="text" >
+          <string>Show &amp;timezone</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" >
         <widget class="QCheckBox" name="secondsCheckbox" >
          <property name="toolTip" >
           <string>Show the seconds</string>
@@ -107,7 +114,7 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0" >
+       <item row="8" column="0" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -135,13 +142,6 @@
         </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="showTimezone" >
-         <property name="text" >
-          <string>Show &amp;timezone</string>
-         </property>
-        </widget>
-       </item>
-       <item>
         <widget class="KTimeZoneWidget" name="timeZones" >
          <property name="minimumSize" >
           <size>
@@ -234,21 +234,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>localTimeZone</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>showTimezone</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>209</x>
-     <y>53</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>209</x>
-     <y>255</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>


More information about the Panel-devel mailing list