add "BTC" to balance for clarity

[novacoin.git] / src / qt / bitcoingui.cpp

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index ed09ac9..5bf79ee 100644 (file)
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -16,7 +16,7 @@
 #include "transactiondescdialog.h"
 #include "addresstablemodel.h"
 
-#include "main.h"
+#include "headers.h"
 
 #include <QApplication>
 #include <QMainWindow>
@@ -82,8 +82,10 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     
     QPushButton *button_new = new QPushButton(tr("&New..."));
     button_new->setToolTip(tr("Create new receiving address"));
+    button_new->setIcon(QIcon(":/icons/add"));
     QPushButton *button_clipboard = new QPushButton(tr("&Copy to clipboard"));
     button_clipboard->setToolTip(tr("Copy current receiving address to the system clipboard"));
+    button_clipboard->setIcon(QIcon(":/icons/editcopy"));
     hbox_address->addWidget(button_new);
     hbox_address->addWidget(button_clipboard);
     
@@ -93,7 +95,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     hbox_balance->addSpacing(5);/* Add some spacing between the label and the text */
 
     labelBalance = new QLabel();
-    labelBalance->setFont(QFont("Monospace"));
+    labelBalance->setFont(QFont("Monospace", -1, QFont::Bold));
     labelBalance->setToolTip(tr("Your current balance"));
     hbox_balance->addWidget(labelBalance);
     hbox_balance->addStretch(1);
@@ -265,6 +267,7 @@ void BitcoinGUI::setTabsModel(QAbstractItemModel *transaction_model)
 
         QTableView *transaction_table = transactionViews.at(i);
         transaction_table->setModel(proxy_model);
+        transaction_table->setAlternatingRowColors(true);
         transaction_table->setSelectionBehavior(QAbstractItemView::SelectRows);
         transaction_table->setSelectionMode(QAbstractItemView::ExtendedSelection);
         transaction_table->setSortingEnabled(true);
@@ -275,12 +278,12 @@ void BitcoinGUI::setTabsModel(QAbstractItemModel *transaction_model)
                 TransactionTableModel::Status, 23);
         transaction_table->horizontalHeader()->resizeSection(
                 TransactionTableModel::Date, 120);
-        transaction_table->horizontalHeader()->setResizeMode(
-                TransactionTableModel::Description, QHeaderView::Stretch);
         transaction_table->horizontalHeader()->resizeSection(
-                TransactionTableModel::Debit, 79);
+                TransactionTableModel::Type, 120);
+        transaction_table->horizontalHeader()->setResizeMode(
+                TransactionTableModel::ToAddress, QHeaderView::Stretch);
         transaction_table->horizontalHeader()->resizeSection(
-                TransactionTableModel::Credit, 79);
+                TransactionTableModel::Amount, 79);
     }
 
     connect(transaction_model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
@@ -341,7 +344,7 @@ void BitcoinGUI::copyClipboardClicked()
 
 void BitcoinGUI::setBalance(qint64 balance)
 {
-    labelBalance->setText(QString::fromStdString(FormatMoney(balance)));
+    labelBalance->setText(QString::fromStdString(FormatMoney(balance)) + QString(" BTC"));
 }
 
 void BitcoinGUI::setAddress(const QString &addr)
@@ -457,23 +460,24 @@ void BitcoinGUI::transactionDetails(const QModelIndex& idx)
 void BitcoinGUI::incomingTransaction(const QModelIndex & parent, int start, int end)
 {
     TransactionTableModel *ttm = model->getTransactionTableModel();
-    qint64 credit = ttm->index(start, TransactionTableModel::Credit, parent)
+    qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent)
                     .data(Qt::EditRole).toULongLong();
-    qint64 debit = ttm->index(start, TransactionTableModel::Debit, parent)
-                    .data(Qt::EditRole).toULongLong();
-    if((credit+debit)>0 && !model->inInitialBlockDownload())
+    if(amount>0 && !model->inInitialBlockDownload())
     {
         // On incoming transaction, make an info balloon
         // Unless the initial block download is in progress, to prevent balloon-spam
         QString date = ttm->index(start, TransactionTableModel::Date, parent)
                         .data().toString();
-        QString description = ttm->index(start, TransactionTableModel::Description, parent)
+        QString type = ttm->index(start, TransactionTableModel::Type, parent)
+                        .data().toString();
+        QString address = ttm->index(start, TransactionTableModel::ToAddress, parent)
                         .data().toString();
 
         trayIcon->showMessage(tr("Incoming transaction"),
-                              "Date: " + date + "\n" +
-                              "Amount: " + QString::fromStdString(FormatMoney(credit+debit, true)) + "\n" +
-                              description,
+                              tr("Date: ") + date + "\n" +
+                              tr("Amount: ") + QString::fromStdString(FormatMoney(amount, true)) + "\n" +
+                              tr("Type: ") + type + "\n" +
+                              tr("Address: ") + address + "\n",
                               QSystemTrayIcon::Information);
     }
 }