1
0

qml: restore Send/ScanDialog for desktop/dev, keeping qr scan Activity for android only.

Also use stable R package, regardless of APP_PACKAGE_DOMAIN used in build.
This commit is contained in:
Sander van Grieken
2023-10-26 11:17:22 +02:00
parent 5c3e14d8de
commit 32c1915de4
7 changed files with 210 additions and 8 deletions

View File

@@ -377,13 +377,19 @@ ApplicationWindow
}
}
property alias scanDialog: _scanDialog
property Component scanDialog // set in Component.onCompleted
Component {
id: _scanDialog
QRScanner {
//onClosed: destroy()
}
}
Component {
id: _qtScanDialog
ScanDialog {
onClosed: destroy()
}
}
property alias channelOpenProgressDialog: _channelOpenProgressDialog
ChannelOpenProgressDialog {
@@ -434,6 +440,12 @@ ApplicationWindow
Component.onCompleted: {
coverTimer.start()
if (AppController.isAndroid()) {
app.scanDialog = _scanDialog
} else {
app.scanDialog = _qtScanDialog
}
if (!Config.autoConnectDefined) {
var dialog = serverConnectWizard.createObject(app)
// without completed serverConnectWizard we can't start