Merge pull request #2102 from cyrossignol/gui

gui: Refresh UI styles and sidebar/statusbar design

src/Makefile.qt.include

@@ -287,10 +287,6 @@ GRIDCOINRESEARCH_QT_CPP = \
 
 RES_ICONS = \
   qt/res/icons/add.png \
-  qt/res/icons/beacon_green.svg \
-  qt/res/icons/beacon_grey.svg \
-  qt/res/icons/beacon_red.svg \
-  qt/res/icons/beacon_yellow.svg \
   qt/res/icons/block.png \
   qt/res/icons/chat.png \
   qt/res/icons/clock1.png \
@@ -311,26 +307,21 @@ RES_ICONS = \
   qt/res/icons/ex.png \
   qt/res/icons/export.png \
   qt/res/icons/filesave.png \
-  qt/res/icons/gray_scraper.svg \
-  qt/res/icons/green_check.svg \
-  qt/res/icons/green_scraper.svg \
   qt/res/icons/gridcoin.ico \
   qt/res/icons/gridcoin_testnet.ico \
   qt/res/icons/key.png \
   qt/res/icons/message.svg \
-  qt/res/icons/notsynced.svg \
   qt/res/icons/qrcode.png \
   qt/res/icons/quit.png \
   qt/res/icons/remove.png \
   qt/res/icons/round_gray_x.svg \
   qt/res/icons/round_green_check.svg \
-  qt/res/icons/staking_off.svg \
-  qt/res/icons/staking_on.svg \
-  qt/res/icons/staking_unable.svg \
   qt/res/icons/superblock.svg \
   qt/res/icons/transaction_conflicted.png \
   qt/res/icons/transaction0.png \
-  qt/res/icons/transaction2.png \
+  qt/res/icons/transaction2.svg \
+  qt/res/icons/tx_contract_beacon.svg \
+  qt/res/icons/tx_contract_voting.svg \
   qt/res/icons/tx_inout.svg \
   qt/res/icons/tx_input.svg \
   qt/res/icons/tx_output.svg \
@@ -343,30 +334,84 @@ RES_ICONS = \
   qt/res/icons/warning.svg \
   qt/res/icons/white_and_red_x.svg \
   qt/res/icons/www.png \
