aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/bitcoingui.cpp10
-rw-r--r--src/qt/bitcoingui.h1
-rw-r--r--src/qt/forms/overviewpage.ui22
-rw-r--r--src/qt/overviewpage.cpp5
-rw-r--r--src/qt/overviewpage.h1
5 files changed, 29 insertions, 10 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 3ac87262aa..fbab51bd6b 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -104,11 +104,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
labelBlocks->setMinimumWidth(130);
labelBlocks->setToolTip(tr("Number of blocks in the block chain"));
- labelTransactions = new QLabel();
- labelTransactions->setFrameStyle(QFrame::Panel | QFrame::Sunken);
- labelTransactions->setMinimumWidth(130);
- labelTransactions->setToolTip(tr("Number of transactions in your wallet"));
-
// Progress bar for blocks download
progressBarLabel = new QLabel(tr("Synchronizing with network..."));
progressBarLabel->setVisible(false);
@@ -120,7 +115,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
statusBar()->addWidget(progressBar);
statusBar()->addPermanentWidget(labelConnections);
statusBar()->addPermanentWidget(labelBlocks);
- statusBar()->addPermanentWidget(labelTransactions);
createTrayIcon();
@@ -133,7 +127,7 @@ void BitcoinGUI::createActions()
overviewAction = new QAction(QIcon(":/icons/overview"), tr("&Overview"), this);
overviewAction->setCheckable(true);
tabGroup->addAction(overviewAction);
- historyAction = new QAction(QIcon(":/icons/history"), tr("&History"), this);
+ historyAction = new QAction(QIcon(":/icons/history"), tr("&Transactions"), this);
historyAction->setCheckable(true);
tabGroup->addAction(historyAction);
@@ -318,7 +312,7 @@ void BitcoinGUI::setNumBlocks(int count)
void BitcoinGUI::setNumTransactions(int count)
{
- labelTransactions->setText(tr("%n transaction(s)", "", count));
+ overviewPage->setNumTransactions(count);
}
void BitcoinGUI::error(const QString &title, const QString &message)
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index 432a9e3b04..e04bcf915c 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -51,7 +51,6 @@ private:
QLabel *labelConnections;
QLabel *labelConnectionsIcon;
QLabel *labelBlocks;
- QLabel *labelTransactions;
QLabel *progressBarLabel;
QProgressBar *progressBar;
diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index ef9c07306f..4cb28d5bf7 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -26,10 +26,16 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
+ <property name="horizontalSpacing">
+ <number>12</number>
+ </property>
+ <property name="verticalSpacing">
+ <number>12</number>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Balance</string>
+ <string>Balance:</string>
</property>
</widget>
</item>
@@ -40,6 +46,20 @@
</property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Number of transactions:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="labelNumTransactions">
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index faed29866a..87f95fddf3 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -30,3 +30,8 @@ void OverviewPage::setBalance(qint64 balance)
{
ui->labelBalance->setText(GUIUtil::formatMoney(balance) + QString(" BTC"));
}
+
+void OverviewPage::setNumTransactions(int count)
+{
+ ui->labelNumTransactions->setText(QLocale::system().toString(count));
+}
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index 85b927b83f..fbd6853b37 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -17,6 +17,7 @@ public:
public slots:
void setBalance(qint64 balance);
+ void setNumTransactions(int count);
private:
Ui::OverviewPage *ui;