diff options
author | Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> | 2021-07-08 15:50:22 +0200 |
---|---|---|
committer | Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de> | 2021-07-08 15:50:46 +0200 |
commit | dc3b77a1e3c8b8ff9a9299fd17c13b0428f1fa14 (patch) | |
tree | f21a172dbc7e4ff1d304276a4025dfbe8973a6c4 /src/main.qml | |
parent | 0ed25cd9cd46ba4c3f64eb5e8866becaa07f5344 (diff) | |
download | RWA.Support.DesktopApp-dc3b77a1e3c8b8ff9a9299fd17c13b0428f1fa14.tar.gz RWA.Support.DesktopApp-dc3b77a1e3c8b8ff9a9299fd17c13b0428f1fa14.tar.bz2 RWA.Support.DesktopApp-dc3b77a1e3c8b8ff9a9299fd17c13b0428f1fa14.zip |
Add: 'Scene_no_server_available.qml'
Diffstat (limited to 'src/main.qml')
-rw-r--r-- | src/main.qml | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/src/main.qml b/src/main.qml index 12c4668..4494526 100644 --- a/src/main.qml +++ b/src/main.qml @@ -66,25 +66,25 @@ ApplicationWindow { console.log("Opening window now..."); } - function main_content_pop(item, operation) { + function main_content_pop(item) { if(item) { if(item.search(main_content.currentItem.objectName) >= 0) return } - return main_content.pop(item, operation) + return main_content.pop(item) } - function main_content_push(item, operation) { + function main_content_push(item) { if(item) { if(item.search(main_content.currentItem.objectName) >= 0) return } - return main_content.push(item, operation) + return main_content.push(item) } - function main_content_replace(item, operation) { + function main_content_replace(item) { if(item) { if(item.search(main_content.currentItem.objectName) >= 0) return } - return main_content.replace(item, operation) + return main_content.replace(item) } MessageDialog { @@ -206,18 +206,29 @@ ApplicationWindow { anchors.fill: parent model: mainModel - header: ComboBox { - id: server_chooser - objectName: "server_chooser" - width: parent.width + header: Rectangle { height: 50 - model: mainqmladaptor.rwaHostModel - textRole: "alias" + width: parent.width + color: Material.background + + ComboBox { + id: server_chooser + objectName: "server_chooser" + + padding: 0 + width: parent.width + height: 56 - y + y: -6 + clip: false + + model: mainqmladaptor.rwaHostModel + textRole: "alias" - onCurrentIndexChanged: { - var rwa_host = mainqmladaptor.rwaHostModel - sidebar_drawer.rwaHostSelected(rwa_host[currentIndex].uuid) - sidebar_drawer.rwaHostIsSelected = true + onCurrentIndexChanged: { + var rwa_host = mainqmladaptor.rwaHostModel + if (rwa_host[currentIndex] !== undefined) + sidebar_drawer.rwaHostSelected(rwa_host[currentIndex].uuid) + } } } @@ -225,13 +236,15 @@ ApplicationWindow { id: footer text: " " + qsTr("Settings") width: parent.width + enabled: false onClicked: { var scene_url = "scenes/Scene_placeholder.qml" header_text.text = qsTr("Settings") if(inPortrait) sidebar_drawer.close() - main_content_replace(scene_url, StackView.Transition) + if(scene_url.search(main_content.currentItem.objectName) >= 0) return + main_content.replace(scene_url, StackView.Transition) } MenuSeparator { @@ -251,7 +264,8 @@ ApplicationWindow { header_text.text = qsTr("Allow remote control") if(inPortrait) sidebar_drawer.close() - main_content_replace(scene_url, StackView.Transition) + if(scene_url.search(main_content.currentItem.objectName) >= 0) return + main_content.replace(scene_url, StackView.Transition) } // Disabled till a RWAHost object is selected. @@ -264,7 +278,8 @@ ApplicationWindow { header_text.text = qsTr("Allow remote view") if(inPortrait) sidebar_drawer.close() - main_content_replace(scene_url, StackView.Transition) + if(scene_url.search(main_content.currentItem.objectName) >= 0) return + main_content.replace(scene_url, StackView.Transition) } // Disabled till a RWAHost object is selected. @@ -277,7 +292,8 @@ ApplicationWindow { header_text.text = qsTr("Server addition wizard") if(inPortrait) sidebar_drawer.close() - main_content_push(scene_url, StackView.ReplaceTransition) + if(scene_url.search(main_content.currentItem.objectName) >= 0) return + main_content.push(scene_url, StackView.ReplaceTransition) } } } |