#307 removed calling "QFileDialog" from QML

BeamMW · Jan 12, 2019 · 3735220 · 3735220
1 parent c282e62
commit 3735220
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/ui/view/start.qml b/ui/view/start.qml
@@ -6,7 +6,6 @@ import QtGraphicalEffects 1.0
 import "controls"
 import Beam.Wallet 1.0
 import QtQuick.Layouts 1.3
-import QtQuick.Dialogs 1.0
 
 Item
 {
@@ -348,7 +347,11 @@ Item
                             icon.source: "qrc:/assets/icon-folder.svg"
                             onClicked: {
                                 // open fileOpenDialog
-                                fileDialog.open();
+                                var path = viewModel.selectCustomWalletDB();
+
+                                if (path.length > 0) {
+                                    buttons.migrateWalletDB(path);
+                                }
                             }
                         }
 
@@ -362,23 +365,6 @@ Item
                             }
                         }
 
-                        FileDialog {
-                            id: fileDialog
-                            title: qsTr("Select the wallet database file")
-                            folder: shortcuts.home
-                            visible: false
-                            nameFilters: [ "SQLite database file (*.db)" ]
-                            onAccepted: {
-                                var path = fileDialog.fileUrl.toString();
-                                // remove prefixed "file:///"
-                                path = path.replace(/^(file:\/{3})/,"");
-                                // unescape html codes like '%23' for '#'
-                                buttons.migrateWalletDB(decodeURIComponent(path));
-                            }
-                            onRejected: {
-                            }
-                        }
-
                         function backAction() {
                             // remove wallet.db file
                             viewModel.deleteCurrentWalletDB();

diff --git a/ui/viewmodel/start_view.cpp b/ui/viewmodel/start_view.cpp
@@ -18,6 +18,7 @@
 #include <QStringBuilder>
 #include <QApplication>
 #include <QClipboard>
+#include <QFileDialog>
 #include <QVariant>
 #include <QStandardPaths>
 #if defined(QT_PRINTSUPPORT_LIB)
@@ -574,4 +575,12 @@ void StartViewModel::migrateWalletDB(const QString& path)
 void StartViewModel::copyToClipboard(const QString& text)
 {
     QApplication::clipboard()->setText(text);
+}
+
+QString StartViewModel::selectCustomWalletDB()
+{
+    QString filePath = QFileDialog::getOpenFileName(nullptr, tr("Select the wallet database file"),
+        QStandardPaths::writableLocation(QStandardPaths::DesktopLocation), tr("SQLite database file (*.db)"));
+
+    return filePath;
 }
diff --git a/ui/viewmodel/start_view.h b/ui/viewmodel/start_view.h
@@ -126,6 +126,7 @@ class StartViewModel : public QObject
     Q_INVOKABLE void deleteCurrentWalletDB();
     Q_INVOKABLE void migrateWalletDB(const QString& path);
     Q_INVOKABLE void copyToClipboard(const QString& text);
+    Q_INVOKABLE QString selectCustomWalletDB();
 
 signals:
     void walletExistsChanged();