diff --git a/Main.qml b/Main.qml index 58b6458..0b14f23 100644 --- a/Main.qml +++ b/Main.qml @@ -21,10 +21,10 @@ Rectangle { // Set SDDM actions Connections { target: sddm - onLoginSucceeded: { + function onLoginSucceeded() { } - onLoginFailed: { + function onLoginFailed() { error_message.color = "#dc322f" error_message.text = textConstants.loginFailed } @@ -439,7 +439,9 @@ Rectangle { Connections { target: keyboard - onCurrentLayoutChanged: combo.index = keyboard.currentLayout + function onCurrentLayoutChanged() { + combo.index = keyboard.currentLayout + } } rowDelegate: Rectangle { @@ -505,7 +507,7 @@ Rectangle { // load and randomize playlist var time = parseInt(new Date().toLocaleTimeString(Qt.locale(),'h')) - if ( time >= 5 && time <= 17 ) { + if ( time >= config.day_time_start && time <= config.day_time_end ) { playlist1.load(Qt.resolvedUrl(config.background_vid_day), 'm3u') playlist2.load(Qt.resolvedUrl(config.background_vid_day), 'm3u') image1.source = config.background_img_day diff --git a/README.md b/README.md index d3d4061..975f112 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ done < playlist_file ### Changing settings in `theme.conf.user` You can change a few settings in this file +- `day_time_start` and `day_time_end` - set your day start/end time - `background_img_day` and `background_img_night` - default background day/night image - `background_vid_day` and `background_vid_night` - video playlists - `displayFont` - font diff --git a/components/WallpaperFader.qml b/components/WallpaperFader.qml index 7369c49..412e9a8 100644 --- a/components/WallpaperFader.qml +++ b/components/WallpaperFader.qml @@ -128,13 +128,13 @@ Item { NumberAnimation { target: mainStack property: "opacity" - duration: units.longDuration + duration: 500 easing.type: Easing.InOutQuad } NumberAnimation { target: footer property: "opacity" - duration: units.longDuration + duration: 500 easing.type: Easing.InOutQuad } } diff --git a/theme.conf b/theme.conf index 6f27788..7942232 100644 --- a/theme.conf +++ b/theme.conf @@ -1,4 +1,6 @@ [General] +day_time_start=7 +day_time_start=19 background_img_day=background.jpg background_img_night=background.jpg background_vid_day=playlists/day.m3u diff --git a/theme.conf.user b/theme.conf.user index 110ff11..b23fe21 100644 --- a/theme.conf.user +++ b/theme.conf.user @@ -1,4 +1,6 @@ [General] +day_time_start=7 +day_time_start=19 background_vid_day=playlists/day.m3u background_vid_night=playlists/night.m3u displayFont="Misc Fixed"