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

Jump to bottom

Crownium theme #640

Merged
merged 10 commits into from
Jan 5, 2016
Merged

Crownium theme #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c2cd422
UI: new wallet theme "Crownium"
crowning- Sep 16, 2015
b5efb1e
Merge remote-tracking branch 'upstream/v0.12.1.x' into Crownium
crowning- Sep 16, 2015
8df2edc
UI: theme-dependent icons/images Step 5 (About message)
crowning- Sep 16, 2015
61b2f8f
UI: about image beautified
crowning- Sep 16, 2015
8392b72
UI: toolbar behaviour changed
crowning- Sep 16, 2015
8599ced
UI: theme-dependent icons/images (Win installer fix)
crowning- Sep 17, 2015
032076d
UI: min-width adjustment for toolbar buttons
crowning- Sep 17, 2015
b6da10e
Merge remote-tracking branch 'upstream/v0.12.1.x' into Crownium
crowning- Oct 2, 2015
b30be63
Merge remote-tracking branch 'upstream/v0.12.1.x' into Crownium
crowning- Oct 6, 2015
0a0f12a
Non-critical CSS-error-messages removed from debug.log
crowning- Oct 6, 2015
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
72 changes: 71 additions & 1 deletion src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,63 @@ RES_ICONS = \
qt/res/icons/drkblue/unit_tmdash.png \
qt/res/icons/drkblue/unit_tudash.png \
qt/res/icons/drkblue/unit_tduffs.png \
qt/res/icons/crownium/add.png \
qt/res/icons/crownium/address-book.png \
qt/res/icons/crownium/bitcoin.ico \
qt/res/icons/crownium/bitcoin.png \
qt/res/icons/crownium/bitcoin_testnet.ico \
qt/res/icons/crownium/bitcoin_testnet.png \
qt/res/icons/crownium/browse.png \
qt/res/icons/crownium/clock1.png \
qt/res/icons/crownium/clock2.png \
qt/res/icons/crownium/clock3.png \
qt/res/icons/crownium/clock4.png \
qt/res/icons/crownium/clock5.png \
qt/res/icons/crownium/configure.png \
qt/res/icons/crownium/connect0_16.png \
qt/res/icons/crownium/connect1_16.png \
qt/res/icons/crownium/connect2_16.png \
qt/res/icons/crownium/connect3_16.png \
qt/res/icons/crownium/connect4_16.png \
qt/res/icons/crownium/debugwindow.png \
qt/res/icons/crownium/drkblue_editpaste.png \
qt/res/icons/crownium/drkblue_address-book.png \
qt/res/icons/crownium/drkblue_editcopy.png \
qt/res/icons/crownium/drkblue_remove.png \
qt/res/icons/crownium/edit.png \
qt/res/icons/crownium/editcopy.png \
qt/res/icons/crownium/editpaste.png \
qt/res/icons/crownium/export.png \
qt/res/icons/crownium/eye.png \
qt/res/icons/crownium/eye_minus.png \
qt/res/icons/crownium/eye_plus.png \
qt/res/icons/crownium/filesave.png \
qt/res/icons/crownium/history.png \
qt/res/icons/crownium/key.png \
qt/res/icons/crownium/lock_closed.png \
qt/res/icons/crownium/lock_open.png \
qt/res/icons/crownium/overview.png \
qt/res/icons/crownium/qrcode.png \
qt/res/icons/crownium/quit.png \
qt/res/icons/crownium/receive.png \
qt/res/icons/crownium/remove.png \
qt/res/icons/crownium/send.png \
qt/res/icons/crownium/synced.png \
qt/res/icons/crownium/transaction0.png \
qt/res/icons/crownium/transaction2.png \
qt/res/icons/crownium/transaction_conflicted.png \
qt/res/icons/crownium/tx_inout.png \
qt/res/icons/crownium/tx_input.png \
qt/res/icons/crownium/tx_output.png \
qt/res/icons/crownium/tx_mined.png \
qt/res/icons/crownium/unit_dash.png \
qt/res/icons/crownium/unit_mdash.png \
qt/res/icons/crownium/unit_udash.png \
qt/res/icons/crownium/unit_duffs.png \
qt/res/icons/crownium/unit_tdash.png \
qt/res/icons/crownium/unit_tmdash.png \
qt/res/icons/crownium/unit_tudash.png \
qt/res/icons/crownium/unit_tduffs.png \
qt/res/icons/trad/add.png \
qt/res/icons/trad/address-book.png \
qt/res/icons/trad/bitcoin.ico \
Expand Down Expand Up @@ -341,6 +398,18 @@ RES_IMAGES = \
qt/res/images/drkblue/drkblue_qtreeview_selected.png \
qt/res/images/drkblue/drkblue_walletFrame_bg.png \
qt/res/images/drkblue/drkblue_walletFrame.png \
qt/res/images/crownium/about.png \
qt/res/images/crownium/splash.png \
qt/res/images/crownium/splash_testnet.png \
qt/res/images/crownium/dash_logo_horizontal.png \
qt/res/images/crownium/drkblue_downArrow.png \
qt/res/images/crownium/drkblue_downArrow_small.png \
qt/res/images/crownium/drkblue_upArrow_small.png \
qt/res/images/crownium/drkblue_leftArrow_small.png \
qt/res/images/crownium/drkblue_rightArrow_small.png \
qt/res/images/crownium/drkblue_qtreeview_selected.png \
qt/res/images/crownium/drkblue_walletFrame_bg.png \
qt/res/images/crownium/drkblue_walletFrame.png \
qt/res/images/trad/about.png \
qt/res/images/trad/splash.png \
qt/res/images/trad/splash_testnet.png \
Expand All @@ -355,7 +424,8 @@ RES_IMAGES = \
qt/res/images/trad/drkblue_walletFrame.png

