aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AddressTableModel.cpp6
-rw-r--r--AddressTableModel.h18
-rw-r--r--BitcoinGUI.cpp24
-rw-r--r--bitcoin.pro9
-rw-r--r--bitcoin.qrc8
5 files changed, 52 insertions, 13 deletions
diff --git a/AddressTableModel.cpp b/AddressTableModel.cpp
new file mode 100644
index 000000000..b25ee3e9e
--- /dev/null
+++ b/AddressTableModel.cpp
@@ -0,0 +1,6 @@
+#include "AddressTableModel.h"
+
+AddressTableModel::AddressTableModel(QObject *parent) :
+ QAbstractTableModel(parent)
+{
+}
diff --git a/AddressTableModel.h b/AddressTableModel.h
new file mode 100644
index 000000000..490452e11
--- /dev/null
+++ b/AddressTableModel.h
@@ -0,0 +1,18 @@
+#ifndef ADDRESSTABLEMODEL_H
+#define ADDRESSTABLEMODEL_H
+
+#include <QAbstractTableModel>
+
+class AddressTableModel : public QAbstractTableModel
+{
+ Q_OBJECT
+public:
+ explicit AddressTableModel(QObject *parent = 0);
+
+signals:
+
+public slots:
+
+};
+
+#endif // ADDRESSTABLEMODEL_H
diff --git a/BitcoinGUI.cpp b/BitcoinGUI.cpp
index f07b82809..3ee74a1e5 100644
--- a/BitcoinGUI.cpp
+++ b/BitcoinGUI.cpp
@@ -19,6 +19,7 @@
#include <QLineEdit>
#include <QPushButton>
#include <QHeaderView>
+#include <QLocale>
#include <iostream>
@@ -27,12 +28,12 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
{
resize(850, 550);
setWindowTitle("Bitcoin");
- setWindowIcon(QIcon("bitcoin.png"));
+ setWindowIcon(QIcon(":icons/bitcoin"));
- QAction *quit = new QAction(QIcon("quit.png"), "&Quit", this);
- QAction *sendcoins = new QAction(QIcon("send.png"), "&Send coins", this);
- QAction *addressbook = new QAction(QIcon("address-book.png"), "&Address book", this);
- QAction *about = new QAction(QIcon("bitcoin.png"), "&About", this);
+ QAction *quit = new QAction(QIcon(":/icons/quit"), "&Quit", this);
+ QAction *sendcoins = new QAction(QIcon(":/icons/send"), "&Send coins", this);
+ QAction *addressbook = new QAction(QIcon(":/icons/address-book"), "&Address book", this);
+ QAction *about = new QAction(QIcon(":/icons/bitcoin"), "&About", this);
/* Menus */
QMenu *file = menuBar()->addMenu("&File");
@@ -66,9 +67,10 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
/* Balance: <balance> */
QHBoxLayout *hbox_balance = new QHBoxLayout();
- hbox_balance->addWidget(new QLabel("Balance:"));
+ hbox_balance->addWidget(new QLabel(tr("Balance:")));
hbox_balance->addSpacing(5);/* Add some spacing between the label and the text */
- QLabel *label_balance = new QLabel("1,234.54");
+
+ QLabel *label_balance = new QLabel(QLocale::system().toString(1345.54)); /* TODO: use locale to format amount */
label_balance->setFont(QFont("Teletype"));
hbox_balance->addWidget(label_balance);
hbox_balance->addStretch(1);
@@ -106,10 +108,10 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
/* TODO: alignment; debit/credit columns must align right */
QTabBar *tabs = new QTabBar(this);
- tabs->addTab("All transactions");
- tabs->addTab("Sent/Received");
- tabs->addTab("Sent");
- tabs->addTab("Received");
+ tabs->addTab(tr("All transactions"));
+ tabs->addTab(tr("Sent/Received"));
+ tabs->addTab(tr("Sent"));
+ tabs->addTab(tr("Received"));
vbox->addWidget(tabs);
vbox->addWidget(transaction_table);
diff --git a/bitcoin.pro b/bitcoin.pro
index 4f794ac69..b28b45f44 100644
--- a/bitcoin.pro
+++ b/bitcoin.pro
@@ -13,10 +13,15 @@ HEADERS += BitcoinGUI.h \
SendCoinsDialog.h \
SettingsDialog.h \
AddressBookDialog.h \
- AboutDialog.h
+ AboutDialog.h \
+ AddressTableModel.h
SOURCES += bitcoin.cpp BitcoinGUI.cpp \
TransactionTableModel.cpp \
SendCoinsDialog.cpp \
SettingsDialog.cpp \
AddressBookDialog.cpp \
- AboutDialog.cpp
+ AboutDialog.cpp \
+ AddressTableModel.cpp
+
+RESOURCES += \
+ bitcoin.qrc
diff --git a/bitcoin.qrc b/bitcoin.qrc
new file mode 100644
index 000000000..ebce276c8
--- /dev/null
+++ b/bitcoin.qrc
@@ -0,0 +1,8 @@
+<RCC>
+ <qresource prefix="/icons">
+ <file alias="address-book">res/icons/address-book.png</file>
+ <file alias="bitcoin">res/icons/bitcoin.png</file>
+ <file alias="quit">res/icons/quit.png</file>
+ <file alias="send">res/icons/send.png</file>
+ </qresource>
+</RCC>