UI modernization and new Spark Assets UI

src/Makefile.qt.include

@@ -106,6 +106,7 @@ QT_FORMS_UI = \
   qt/forms/helpmessagedialog.ui \
   qt/forms/masternodelist.ui \
   qt/forms/myownspats.ui \
+  qt/forms/sparkassetspage.ui \
   qt/forms/sparkassetdialog.ui \
   qt/forms/spatsburndialog.ui \
   qt/forms/spatsmintdialog.ui \
@@ -151,6 +152,7 @@ QT_MOC_CPP = \
   qt/moc_macnotificationhandler.cpp \
   qt/moc_masternodelist.cpp \
   qt/moc_myownspats.cpp \
+  qt/moc_sparkassetspage.cpp \
   qt/moc_sparkassetdialog.cpp \
   qt/moc_spatsburndialog.cpp \
   qt/moc_spatsmintdialog.cpp \
@@ -243,6 +245,7 @@ BITCOIN_QT_H = \
   qt/optionsdialog.h \
   qt/optionsmodel.h \
   qt/overviewpage.h \
+  qt/sparkassetspage.h \
   qt/paymentserver.h \
   qt/peertablemodel.h \
   qt/platformstyle.h \
@@ -442,6 +445,7 @@ BITCOIN_QT_WALLET_CPP = \
   qt/manualmintdialog.cpp \
   qt/openuridialog.cpp \
   qt/overviewpage.cpp \
+  qt/sparkassetspage.cpp \
   qt/paymentserver.cpp \
   qt/receivecoinsdialog.cpp \
   qt/receiverequestdialog.cpp \

src/qt/CMakeLists.txt

@@ -85,6 +85,7 @@ add_library(firoqt STATIC EXCLUDE_FROM_ALL
   optionsdialog.cpp
   optionsmodel.cpp
   overviewpage.cpp
+  sparkassetspage.cpp
   paymentserver.cpp
   peertablemodel.cpp
   platformstyle.cpp
@@ -185,6 +186,7 @@ if(ENABLE_WALLET)
         myownspats.cpp
         openuridialog.cpp
         overviewpage.cpp
+        sparkassetspage.cpp
         paymentserver.cpp
         receivecoinsdialog.cpp
         receiverequestdialog.cpp

src/qt/bitcoingui.cpp

@@ -126,6 +126,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     lelantusAction(0),
     masternodeAction(0),
     myownspatsAction(nullptr),
+    sparkAssetsAction(nullptr),
     logoAction(0),
     trayIcon(0),
     trayIconMenu(0),
@@ -376,6 +377,13 @@ void BitcoinGUI::createActions()
     myownspatsAction->setShortcut(QKeySequence(Qt::ALT +  key++));
     tabGroup->addAction(myownspatsAction);
 
+    sparkAssetsAction = new QAction(tr("&Spark Assets"), this);
+    sparkAssetsAction->setStatusTip(tr("Manage and view your Spark assets"));
+    sparkAssetsAction->setToolTip(sparkAssetsAction->statusTip());
+    sparkAssetsAction->setCheckable(true);
+    sparkAssetsAction->setShortcut(QKeySequence(Qt::ALT + key++));
+    tabGroup->addAction(sparkAssetsAction);
+
 #ifdef ENABLE_WALLET
     connect(masternodeAction, &QAction::triggered, [this]{ showNormalIfMinimized(); });
     connect(masternodeAction, &QAction::triggered, this, &BitcoinGUI::gotoMasternodePage);
@@ -393,6 +401,8 @@ void BitcoinGUI::createActions()
 	connect(receiveCoinsMenuAction, &QAction::triggered, this, &BitcoinGUI::gotoReceiveCoinsPage);
 	connect(historyAction, &QAction::triggered, this, [this]{ showNormalIfMinimized(); });
 	connect(historyAction, &QAction::triggered, this, &BitcoinGUI::gotoHistoryPage);
+    connect(sparkAssetsAction, &QAction::triggered, [this]{ showNormalIfMinimized(); });
+    connect(sparkAssetsAction, &QAction::triggered, this, &BitcoinGUI::gotoSparkAssetsPage);
 
 #endif // ENABLE_WALLET
 
@@ -529,25 +539,57 @@ void BitcoinGUI::createToolBars()
         toolbar = addToolBar(tr("Tabs toolbar"));
         toolbar->setContextMenuPolicy(Qt::PreventContextMenu);
         toolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-        toolbar->setToolButtonStyle(Qt::ToolButtonTextOnly);
         toolbar->setMovable(false);
-        toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        toolbar->setToolButtonStyle(Qt::ToolButtonTextOnly);
         toolbar->addAction(overviewAction);
         toolbar->addAction(sendCoinsAction);
         toolbar->addAction(receiveCoinsAction);
         toolbar->addAction(historyAction);
-        toolbar->addAction(lelantusAction);
         toolbar->addAction(masternodeAction);
         toolbar->addAction(myownspatsAction);
+        toolbar->addAction(sparkAssetsAction);
 
         logoLabel = new QLabel();
         logoLabel->setObjectName("lblToolbarLogo");
         logoLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
         toolbar->addWidget(logoLabel);
 
         overviewAction->setChecked(true);
     }
+
+    toolbar->setStyleSheet(R"(
+    QToolBar {
+        background: #F7F8FA;
+        border: none;
+        spacing: 8px;
+        padding: 4px 8px;
+    }
+
+    QToolButton {
+        background-color: #F7F8FA;
+        color: #111827;
+        border: none;
+        border-radius: 9px;
+        min-width: 90px;
+        min-height: 28px;
+        font-size: 10pt;
+        font-weight: 800;
+        padding: 2px 8px;
+        margin: 1px 2px;
+    }
+
+    QToolButton:hover {
+        background-color: #E5E7EB;
+    }
+
+    QToolButton:checked {
+        background-color: #B24040;
+        color: #FFFFFF;
+        border-radius: 9px;
+        padding: 2px 8px;
+    }
+    )");
+
 }
 
 void BitcoinGUI::setClientModel(ClientModel *_clientModel)
@@ -824,6 +866,13 @@ void BitcoinGUI::gotoSendCoinsPage(QString addr)
     if (walletFrame) walletFrame->gotoSendCoinsPage(addr);
 }
 
+void BitcoinGUI::gotoSparkAssetsPage()
+{
+    if (!walletFrame)
+        return;
+    walletFrame->gotoSparkAssetsPage();
+}
+
 void BitcoinGUI::gotoSignMessageTab(QString addr)
 {
     if (walletFrame) walletFrame->gotoSignMessageTab(addr);

src/qt/bitcoingui.h

@@ -125,6 +125,7 @@ class BitcoinGUI : public QMainWindow
     QAction *lelantusAction;
     QAction *masternodeAction;
     QAction *myownspatsAction;
+    QAction *sparkAssetsAction;
     QAction *logoAction;
     QToolBar *toolbar;
     QLabel *logoLabel;
@@ -227,6 +228,7 @@ public Q_SLOTS:
     void gotoReceiveCoinsPage();
     /** Switch to send coins page */
     void gotoSendCoinsPage(QString addr = "");
+    void gotoSparkAssetsPage();
 
     /** Show Sign/Verify Message dialog and switch to sign message tab */
     void gotoSignMessageTab(QString addr = "");