Skip to content

Commit 58dbf93

Browse files
committed
screensaver switching changed from mins to seconds
1 parent 3de8ec6 commit 58dbf93

File tree

7 files changed

+22
-14
lines changed

7 files changed

+22
-14
lines changed

api/admin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@
155155
$newConfig['collage']['placeholderpath'] = $normalizePath($newConfig['collage']['placeholderpath'] ?? null);
156156
$newConfig['screensaver']['image_source'] = $normalizePath($newConfig['screensaver']['image_source'] ?? null);
157157
$newConfig['screensaver']['video_source'] = $normalizePath($newConfig['screensaver']['video_source'] ?? null);
158-
if (isset($newConfig['screensaver']['switch_minutes'])) {
159-
$newConfig['screensaver']['switch_minutes'] = (int)$newConfig['screensaver']['switch_minutes'];
158+
if (isset($newConfig['screensaver']['switch_seconds'])) {
159+
$newConfig['screensaver']['switch_seconds'] = (int)$newConfig['screensaver']['switch_seconds'];
160160
}
161161
if (isset($newConfig['screensaver']['timeout_minutes'])) {
162162
$newConfig['screensaver']['timeout_minutes'] = (int)$newConfig['screensaver']['timeout_minutes'];

assets/js/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const photoBooth = (function () {
7777
screensaverMode === 'folder' ||
7878
(screensaverMode === 'video' ? !!config.screensaver.video_source : !!config.screensaver.image_source)),
7979
screensaverTimeoutMs = (config.screensaver.timeout_minutes || 0) * 60000,
80-
screensaverSwitchMs = (config.screensaver.switch_minutes || 1) * 60000,
80+
screensaverSwitchMs = (config.screensaver.switch_seconds || 60) * 1000,
8181
urlSafe = (src) => (src ? encodeURI(src) : '');
8282

8383
let timeOut,

lib/configsetup.inc.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,16 +599,16 @@
599599
'range_step' => 1,
600600
'unit' => 'min',
601601
],
602-
'screensaver_switch_minutes' => [
602+
'screensaver_switch_seconds' => [
603603
'view' => 'basic',
604604
'type' => 'number',
605-
'name' => 'screensaver[switch_minutes]',
606-
'placeholder' => $defaultConfig['screensaver']['switch_minutes'],
607-
'value' => $config['screensaver']['switch_minutes'],
605+
'name' => 'screensaver[switch_seconds]',
606+
'placeholder' => $defaultConfig['screensaver']['switch_seconds'],
607+
'value' => $config['screensaver']['switch_seconds'],
608608
'range_min' => 1,
609-
'range_max' => 120,
609+
'range_max' => 7200,
610610
'range_step' => 1,
611-
'unit' => 'min',
611+
'unit' => 'sec',
612612
],
613613
],
614614
'pictures' => [

resources/lang/de.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@
736736
"manual:screensaver:screensaver_image_source": "Bild wählen, das im Modus Bild bzw. als Fallback für Galerie genutzt wird.",
737737
"manual:screensaver:screensaver_mode": "Wählen, was der Bildschirmschoner zeigt: Einzelbild, Video, Bilder aus dem Ordner screensavers oder Galerie-Bilder.",
738738
"manual:screensaver:screensaver_preview": "Öffnet in neuem Tab und startet den Bildschirmschoner sofort mit aktuellen Einstellungen.",
739-
"manual:screensaver:screensaver_switch_minutes": "Minuten zwischen Bild-/Video-Wechseln im Bildschirmschoner.",
739+
"manual:screensaver:screensaver_switch_seconds": "Sekunden zwischen Bild-/Video-Wechseln im Bildschirmschoner.",
740740
"manual:screensaver:screensaver_text": "Optionaler Text im Bildschirmschoner; wechselt mit Event-Text, falls vorhanden.",
741741
"manual:screensaver:screensaver_text_backdrop_color": "Grundfarbe hinter dem Text.",
742742
"manual:screensaver:screensaver_text_backdrop_opacity": "Deckkraft des Text-Hintergrunds (0 = transparent, 1 = deckend).",
@@ -1024,7 +1024,7 @@
10241024
"screensaver:screensaver_image_source": "Bildpfad",
10251025
"screensaver:screensaver_mode": "Medientyp",
10261026
"screensaver:screensaver_preview": "Vorschau",
1027-
"screensaver:screensaver_switch_minutes": "Wechselintervall (Min.)",
1027+
"screensaver:screensaver_switch_seconds": "Wechselintervall (Sek.)",
10281028
"screensaver:screensaver_text": "Text",
10291029
"screensaver:screensaver_text_backdrop_color": "Texthintergrund",
10301030
"screensaver:screensaver_text_backdrop_opacity": "Hintergrund-Deckkraft",

resources/lang/en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@
738738
"manual:screensaver:screensaver_image_source": "Pick the image used when screensaver mode is image or as fallback for gallery.",
739739
"manual:screensaver:screensaver_mode": "Select what the screensaver shows: single image, single video, images from the screensavers folder, or gallery images.",
740740
"manual:screensaver:screensaver_preview": "Open a new tab and show the screensaver immediately with the current settings.",
741-
"manual:screensaver:screensaver_switch_minutes": "Minutes between image/video changes in the screensaver.",
741+
"manual:screensaver:screensaver_switch_seconds": "Seconds between image/video changes in the screensaver.",
742742
"manual:screensaver:screensaver_text": "Optional text shown on screensaver; alternates with event text if set.",
743743
"manual:screensaver:screensaver_text_backdrop_color": "Backdrop base color behind screensaver text.",
744744
"manual:screensaver:screensaver_text_backdrop_opacity": "Backdrop opacity (0 = transparent, 1 = solid).",
@@ -1026,7 +1026,7 @@
10261026
"screensaver:screensaver_image_source": "Image path",
10271027
"screensaver:screensaver_mode": "Media type",
10281028
"screensaver:screensaver_preview": "Preview",
1029-
"screensaver:screensaver_switch_minutes": "Change interval (min)",
1029+
"screensaver:screensaver_switch_seconds": "Change interval (sec)",
10301030
"screensaver:screensaver_text": "Text",
10311031
"screensaver:screensaver_text_backdrop_color": "Text backdrop",
10321032
"screensaver:screensaver_text_backdrop_opacity": "Backdrop opacity",

src/Configuration/Section/ScreensaverConfiguration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static function getNode(): NodeDefinition
2626
->values(['top-center', 'center', 'bottom-center'])
2727
->defaultValue('center')
2828
->end()
29-
->integerNode('switch_minutes')->min(1)->defaultValue(1)->end()
29+
->integerNode('switch_seconds')->min(1)->defaultValue(60)->end()
3030
->integerNode('timeout_minutes')->min(0)->defaultValue(3)->end()
3131
->end();
3232
}

src/Service/ConfigurationService.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,14 @@ protected function processMigration(array $config): array
217217
$config['preview']['url'] = trim(substr($config['preview']['url'], 4, -1), '"\'');
218218
}
219219

220+
// Migrate screensaver switch interval from minutes to seconds
221+
if (isset($config['screensaver'])) {
222+
if (isset($config['screensaver']['switch_minutes']) && !isset($config['screensaver']['switch_seconds'])) {
223+
$config['screensaver']['switch_seconds'] = (int)$config['screensaver']['switch_minutes'] * 60;
224+
}
225+
unset($config['screensaver']['switch_minutes']);
226+
}
227+
220228
// Migrate button font color from old colors config
221229
if (!empty($config['colors']['button_font']) && empty($config['fonts']['button_font_color'])) {
222230
$config['fonts']['button_font_color'] = $config['colors']['button_font'];

0 commit comments

Comments
 (0)