improve address book, add less conspicious toolbar icon

diff --git a/TODO b/TODO
index 0cc78f1..4f81ec9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -60,3 +60,5 @@ AboutDialog
   - Address
   - Delete / Copy to clipboard based on tab
 
+- Make icon blend into taskbar and maybe silver/grey
+  Same for the other icons?

diff --git a/addressbookdialog.cpp b/addressbookdialog.cpp
index e1ce1fe..72b0da3 100644 (file)
--- a/addressbookdialog.cpp
+++ b/addressbookdialog.cpp
@@ -1,11 +1,20 @@
 #include "addressbookdialog.h"
 #include "ui_addressbookdialog.h"
 
+#include "addresstablemodel.h"
+#include "editaddressdialog.h"
+
+#include <QSortFilterProxyModel>
+
 AddressBookDialog::AddressBookDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::AddressBookDialog)
+    ui(new Ui::AddressBookDialog),
+    model(0)
 {
     ui->setupUi(this);
+
+    model = new AddressTableModel(this);
+    setModel(model);
 }
 
 AddressBookDialog::~AddressBookDialog()
@@ -13,6 +22,41 @@ AddressBookDialog::~AddressBookDialog()
     delete ui;
 }
 
+void AddressBookDialog::setModel(AddressTableModel *model)
+{
+    /* Receive filter */
+    QSortFilterProxyModel *receive_model = new QSortFilterProxyModel(this);
+    receive_model->setSourceModel(model);
+    receive_model->setDynamicSortFilter(true);
+    receive_model->setFilterRole(Qt::UserRole);
+    receive_model->setFilterKeyColumn(AddressTableModel::Type);
+    receive_model->setFilterFixedString(AddressTableModel::Receive);
+    ui->receiveTableView->setModel(receive_model);
+
+    /* Send filter */
+    QSortFilterProxyModel *send_model = new QSortFilterProxyModel(this);
+    send_model->setSourceModel(model);
+    send_model->setDynamicSortFilter(true);
+    send_model->setFilterRole(Qt::UserRole);
+    send_model->setFilterKeyColumn(AddressTableModel::Type);
+    send_model->setFilterFixedString(AddressTableModel::Send);
+    ui->sendTableView->setModel(send_model);
+
+    /* Set column widths */
+    ui->receiveTableView->horizontalHeader()->resizeSection(
+            AddressTableModel::Address, 320);
+    ui->receiveTableView->horizontalHeader()->setResizeMode(
+            AddressTableModel::Label, QHeaderView::Stretch);
+    ui->sendTableView->horizontalHeader()->resizeSection(
+            AddressTableModel::Address, 320);
+    ui->sendTableView->horizontalHeader()->setResizeMode(
+            AddressTableModel::Label, QHeaderView::Stretch);
+
+    /* Hide "Type" column in both views as it is only used for filtering */
+    ui->receiveTableView->setColumnHidden(AddressTableModel::Type, true);
+    ui->sendTableView->setColumnHidden(AddressTableModel::Type, true);
+}
+
 void AddressBookDialog::setTab(int tab)
 {
     ui->tabWidget->setCurrentIndex(tab);
@@ -25,15 +69,18 @@ void AddressBookDialog::on_OKButton_clicked()
 
 void AddressBookDialog::on_copyToClipboard_clicked()
 {
-
+   /* Copy currently selected address to clipboard */
 }
 
 void AddressBookDialog::on_editButton_clicked()
 {
-
+    /* Double click should trigger edit button */
+    EditAddressDialog dlg;
+    dlg.exec();
 }
 
 void AddressBookDialog::on_newAddressButton_clicked()
 {
-
+    EditAddressDialog dlg;
+    dlg.exec();
 }

diff --git a/addressbookdialog.h b/addressbookdialog.h
index e287019..d075c9b 100644 (file)
--- a/addressbookdialog.h
+++ b/addressbookdialog.h
@@ -6,6 +6,7 @@
 namespace Ui {
     class AddressBookDialog;
 }
+class AddressTableModel;
 
 class AddressBookDialog : public QDialog
 {
@@ -20,9 +21,11 @@ public:
         ReceivingTab = 1
     } Tabs;
 
+    void setModel(AddressTableModel *model);
     void setTab(int tab);
 private:
     Ui::AddressBookDialog *ui;
+    AddressTableModel *model;
 
 private slots:
     void on_newAddressButton_clicked();

diff --git a/addressbookdialog.ui b/addressbookdialog.ui
index 8620a1c..0aa093e 100644 (file)
--- a/addressbookdialog.ui
+++ b/addressbookdialog.ui
@@ -25,7 +25,14 @@
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="QTableView" name="sendTableView"/>
+        <widget class="QTableView" name="sendTableView">
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+         <attribute name="verticalHeaderVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
        </item>
       </layout>
      </widget>
@@ -48,7 +55,14 @@
         </widget>
        </item>
        <item>
-        <widget class="QTableView" name="receiveTableView"/>
+        <widget class="QTableView" name="receiveTableView">
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+         <attribute name="verticalHeaderVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
        </item>
       </layout>
      </widget>
@@ -102,5 +116,38 @@
   </layout>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>receiveTableView</sender>
+   <signal>doubleClicked(QModelIndex)</signal>
+   <receiver>editButton</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>334</x>
+     <y>249</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>333</x>
+     <y>326</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sendTableView</sender>
+   <signal>doubleClicked(QModelIndex)</signal>
+   <receiver>editButton</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>329</x>
+     <y>261</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>332</x>
+     <y>326</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

diff --git a/addresstablemodel.cpp b/addresstablemodel.cpp
index 95ea732..e8746c2 100644 (file)
--- a/addresstablemodel.cpp
+++ b/addresstablemodel.cpp
@@ -1,6 +1,57 @@
 #include "addresstablemodel.h"
 
+const QString AddressTableModel::Send = "S";
+const QString AddressTableModel::Receive = "R";
+
 AddressTableModel::AddressTableModel(QObject *parent) :
     QAbstractTableModel(parent)
 {
+
+}
+
+int AddressTableModel::rowCount(const QModelIndex &parent) const
+{
+    return 5;
+}
+
+int AddressTableModel::columnCount(const QModelIndex &parent) const
+{
+    return 3;
+}
+
+QVariant AddressTableModel::data(const QModelIndex &index, int role) const
+{
+    if(!index.isValid())
+        return QVariant();
+
+    if(role == Qt::DisplayRole)
+    {
+        /* index.row(), index.column() */
+        /* Return QString */
+        if(index.column() == Address)
+            return "1PC9aZC4hNX2rmmrt7uHTfYAS3hRbph4UN";
+        else
+            return "Description";
+    } else if (role == Qt::UserRole)
+    {
+        switch(index.row() % 2)
+        {
+        case 0: return Send;
+        case 1: return Receive;
+        }
+    }
+    return QVariant();
+}
+
+QVariant AddressTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return QVariant();
+}
+
+Qt::ItemFlags AddressTableModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::ItemIsEnabled;
+
+    return QAbstractTableModel::flags(index);
 }

