gui: Refresh "receive payment" page design

gridcoinresearch.pro

@@ -190,6 +190,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/optionsdialog.h \
     src/qt/coincontroldialog.h \
     src/qt/coincontroltreewidget.h \
+    src/qt/receivecoinspage.h \
     src/qt/sendcoinsdialog.h \
     src/qt/addressbookpage.h \
     src/qt/signverifymessagedialog.h \
@@ -292,6 +293,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/transactiontablemodel.cpp \
     src/qt/addresstablemodel.cpp \
     src/qt/optionsdialog.cpp \
+    src/qt/receivecoinspage.cpp \
     src/qt/sendcoinsdialog.cpp \
     src/qt/coincontroldialog.cpp \
     src/qt/coincontroltreewidget.cpp \
@@ -388,6 +390,7 @@ FORMS += \
     src/qt/forms/researcherwizardpoolsummarypage.ui \
     src/qt/forms/researcherwizardprojectspage.ui \
     src/qt/forms/researcherwizardsummarypage.ui \
+    src/qt/forms/receivecoinspage.ui \
     src/qt/forms/sendcoinsdialog.ui \
     src/qt/forms/addressbookpage.ui \
     src/qt/forms/signverifymessagedialog.ui \

src/Makefile.qt.include

@@ -86,6 +86,7 @@ QT_FORMS_UI = \
   qt/forms/addressbookpage.ui \
   qt/forms/editaddressdialog.ui \
   qt/forms/overviewpage.ui \
+  qt/forms/receivecoinspage.ui \
   qt/forms/researcherwizard.ui \
   qt/forms/researcherwizardauthpage.ui \
   qt/forms/researcherwizardbeaconpage.ui \
@@ -136,6 +137,7 @@ QT_MOC_CPP = \
   qt/moc_peertablemodel.cpp \
   qt/moc_qvalidatedlineedit.cpp \
   qt/moc_qvaluecombobox.cpp \
+  qt/moc_receivecoinspage.cpp \
   qt/moc_rpcconsole.cpp \
   qt/moc_sendcoinsdialog.cpp \
   qt/moc_sendcoinsentry.cpp \
@@ -215,6 +217,7 @@ GRIDCOINRESEARCH_QT_H = \
   qt/qtipcserver.h \
   qt/qvalidatedlineedit.h \
   qt/qvaluecombobox.h \
+  qt/receivecoinspage.h \
   qt/researcher/projecttablemodel.h \
   qt/researcher/researchermodel.h \
   qt/researcher/researcherwizard.h \
@@ -278,6 +281,7 @@ GRIDCOINRESEARCH_QT_CPP = \
   qt/qtipcserver.cpp \
   qt/qvalidatedlineedit.cpp \
   qt/qvaluecombobox.cpp \
+  qt/receivecoinspage.cpp \
   qt/researcher/projecttablemodel.cpp \
   qt/researcher/researchermodel.cpp \
   qt/researcher/researcherwizard.cpp \
@@ -362,6 +366,7 @@ RES_ICONS = \
   qt/res/icons/warning.svg \
   qt/res/icons/white_and_red_x.svg \
   qt/res/icons/www.png \
+  qt/res/icons/icons_light/search.svg \
   qt/res/icons/icons_light/settings.svg \
   qt/res/icons/icons_light/settings_action_needed.svg \
   qt/res/icons/icons_light/sidebar_favorites_active.svg \
@@ -404,6 +409,7 @@ RES_ICONS = \
   qt/res/icons/icons_light/status_sync_done.svg \
   qt/res/icons/icons_light/status_sync_stalled.svg \
   qt/res/icons/icons_light/status_sync_syncing.svg \
+  qt/res/icons/icons_dark/search.svg \
   qt/res/icons/icons_dark/settings_action_needed.svg \
   qt/res/icons/icons_dark/sidebar_favorites_active.svg \
   qt/res/icons/icons_dark/sidebar_favorites_inactive.svg \

src/qt/addressbookpage.cpp

@@ -57,6 +57,7 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
         break;
     case ReceivingTab:
         ui->deleteButton->setVisible(false);
+        ui->verifyMessageButton->setVisible(false);
         ui->signMessageButton->setVisible(true);
         break;
     }
@@ -115,6 +116,7 @@ void AddressBookPage::setModel(AddressTableModel *model)
     proxyModel->setDynamicSortFilter(true);
     proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
     proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+
     switch(tab)
     {
     case ReceivingTab:
@@ -128,7 +130,14 @@ void AddressBookPage::setModel(AddressTableModel *model)
         proxyModel->setFilterFixedString(AddressTableModel::Send);
         break;
     }
-    ui->tableView->setModel(proxyModel);
+
+    filterProxyModel = new QSortFilterProxyModel(this);
+    filterProxyModel->setSourceModel(proxyModel);
+    filterProxyModel->setDynamicSortFilter(true);
+    filterProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    filterProxyModel->setFilterKeyColumn(-1); // All columns
+
+    ui->tableView->setModel(filterProxyModel);
     ui->tableView->sortByColumn(0, Qt::AscendingOrder);
 
     // Set column widths
@@ -332,6 +341,11 @@ void AddressBookPage::exportClicked()
     }
 }
 
