0.14-1 trigger via dbus; minor changes

jgibbon · May 9, 2021 · 9a533b6 · 9a533b6
1 parent 4d16978
commit 9a533b6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 13 deletions.
diff --git a/main/qml/harbour-slumber.qml b/main/qml/harbour-slumber.qml
@@ -58,21 +58,32 @@ ApplicationWindow
         service: 'de.gibbon.slumber'
         iface: 'de.gibbon.slumber'
         path: '/de/gibbon/slumber'
+        property int timerSeconds: settings.timerSeconds
 
         xml: '  <interface name="de.gibbon.slumber">\n' +
              '    <method name="startTimer" >\n' +
              '    </method>' +
+             '    <method name="trigger" >\n' +
+             '    </method>' +
              '    <method name="stopTimer" >\n' +
              '    </method>' +
              '    <signal name="Triggered" >\n' +
              '    </signal>\n' +
+             '    <property name="timerSeconds" type="i" access="read" />\n' +
              '  </interface>\n'
         function startTimer(){
             SleepTimer.start();
         }
         function stopTimer(){
             SleepTimer.stop();
         }
+        function trigger(){
+            console.log("trigger?")
+            if(SleepTimer.running) {
+                console.log("trigger!")
+                SleepTimer.triggered()
+            }
+        }
     }
 
     // import old sqlite settings once

diff --git a/main/qml/lib/Globals.qml b/main/qml/lib/Globals.qml
@@ -106,6 +106,10 @@ Item {
         target: SleepTimer
         onTriggered: {
             console.log('sleep timer fired!');
+            if(SleepTimer.running) { // this can be triggered manually (and/or via dbus)
+                SleepTimer.stop();
+            }
+
             dbus.emitSignal('Triggered');
             justTriggeredTimer.start();
             actuators.run();

diff --git a/main/qml/lib/VolumeFade.qml b/main/qml/lib/VolumeFade.qml
@@ -10,6 +10,7 @@ Item {
     property double resetToVolume
     property bool isIdle: true
     property bool isDone: false
+    property bool hasBeenFaded: false
     property int resetTimerInterval: 450
     signal volumeResetDone // to trigger bt disable only after it's done
     onVolumeResetDone: {
@@ -19,25 +20,30 @@ Item {
     function start() {
         resetToVolume = VolumeControl.getVolume()
         if(resetToVolume > 1) {
+            hasBeenFaded = true
             audiofadeout.from = resetToVolume
             audiofadeout.start()
         }
     }
     function reset(forceReset) {
-        if(forceReset) {
-            resetTimer.interval = 2; //cancel fast
-        } else {
-            resetTimer.interval = resetTimerInterval; // finish slowly
-        }
+        if(hasBeenFaded) {
+            if(forceReset) {
+                resetTimer.interval = 2; //cancel fast
+            } else {
+                resetTimer.interval = resetTimerInterval; // finish slowly
+            }
 
-        if(!root.isIdle) {
-            audiofadeout.stop()
-            if(doReset || forceReset) {
-                resetTimer.start()
+            if(!root.isIdle) {
+                audiofadeout.stop()
+                if(doReset || forceReset) {
+                    resetTimer.start()
+                }
             }
         }
+        hasBeenFaded = false;
     }
     function finish(){ //called when sleep timer is triggered to reset and fire event
+
         isDone = true;
         reset()
     }

diff --git a/rpm/harbour-slumber.changes b/rpm/harbour-slumber.changes
@@ -8,6 +8,11 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Sun May 09 2021 velox 0.14-1
+ - feature: D-Bus call for manually triggering/stopping the running timer
+ - enhancement: Stop timer if finish actions are triggered manually
+ - enhancement: Don't restore Volume if it hasn't been faded out (manual trigger)
+
 * Sun Feb 21 2021 velox 0.13-5
  - bugfix: Fix typo in Amazfish options
  - bugfix: Layout issue for large screens

diff --git a/rpm/harbour-slumber.spec b/rpm/harbour-slumber.spec
@@ -13,8 +13,8 @@ Name:       harbour-slumber
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Slumber Sleeptimer
-Version:    0.13
-Release:    5
+Version:    0.14
+Release:    1
 Group:      Qt/Qt
 License:    GPL2
 URL:        https://github.com/jgibbon/slumber

diff --git a/rpm/harbour-slumber.yaml b/rpm/harbour-slumber.yaml
@@ -1,7 +1,7 @@
 Name: harbour-slumber
 Summary: Slumber Sleeptimer
-Version: 0.13
-Release: 5
+Version: 0.14
+Release: 1
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Qt/Qt