Implement filter row instead of tabs, allows for more expressive filters

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

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 76ae3dd..44f7746 100644 (file)
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -15,6 +15,7 @@
 #include "optionsmodel.h"
 #include "transactiondescdialog.h"
 #include "addresstablemodel.h"
+#include "transactionview.h"
 
 #include "headers.h"
 
@@ -29,12 +30,9 @@
 #include <QToolBar>
 #include <QStatusBar>
 #include <QLabel>
-#include <QTableView>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QHeaderView>
 #include <QLocale>
-#include <QSortFilterProxyModel>
 #include <QClipboard>
 #include <QMessageBox>
 #include <QProgressBar>
@@ -82,8 +80,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);
     
@@ -102,7 +102,9 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     vbox->addLayout(hbox_address);
     vbox->addLayout(hbox_balance);
 
-    vbox->addWidget(createTabs());
+    transactionView = new TransactionView(this);
+    connect(transactionView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(transactionDetails(const QModelIndex&)));
+    vbox->addWidget(transactionView);
 
     QWidget *centralwidget = new QWidget(this);
     centralwidget->setLayout(vbox);
@@ -196,7 +198,11 @@ void BitcoinGUI::setModel(ClientModel *model)
     connect(model, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString)));    
 
     // Put transaction list in tabs
-    setTabsModel(model->getTransactionTableModel());
+    transactionView->setModel(model->getTransactionTableModel());
+
+    // Balloon popup for new transaction
+    connect(model->getTransactionTableModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+            this, SLOT(incomingTransaction(const QModelIndex &, int, int)));
 }
 
 void BitcoinGUI::createTrayIcon()
@@ -225,68 +231,6 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
     }
 }
 
-QWidget *BitcoinGUI::createTabs()
-{
-    QStringList tab_labels;
-    tab_labels  << tr("All transactions")
-                << tr("Sent/Received")
-                << tr("Sent")
-                << tr("Received");
-
-    QTabWidget *tabs = new QTabWidget(this);
-    for(int i = 0; i < tab_labels.size(); ++i)
-    {
-        QTableView *view = new QTableView(this);
-        tabs->addTab(view, tab_labels.at(i));
-
-        connect(view, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(transactionDetails(const QModelIndex&)));
-        transactionViews.append(view);
-    }
-
-    return tabs;
-}
-
-void BitcoinGUI::setTabsModel(QAbstractItemModel *transaction_model)
-{
-    QStringList tab_filters;
-    tab_filters << "^."
-            << "^["+TransactionTableModel::Sent+TransactionTableModel::Received+"]"
-            << "^["+TransactionTableModel::Sent+"]"
-            << "^["+TransactionTableModel::Received+"]";
-
-    for(int i = 0; i < transactionViews.size(); ++i)
-    {
-        QSortFilterProxyModel *proxy_model = new QSortFilterProxyModel(this);
-        proxy_model->setSourceModel(transaction_model);
-        proxy_model->setDynamicSortFilter(true);
-        proxy_model->setFilterRole(TransactionTableModel::TypeRole);
-        proxy_model->setFilterRegExp(QRegExp(tab_filters.at(i)));
-        proxy_model->setSortRole(Qt::EditRole);
-
-        QTableView *transaction_table = transactionViews.at(i);
-        transaction_table->setModel(proxy_model);
-        transaction_table->setSelectionBehavior(QAbstractItemView::SelectRows);
-        transaction_table->setSelectionMode(QAbstractItemView::ExtendedSelection);
-        transaction_table->setSortingEnabled(true);
-        transaction_table->sortByColumn(TransactionTableModel::Status, Qt::DescendingOrder);
-        transaction_table->verticalHeader()->hide();
-
-        transaction_table->horizontalHeader()->resizeSection(
-                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);
-        transaction_table->horizontalHeader()->resizeSection(
-                TransactionTableModel::Credit, 79);
-    }
-
-    connect(transaction_model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            this, SLOT(incomingTransaction(const QModelIndex &, int, int)));
-}
-
 void BitcoinGUI::sendcoinsClicked()
 {
     SendCoinsDialog dlg;
@@ -341,7 +285,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 +401,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);
     }
 }