+void AddressBookPage::changeFilter(const QString& needle)
+{
+    filterProxyModel->setFilterFixedString(needle);
+}
+
 void AddressBookPage::on_showQRCodeButton_clicked()
 {
 #ifdef USE_QRCODE

src/qt/addressbookpage.h

@@ -44,6 +44,7 @@ class AddressBookPage : public QDialog
 public slots:
     void done(int retval);
     void exportClicked();
+    void changeFilter(const QString& needle);
 
 private:
     Ui::AddressBookPage *ui;
@@ -53,6 +54,7 @@ public slots:
     Tabs tab;
     QString returnValue;
     QSortFilterProxyModel *proxyModel;
+    QSortFilterProxyModel *filterProxyModel;
     QMenu *contextMenu;
     QAction *deleteAction;
     QString newAddressToSelect;

src/qt/bitcoin.qrc

@@ -91,6 +91,7 @@
         <file alias="light_chevron_down">res/icons/icons_light/chevron_down.svg</file>
         <file alias="light_chevron_right">res/icons/icons_light/chevron_right.svg</file>
         <file alias="light_chevron_up">res/icons/icons_light/chevron_up.svg</file>
+        <file alias="light_search">res/icons/icons_light/search.svg</file>
         <file alias="light_settings">res/icons/icons_light/settings.svg</file>
         <file alias="light_settings_action_needed">res/icons/icons_light/settings_action_needed.svg</file>
 
@@ -156,6 +157,7 @@
         <file alias="dark_chevron_down">res/icons/icons_dark/chevron_down.svg</file>
         <file alias="dark_chevron_right">res/icons/icons_dark/chevron_right.svg</file>
         <file alias="dark_chevron_up">res/icons/icons_dark/chevron_up.svg</file>
+        <file alias="dark_search">res/icons/icons_dark/search.svg</file>
         <file alias="dark_settings_action_needed">res/icons/icons_dark/settings_action_needed.svg</file>
 
         <file alias="tx_pos_ss">res/icons/tx_pos_ss.svg</file>

src/qt/bitcoingui.cpp

@@ -15,6 +15,7 @@
 #include "addressbookpage.h"
 
 #include "diagnosticsdialog.h"
+#include "receivecoinspage.h"
 #include "sendcoinsdialog.h"
 #include "signverifymessagedialog.h"
 #include "optionsdialog.h"
@@ -194,11 +195,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     addressBookPageLayout->addWidget(addressBook);
     addressBookPage->setLayout(addressBookPageLayout);
 
-    receiveCoinsPage = new QWidget(this);
-    receiveAddressBook = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab);
-    QVBoxLayout *receiveCoinsPageLayout = new QVBoxLayout();
-    receiveCoinsPageLayout->addWidget(receiveAddressBook);
-    receiveCoinsPage->setLayout(receiveCoinsPageLayout);
+    receiveCoinsPage = new ReceiveCoinsPage(this);
 
     sendCoinsPage = new SendCoinsDialog(this);
 
@@ -765,7 +762,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
 
         rpcConsole->setClientModel(clientModel);
         addressBook->setOptionsModel(clientModel->getOptionsModel());
-        receiveAddressBook->setOptionsModel(clientModel->getOptionsModel());
+        receiveCoinsPage->setOptionsModel(clientModel->getOptionsModel());
     }
 }
 
@@ -786,7 +783,7 @@ void BitcoinGUI::setWalletModel(WalletModel *walletModel)
 
         overviewPage->setWalletModel(walletModel);
         addressBook->setModel(walletModel->getAddressTableModel());
-        receiveAddressBook->setModel(walletModel->getAddressTableModel());
+        receiveCoinsPage->setAddressTableModel(walletModel->getAddressTableModel());
         sendCoinsPage->setModel(walletModel);
         votingPage->setModel(walletModel);
         signVerifyMessageDialog->setModel(walletModel);
@@ -1304,7 +1301,7 @@ void BitcoinGUI::gotoReceiveCoinsPage()
 
     exportAction->setEnabled(true);
     disconnect(exportAction, SIGNAL(triggered()), 0, 0);
-    connect(exportAction, SIGNAL(triggered()), receiveAddressBook, SLOT(exportClicked()));
+    connect(exportAction, SIGNAL(triggered()), receiveCoinsPage, SLOT(exportClicked()));
 }
 
 void BitcoinGUI::gotoSendCoinsPage()

src/qt/bitcoingui.h

@@ -19,6 +19,7 @@ class ResearcherModel;
 class TransactionView;
 class OverviewPage;
 class AddressBookPage;
+class ReceiveCoinsPage;
 class SendCoinsDialog;
 class VotingDialog;
 class SignVerifyMessageDialog;
@@ -80,7 +81,7 @@ class BitcoinGUI : public QMainWindow
     OverviewPage *overviewPage;
     QWidget *transactionsPage;
     QWidget *addressBookPage;
-    QWidget *receiveCoinsPage;
+    ReceiveCoinsPage *receiveCoinsPage;
     SendCoinsDialog *sendCoinsPage;
     VotingDialog *votingPage;
     SignVerifyMessageDialog *signVerifyMessageDialog;
@@ -136,7 +137,6 @@ class BitcoinGUI : public QMainWindow
     Notificator *notificator;
     TransactionView *transactionView;
     AddressBookPage *addressBook;
-    AddressBookPage *receiveAddressBook;
     RPCConsole *rpcConsole;
     DiagnosticsDialog *diagnosticsDialog;