-  qt/res/icons/icons_native/overview.svg \
-  qt/res/icons/icons_light/overview.svg \
-  qt/res/icons/icons_dark/overview.svg \
-  qt/res/icons/icons_native/Voting.svg \
-  qt/res/icons/icons_native/address-book.svg \
-  qt/res/icons/icons_native/lock_closed.svg \
-  qt/res/icons/icons_native/lock_open.svg \
-  qt/res/icons/icons_native/receive.svg \
-  qt/res/icons/icons_native/send.svg \
-  qt/res/icons/icons_light/Voting.svg \
-  qt/res/icons/icons_light/address-book.svg \
-  qt/res/icons/icons_light/lock_closed.svg \
-  qt/res/icons/icons_light/lock_open.svg \
-  qt/res/icons/icons_light/receive.svg \
-  qt/res/icons/icons_light/send.svg \
-  qt/res/icons/icons_dark/Voting.svg \
-  qt/res/icons/icons_dark/address-book.svg \
-  qt/res/icons/icons_dark/lock_closed.svg \
-  qt/res/icons/icons_dark/lock_open.svg \
-  qt/res/icons/icons_dark/receive.svg \
-  qt/res/icons/icons_dark/send.svg \
+  qt/res/icons/icons_light/sidebar_favorites_active.svg \
+  qt/res/icons/icons_light/sidebar_favorites_inactive.svg \
+  qt/res/icons/icons_light/sidebar_history_active.svg \
+  qt/res/icons/icons_light/sidebar_history_inactive.svg \
+  qt/res/icons/icons_light/sidebar_locked_active.svg \
+  qt/res/icons/icons_light/sidebar_locked_inactive.svg \
+  qt/res/icons/icons_light/sidebar_overview_active.svg \
+  qt/res/icons/icons_light/sidebar_overview_inactive.svg \
+  qt/res/icons/icons_light/sidebar_receive_active.svg \
+  qt/res/icons/icons_light/sidebar_receive_inactive.svg \
+  qt/res/icons/icons_light/sidebar_send_active.svg \
+  qt/res/icons/icons_light/sidebar_send_inactive.svg \
+  qt/res/icons/icons_light/sidebar_unlocked_active.svg \
+  qt/res/icons/icons_light/sidebar_unlocked_inactive.svg \
+  qt/res/icons/icons_light/sidebar_voting_active.svg \
+  qt/res/icons/icons_light/sidebar_voting_inactive.svg \
+  qt/res/icons/icons_light/status_beacon_green.svg \
+  qt/res/icons/icons_light/status_beacon_gray.svg \
+  qt/res/icons/icons_light/status_beacon_red.svg \
+  qt/res/icons/icons_light/status_beacon_yellow.svg \
+  qt/res/icons/icons_light/status_connections_average.svg \
+  qt/res/icons/icons_light/status_connections_good.svg \
+  qt/res/icons/icons_light/status_connections_none.svg \
+  qt/res/icons/icons_light/status_connections_normal.svg \
+  qt/res/icons/icons_light/status_connections_poor.svg \
+  qt/res/icons/icons_light/status_encryption_none.svg \
+  qt/res/icons/icons_light/status_encryption_locked.svg \
+  qt/res/icons/icons_light/status_encryption_unlocked.svg \
+  qt/res/icons/icons_light/status_scraper_inactive.svg \
+  qt/res/icons/icons_light/status_scraper_no_convergence.svg \
+  qt/res/icons/icons_light/status_scraper_ok.svg \
+  qt/res/icons/icons_light/status_scraper_waiting.svg \
+  qt/res/icons/icons_light/status_staking_no.svg \
+  qt/res/icons/icons_light/status_staking_problem.svg \
+  qt/res/icons/icons_light/status_staking_yes.svg \
+  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/sidebar_favorites_active.svg \
+  qt/res/icons/icons_dark/sidebar_favorites_inactive.svg \
+  qt/res/icons/icons_dark/sidebar_history_active.svg \
+  qt/res/icons/icons_dark/sidebar_history_inactive.svg \
+  qt/res/icons/icons_dark/sidebar_locked_active.svg \
+  qt/res/icons/icons_dark/sidebar_locked_inactive.svg \
+  qt/res/icons/icons_dark/sidebar_overview_active.svg \
+  qt/res/icons/icons_dark/sidebar_overview_inactive.svg \
+  qt/res/icons/icons_dark/sidebar_receive_active.svg \
+  qt/res/icons/icons_dark/sidebar_receive_inactive.svg \
+  qt/res/icons/icons_dark/sidebar_send_active.svg \
+  qt/res/icons/icons_dark/sidebar_send_inactive.svg \
+  qt/res/icons/icons_dark/sidebar_unlocked_active.svg \
+  qt/res/icons/icons_dark/sidebar_unlocked_inactive.svg \
+  qt/res/icons/icons_dark/sidebar_voting_active.svg \
+  qt/res/icons/icons_dark/sidebar_voting_inactive.svg \
+  qt/res/icons/icons_dark/status_beacon_green.svg \
+  qt/res/icons/icons_dark/status_beacon_gray.svg \
+  qt/res/icons/icons_dark/status_beacon_red.svg \
+  qt/res/icons/icons_dark/status_beacon_yellow.svg \
+  qt/res/icons/icons_dark/status_connections_average.svg \
+  qt/res/icons/icons_dark/status_connections_good.svg \
+  qt/res/icons/icons_dark/status_connections_none.svg \
+  qt/res/icons/icons_dark/status_connections_normal.svg \
+  qt/res/icons/icons_dark/status_connections_poor.svg \
+  qt/res/icons/icons_dark/status_encryption_none.svg \
+  qt/res/icons/icons_dark/status_encryption_locked.svg \
+  qt/res/icons/icons_dark/status_encryption_unlocked.svg \
+  qt/res/icons/icons_dark/status_scraper_inactive.svg \
+  qt/res/icons/icons_dark/status_scraper_no_convergence.svg \
+  qt/res/icons/icons_dark/status_scraper_ok.svg \
+  qt/res/icons/icons_dark/status_scraper_waiting.svg \
+  qt/res/icons/icons_dark/status_staking_no.svg \
+  qt/res/icons/icons_dark/status_staking_problem.svg \
+  qt/res/icons/icons_dark/status_staking_yes.svg \
+  qt/res/icons/icons_dark/status_sync_done.svg \
+  qt/res/icons/icons_dark/status_sync_stalled.svg \
+  qt/res/icons/icons_dark/status_sync_syncing.svg \
   qt/res/icons/icons_dark/transactions.svg \
   qt/res/icons/icons_light/transactions.svg \
-  qt/res/icons/icons_native/transactions.svg \
   qt/res/icons/icons_light/chevron_down.svg \
   qt/res/icons/icons_light/chevron_up.svg \
   qt/res/icons/icons_dark/chevron_down.svg \
@@ -390,12 +435,10 @@ RES_IMAGES = \
 
 RES_FONTS = \
   qt/res/fonts/Inconsolata-Regular.ttf \
-  qt/res/fonts/Inter-Bold.ttf \
-  qt/res/fonts/Inter-Regular.ttf
+  qt/res/fonts/Inter-VariableFont.ttf
 
 RES_STYLESHEETS = \
   qt/res/stylesheets/light_stylesheet.qss \
-  qt/res/stylesheets/native_stylesheet.qss \
   qt/res/stylesheets/dark_stylesheet.qss
 
 

src/qt/bitcoin.cpp

@@ -560,9 +560,9 @@ int StartGridcoinQt(int argc, char *argv[], QApplication& app, OptionsModel& opt
                 WalletModel walletModel(pwalletMain, &optionsModel);
                 ResearcherModel researcherModel;
 
+                window.setResearcherModel(&researcherModel);
                 window.setClientModel(&clientModel);
                 window.setWalletModel(&walletModel);
-                window.setResearcherModel(&researcherModel);
 
                 // If -min option passed, start window minimized.
                 if(GetBoolArg("-min"))