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

List:       kde-commits
Subject:    [plasma-workspace] applets/digital-clock/package/contents/ui: [digital-clock] Add support for ISO da
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2015-08-03 14:10:20
Message-ID: E1ZMGRY-0005k3-BT () scm ! kde ! org
[Download RAW message or body]

Git commit 3d241158ff42fb484eac1d5162d71331e9527886 by Martin Klapetek.
Committed on 03/08/2015 at 14:10.
Pushed by mklapetek into branch 'master'.

[digital-clock] Add support for ISO date format (YYYY-MM-DD)

REVIEW: 124451
FEATURE: 348080
FIXED-IN: 5.4.0

M  +19   -6    applets/digital-clock/package/contents/ui/DigitalClock.qml
M  +4    -0    applets/digital-clock/package/contents/ui/configAppearance.qml
M  +1    -1    applets/digital-clock/package/contents/ui/main.qml

http://commits.kde.org/plasma-workspace/3d241158ff42fb484eac1d5162d71331e9527886

diff --git a/applets/digital-clock/package/contents/ui/DigitalClock.qml \
b/applets/digital-clock/package/contents/ui/DigitalClock.qml index 02a209a..9b88db0 \
                100644
--- a/applets/digital-clock/package/contents/ui/DigitalClock.qml
+++ b/applets/digital-clock/package/contents/ui/DigitalClock.qml
@@ -33,7 +33,15 @@ Item {
     property bool showSeconds: plasmoid.configuration.showSeconds
     property bool showLocalTimezone: plasmoid.configuration.showLocalTimezone
     property bool showDate: plasmoid.configuration.showDate
-    property int dateFormat: plasmoid.configuration.dateFormat == "longDate" ? \
Locale.LongFormat : Locale.ShortFormat +    property int dateFormat: {
+        if (plasmoid.configuration.dateFormat === "longDate") {
+            return  Qt.SystemLocaleLongDate;
+        } else if (plasmoid.configuration.dateFormat === "isoDate") {
+            return Qt.ISODate;
+        }
+
+        return Qt.SystemLocaleShortDate;
+    }
 
     property string lastSelectedTimezone: \
                plasmoid.configuration.lastSelectedTimezone
     property bool displayTimezoneAsCode: \
plasmoid.configuration.displayTimezoneAsCode @@ -47,6 +55,11 @@ Item {
     // if the date/timezone cannot be fit with the smallest font to its designated \
                space
     readonly property bool tooSmall: Math.round(2 * (main.height / 5)) <= \
theme.smallestFont.pixelSize  
+    onDateFormatChanged: {
+        setupLabels();
+        updateToolTip();
+    }
+
     onDisplayTimezoneAsCodeChanged: { setupLabels(); }
     onStateChanged: { setupLabels(); }
 
@@ -485,9 +498,9 @@ Item {
 
         if (main.showDate) {
             if (main.tooSmall) {
-                dateLabelLeft.text = Qt.formatDate(main.currentTime, \
Qt.locale().dateFormat(main.dateFormat)); +                dateLabelLeft.text = \
Qt.formatDate(main.currentTime, main.dateFormat);  } else {
-                dateLabel.text = Qt.formatDate(main.currentTime, \
Qt.locale().dateFormat(main.dateFormat)); +                dateLabel.text = \
Qt.formatDate(main.currentTime, main.dateFormat);  }
         } else {
             // clear it so it doesn't take space in the layout
@@ -501,7 +514,7 @@ Item {
     }
 
     function updateToolTip() {
-        var timezoneString = Qt.formatDate(root.tzDate, root.dateFormatString);
+        var timezoneString = Qt.formatDate(root.tzDate, \
plasmoid.configuration.dateFormat === "isoDate" ? Qt.ISODate : \
root.dateFormatString);  if (plasmoid.configuration.selectedTimeZones.length > 1) {
             timezoneString += "<br />";
             for (var i = 0; i < plasmoid.configuration.selectedTimeZones.length; \
++i) { @@ -545,8 +558,8 @@ Item {
         }
 
         if (showDate) {
-            returnString += (addlinebreaks ? "<br/>" + Qt.formatDate(dateTime, \
                Qt.locale().dateFormat(main.dateFormat))
-                                           : " " + Qt.formatDate(dateTime, \
Qt.locale().dateFormat(main.dateFormat))); +            returnString += \
(addlinebreaks ? "<br/>" + Qt.formatDate(dateTime, main.dateFormat) +                 \
: " " + Qt.formatDate(dateTime, main.dateFormat));  }
 
         return returnString;
diff --git a/applets/digital-clock/package/contents/ui/configAppearance.qml \
b/applets/digital-clock/package/contents/ui/configAppearance.qml index \
                ead0ad5..cc1acbe 100644
--- a/applets/digital-clock/package/contents/ui/configAppearance.qml
+++ b/applets/digital-clock/package/contents/ui/configAppearance.qml
@@ -127,6 +127,10 @@ Item {
                             {
                                 'label': i18n("Short Date"),
                                 'name': "shortDate"
+                            },
+                            {
+                                'label': i18n("ISO Date"),
+                                'name': "isoDate"
                             }
                         ]
                         onCurrentIndexChanged: cfg_dateFormat = \
                model[currentIndex]["name"]
diff --git a/applets/digital-clock/package/contents/ui/main.qml \
b/applets/digital-clock/package/contents/ui/main.qml index f42d7ad..310a049 100644
--- a/applets/digital-clock/package/contents/ui/main.qml
+++ b/applets/digital-clock/package/contents/ui/main.qml
@@ -46,7 +46,7 @@ Item {
     Plasmoid.fullRepresentation: CalendarView { }
 
     Plasmoid.toolTipMainText: Qt.formatDate(tzDate,"dddd")
-    Plasmoid.toolTipSubText:  Qt.formatDate(tzDate, dateFormatString)
+    Plasmoid.toolTipSubText:  Qt.formatDate(tzDate, \
plasmoid.configuration.dateFormat === "isoDate" ? Qt.ISODate : dateFormatString)  \
Plasmoid.toolTipTextFormat: Text.StyledText  
     PlasmaCore.DataSource {


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