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

swap out old logo for T&C logo in Qt GUI #2081

Merged
merged 9 commits into from
May 29, 2018
Merged

swap out old logo for T&C logo in Qt GUI #2081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0e3207
Qt: rename light theme to light-retro
nmarley May 24, 2018
500e31b
add new light theme with new logo images
nmarley May 24, 2018
1965a80
revert changes to light.css
nmarley May 24, 2018
5d2811c
Qt: rename light-hires theme to light-hires-retro
nmarley May 24, 2018
b7eba03
copy, not move
nmarley May 28, 2018
7ad2bc4
restore light-hires.css
nmarley May 28, 2018
f4fbe64
all links updated from light to light-retro
nmarley May 28, 2018
5bbed00
revert rm trailing spaces in src/qt/guiutil.cpp
nmarley May 28, 2018
6ff12e9
all links updated from light-hires to light-hires-retro
nmarley May 28, 2018
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
69 changes: 69 additions & 0 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,60 @@ RES_ICONS = \
qt/res/icons/light/fontsmaller.png \
qt/res/icons/light/transaction_abandoned.png \
qt/res/icons/light/network_disabled.png \
qt/res/icons/light-retro/add.png \
qt/res/icons/light-retro/address-book.png \
qt/res/icons/light-retro/browse.png \
qt/res/icons/light-retro/clock1.png \
qt/res/icons/light-retro/clock2.png \
qt/res/icons/light-retro/clock3.png \
qt/res/icons/light-retro/clock4.png \
qt/res/icons/light-retro/clock5.png \
qt/res/icons/light-retro/configure.png \
qt/res/icons/light-retro/connect0_16.png \
qt/res/icons/light-retro/connect1_16.png \
qt/res/icons/light-retro/connect2_16.png \
qt/res/icons/light-retro/connect3_16.png \
qt/res/icons/light-retro/connect4_16.png \
qt/res/icons/light-retro/debugwindow.png \
qt/res/icons/light-retro/drkblue_editpaste.png \
qt/res/icons/light-retro/drkblue_address-book.png \
qt/res/icons/light-retro/drkblue_editcopy.png \
qt/res/icons/light-retro/drkblue_remove.png \
qt/res/icons/light-retro/edit.png \
qt/res/icons/light-retro/editcopy.png \
qt/res/icons/light-retro/editpaste.png \
qt/res/icons/light-retro/export.png \
qt/res/icons/light-retro/eye.png \
qt/res/icons/light-retro/eye_minus.png \
qt/res/icons/light-retro/eye_plus.png \
qt/res/icons/light-retro/filesave.png \
qt/res/icons/light-retro/hd_disabled.png \
qt/res/icons/light-retro/hd_enabled.png \
qt/res/icons/light-retro/history.png \
qt/res/icons/light-retro/key.png \
qt/res/icons/light-retro/lock_closed.png \
qt/res/icons/light-retro/lock_open.png \
qt/res/icons/light-retro/masternodes.png \
qt/res/icons/light-retro/overview.png \
qt/res/icons/light-retro/quit.png \
qt/res/icons/light-retro/receive.png \
qt/res/icons/light-retro/remove.png \
qt/res/icons/light-retro/send.png \
qt/res/icons/light-retro/synced.png \
qt/res/icons/light-retro/transaction0.png \
qt/res/icons/light-retro/transaction2.png \
qt/res/icons/light-retro/transaction_conflicted.png \
qt/res/icons/light-retro/tx_inout.png \
qt/res/icons/light-retro/tx_input.png \
qt/res/icons/light-retro/tx_output.png \
qt/res/icons/light-retro/tx_mined.png \
qt/res/icons/light-retro/about.png \
qt/res/icons/light-retro/about_qt.png \
qt/res/icons/light-retro/verify.png \
qt/res/icons/light-retro/fontbigger.png \
qt/res/icons/light-retro/fontsmaller.png \
qt/res/icons/light-retro/transaction_abandoned.png \
qt/res/icons/light-retro/network_disabled.png \
qt/res/icons/trad/add.png \
qt/res/icons/trad/address-book.png \
qt/res/icons/trad/browse.png \
Expand Down Expand Up @@ -506,6 +560,19 @@ RES_IMAGES = \
qt/res/images/light/drkblue_rightArrow_small.png \
qt/res/images/light/drkblue_qtreeview_selected.png \
qt/res/images/light/drkblue_walletFrame_bg.png \
qt/res/images/light-retro/about.png \
qt/res/images/light-retro/splash.png \
qt/res/images/light-retro/splash_testnet.png \
qt/res/images/light-retro/dash_logo_horizontal.png \
qt/res/images/light-retro/unchecked.png \
qt/res/images/light-retro/checked.png \
qt/res/images/light-retro/drkblue_downArrow.png \
qt/res/images/light-retro/drkblue_downArrow_small.png \
qt/res/images/light-retro/drkblue_upArrow_small.png \
qt/res/images/light-retro/drkblue_leftArrow_small.png \
qt/res/images/light-retro/drkblue_rightArrow_small.png \
qt/res/images/light-retro/drkblue_qtreeview_selected.png \
qt/res/images/light-retro/drkblue_walletFrame_bg.png \
qt/res/images/trad/about.png \
qt/res/images/trad/splash.png \
qt/res/images/trad/splash_testnet.png \
Expand All @@ -523,6 +590,8 @@ RES_CSS = \
qt/res/css/crownium.css \
qt/res/css/light.css \
qt/res/css/light-hires.css \
qt/res/css/light-retro.css \
qt/res/css/light-hires-retro.css \
qt/res/css/trad.css

RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
Expand Down
73 changes: 73 additions & 0 deletions src/qt/dash.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,62 @@
<file alias="transaction_abandoned">res/icons/light/transaction_abandoned.png</file>
<file alias="network_disabled">res/icons/light/network_disabled.png</file>
</qresource>
<qresource prefix="/icons/light-retro">
<file alias="address-book">res/icons/light-retro/address-book.png</file>
<file alias="quit">res/icons/light-retro/quit.png</file>
<file alias="send">res/icons/light-retro/send.png</file>
<file alias="connect_0">res/icons/light-retro/connect0_16.png</file>
<file alias="connect_1">res/icons/light-retro/connect1_16.png</file>
<file alias="connect_2">res/icons/light-retro/connect2_16.png</file>
<file alias="connect_3">res/icons/light-retro/connect3_16.png</file>
<file alias="connect_4">res/icons/light-retro/connect4_16.png</file>
<file alias="transaction_0">res/icons/light-retro/transaction0.png</file>
<file alias="transaction_confirmed">res/icons/light-retro/transaction2.png</file>
<file alias="transaction_conflicted">res/icons/light-retro/transaction_conflicted.png</file>
<file alias="transaction_1">res/icons/light-retro/clock1.png</file>
<file alias="transaction_2">res/icons/light-retro/clock2.png</file>
<file alias="transaction_3">res/icons/light-retro/clock3.png</file>
<file alias="transaction_4">res/icons/light-retro/clock4.png</file>
<file alias="transaction_5">res/icons/light-retro/clock5.png</file>
<file alias="eye">res/icons/light-retro/eye.png</file>
<file alias="eye_minus">res/icons/light-retro/eye_minus.png</file>
<file alias="eye_plus">res/icons/light-retro/eye_plus.png</file>
<file alias="options">res/icons/light-retro/configure.png</file>
<file alias="receiving_addresses">res/icons/light-retro/receive.png</file>
<file alias="editpaste">res/icons/light-retro/editpaste.png</file>
<file alias="editcopy">res/icons/light-retro/editcopy.png</file>
<file alias="add">res/icons/light-retro/add.png</file>
<file alias="edit">res/icons/light-retro/edit.png</file>
<file alias="history">res/icons/light-retro/history.png</file>
<file alias="masternodes">res/icons/light-retro/masternodes.png</file>
<file alias="overview">res/icons/light-retro/overview.png</file>
<file alias="export">res/icons/light-retro/export.png</file>
<file alias="synced">res/icons/light-retro/synced.png</file>
<file alias="remove">res/icons/light-retro/remove.png</file>
<file alias="tx_mined">res/icons/light-retro/tx_mined.png</file>
<file alias="tx_input">res/icons/light-retro/tx_input.png</file>
<file alias="tx_output">res/icons/light-retro/tx_output.png</file>
<file alias="tx_inout">res/icons/light-retro/tx_inout.png</file>
<file alias="lock_closed">res/icons/light-retro/lock_closed.png</file>
<file alias="lock_open">res/icons/light-retro/lock_open.png</file>
<file alias="key">res/icons/light-retro/key.png</file>
<file alias="filesave">res/icons/light-retro/filesave.png</file>
<file alias="debugwindow">res/icons/light-retro/debugwindow.png</file>
<file alias="drkblue_editpaste">res/icons/light-retro/drkblue_editpaste.png</file>
<file alias="drkblue_address-book">res/icons/light-retro/drkblue_address-book.png</file>
<file alias="drkblue_editcopy">res/icons/light-retro/drkblue_editcopy.png</file>
<file alias="drkblue_remove">res/icons/light-retro/drkblue_remove.png</file>
<file alias="browse">res/icons/light-retro/browse.png</file>
<file alias="about">res/icons/light-retro/about.png</file>
<file alias="about_qt">res/icons/light-retro/about_qt.png</file>
<file alias="verify">res/icons/light-retro/verify.png</file>
<file alias="hd_enabled">res/icons/light-retro/hd_enabled.png</file>
<file alias="hd_disabled">res/icons/light-retro/hd_disabled.png</file>
<file alias="fontbigger">res/icons/light-retro/fontbigger.png</file>
<file alias="fontsmaller">res/icons/light-retro/fontsmaller.png</file>
<file alias="transaction_abandoned">res/icons/light-retro/transaction_abandoned.png</file>
<file alias="network_disabled">res/icons/light-retro/network_disabled.png</file>
</qresource>
<qresource prefix="/icons/trad">
<file alias="address-book">res/icons/trad/address-book.png</file>
<file alias="quit">res/icons/trad/quit.png</file>
Expand Down Expand Up @@ -233,6 +289,8 @@
<file alias="crownium">res/css/crownium.css</file>
<file alias="light">res/css/light.css</file>
<file alias="light-hires">res/css/light-hires.css</file>
<file alias="light-retro">res/css/light-retro.css</file>
<file alias="light-hires-retro">res/css/light-hires-retro.css</file>
<file alias="trad">res/css/trad.css</file>
</qresource>
<qresource prefix="/images/drkblue">
Expand Down Expand Up @@ -280,6 +338,21 @@
<file alias="splash">res/images/light/splash.png</file>
<file alias="splash_testnet">res/images/light/splash_testnet.png</file>
</qresource>
<qresource prefix="/images/light-retro">
<file alias="about">res/images/light-retro/about.png</file>
<file alias="dash_logo_horizontal">res/images/light-retro/dash_logo_horizontal.png</file>
<file alias="unchecked">res/images/light-retro/unchecked.png</file>
<file alias="checked">res/images/light-retro/checked.png</file>
<file alias="drkblue_downArrow">res/images/light-retro/drkblue_downArrow.png</file>
<file alias="drkblue_downArrow_small">res/images/light-retro/drkblue_downArrow_small.png</file>
<file alias="drkblue_upArrow_small">res/images/light-retro/drkblue_upArrow_small.png</file>
<file alias="drkblue_leftArrow_small">res/images/light-retro/drkblue_leftArrow_small.png</file>
<file alias="drkblue_rightArrow_small">res/images/light-retro/drkblue_rightArrow_small.png</file>
<file alias="drkblue_qtreeview_selected">res/images/light-retro/drkblue_qtreeview_selected.png</file>
<file alias="drkblue_walletFrame_bg">res/images/light-retro/drkblue_walletFrame_bg.png</file>
<file alias="splash">res/images/light-retro/splash.png</file>
<file alias="splash_testnet">res/images/light-retro/splash_testnet.png</file>
</qresource>
<qresource prefix="/images/trad">
<file alias="about">res/images/trad/about.png</file>
<file alias="dash_logo_horizontal">res/images/trad/dash_logo_horizontal.png</file>
Expand Down
2 changes: 2 additions & 0 deletions src/qt/optionsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
/* Theme selector */
ui->theme->addItem(QString("DASH-light"), QVariant("light"));
ui->theme->addItem(QString("DASH-light-hires"), QVariant("light-hires"));
ui->theme->addItem(QString("DASH-light-retro"), QVariant("light-retro"));
ui->theme->addItem(QString("DASH-light-hires-retro"), QVariant("light-hires-retro"));
ui->theme->addItem(QString("DASH-blue"), QVariant("drkblue"));
ui->theme->addItem(QString("DASH-Crownium"), QVariant("crownium"));
ui->theme->addItem(QString("DASH-traditional"), QVariant("trad"));
Expand Down
Loading