Merge pull request #3579

f3005c8 [Qt] harmonize strings used when exporting in addressbookpage (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan 2014-01-27 09:52:29 +01:00
commit 86fa1c9cf2
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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));
}
}