aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qt/aboutdialog.cpp10
-rw-r--r--src/qt/aboutdialog.h2
-rw-r--r--src/qt/bitcoinaddressvalidator.cpp2
-rw-r--r--src/qt/bitcoingui.cpp9
-rw-r--r--src/qt/clientmodel.cpp4
-rw-r--r--src/qt/clientmodel.h2
6 files changed, 19 insertions, 10 deletions
diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp
index 13347961dd..13d263b75c 100644
--- a/src/qt/aboutdialog.cpp
+++ b/src/qt/aboutdialog.cpp
@@ -1,14 +1,18 @@
#include "aboutdialog.h"
#include "ui_aboutdialog.h"
-
-#include "util.h"
+#include "clientmodel.h"
AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::AboutDialog)
{
ui->setupUi(this);
- ui->versionLabel->setText(QString::fromStdString(FormatFullVersion()));
+
+}
+
+void AboutDialog::setModel(ClientModel *model)
+{
+ ui->versionLabel->setText(model->formatFullVersion());
}
AboutDialog::~AboutDialog()
diff --git a/src/qt/aboutdialog.h b/src/qt/aboutdialog.h
index 827cc741c3..d2caa3eedf 100644
--- a/src/qt/aboutdialog.h
+++ b/src/qt/aboutdialog.h
@@ -6,6 +6,7 @@
namespace Ui {
class AboutDialog;
}
+class ClientModel;
class AboutDialog : public QDialog
{
@@ -15,6 +16,7 @@ public:
explicit AboutDialog(QWidget *parent = 0);
~AboutDialog();
+ void setModel(ClientModel *model);
private:
Ui::AboutDialog *ui;
diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp
index 92d7daeb88..4308a893c2 100644
--- a/src/qt/bitcoinaddressvalidator.cpp
+++ b/src/qt/bitcoinaddressvalidator.cpp
@@ -1,7 +1,5 @@
#include "bitcoinaddressvalidator.h"
-#include <QDebug>
-
/* Base58 characters are:
"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 84eb366593..bdedfc6923 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -18,8 +18,6 @@
#include "addresstablemodel.h"
#include "transactionview.h"
-#include "headers.h"
-
#include <QApplication>
#include <QMainWindow>
#include <QMenuBar>
@@ -290,6 +288,7 @@ void BitcoinGUI::optionsClicked()
void BitcoinGUI::aboutClicked()
{
AboutDialog dlg;
+ dlg.setModel(clientModel);
dlg.exec();
}
@@ -311,7 +310,7 @@ void BitcoinGUI::copyClipboardClicked()
void BitcoinGUI::setBalance(qint64 balance)
{
- labelBalance->setText(QString::fromStdString(FormatMoney(balance)) + QString(" BTC"));
+ labelBalance->setText(GUIUtil::formatMoney(balance) + QString(" BTC"));
}
void BitcoinGUI::setAddress(const QString &addr)
@@ -410,7 +409,7 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
QString strMessage =
tr("This transaction is over the size limit. You can still send it for a fee of %1, "
"which goes to the nodes that process your transaction and helps to support the network. "
- "Do you want to pay the fee?").arg(QString::fromStdString(FormatMoney(nFeeRequired)));
+ "Do you want to pay the fee?").arg(GUIUtil::formatMoney(nFeeRequired));
QMessageBox::StandardButton retval = QMessageBox::question(
this, tr("Sending..."), strMessage,
QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Yes);
@@ -442,7 +441,7 @@ void BitcoinGUI::incomingTransaction(const QModelIndex & parent, int start, int
trayIcon->showMessage(tr("Incoming transaction"),
tr("Date: ") + date + "\n" +
- tr("Amount: ") + QString::fromStdString(FormatMoney(amount, true)) + "\n" +
+ tr("Amount: ") + GUIUtil::formatMoney(amount, true) + "\n" +
tr("Type: ") + type + "\n" +
tr("Address: ") + address + "\n",
QSystemTrayIcon::Information);
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 30b4fe7235..06ad5adfc8 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -59,3 +59,7 @@ OptionsModel *ClientModel::getOptionsModel()
return optionsModel;
}
+QString ClientModel::formatFullVersion() const
+{
+ return QString::fromStdString(FormatFullVersion());
+}
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 18b3ba11e1..659fa65762 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -29,6 +29,8 @@ public:
// Return conservative estimate of total number of blocks, or 0 if unknown
int getTotalBlocksEstimate() const;
+ QString formatFullVersion() const;
+
private:
CWallet *wallet;