diff --git a/addresstablemodel.h b/addresstablemodel.h
index 490452e..50ed80d 100644 (file)
--- a/addresstablemodel.h
+++ b/addresstablemodel.h
@@ -9,6 +9,20 @@ class AddressTableModel : public QAbstractTableModel
 public:
     explicit AddressTableModel(QObject *parent = 0);
 
+    enum {
+        Label = 0,  /* User specified label */
+        Address = 1,  /* Bitcoin address */
+        Type = 2 /* Send/Receive, used for filter */
+    } ColumnIndex;
+
+    static const QString Send; /* Send addres */
+    static const QString Receive; /* Receive address */
+
+    int rowCount(const QModelIndex &parent) const;
+    int columnCount(const QModelIndex &parent) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const;
 signals:
 
 public slots:

diff --git a/bitcoin.pro b/bitcoin.pro
index 7bcf3af..d0b9512 100644 (file)
--- a/bitcoin.pro
+++ b/bitcoin.pro
@@ -15,7 +15,8 @@ HEADERS += bitcoingui.h \
     mainoptionspage.h \
     sendcoinsdialog.h \
     addressbookdialog.h \
-    aboutdialog.h
+    aboutdialog.h \
+    editaddressdialog.h
 SOURCES += bitcoin.cpp bitcoingui.cpp \
     transactiontablemodel.cpp \
     addresstablemodel.cpp \
@@ -23,7 +24,8 @@ SOURCES += bitcoin.cpp bitcoingui.cpp \
     mainoptionspage.cpp \
     sendcoinsdialog.cpp \
     addressbookdialog.cpp \
-    aboutdialog.cpp
+    aboutdialog.cpp \
+    editaddressdialog.cpp
 
 RESOURCES += \
     bitcoin.qrc
@@ -31,4 +33,5 @@ RESOURCES += \
 FORMS += \
     sendcoinsdialog.ui \
     addressbookdialog.ui \
-    aboutdialog.ui
+    aboutdialog.ui \
+    editaddressdialog.ui

diff --git a/bitcoin.qrc b/bitcoin.qrc
index 0d91bbc..80904b3 100644 (file)
--- a/bitcoin.qrc
+++ b/bitcoin.qrc
@@ -4,6 +4,7 @@
         <file alias="bitcoin">res/icons/bitcoin.png</file>
         <file alias="quit">res/icons/quit.png</file>
         <file alias="send">res/icons/send.png</file>
+        <file alias="toolbar">res/icons/toolbar.png</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="about">res/images/about.png</file>

diff --git a/bitcoingui.cpp b/bitcoingui.cpp
index 072dc92..4af703c 100644 (file)
--- a/bitcoingui.cpp
+++ b/bitcoingui.cpp
@@ -150,7 +150,7 @@ void BitcoinGUI::createTrayIcon()
 
     trayIcon = new QSystemTrayIcon(this);
     trayIcon->setContextMenu(trayIconMenu);
-    trayIcon->setIcon(QIcon(":/icons/bitcoin"));
+    trayIcon->setIcon(QIcon(":/icons/toolbar"));
     trayIcon->show();
 }
 
