aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2021-09-05 12:51:53 -0400
committerluigi1111 <luigi1111w@gmail.com>2021-09-05 12:51:53 -0400
commitd93af5a4696143c521dceced3fe2cfc3e04674cb (patch)
treebab15d786fea2051a6acf12ddf948782d8c0a2fc
parent051282931a77a4352eca5f3a5cb1032e94d4a2bc (diff)
parent6dd7445938cef979579a829a2e03cb85b7ddd298 (diff)
downloadmonzero-gui-d93af5a4696143c521dceced3fe2cfc3e04674cb.tar.gz
monzero-gui-d93af5a4696143c521dceced3fe2cfc3e04674cb.tar.xz
monzero-gui-d93af5a4696143c521dceced3fe2cfc3e04674cb.zip
Merge pull request #3282
6dd7445 Transfer: export all key images by default (benevanoff)
-rw-r--r--pages/Transfer.qml2
-rw-r--r--src/libwalletqt/Wallet.cpp4
-rw-r--r--src/libwalletqt/Wallet.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 1b1a8260..86749aba 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -1079,7 +1079,7 @@ Rectangle {
selectExisting: false
onAccepted: {
console.log(walletManager.urlToLocalPath(exportKeyImagesDialog.fileUrl))
- currentWallet.exportKeyImages(walletManager.urlToLocalPath(exportKeyImagesDialog.fileUrl));
+ currentWallet.exportKeyImages(walletManager.urlToLocalPath(exportKeyImagesDialog.fileUrl), true);
}
onRejected: {
console.log("Canceled");
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index f7cc1965..691e03d3 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -489,9 +489,9 @@ quint64 Wallet::daemonBlockChainTargetHeight() const
return m_daemonBlockChainTargetHeight;
}
-bool Wallet::exportKeyImages(const QString& path)
+bool Wallet::exportKeyImages(const QString& path, bool all)
{
- return m_walletImpl->exportKeyImages(path.toStdString());
+ return m_walletImpl->exportKeyImages(path.toStdString(), all);
}
bool Wallet::importKeyImages(const QString& path)
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index e0157ee3..e55bceb9 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -205,7 +205,7 @@ public:
Q_INVOKABLE void refreshHeightAsync();
//! export/import key images
- Q_INVOKABLE bool exportKeyImages(const QString& path);
+ Q_INVOKABLE bool exportKeyImages(const QString& path, bool all = false);
Q_INVOKABLE bool importKeyImages(const QString& path);
//! refreshes the wallet