aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Teichmann <daniel.teichmann@das-netzwerkteam.de>2021-07-06 20:21:46 +0200
committerDaniel Teichmann <daniel.teichmann@das-netzwerkteam.de>2021-07-06 20:21:46 +0200
commitd0d6402c46b3fc074002849f4e8071407d06df4f (patch)
treebd48c7557ca9b02d2d5a92651ba20d89e6f71a07
parentd30e51002393f48c271fc4109f1b6b71ea1d0440 (diff)
downloadRWA.Support.DesktopApp-d0d6402c46b3fc074002849f4e8071407d06df4f.tar.gz
RWA.Support.DesktopApp-d0d6402c46b3fc074002849f4e8071407d06df4f.tar.bz2
RWA.Support.DesktopApp-d0d6402c46b3fc074002849f4e8071407d06df4f.zip
Drop add_server_wizard/Scene_step_2.qml
-rw-r--r--qml.qrc1
-rw-r--r--src/scenes/add_server_wizard/Scene_step_1.qml4
-rw-r--r--src/scenes/add_server_wizard/Scene_step_2.qml70
3 files changed, 2 insertions, 73 deletions
diff --git a/qml.qrc b/qml.qrc
index e7bf198..5c8d030 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -28,7 +28,6 @@
<file>src/scenes/Scene_settings.qml</file>
<file>src/scenes/Scene_placeholder.qml</file>
<file>src/scenes/add_server_wizard/Scene_step_1.qml</file>
- <file>src/scenes/add_server_wizard/Scene_step_2.qml</file>
<file>src/scenes/add_server_wizard/add_server_wizard.cpp</file>
<file>src/scenes/add_server_wizard/add_server_wizard.h</file>
</qresource>
diff --git a/src/scenes/add_server_wizard/Scene_step_1.qml b/src/scenes/add_server_wizard/Scene_step_1.qml
index e76462a..a80e4f4 100644
--- a/src/scenes/add_server_wizard/Scene_step_1.qml
+++ b/src/scenes/add_server_wizard/Scene_step_1.qml
@@ -15,9 +15,9 @@ Item {
Connections {
target: add_server_wizard
onStep1Success: {
- //main_content_push("scenes/add_server_wizard/Scene_step_2.qml", StackView.Transition)
+ // Go onto the first page of the stack.
main_content_pop(null)
- mainqmladaptor.showToast(qsTr("Successfully added server address."), 5000);
+ mainqmladaptor.showToast(qsTr("Successfully added remote web app host."), 5000);
}
}
diff --git a/src/scenes/add_server_wizard/Scene_step_2.qml b/src/scenes/add_server_wizard/Scene_step_2.qml
deleted file mode 100644
index 5cfbe46..0000000
--- a/src/scenes/add_server_wizard/Scene_step_2.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Window 2.2
-import QtQuick.Extras 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls.Material 2.3
-
-/*!
- This .qml file is a Scene which can be loaded through for example a StackView (main_content in main.qml).
- */
-
-Item {
- id: scene_server_wizard_step_2
- objectName: "Scene_step_2"
-
- Connections {
- target: add_server_wizard
- onStep2Success: {
- main_content_pop(null, StackView.Transition)
- //main_content_replace("scenes/Scene_placeholder.qml", StackView.Transition)
- }
- }
-
- Connections {
- target: add_server_wizard
- onStep2Failed: {
- mainqmladaptor.showToast(reason, 3000);
- }
- }
-
- Rectangle {
- id: rectangle
- anchors.fill: parent
- color: Material.background
-
- Text {
- color: Material.foreground
- id: title
-
- text: qsTr("Step 2")
- font.pointSize: 18
- wrapMode: Text.WordWrap
-
- font.bold: true
- horizontalAlignment: Text.AlignHCenter
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.margins: 5
- }
-
- Button {
- id: next_step2_button
- text: qsTr("Next Step")
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 10
- anchors.right: parent.right
- anchors.rightMargin: 10
-
- onClicked: {
- add_server_wizard.processStep2()
- }
- }
- }
-}
-
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/