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.

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

High dpi improvements #517

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions gridcoinresearch.pro
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ HEADERS += src/qt/bitcoingui.h \
src/backup.h \
src/appcache.h \
src/grcrestarter.h \
src/neuralnet.h
src/neuralnet.h \
src/qt/clicklabel.h


SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
Expand Down Expand Up @@ -354,7 +355,8 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/backup.cpp \
src/appcache.cpp \
src/grcrestarter.cpp \
src/neuralnet.cpp
src/neuralnet.cpp \
src/qt/clicklabel.cpp

##
#RC_FILE = qaxserver.rc
Expand Down
Empty file modified share/genbuild.sh
100644 → 100755
Empty file.
Binary file modified share/pixmaps/bitcoin-bc.ico
Binary file not shown.
Binary file modified share/pixmaps/bitcoin.ico
Binary file not shown.
Binary file modified share/pixmaps/bitcoin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/bitcoin128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/bitcoin16.ico
Binary file not shown.
Binary file modified share/pixmaps/bitcoin256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/bitcoin32.ico
Binary file not shown.
Binary file modified share/pixmaps/bitcoin32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/bitcoin64.ico
Binary file not shown.
Binary file modified share/pixmaps/favicon.ico
Binary file not shown.
Binary file modified share/pixmaps/grc-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/grc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/grclogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/grcsimple - Copy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed share/pixmaps/grcsimple.png
Binary file not shown.
Binary file modified share/pixmaps/gridcoin horizontal green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/gridcoin horizontal.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/gridcoin horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified share/pixmaps/nsis-header.bmp
Binary file not shown.
Binary file modified share/pixmaps/nsis-wizard.bmp
Binary file not shown.
Binary file modified share/pixmaps/nsis-wizard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 3 additions & 17 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ QT_MOC_CPP = \
qt/moc_bitcoinaddressvalidator.cpp \
qt/moc_bitcoinamountfield.cpp \
qt/moc_bitcoingui.cpp \
qt/moc_clicklabel.cpp \
qt/moc_clientmodel.cpp \
qt/moc_coincontroldialog.cpp \
qt/moc_coincontroltreewidget.cpp \
Expand Down Expand Up @@ -146,6 +147,7 @@ GRIDCOINRESEARCH_QT_H = \
qt/bitcoinamountfield.h \
qt/bitcoingui.h \
qt/bitcoinunits.h \
qt/clicklabel.h \
qt/clientmodel.h \
qt/coincontroldialog.h \
qt/coincontroltreewidget.h \
Expand Down Expand Up @@ -187,6 +189,7 @@ GRIDCOINRESEARCH_QT_CPP = \
qt/bitcoinamountfield.cpp \
qt/bitcoingui.cpp \
qt/bitcoinunits.cpp \
qt/clicklabel.cpp \
qt/clientmodel.cpp \
qt/coincontroldialog.cpp \
qt/coincontroltreewidget.cpp \
Expand Down Expand Up @@ -218,12 +221,9 @@ GRIDCOINRESEARCH_QT_CPP = \

RES_ICONS = \
qt/res/icons/add.png \
qt/res/icons/address-book.png \
qt/res/images/about.png \
qt/res/icons/gridcoin.ico \
qt/res/icons/bitcoin_testnet.ico \
qt/res/icons/block.png \
qt/res/icons/boinc.png \
qt/res/icons/chat.png \
qt/res/icons/clock1.png \
qt/res/icons/clock2.png \
Expand All @@ -236,27 +236,19 @@ RES_ICONS = \
qt/res/icons/connect2_16.png \
qt/res/icons/connect3_16.png \
qt/res/icons/connect4_16.png \
qt/res/icons/cpumined_blue.png \
qt/res/icons/debugwindow.png \
qt/res/icons/edit.png \
qt/res/icons/editcopy.png \
qt/res/icons/editpaste.png \
qt/res/icons/ex.png \
qt/res/icons/export.png \
qt/res/icons/filesave.png \
qt/res/icons/history.png \
qt/res/icons/gold_cpumined.gif \
qt/res/icons/gold_cpumined.png \
qt/res/icons/key.png \
qt/res/icons/lock_closed.png \
qt/res/icons/lock_open.png \
qt/res/icons/overview.png \
qt/res/icons/overview2.png \
qt/res/icons/quit.png \
qt/res/icons/receive.png \
qt/res/icons/remove.png \
qt/res/icons/rsz_chat.png \
qt/res/icons/send.png \
qt/res/icons/staking_off.png \
qt/res/icons/staking_on.png \
qt/res/icons/statistics.png \
Expand All @@ -266,15 +258,9 @@ RES_ICONS = \
qt/res/icons/transaction2.png \
qt/res/icons/transaction_conflicted.png \
qt/res/icons/tx2.png \
qt/res/icons/tx_cpumined.png \
qt/res/icons/2tx_cpumined.png \
qt/res/icons/tx_inout.png \
qt/res/icons/tx_input.png \
qt/res/icons/tx_output.png \
qt/res/icons/tx_minedoie_WOEI3ooIzGHI.png \
qt/res/icons/tx_mined.old.png \
qt/res/icons/tx_mined.png \
qt/res/icons/tx_output.png \
qt/res/icons/www.png \
qt/res/icons/wwww.png