@@ -158,9 +158,9 @@ QWidget *BitcoinGUI::createTabs()
 {
     QStringList tab_filters, tab_labels;
     tab_filters << "^."
-                << "^[sr]"
-                << "^[s]"
-                << "^[r]";
+            << "^["+TransactionTableModel::Sent+TransactionTableModel::Received+"]"
+            << "^["+TransactionTableModel::Sent+"]"
+            << "^["+TransactionTableModel::Received+"]";
     tab_labels  << tr("All transactions")
                 << tr("Sent/Received")
                 << tr("Sent")
@@ -173,6 +173,7 @@ QWidget *BitcoinGUI::createTabs()
         proxy_model->setSourceModel(transaction_model);
         proxy_model->setDynamicSortFilter(true);
         proxy_model->setFilterRole(Qt::UserRole);
+        proxy_model->setFilterKeyColumn(TransactionTableModel::Type);
         proxy_model->setFilterRegExp(QRegExp(tab_filters.at(i)));
 
         QTableView *transaction_table = new QTableView(this);
@@ -191,6 +192,7 @@ QWidget *BitcoinGUI::createTabs()
                 TransactionTableModel::Debit, 79);
         transaction_table->horizontalHeader()->resizeSection(
                 TransactionTableModel::Credit, 79);
+        transaction_table->setColumnHidden(TransactionTableModel::Type, true);
 
         tabs->addTab(transaction_table, tab_labels.at(i));
     }

diff --git a/editaddressdialog.cpp b/editaddressdialog.cpp
new file mode 100644 (file)
index 0000000..bd55597
--- /dev/null
+++ b/editaddressdialog.cpp
@@ -0,0 +1,14 @@
+#include "editaddressdialog.h"
+#include "ui_editaddressdialog.h"
+
+EditAddressDialog::EditAddressDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::EditAddressDialog)
+{
+    ui->setupUi(this);
+}
+
+EditAddressDialog::~EditAddressDialog()
+{
+    delete ui;
+}

diff --git a/editaddressdialog.h b/editaddressdialog.h
new file mode 100644 (file)
index 0000000..650ed53
--- /dev/null
+++ b/editaddressdialog.h
@@ -0,0 +1,22 @@
+#ifndef EDITADDRESSDIALOG_H
+#define EDITADDRESSDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+    class EditAddressDialog;
+}
+
+class EditAddressDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit EditAddressDialog(QWidget *parent = 0);
+    ~EditAddressDialog();
+
+private:
+    Ui::EditAddressDialog *ui;
+};
+
+#endif // EDITADDRESSDIALOG_H

diff --git a/editaddressdialog.ui b/editaddressdialog.ui
new file mode 100644 (file)
index 0000000..2d8aa88
--- /dev/null
+++ b/editaddressdialog.ui
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EditAddressDialog</class>
+ <widget class="QDialog" name="EditAddressDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>EditAddressDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>EditAddressDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

diff --git a/res/icons/toolbar.png b/res/icons/toolbar.png
new file mode 100644 (file)
index 0000000..f2dcb20
Binary files /dev/null and b/res/icons/toolbar.png differ

diff --git a/transactiontablemodel.cpp b/transactiontablemodel.cpp
index 5a84d2e..ee58ecb 100644 (file)
--- a/transactiontablemodel.cpp
+++ b/transactiontablemodel.cpp
@@ -2,19 +2,24 @@
 
 #include <QLocale>
 
+const QString TransactionTableModel::Sent = "s";
+const QString TransactionTableModel::Received = "r";
+const QString TransactionTableModel::Generated = "g";
+
 /* Credit and Debit columns are right-aligned as they contain numbers */
 static int column_alignments[] = {
         Qt::AlignLeft|Qt::AlignVCenter,
         Qt::AlignLeft|Qt::AlignVCenter,
         Qt::AlignLeft|Qt::AlignVCenter,
         Qt::AlignRight|Qt::AlignVCenter,
-        Qt::AlignRight|Qt::AlignVCenter
+        Qt::AlignRight|Qt::AlignVCenter,
+        Qt::AlignLeft|Qt::AlignVCenter
     };
 
 TransactionTableModel::TransactionTableModel(QObject *parent):
         QAbstractTableModel(parent)
 {
-    columns << tr("Status") << tr("Date") << tr("Description") << tr("Debit") << tr("Credit");
+    columns << tr("Status") << tr("Date") << tr("Description") << tr("Debit") << tr("Credit") << tr("Type");
 }
 
 int TransactionTableModel::rowCount(const QModelIndex &parent) const

diff --git a/transactiontablemodel.h b/transactiontablemodel.h
index 8913f1d..77ad730 100644 (file)
--- a/transactiontablemodel.h
+++ b/transactiontablemodel.h
@@ -15,9 +15,15 @@ public:
         Date = 1,
         Description = 2,
         Debit = 3,
-        Credit = 4
+        Credit = 4,
+        Type = 5
     } ColumnIndex;
 
+    /* Transaction type */
+    static const QString Sent;
+    static const QString Received;
+    static const QString Generated;
+
     int rowCount(const QModelIndex &parent) const;
     int columnCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;