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

List:       kde-commits
Subject:    [kdeplasma-addons/frameworks] applets: Timer plasmoid:
From:       Davide Bettio <bettio () kde ! org>
Date:       2014-04-21 16:59:09
Message-ID: E1WcHYj-00032i-A1 () scm ! kde ! org
[Download RAW message or body]

Git commit ceb70d5f720b2a9aef3b6d67221d92884d33a30c by Davide Bettio.
Committed on 21/04/2014 at 16:53.
Pushed by bettio into branch 'frameworks'.

Timer plasmoid:
* Stop when timer expires.
* Install it correctly
Signed-off-by: Davide Bettio <bettio@kde.org>

M  +1    -2    applets/CMakeLists.txt
M  +1    -7    applets/timer/CMakeLists.txt
R  +0    -0    applets/timer/package/contents/config/main.xml [from: \
applets/timer/contents/config/main.xml - 100% similarity] R  +0    -0    \
applets/timer/package/contents/ui/TimerDigit.qml [from: \
applets/timer/contents/ui/TimerDigit.qml - 100% similarity] R  +0    -0    \
applets/timer/package/contents/ui/config.ui [from: \
applets/timer/contents/ui/config.ui - 100% similarity] R  +6    -1    \
applets/timer/package/contents/ui/timer.qml [from: \
applets/timer/contents/ui/timer.qml - 097% similarity] R  +0    -0    \
applets/timer/package/metadata.desktop [from: applets/timer/metadata.desktop - 100% \
similarity]

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

diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
index fc01b21..9317c95 100644
--- a/applets/CMakeLists.txt
+++ b/applets/CMakeLists.txt
@@ -45,7 +45,7 @@ add_subdirectory(calculator)
 # add_subdirectory(rssnow)
 # add_subdirectory(spellcheck)
 # add_subdirectory(showdashboard)
-# add_subdirectory(timer)
+add_subdirectory(timer)
 # 
 # add_subdirectory(eyes)
 # 
@@ -98,4 +98,3 @@ add_subdirectory(calculator)
 # add_subdirectory(webslice)
 
 plasma_install_package(quickshare org.kde.plasma.quickshare)
-plasma_install_package(timer org.kde.plasma.timer)
diff --git a/applets/timer/CMakeLists.txt b/applets/timer/CMakeLists.txt
index 896363d..155dc8e 100644
--- a/applets/timer/CMakeLists.txt
+++ b/applets/timer/CMakeLists.txt
@@ -1,12 +1,6 @@
 project(timer)
 
-install(DIRECTORY package/
-        DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/timer)
-
-install(FILES package/metadata.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}
-        RENAME plasma-applet-timer.desktop)
-
 install(FILES timer.svgz
 	DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/)
 
+plasma_install_package(package org.kde.plasma.timer)
diff --git a/applets/timer/contents/config/main.xml \
b/applets/timer/package/contents/config/main.xml similarity index 100%
rename from applets/timer/contents/config/main.xml
rename to applets/timer/package/contents/config/main.xml
diff --git a/applets/timer/contents/ui/TimerDigit.qml \
b/applets/timer/package/contents/ui/TimerDigit.qml similarity index 100%
rename from applets/timer/contents/ui/TimerDigit.qml
rename to applets/timer/package/contents/ui/TimerDigit.qml
diff --git a/applets/timer/contents/ui/config.ui \
b/applets/timer/package/contents/ui/config.ui similarity index 100%
rename from applets/timer/contents/ui/config.ui
rename to applets/timer/package/contents/ui/config.ui
diff --git a/applets/timer/contents/ui/timer.qml \
b/applets/timer/package/contents/ui/timer.qml similarity index 97%
rename from applets/timer/contents/ui/timer.qml
rename to applets/timer/package/contents/ui/timer.qml
index 712721d..b5bf932 100644
--- a/applets/timer/contents/ui/timer.qml
+++ b/applets/timer/package/contents/ui/timer.qml
@@ -49,7 +49,12 @@ Item
     Timer {
         id: t;
         interval: 1000;
-        onTriggered: seconds--;
+        onTriggered:{
+            seconds--;
+            if (seconds == 0){
+                parent.running = false;
+            }
+        }
         repeat: true;
         running: parent.running;
     }
diff --git a/applets/timer/metadata.desktop b/applets/timer/package/metadata.desktop
similarity index 100%
rename from applets/timer/metadata.desktop
rename to applets/timer/package/metadata.desktop


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