Expand Down
59 changes: 36 additions & 23 deletions src/qt/bitcoin.qrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<RCC>
<qresource prefix="/icons">
<file alias="bitcoin">../../share/pixmaps/grcsimple.png</file>
<file alias="address-book">res/icons/address-book.png</file>
<file alias="quit">res/icons/quit.png</file>
<file alias="send">res/icons/send.png</file>
<file alias="toolbar">../../share/pixmaps/grcsimple.png</file>
<file alias="connect_0">res/icons/connect0_16.png</file>
<file alias="connect_1">res/icons/connect1_16.png</file>
<file alias="connect_2">res/icons/connect2_16.png</file>
Expand All @@ -19,25 +15,13 @@
<file alias="transaction_4">res/icons/clock4.png</file>
<file alias="transaction_5">res/icons/clock5.png</file>
<file alias="options">res/icons/configure.png</file>
<file alias="receiving_addresses">res/icons/receive.png</file>
<file alias="editpaste">res/icons/editpaste.png</file>
<file alias="editcopy">res/icons/editcopy.png</file>
<file alias="add">res/icons/add.png</file>
<file alias="bitcoin_testnet">../../share/pixmaps/grcsimple.png</file>
<file alias="edit">res/icons/edit.png</file>
<file alias="history">res/icons/history.png</file>
<file alias="overview">res/icons/overview.png</file>
<file alias="export">res/icons/export.png</file>
<file alias="synced">res/icons/synced.png</file>
<file alias="remove">res/icons/remove.png</file>
<file alias="tx_mined">res/icons/tx_mined.png</file>
<file alias="tx_cpumined">res/icons/tx_cpumined.png</file>
<file alias="cpumined_blue">res/icons/cpumined_blue.png</file>
<file alias="tx_input">res/icons/tx_input.png</file>
<file alias="tx_output">res/icons/tx_output.png</file>
<file alias="tx_inout">res/icons/tx_inout.png</file>
<file alias="lock_closed">res/icons/lock_closed.png</file>
<file alias="lock_open">res/icons/lock_open.png</file>
<file alias="key">res/icons/key.png</file>
<file alias="filesave">res/icons/filesave.png</file>
<file alias="qrcode">res/icons/qrcode.png</file>
Expand All @@ -47,23 +31,52 @@
<file alias="block">res/icons/block.png</file>
<file alias="ex">res/icons/ex.png</file>
<file alias="www">res/icons/www.png</file>
<file alias="boinc">res/icons/boinc.png</file>
<file alias="gold_cpumined">res/icons/gold_cpumined.png</file>
<file alias="chat">res/icons/chat.png</file>
<file alias="voting">res/icons/voting.png</file>
<file alias="tx_inout">res/icons/tx_inout.svg</file>
<file alias="tx_input">res/icons/tx_input.svg</file>
<file alias="tx_mined">res/icons/tx_mined.svg</file>
<file alias="tx_output">res/icons/tx_output.svg</file>
<file alias="tx_cpumined">res/icons/tx_por.svg</file>
<file alias="overview_native">res/icons/icons_native/overview.svg</file>
<file alias="overview_light">res/icons/icons_light/overview.svg</file>
<file alias="overview_dark">res/icons/icons_dark/overview.svg</file>
<file alias="voting_native">res/icons/icons_native/Voting.svg</file>
<file alias="address-book_native">res/icons/icons_native/address-book.svg</file>
<file alias="lock_closed_native">res/icons/icons_native/lock_closed.svg</file>
<file alias="lock_open_native">res/icons/icons_native/lock_open.svg</file>
<file alias="receiving_addresses_native">res/icons/icons_native/receive.svg</file>
<file alias="send_native">res/icons/icons_native/send.svg</file>
<file alias="voting_light">res/icons/icons_light/Voting.svg</file>
<file alias="address-book_light">res/icons/icons_light/address-book.svg</file>
<file alias="lock_closed_light">res/icons/icons_light/lock_closed.svg</file>
<file alias="lock_open_light">res/icons/icons_light/lock_open.svg</file>
<file alias="receiving_addresses_light">res/icons/icons_light/receive.svg</file>
<file alias="send_light">res/icons/icons_light/send.svg</file>
<file alias="voting_dark">res/icons/icons_dark/Voting.svg</file>
<file alias="address-book_dark">res/icons/icons_dark/address-book.svg</file>
<file alias="lock_closed_dark">res/icons/icons_dark/lock_closed.svg</file>
<file alias="lock_open_dark">res/icons/icons_dark/lock_open.svg</file>
<file alias="receiving_addresses_dark">res/icons/icons_dark/receive.svg</file>
<file alias="send_dark">res/icons/icons_dark/send.svg</file>
<file alias="history_dark">res/icons/icons_dark/transactions.svg</file>
<file alias="history_light">res/icons/icons_light/transactions.svg</file>
<file alias="history_native">res/icons/icons_native/transactions.svg</file>
</qresource>
<qresource prefix="/images">
<file alias="about">res/images/about.png</file>
<file alias="splash">res/images/splash3.png</file>
<file alias="bkg">res/images/bkg.png</file>
<file alias="logo_hz">res/images/gridcoin_horizontal.png</file>
<file alias="boinc">res/images/boinc_logo.png</file>
<file alias="boinc">res/images/boinc_logo.svg</file>
<file alias="about">res/images/about.svg</file>
<file alias="logo_hz">res/images/gridcoin_horizontal.svg</file>
<file alias="boinc_w">res/images/boinc_logo_white.svg</file>
<file alias="gridcoin">res/images/gridcoin.svg</file>
<file alias="about_light">res/images/about_light.svg</file>
</qresource>
<qresource prefix="/movies">
<file alias="update_spinner">res/movies/update_spinner.gif</file>
</qresource>
<qresource prefix="/stylesheets">
<file alias="light">res/stylesheets/light_stylesheet.qss</file>
<file alias="native">res/stylesheets/native_stylesheet.qss</file>
<file alias="dark">res/stylesheets/dark_stylesheet.qss</file>
</qresource>
</RCC>
Loading