diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-17 11:31:37 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-20 07:15:00 +0000 |
| commit | 97e035ce4c2b79617475167858b15f88bbcd8c5d (patch) | |
| tree | 9a66669992a06dd07401dc1508ae984d0aa79c48 | |
| parent | da09bf565f46032dad5bb024afd5103cf7822f28 (diff) | |
Move obsolete additionalConfiguration to systemProperties
Change-Id: Ib6e0e41a7f1da8cb25af914649a261a1bc703693
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | Main.qml | 2 | ||||
| -rw-r--r-- | am-config.yaml | 11 | ||||
| -rw-r--r-- | imports/shared/utils/Style.qml | 4 | ||||
| -rw-r--r-- | imports/system/models/ApplicationManagerInterface.qml | 2 |
4 files changed, 11 insertions, 8 deletions
@@ -54,7 +54,7 @@ Rectangle { id: root property var cluster - property bool showClusterIfPossible: ApplicationManager.additionalConfiguration.showCluster + property bool showClusterIfPossible: ApplicationManager.systemProperties.showCluster Item { id: centerConsole diff --git a/am-config.yaml b/am-config.yaml index d0e40e8..b1292ca 100644 --- a/am-config.yaml +++ b/am-config.yaml @@ -18,12 +18,15 @@ ui: fullscreen: yes mainQml: "Main.qml" importPaths: [ "imports/shared", "imports/system", "qml" ] - additionalConfiguration: - appStoreServerUrl: 'http://chaos.pelagicore.net:8080' - styleConfig: "auto" - showCluster: yes windowIcon: "imports/shared/assets/icons/active/apps@96.png" +systemProperties: + public: + styleConfig: "auto" + showCluster: yes + private: + appStoreServerUrl: 'http://chaos.pelagicore.net:8080' + # development setup: no security flags: diff --git a/imports/shared/utils/Style.qml b/imports/shared/utils/Style.qml index 8a6549a..cc6f4ec 100644 --- a/imports/shared/utils/Style.qml +++ b/imports/shared/utils/Style.qml @@ -97,8 +97,8 @@ QtObject { property url fonts: Qt.resolvedUrl('../assets/fonts/') property bool isClient: typeof ApplicationInterface !== 'undefined' - property string styleConfig: isClient ? ApplicationInterface.additionalConfiguration.styleConfig : ApplicationManager.additionalConfiguration.styleConfig - property bool showClusterIfPossible: isClient ? ApplicationInterface.additionalConfiguration.showCluster :ApplicationManager.additionalConfiguration.showCluster + property string styleConfig: isClient ? ApplicationInterface.additionalConfiguration.styleConfig : ApplicationManager.systemProperties.styleConfig + property bool showClusterIfPossible: isClient ? ApplicationInterface.additionalConfiguration.showCluster :ApplicationManager.systemProperties.showCluster property Loader styleLoader: Loader { property bool showClusterIfPossible: root.showClusterIfPossible diff --git a/imports/system/models/ApplicationManagerInterface.qml b/imports/system/models/ApplicationManagerInterface.qml index 03ff573..dbff491 100644 --- a/imports/system/models/ApplicationManagerInterface.qml +++ b/imports/system/models/ApplicationManagerInterface.qml @@ -77,7 +77,7 @@ QtObject { acceptWindow = false } else if (isClusterWidget) { - if (ApplicationManager.additionalConfiguration.showCluster && (WindowManager.runningOnDesktop || ScreenManager.screenCount() > 1)) { + if (ApplicationManager.systemProperties.showCluster && (WindowManager.runningOnDesktop || ScreenManager.screenCount() > 1)) { if (ApplicationManager.get(appID).categories[0] === "media") { root.clusterWidgetReady("media", item) } else if (ApplicationManager.get(appID).categories[0] === "app") { |