diff options
| author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2017-03-07 09:23:50 +0100 |
|---|---|---|
| committer | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2017-03-07 12:40:07 +0000 |
| commit | 9c2a83a7e92d613064bf159b9c053c18d6cf2574 (patch) | |
| tree | ca5c4e294a559a4c5142e292374530834f152324 | |
| parent | d04fec9f8309cb21662b02be002180aefc412f5d (diff) | |
| download | neptune-ui-9c2a83a7e92d613064bf159b9c053c18d6cf2574.tar.gz | |
Switch additionalConfiguration to systemProperties
The additionalConfiguration property will be removed
from ApplicationManager and systemProperties will be
used instead.
Change-Id: Id34ee6033d58f9b799791db71a95926fca3ec99a
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
| -rw-r--r-- | Main.qml | 2 | ||||
| -rw-r--r-- | am-config.yaml | 11 | ||||
| -rw-r--r-- | doc/src/neptuneui-index.qdoc | 11 | ||||
| -rw-r--r-- | imports/shared/utils/Style.qml | 4 | ||||
| -rw-r--r-- | sysui/Cloud/Store/AppStore.qml | 2 |
5 files changed, 18 insertions, 12 deletions
@@ -41,7 +41,7 @@ import utils 1.0 Rectangle { id: root - property bool showClusterIfPossible: ApplicationManager.additionalConfiguration.showCluster + property bool showClusterIfPossible: ApplicationManager.systemProperties.showCluster property var cluster color: "black" diff --git a/am-config.yaml b/am-config.yaml index 1c96486..21af701 100644 --- a/am-config.yaml +++ b/am-config.yaml @@ -18,12 +18,15 @@ ui: fullscreen: yes mainQml: "${CONFIG_PWD}/Main.qml" importPaths: [ "${CONFIG_PWD}/imports/shared", "${CONFIG_PWD}/imports/system" ] - additionalConfiguration: - appStoreServerUrl: 'http://chaos.pelagicore.net:8080' - styleConfig: "auto" - showCluster: yes windowIcon: "${CONFIG_PWD}/imports/shared/assets/icons/active/apps@96.png" +systemProperties: + public: + styleConfig: "Config1920x1080.qml" + showCluster: yes + private: + appStoreServerUrl: 'http://chaos.pelagicore.net:8080' + # development setup: no security flags: diff --git a/doc/src/neptuneui-index.qdoc b/doc/src/neptuneui-index.qdoc index 71b890f..e532504 100644 --- a/doc/src/neptuneui-index.qdoc +++ b/doc/src/neptuneui-index.qdoc @@ -164,12 +164,15 @@ fullscreen: yes mainQml: "Main.qml" importPaths: [ "imports/shared", "imports/system" ] - additionalConfiguration: - appStoreServerUrl: 'http://chaos.pelagicore.net:8080' - styleConfig: "auto" - showCluster: yes windowIcon: "imports/shared/assets/icons/active/apps@96.png" + systemProperties: + public: + styleConfig: "Config1920x1080.qml" + 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 cf7f20f..8b2aef3 100644 --- a/imports/shared/utils/Style.qml +++ b/imports/shared/utils/Style.qml @@ -86,8 +86,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.systemProperties.styleConfig : ApplicationManager.systemProperties.styleConfig + property bool showClusterIfPossible: isClient ? ApplicationInterface.systemProperties.showCluster :ApplicationManager.systemProperties.showCluster property Loader styleLoader: Loader { property bool showClusterIfPossible: root.showClusterIfPossible diff --git a/sysui/Cloud/Store/AppStore.qml b/sysui/Cloud/Store/AppStore.qml index 72f22a3..234e917 100644 --- a/sysui/Cloud/Store/AppStore.qml +++ b/sysui/Cloud/Store/AppStore.qml @@ -37,7 +37,7 @@ Item { property bool serverOnline: false property string serverReason - property string server: ApplicationManager.additionalConfiguration.appStoreServerUrl + property string server: ApplicationManager.systemProperties.appStoreServerUrl signal loginSuccessful() |