diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-30 08:02:38 -0700 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-30 08:02:38 -0700 |
commit | 033ffc4377f009d6b7529bf30591287b50d773df (patch) | |
tree | be65abb07c59eb836e11fec058cb1a60686ff9a8 /src/qt | |
parent | 42a12f22d6b644fcd879da23f6e56c310eb9985f (diff) | |
parent | d127964a974ad83d01e80ecd82a666b90ffb6793 (diff) |
Merge pull request #3160 from Diapolo/walletview
[Qt] walletview: make backupWallet() use GUIUtil::getSaveFileName()
Diffstat (limited to 'src/qt')
-rw-r--r-- | src/qt/walletview.cpp | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 982041c64a..5622fcfb17 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -18,16 +18,11 @@ #include "overviewpage.h" #include "askpassphrasedialog.h" #include "ui_interface.h" +#include "guiutil.h" #include <QHBoxLayout> #include <QVBoxLayout> #include <QAction> -#if QT_VERSION < 0x050000 -#include <QDesktopServices> -#else -#include <QStandardPaths> -#endif -#include <QFileDialog> #include <QPushButton> WalletView::WalletView(QWidget *parent): @@ -61,7 +56,7 @@ WalletView::WalletView(QWidget *parent): addWidget(receiveCoinsPage); addWidget(sendCoinsPage); - // Clicking on a transaction on the overview page simply sends you to transaction history page + // Clicking on a transaction on the overview pre-selects the transaction on the transaction history page connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex))); // Double-clicking on a transaction on the transaction history page shows details @@ -82,7 +77,7 @@ void WalletView::setBitcoinGUI(BitcoinGUI *gui) { if (gui) { - // Clicking on a transaction on the overview page sends you to the transactions tab + // Clicking on a transaction on the overview page simply sends you to transaction history page connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), gui, SLOT(gotoHistoryPage())); // Receive and report messages @@ -222,20 +217,20 @@ void WalletView::encryptWallet(bool status) void WalletView::backupWallet() { -#if QT_VERSION < 0x050000 - QString saveDir = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation); -#else - QString saveDir = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); -#endif - QString filename = QFileDialog::getSaveFileName(this, tr("Backup Wallet"), saveDir, tr("Wallet Data (*.dat)")); - if (!filename.isEmpty()) { - if (!walletModel->backupWallet(filename)) { - emit message(tr("Backup Failed"), tr("There was an error trying to save the wallet data to the new location."), - CClientUIInterface::MSG_ERROR); + QString filename = GUIUtil::getSaveFileName(this, + tr("Backup Wallet"), QString(), + tr("Wallet Data (*.dat)")); + + if (filename.isEmpty()) + return; + + if (!walletModel->backupWallet(filename)) { + emit message(tr("Backup Failed"), tr("There was an error trying to save the wallet data to %1.").arg(filename), + CClientUIInterface::MSG_ERROR); } - else - emit message(tr("Backup Successful"), tr("The wallet data was successfully saved to the new location."), - CClientUIInterface::MSG_INFORMATION); + else { + emit message(tr("Backup Successful"), tr("The wallet data was successfully saved to %1.").arg(filename), + CClientUIInterface::MSG_INFORMATION); } } |