From c9122283cc652b953cbfc2cdea47902b9f20eea2 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Wed, 12 Sep 2018 13:50:24 +0200 Subject: mobile-widgets: replace qmlprefs::theme with qPrefDisplay::theme Shortcut and use qPrefDisplay::theme() direct Signed-off-by: Jan Iversen --- mobile-widgets/qml/Settings.qml | 9 +++------ mobile-widgets/qml/main.qml | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'mobile-widgets/qml') diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml index 68562a871..9f6f1f8cb 100644 --- a/mobile-widgets/qml/Settings.qml +++ b/mobile-widgets/qml/Settings.qml @@ -139,8 +139,7 @@ Kirigami.ScrollablePage { enabled: subsurfaceTheme.currentTheme !== "Blue" onClicked: { blueTheme() - prefs.theme = subsurfaceTheme.currentTheme - manager.savePreferences() + PrefDisplay.theme = subsurfaceTheme.currentTheme } } @@ -192,8 +191,7 @@ Kirigami.ScrollablePage { enabled: subsurfaceTheme.currentTheme !== "Pink" onClicked: { pinkTheme() - prefs.theme = subsurfaceTheme.currentTheme - manager.savePreferences() + PrefDisplay.theme = subsurfaceTheme.currentTheme } } @@ -244,8 +242,7 @@ Kirigami.ScrollablePage { enabled: subsurfaceTheme.currentTheme !== "Dark" onClicked: { darkTheme() - prefs.theme = subsurfaceTheme.currentTheme - manager.savePreferences() + PrefDisplay.theme = subsurfaceTheme.currentTheme } } } diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index bdd3335e3..b20ff4d2b 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -506,7 +506,7 @@ if you have network connectivity and want to sync your data to cloud storage."), property int columnWidth: Math.round(rootItem.width/(Kirigami.Units.gridUnit*28)) > 0 ? Math.round(rootItem.width / Math.round(rootItem.width/(Kirigami.Units.gridUnit*28))) : rootItem.width Component.onCompleted: { // this needs to pick the theme from persistent preference settings - var theme = prefs.theme + var theme = PrefDisplay.theme if (theme == "Blue") blueTheme() else if (theme == "Pink") -- cgit v1.2.3-70-g09d2