feat: add seconds picker to timed wallpaper change

Author: luisbocanegra

package/contents/config/main.xml

@@ -119,6 +119,9 @@
     <entry name="ChangeWallpaperMode" type="Int">
       <default>1</default>
     </entry>
+    <entry name="ChangeWallpaperTimerSeconds" type="Int">
+      <default>0</default>
+    </entry>
     <entry name="ChangeWallpaperTimerMinutes" type="Int">
       <default>10</default>
     </entry>

package/contents/ui/FadePlayer.qml

@@ -19,9 +19,10 @@ Item {
     property bool restoreLastPosition: true
     property bool debugEnabled: false
     property int changeWallpaperMode: Enum.ChangeWallpaperMode.Slideshow
+    property int changeWallpaperTimerSeconds: 0
     property int changeWallpaperTimerMinutes: 10
     property int changeWallpaperTimerHours: 0
-    property int changeWallpaperTimerTime: (changeWallpaperTimerHours * 60 + changeWallpaperTimerMinutes) * 60 * 1000
+    property int changeWallpaperTimerMs: ((changeWallpaperTimerHours * 60 * 60) + (changeWallpaperTimerMinutes * 60) + changeWallpaperTimerSeconds) * 1000
     property bool resumeLastVideo: true
 
     // Crossfade must not be longer than the shortest video or the fade becomes glitchy
@@ -35,7 +36,7 @@ Item {
         if (!root.crossfadeEnabled) {
             return 0;
         } else if (root.changeWallpaperMode === Enum.ChangeWallpaperMode.OnATimer) {
-            return Math.min(root.targetCrossfadeDuration, changeWallpaperTimerTime / 3 * 2);
+            return Math.min(root.targetCrossfadeDuration, changeWallpaperTimerMs / 3 * 2);
         } else {
             return crossfadeMinDurationLast + crossfadeMinDurationCurrent;
         }
@@ -71,17 +72,13 @@ Item {
             root.primaryPlayer = true;
             videoPlayer1.opacity = 1;
         }
-
-        if (root.changeWallpaperMode === Enum.ChangeWallpaperMode.OnATimer) {
-            changeTimer.restart();
-        }
     }
     signal setNextSource
 
     Timer {
         id: changeTimer
         running: root.changeWallpaperMode === Enum.ChangeWallpaperMode.OnATimer && root.player.playing
-        interval: !running ? 0 : changeWallpaperTimerTime - (root.crossfadeEnabled ? root.crossfadeMinDurationCurrent : 0)
+        interval: !running ? 0 : root.changeWallpaperTimerMs - (root.crossfadeEnabled ? root.crossfadeMinDurationCurrent : 0)
         repeat: true
         onTriggered: {
             if (root.debugEnabled) {

package/contents/ui/config.qml

@@ -63,6 +63,7 @@ ColumnLayout {
     property alias cfg_RandomMode: randomModeCheckbox.checked
     property alias cfg_ResumeLastVideo: resumeLastVideoCheckbox.checked
     property alias cfg_ChangeWallpaperMode: changeWallpaperModeComboBox.currentValue
+    property alias cfg_ChangeWallpaperTimerSeconds: changeWallpaperTimerSecondsSpinBox.value
     property alias cfg_ChangeWallpaperTimerMinutes: changeWallpaperTimerMinutesSpinBox.value
     property alias cfg_ChangeWallpaperTimerHours: changeWallpaperTimerHoursSpinBox.value
     property int currentTab
@@ -72,6 +73,8 @@ ColumnLayout {
     property int editingIndex: -1
     property var validDropExtensions: [".mp4", ".mpg", ".ogg", ".mov", ".webm", ".flv", ".mkv", ".avi", ".wmv", ".gif"]
 
+    readonly property int seconds: (changeWallpaperTimerHoursSpinBox.value * 60 * 60) + (changeWallpaperTimerMinutesSpinBox.value * 60) + changeWallpaperTimerSecondsSpinBox.value
+
     property var muteModeModel: {
         // options for desktop and lock screen
         let model = [
@@ -333,23 +336,41 @@ ColumnLayout {
 
         RowLayout {
             visible: currentTab === 1 && changeWallpaperModeComboBox.currentIndex === Enum.ChangeWallpaperMode.OnATimer
-            Label {
-                text: i18n("Hours:")
-            }
             SpinBox {
                 id: changeWallpaperTimerHoursSpinBox
                 from: 0
                 to: 12
                 stepSize: 1
-            }
-            Label {
-                text: i18n("Minutes:")
+                textFromValue: function (value, locale) {
+                    return i18np("%1 hour", "%1 hours", value);
+                }
+                valueFromText: function (text, locale) {
+                    return parseInt(text);
+                }
             }
             SpinBox {
                 id: changeWallpaperTimerMinutesSpinBox
-                from: changeWallpaperTimerHoursSpinBox.value > 0 ? 0 : 1
+                from: 0
                 to: 59
                 stepSize: 1
+                textFromValue: function (value, locale) {
+                    return i18np("%1 minute", "%1 minutes", value);
+                }
+                valueFromText: function (text, locale) {
+                    return parseInt(text);
+                }
+            }
+            SpinBox {
+                id: changeWallpaperTimerSecondsSpinBox
+                from: root.seconds > 0 ? 0 : 1
+                to: 59
+                stepSize: 1
+                textFromValue: function (value, locale) {
+                    return i18np("%1 second", "%1 seconds", value);
+                }
+                valueFromText: function (text, locale) {
+                    return parseInt(text);
+                }
             }
         }
 

package/contents/ui/main.qml

@@ -134,6 +134,7 @@ WallpaperItem {
     property bool randomMode: main.configuration.RandomMode
     property int lastVideoPosition: main.configuration.LastVideoPosition
     property int changeWallpaperMode: main.configuration.ChangeWallpaperMode
+    property int changeWallpaperTimerSeconds: main.configuration.ChangeWallpaperTimerSeconds
     property int changeWallpaperTimerMinutes: main.configuration.ChangeWallpaperTimerMinutes
     property int changeWallpaperTimerHours: main.configuration.ChangeWallpaperTimerHours
     property bool muteAudio: {
@@ -260,6 +261,7 @@ WallpaperItem {
             targetCrossfadeDuration: main.configuration.CrossfadeDuration
             debugEnabled: main.debugEnabled
             changeWallpaperMode: main.changeWallpaperMode
+            changeWallpaperTimerSeconds: main.changeWallpaperTimerSeconds
             changeWallpaperTimerMinutes: main.changeWallpaperTimerMinutes
             changeWallpaperTimerHours: main.changeWallpaperTimerHours
             fillMode: main.configuration.FillMode