aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-01-27 09:52:29 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-01-27 09:53:51 +0100
commit86fa1c9cf221bc68a45458f820a0890881fa3814 (patch)
tree3500db404ad2513820ed5ab459b98afeae36461a
parentd3d753578c1043ce3755f097ce96cc2388a08738 (diff)
parentf3005c82b15a73358f53420aa798b5db9f9b1f7a (diff)
Merge pull request #3579
f3005c8 [Qt] harmonize strings used when exporting in addressbookpage (Philip Kaufmann)
-rw-r--r--src/qt/addressbookpage.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index abda6c7981..2dc56a5107 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -138,7 +138,7 @@ void AddressBookPage::setModel(AddressTableModel *model)
#endif
connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
- this, SLOT(selectionChanged()));
+ this, SLOT(selectionChanged()));
// Select row for newly created address
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
@@ -270,7 +270,8 @@ void AddressBookPage::on_exportButton_clicked()
tr("Export Address List"), QString(),
tr("Comma separated file (*.csv)"), NULL);
- if (filename.isNull()) return;
+ if (filename.isNull())
+ return;
CSVModelWriter writer(filename);
@@ -279,10 +280,9 @@ void AddressBookPage::on_exportButton_clicked()
writer.addColumn("Label", AddressTableModel::Label, Qt::EditRole);
writer.addColumn("Address", AddressTableModel::Address, Qt::EditRole);
- if(!writer.write())
- {
- QMessageBox::critical(this, tr("Error exporting"), tr("Could not write to file %1.").arg(filename),
- QMessageBox::Abort, QMessageBox::Abort);
+ if(!writer.write()) {
+ QMessageBox::critical(this, tr("Exporting Failed"),
+ tr("There was an error trying to save the address list to %1.").arg(filename));
}
}