Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui: Refresh UI styles and sidebar/statusbar design #2102

Merged
merged 14 commits into from
Apr 17, 2021
Merged

gui: Refresh UI styles and sidebar/statusbar design #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
81ed523
gui: Install Inter Variable font
opsinphark Oct 6, 2020
3c69360
Conceal Qt's hard-painted superfluous decorations
cyrossignol Apr 12, 2021
89942b1
Update GUI light and dark themes
cyrossignol Apr 12, 2021
b067565
Install new sidebar and status bar icons
cyrossignol Apr 12, 2021
6fdd557
Update researcher wizard icons from redesign
cyrossignol Apr 12, 2021
18c8de9
Implement theme support for GUI researcher model
cyrossignol Apr 12, 2021
5336992
Update GUI sidebar styles
cyrossignol Apr 12, 2021
9597853
Update GUI status bar styles
cyrossignol Apr 12, 2021
ca64a7b
Remove the native GUI theme
cyrossignol Apr 12, 2021
cc1d0db
Adjust miscellaneous GUI layout and spacing issues
cyrossignol Apr 12, 2021
96a4ceb
Highlight GUI statusbar icon when fully-unlocked
cyrossignol Apr 12, 2021
44dfc33
Move GUI menu bar over content layout
cyrossignol Apr 12, 2021
97ea1a3
Change GUI default theme to "dark"
cyrossignol Apr 17, 2021
7ff42da
Add BOINC logo to GUI toolbar
cyrossignol Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 80 additions & 37 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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


Expand Down
2 changes: 1 addition & 1 deletion src/qt/bitcoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Loading