Allow overriding the connect wizard by the overlay
This commit is contained in:
parent
8dda768b5e
commit
6feab72c89
@ -3,4 +3,6 @@ import QtQuick 2.0
|
|||||||
Item {
|
Item {
|
||||||
property string systemName: "nymea"
|
property string systemName: "nymea"
|
||||||
property string appName: "nymea:app"
|
property string appName: "nymea:app"
|
||||||
|
|
||||||
|
property string connectionWizard: "/ui/connection/NewConnectionWizard.qml"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -191,7 +191,7 @@ Item {
|
|||||||
PlatformHelper.hideSplashScreen();
|
PlatformHelper.hideSplashScreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
pageStack.push(Qt.resolvedUrl("connection/NewConnectionWizard.qml"), StackView.Immediate)
|
pageStack.push(Configuration.connectionWizard, StackView.Immediate)
|
||||||
}
|
}
|
||||||
|
|
||||||
Timer { running: true; repeat: false; interval: 3000; onTriggered: PlatformHelper.hideSplashScreen(); }
|
Timer { running: true; repeat: false; interval: 3000; onTriggered: PlatformHelper.hideSplashScreen(); }
|
||||||
@ -202,7 +202,7 @@ Item {
|
|||||||
if (!engine.jsonRpcClient.currentHost) {
|
if (!engine.jsonRpcClient.currentHost) {
|
||||||
print("pushing ConnectPage")
|
print("pushing ConnectPage")
|
||||||
tabSettings.lastConnectedHost = ""
|
tabSettings.lastConnectedHost = ""
|
||||||
pageStack.push(Qt.resolvedUrl("connection/NewConnectionWizard.qml"))
|
pageStack.push(Configuration.connectionWizard)
|
||||||
PlatformHelper.hideSplashScreen();
|
PlatformHelper.hideSplashScreen();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,6 @@ Page {
|
|||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.margins: Style.margins
|
Layout.margins: Style.margins
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
text: qsTr("This wizard will guide you through the process of setting up a new nymea system.")
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user