RES_CSS = \
qt/res/css/drkblue.css
qt/res/css/drkblue.css \
qt/res/css/crownium.css

RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png)

Expand Down
72 changes: 72 additions & 0 deletions src/qt/dash.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,63 @@
<file alias="drkblue_remove">res/icons/drkblue/drkblue_remove.png</file>
<file alias="browse">res/icons/drkblue/browse.png</file>
</qresource>
<qresource prefix="/icons/crownium">
<file alias="bitcoin">res/icons/crownium/bitcoin.png</file>
<file alias="address-book">res/icons/crownium/address-book.png</file>
<file alias="quit">res/icons/crownium/quit.png</file>
<file alias="send">res/icons/crownium/send.png</file>
<file alias="connect_0">res/icons/crownium/connect0_16.png</file>
<file alias="connect_1">res/icons/crownium/connect1_16.png</file>
<file alias="connect_2">res/icons/crownium/connect2_16.png</file>
<file alias="connect_3">res/icons/crownium/connect3_16.png</file>
<file alias="connect_4">res/icons/crownium/connect4_16.png</file>
<file alias="transaction_0">res/icons/crownium/transaction0.png</file>
<file alias="transaction_confirmed">res/icons/crownium/transaction2.png</file>
<file alias="transaction_conflicted">res/icons/crownium/transaction_conflicted.png</file>
<file alias="transaction_1">res/icons/crownium/clock1.png</file>
<file alias="transaction_2">res/icons/crownium/clock2.png</file>
<file alias="transaction_3">res/icons/crownium/clock3.png</file>
<file alias="transaction_4">res/icons/crownium/clock4.png</file>
<file alias="transaction_5">res/icons/crownium/clock5.png</file>
<file alias="eye">res/icons/crownium/eye.png</file>
<file alias="eye_minus">res/icons/crownium/eye_minus.png</file>
<file alias="eye_plus">res/icons/crownium/eye_plus.png</file>
<file alias="options">res/icons/crownium/configure.png</file>
<file alias="receiving_addresses">res/icons/crownium/receive.png</file>
<file alias="editpaste">res/icons/crownium/editpaste.png</file>
<file alias="editcopy">res/icons/crownium/editcopy.png</file>
<file alias="add">res/icons/crownium/add.png</file>
<file alias="bitcoin_testnet">res/icons/crownium/bitcoin_testnet.png</file>
<file alias="edit">res/icons/crownium/edit.png</file>
<file alias="history">res/icons/crownium/history.png</file>
<file alias="overview">res/icons/crownium/overview.png</file>
<file alias="export">res/icons/crownium/export.png</file>
<file alias="synced">res/icons/crownium/synced.png</file>
<file alias="remove">res/icons/crownium/remove.png</file>
<file alias="tx_mined">res/icons/crownium/tx_mined.png</file>
<file alias="tx_input">res/icons/crownium/tx_input.png</file>
<file alias="tx_output">res/icons/crownium/tx_output.png</file>
<file alias="tx_inout">res/icons/crownium/tx_inout.png</file>
<file alias="unit_dash">res/icons/crownium/unit_dash.png</file>
<file alias="unit_mdash">res/icons/crownium/unit_mdash.png</file>
<file alias="unit_udash">res/icons/crownium/unit_udash.png</file>
<file alias="unit_duffs">res/icons/crownium/unit_duffs.png</file>
<file alias="unit_tdash">res/icons/crownium/unit_tdash.png</file>
<file alias="unit_tmdash">res/icons/crownium/unit_tmdash.png</file>
<file alias="unit_tudash">res/icons/crownium/unit_tudash.png</file>
<file alias="unit_tduffs">res/icons/crownium/unit_tduffs.png</file>
<file alias="lock_closed">res/icons/crownium/lock_closed.png</file>
<file alias="lock_open">res/icons/crownium/lock_open.png</file>
<file alias="key">res/icons/crownium/key.png</file>
<file alias="filesave">res/icons/crownium/filesave.png</file>
<file alias="qrcode">res/icons/crownium/qrcode.png</file>
<file alias="debugwindow">res/icons/crownium/debugwindow.png</file>
<file alias="drkblue_editpaste">res/icons/crownium/drkblue_editpaste.png</file>
<file alias="drkblue_address-book">res/icons/crownium/drkblue_address-book.png</file>
<file alias="drkblue_editcopy">res/icons/crownium/drkblue_editcopy.png</file>
<file alias="drkblue_remove">res/icons/crownium/drkblue_remove.png</file>
<file alias="browse">res/icons/crownium/browse.png</file>
</qresource>
<qresource prefix="/icons/trad">
<file alias="bitcoin">res/icons/trad/bitcoin.png</file>
<file alias="address-book">res/icons/trad/address-book.png</file>
Expand Down Expand Up @@ -115,6 +172,7 @@
</qresource>
<qresource prefix="/css">
<file alias="drkblue">res/css/drkblue.css</file>
<file alias="crownium">res/css/crownium.css</file>
</qresource>
<qresource prefix="/images/drkblue">
<file alias="about">res/images/drkblue/about.png</file>
Expand All @@ -130,6 +188,20 @@
<file alias="splash">res/images/drkblue/splash.png</file>
<file alias="splash_testnet">res/images/drkblue/splash_testnet.png</file>
</qresource>
<qresource prefix="/images/crownium">
<file alias="about">res/images/crownium/about.png</file>
<file alias="dash_logo_horizontal">res/images/crownium/dash_logo_horizontal.png</file>
<file alias="drkblue_downArrow">res/images/crownium/drkblue_downArrow.png</file>
<file alias="drkblue_downArrow_small">res/images/crownium/drkblue_downArrow_small.png</file>
<file alias="drkblue_upArrow_small">res/images/crownium/drkblue_upArrow_small.png</file>
<file alias="drkblue_leftArrow_small">res/images/crownium/drkblue_leftArrow_small.png</file>
<file alias="drkblue_rightArrow_small">res/images/crownium/drkblue_rightArrow_small.png</file>
<file alias="drkblue_qtreeview_selected">res/images/crownium/drkblue_qtreeview_selected.png</file>
<file alias="drkblue_walletFrame_bg">res/images/crownium/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/crownium/drkblue_walletFrame.png</file>
<file alias="splash">res/images/crownium/splash.png</file>
<file alias="splash_testnet">res/images/crownium/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
1 change: 1 addition & 0 deletions src/qt/optionsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :

/* Theme selector */
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