small updates for walletview.cpp
- make "&Export" translatable - fix some includes - small formatting changes
This commit is contained in:
parent
77a1e12eed
commit
46fd626b21
1 changed files with 7 additions and 12 deletions
|
@ -18,8 +18,8 @@
|
||||||
#include "askpassphrasedialog.h"
|
#include "askpassphrasedialog.h"
|
||||||
#include "ui_interface.h"
|
#include "ui_interface.h"
|
||||||
|
|
||||||
|
#include <QHBoxLayout>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include <QActionGroup>
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
|
@ -39,7 +39,7 @@ WalletView::WalletView(QWidget *parent, BitcoinGUI *_gui):
|
||||||
QHBoxLayout *hbox_buttons = new QHBoxLayout();
|
QHBoxLayout *hbox_buttons = new QHBoxLayout();
|
||||||
transactionView = new TransactionView(this);
|
transactionView = new TransactionView(this);
|
||||||
vbox->addWidget(transactionView);
|
vbox->addWidget(transactionView);
|
||||||
QPushButton *exportButton = new QPushButton("&Export", this);
|
QPushButton *exportButton = new QPushButton(tr("&Export"), this);
|
||||||
exportButton->setToolTip(tr("Export the data in the current tab to a file"));
|
exportButton->setToolTip(tr("Export the data in the current tab to a file"));
|
||||||
#ifndef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
|
#ifndef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
|
||||||
exportButton->setIcon(QIcon(":/icons/export"));
|
exportButton->setIcon(QIcon(":/icons/export"));
|
||||||
|
@ -138,14 +138,10 @@ void WalletView::incomingTransaction(const QModelIndex& parent, int start, int /
|
||||||
|
|
||||||
TransactionTableModel *ttm = walletModel->getTransactionTableModel();
|
TransactionTableModel *ttm = walletModel->getTransactionTableModel();
|
||||||
|
|
||||||
QString date = ttm->index(start, TransactionTableModel::Date, parent)
|
QString date = ttm->index(start, TransactionTableModel::Date, parent).data().toString();
|
||||||
.data().toString();
|
qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent).data(Qt::EditRole).toULongLong();
|
||||||
qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent)
|
QString type = ttm->index(start, TransactionTableModel::Type, parent).data().toString();
|
||||||
.data(Qt::EditRole).toULongLong();
|
QString address = ttm->index(start, TransactionTableModel::ToAddress, parent).data().toString();
|
||||||
QString type = ttm->index(start, TransactionTableModel::Type, parent)
|
|
||||||
.data().toString();
|
|
||||||
QString address = ttm->index(start, TransactionTableModel::ToAddress, parent)
|
|
||||||
.data().toString();
|
|
||||||
|
|
||||||
gui->incomingTransaction(date, walletModel->getOptionsModel()->getDisplayUnit(), amount, type, address);
|
gui->incomingTransaction(date, walletModel->getOptionsModel()->getDisplayUnit(), amount, type, address);
|
||||||
}
|
}
|
||||||
|
@ -227,8 +223,7 @@ void WalletView::encryptWallet(bool status)
|
||||||
{
|
{
|
||||||
if(!walletModel)
|
if(!walletModel)
|
||||||
return;
|
return;
|
||||||
AskPassphraseDialog dlg(status ? AskPassphraseDialog::Encrypt:
|
AskPassphraseDialog dlg(status ? AskPassphraseDialog::Encrypt : AskPassphraseDialog::Decrypt, this);
|
||||||
AskPassphraseDialog::Decrypt, this);
|
|
||||||
dlg.setModel(walletModel);
|
dlg.setModel(walletModel);
|
||||||
dlg.exec();
|
dlg.exec();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue