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

List:       kde-commits
Subject:    [kdeplasma-addons/frameworks] applets/timer/package/contents: Timer plasmoid: added predefined timer
From:       Davide Bettio <bettio () kde ! org>
Date:       2014-04-22 19:59:48
Message-ID: E1Wcgr6-00063M-3y () scm ! kde ! org
[Download RAW message or body]

Git commit cd655c0efc91d66335bf690d320d0fe7fe38cfdc by Davide Bettio.
Committed on 22/04/2014 at 19:58.
Pushed by bettio into branch 'frameworks'.

Timer plasmoid: added predefined timers

Signed-off-by: Davide Bettio <bettio@kde.org>

M  +3    -1    applets/timer/package/contents/config/main.xml
M  +26   -1    applets/timer/package/contents/ui/timer.qml

http://commits.kde.org/kdeplasma-addons/cd655c0efc91d66335bf690d320d0fe7fe38cfdc

diff --git a/applets/timer/package/contents/config/main.xml \
b/applets/timer/package/contents/config/main.xml index 7505ef4..6d4cdd3 100644
--- a/applets/timer/package/contents/config/main.xml
+++ b/applets/timer/package/contents/config/main.xml
@@ -6,7 +6,9 @@
   <kcfgfile name=""/>
 
   <group name="General">
-    <entry name="predefinedTimers" type="StringList" />
+    <entry name="predefinedTimers" type="StringList">
+        <default>30,60,120,300,450,600,900,1200,1500,1800,2700,3600</default>
+    </entry>
 
     <entry name="running" type="int">
         <default>0</default>
diff --git a/applets/timer/package/contents/ui/timer.qml \
b/applets/timer/package/contents/ui/timer.qml index 3de7906..09df670 100644
--- a/applets/timer/package/contents/ui/timer.qml
+++ b/applets/timer/package/contents/ui/timer.qml
@@ -110,7 +110,7 @@ Item
             }
             TimerDigit {
                 meaning: 60*60;
-                num: (seconds / (60*60)) % 10;
+                num: ~~(~~(seconds / (60*60))) % 10;
                 suffix: (running && seconds < 60) ? "_1" : "";
             }
 
@@ -169,6 +169,23 @@ Item
         plasmoid.setAction("timerStop", i18n("S&top"));
         plasmoid.setAction("timerReset", i18n("&Reset"));
         plasmoid.setActionSeparator("separator0");
+
+        for (var predefinedTimer in plasmoid.configuration.predefinedTimers){
+            plasmoid.setAction("predefined_timer_" + \
plasmoid.configuration.predefinedTimers[predefinedTimer], +                           \
secondsToDisplayableString(plasmoid.configuration.predefinedTimers[predefinedTimer]));
 +        }
+        plasmoid.setActionSeparator("separator1");
+    }
+
+    function secondsToDisplayableString(sec)
+    {
+
+                return ~~((sec / (60*60)) / 10) + "" +
+                (~~(~~(sec / (60*60))) % 10) + ":" +
+                ~~(~~((sec % (60*60)) / 60) / 10) + "" +
+                ~~((sec % (60*60)) / 60) % 10 + ":" +
+                ~~((sec % 60) / 10) + "" +
+                (sec % 60) % 10;
     }
 
     function startTimer()
@@ -222,6 +239,14 @@ Item
         delayedSaveTimer.start();
     }
 
+    function actionTriggered(actionName)
+    {
+        if (actionName.indexOf("predefined_timer_") == 0){
+            seconds = actionName.replace("predefined_timer_", "");
+            startTimer();
+        }
+    }
+
     function action_timerStart()
     {
         startTimer();


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