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

List:       kde-commits
Subject:    [kde-workspace/plasma/brummbq/digital-clock] plasma/generic/applets/digital-clock/package/contents/u
From:       Gregor_Tätzner <gregor () freenet ! de>
Date:       2012-12-25 19:26:07
Message-ID: 20121225192607.1E6CCA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 64a70b52a4d95717759ff0e74091aa793c0d20f2 by Gregor Tätzner.
Committed on 25/12/2012 at 20:23.
Pushed by gregort into branch 'plasma/brummbq/digital-clock'.

Completed 'No Date' option

M  +4    -4    plasma/generic/applets/digital-clock/package/contents/ui/digitalclock.qml


http://commits.kde.org/kde-workspace/64a70b52a4d95717759ff0e74091aa793c0d20f2

diff --git a/plasma/generic/applets/digital-clock/package/contents/ui/digitalclock.qml \
b/plasma/generic/applets/digital-clock/package/contents/ui/digitalclock.qml index \
                6e0256f..a08d289 100644
--- a/plasma/generic/applets/digital-clock/package/contents/ui/digitalclock.qml
+++ b/plasma/generic/applets/digital-clock/package/contents/ui/digitalclock.qml
@@ -11,7 +11,7 @@ Item {
     property variant dateStyle
     property bool showSeconds
 
-    property double timeScaleF: 0.7
+    property double timeScaleF: dateLabel.text ? 0.7 : 1
     property double dateScaleF: 1 - timeScaleF
 
     property int minimumWidth
@@ -63,9 +63,9 @@ Item {
         showSeconds = plasmoid.readConfig("showSeconds");
         switch(Number(plasmoid.readConfig("dateStyle"))) {
             case 0:
-                dateStyle = KLocale.Locale.ShortDate;
+                dateStyle = undefined;
                 break;
-            case 1:
+            case 1: //TODO compact date here
                 dateStyle = KLocale.Locale.ShortDate;
                 break;
             case 2:
@@ -127,7 +127,7 @@ Item {
 
     PlasmaComponents.Label {
         id: dateLabel
-        text: locale.formatDate(dateTime, dateStyle)
+        text: dateStyle === undefined ? "" : locale.formatDate(dateTime, dateStyle)
 
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter


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