diff options
| -rw-r--r-- | monero-core.pro | 3 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.cpp | 12 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.h | 5 | ||||
| -rw-r--r-- | wizard/WizardManageWalletUI.qml | 3 |
4 files changed, 21 insertions, 2 deletions
diff --git a/monero-core.pro b/monero-core.pro index 7403cc8f..416ef9d7 100644 --- a/monero-core.pro +++ b/monero-core.pro @@ -41,7 +41,8 @@ lupdate_only { SOURCES = *.qml \ components/*.qml \ pages/*.qml \ - wizard/*.qml + wizard/*.qml \ + wizard/*js } LIBS += -L$$WALLET_ROOT/lib \ diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index a9f332a3..ea299cdc 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -132,6 +132,8 @@ QString WalletManager::maximumAllowedAmountAsSting() const return WalletManager::displayAmount(WalletManager::maximumAllowedAmount()); } + + QString WalletManager::displayAmount(quint64 amount) const { return QString::fromStdString(Bitmonero::Wallet::displayAmount(amount)); @@ -152,6 +154,16 @@ void WalletManager::setLogLevel(int logLevel) Bitmonero::WalletManagerFactory::setLogLevel(logLevel); } +QString WalletManager::urlToLocalPath(const QUrl &url) const +{ + return QDir::toNativeSeparators(url.toLocalFile()); +} + +QUrl WalletManager::localPathToUrl(const QString &path) const +{ + return QUrl::fromLocalFile(path); +} + WalletManager::WalletManager(QObject *parent) : QObject(parent) { m_pimpl = Bitmonero::WalletManagerFactory::getWalletManager(); diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 3629242a..23c56925 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -2,6 +2,7 @@ #define WALLETMANAGER_H #include <QObject> +#include <QUrl> #include <wallet/wallet2_api.h> class Wallet; @@ -88,6 +89,10 @@ public: // QML JS engine doesn't support unsigned integers Q_INVOKABLE QString maximumAllowedAmountAsSting() const; + // QML missing such functionality, implementing these helpers here + Q_INVOKABLE QString urlToLocalPath(const QUrl &url) const; + Q_INVOKABLE QUrl localPathToUrl(const QString &path) const; + void setLogLevel(int logLevel); signals: diff --git a/wizard/WizardManageWalletUI.qml b/wizard/WizardManageWalletUI.qml index a11ee094..44d3c5fd 100644 --- a/wizard/WizardManageWalletUI.qml +++ b/wizard/WizardManageWalletUI.qml @@ -186,7 +186,7 @@ Item { selectFolder: true title: qsTr("Please choose a directory") + translationManager.emptyString onAccepted: { - fileUrlInput.text = fileDialog.folder + fileUrlInput.text = walletManager.urlToLocalPath(fileDialog.folder) fileDialog.visible = false } onRejected: { @@ -213,6 +213,7 @@ Item { fileDialog.open() } } + } Rectangle { |