Skip to content

Commit d3ce096

Browse files
nmarleyUdjinM6
authored andcommitted
Add Qt GUI refresh w/branding updates (#3000)
* Update Dash app and toolbar icons * Update icons and images * Remove menubar icons * Add Dash logo to top-right of menubar * Remove the small PrivateSend buttons * Remove image entirely from About modal * Update CSS for new theme changes * Restore splash testnet image * Make entire toolbar button clickable * Fix address book and shrink transaction icons * Revert "Restore splash testnet image" This reverts commit 2df07ff. * Restore original direction for tx in/out arrows * Add transparency to icons * Remove unused icons * Resize way too small icons * `mogrify src/qt/res/*/*.png` * Drop `light` from `optimize-pngs.py` * `python3 contrib/devtools/optimize-pngs.py` "Total reduction: 42507 bytes" * Restore old remove icon as console_remove
1 parent 9bc699f commit d3ce096

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+159
-385
lines changed

contrib/devtools/optimize-pngs.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ def content_hash(filename):
2929
folders = [
3030
"src/qt/res/movies",
3131
"src/qt/res/icons",
32-
"src/qt/res/icons/light",
3332
"src/qt/res/images",
34-
"src/qt/res/images/light",
3533
"share/pixmaps"
3634
]
3735
basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel'], universal_newlines=True).rstrip('\n')

share/pixmaps/dash128.png

-530 Bytes
Loading

share/pixmaps/dash16.png

-116 Bytes
Loading

share/pixmaps/dash32.png

-186 Bytes
Loading

share/pixmaps/dash64.png

-282 Bytes
Loading

src/Makefile.qt.include

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ RES_ICONS = \
202202
qt/res/icons/connect2_16.png \
203203
qt/res/icons/connect3_16.png \
204204
qt/res/icons/connect4_16.png \
205+
qt/res/icons/console_remove.png \
205206
qt/res/icons/debugwindow.png \
206207
qt/res/icons/edit.png \
207208
qt/res/icons/editcopy.png \
@@ -213,12 +214,9 @@ RES_ICONS = \
213214
qt/res/icons/filesave.png \
214215
qt/res/icons/hd_disabled.png \
215216
qt/res/icons/hd_enabled.png \
216-
qt/res/icons/history.png \
217217
qt/res/icons/key.png \
218218
qt/res/icons/lock_closed.png \
219219
qt/res/icons/lock_open.png \
220-
qt/res/icons/masternodes.png \
221-
qt/res/icons/overview.png \
222220
qt/res/icons/quit.png \
223221
qt/res/icons/receive.png \
224222
qt/res/icons/remove.png \
@@ -231,7 +229,6 @@ RES_ICONS = \
231229
qt/res/icons/tx_input.png \
232230
qt/res/icons/tx_output.png \
233231
qt/res/icons/tx_mined.png \
234-
qt/res/icons/about.png \
235232
qt/res/icons/about_qt.png \
236233
qt/res/icons/verify.png \
237234
qt/res/icons/fontbigger.png \
@@ -305,14 +302,14 @@ BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
305302
endif
306303

307304
RES_IMAGES = \
308-
qt/res/images/about.png \
309305
qt/res/images/arrow_down.png \
310306
qt/res/images/arrow_down_small.png \
311307
qt/res/images/arrow_left_small.png \
312308
qt/res/images/arrow_right_small.png \
313309
qt/res/images/arrow_up_small.png \
314310
qt/res/images/checked.png \
315311
qt/res/images/dash_logo_horizontal.png \
312+
qt/res/images/dash_logo_toolbar.png \
316313
qt/res/images/qtreeview_selected.png \
317314
qt/res/images/splash.png \
318315
qt/res/images/unchecked.png \

src/qt/bitcoingui.cpp

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ void BitcoinGUI::createActions()
303303
{
304304
QActionGroup *tabGroup = new QActionGroup(this);
305305

306-
overviewAction = new QAction(QIcon(":/icons/overview"), tr("&Overview"), this);
306+
overviewAction = new QAction(tr("&Overview"), this);
307307
overviewAction->setStatusTip(tr("Show general overview of wallet"));
308308
overviewAction->setToolTip(overviewAction->statusTip());
309309
overviewAction->setCheckable(true);
@@ -314,7 +314,7 @@ void BitcoinGUI::createActions()
314314
#endif
315315
tabGroup->addAction(overviewAction);
316316

317-
sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this);
317+
sendCoinsAction = new QAction(tr("&Send"), this);
318318
sendCoinsAction->setStatusTip(tr("Send coins to a Dash address"));
319319
sendCoinsAction->setToolTip(sendCoinsAction->statusTip());
320320
sendCoinsAction->setCheckable(true);
@@ -329,7 +329,7 @@ void BitcoinGUI::createActions()
329329
sendCoinsMenuAction->setStatusTip(sendCoinsAction->statusTip());
330330
sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip());
331331

332-
receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this);
332+
receiveCoinsAction = new QAction(tr("&Receive"), this);
333333
receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and dash: URIs)"));
334334
receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip());
335335
receiveCoinsAction->setCheckable(true);
@@ -344,7 +344,7 @@ void BitcoinGUI::createActions()
344344
receiveCoinsMenuAction->setStatusTip(receiveCoinsAction->statusTip());
345345
receiveCoinsMenuAction->setToolTip(receiveCoinsMenuAction->statusTip());
346346

347-
historyAction = new QAction(QIcon(":/icons/history"), tr("&Transactions"), this);
347+
historyAction = new QAction(tr("&Transactions"), this);
348348
historyAction->setStatusTip(tr("Browse transaction history"));
349349
historyAction->setToolTip(historyAction->statusTip());
350350
historyAction->setCheckable(true);
@@ -358,7 +358,7 @@ void BitcoinGUI::createActions()
358358
#ifdef ENABLE_WALLET
359359
QSettings settings;
360360
if (!fLiteMode && settings.value("fShowMasternodesTab").toBool()) {
361-
masternodeAction = new QAction(QIcon(":/icons/masternodes"), tr("&Masternodes"), this);
361+
masternodeAction = new QAction(tr("&Masternodes"), this);
362362
masternodeAction->setStatusTip(tr("Browse masternodes"));
363363
masternodeAction->setToolTip(masternodeAction->statusTip());
364364
masternodeAction->setCheckable(true);
@@ -582,6 +582,16 @@ void BitcoinGUI::createToolBars()
582582
toolbar->setMovable(false); // remove unused icon in upper left corner
583583
overviewAction->setChecked(true);
584584

585+
// Add Dash logo on the right side
586+
QWidget* spacer = new QWidget();
587+
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
588+
toolbar->addWidget(spacer);
589+
590+
QLabel *logoLabel = new QLabel();
591+
QPixmap logoPixmap(":/images/dash_logo_toolbar");
592+
logoLabel->setPixmap(logoPixmap);
593+
toolbar->addWidget(logoLabel);
594+
585595
/** Create additional container for toolbar and walletFrame and make it the central widget.
586596
This is a workaround mostly for toolbar styling on Mac OS but should work fine for every other OSes too.
587597
*/

src/qt/dash.qrc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<file alias="transaction_3">res/icons/clock3.png</file>
2222
<file alias="transaction_4">res/icons/clock4.png</file>
2323
<file alias="transaction_5">res/icons/clock5.png</file>
24+
<file alias="console_remove">res/icons/console_remove.png</file>
2425
<file alias="eye">res/icons/eye.png</file>
2526
<file alias="eye_minus">res/icons/eye_minus.png</file>
2627
<file alias="eye_plus">res/icons/eye_plus.png</file>
@@ -30,9 +31,6 @@
3031
<file alias="editcopy">res/icons/editcopy.png</file>
3132
<file alias="add">res/icons/add.png</file>
3233
<file alias="edit">res/icons/edit.png</file>
33-
<file alias="history">res/icons/history.png</file>
34-
<file alias="masternodes">res/icons/masternodes.png</file>
35-
<file alias="overview">res/icons/overview.png</file>
3634
<file alias="export">res/icons/export.png</file>
3735
<file alias="synced">res/icons/synced.png</file>
3836
<file alias="remove">res/icons/remove.png</file>
@@ -46,7 +44,6 @@
4644
<file alias="filesave">res/icons/filesave.png</file>
4745
<file alias="debugwindow">res/icons/debugwindow.png</file>
4846
<file alias="browse">res/icons/browse.png</file>
49-
<file alias="about">res/icons/about.png</file>
5047
<file alias="about_qt">res/icons/about_qt.png</file>
5148
<file alias="verify">res/icons/verify.png</file>
5249
<file alias="hd_enabled">res/icons/hd_enabled.png</file>
@@ -62,14 +59,14 @@
6259
<file alias="trad">res/css/trad.css</file>
6360
</qresource>
6461
<qresource prefix="/images">
65-
<file alias="about">res/images/about.png</file>
6662
<file alias="arrow_down">res/images/arrow_down.png</file>
6763
<file alias="arrow_down_small">res/images/arrow_down_small.png</file>
6864
<file alias="arrow_left_small">res/images/arrow_left_small.png</file>
6965
<file alias="arrow_right_small">res/images/arrow_right_small.png</file>
7066
<file alias="arrow_up_small">res/images/arrow_up_small.png</file>
7167
<file alias="checked">res/images/checked.png</file>
7268
<file alias="dash_logo_horizontal">res/images/dash_logo_horizontal.png</file>
69+
<file alias="dash_logo_toolbar">res/images/dash_logo_toolbar.png</file>
7370
<file alias="qtreeview_selected">res/images/qtreeview_selected.png</file>
7471
<file alias="splash">res/images/splash.png</file>
7572
<file alias="unchecked">res/images/unchecked.png</file>

src/qt/forms/debugwindow.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@
554554
</property>
555555
<property name="icon">
556556
<iconset resource="../bitcoin.qrc">
557-
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
557+
<normaloff>:/icons/console_remove</normaloff>:/icons/console_remove</iconset>
558558
</property>
559559
<property name="shortcut">
560560
<string notr="true">Ctrl+L</string>

src/qt/forms/helpmessagedialog.ui

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -43,46 +43,6 @@
4343
<property name="rightMargin">
4444
<number>0</number>
4545
</property>
46-
<item>
47-
<widget class="QLabel" name="aboutLogo">
48-
<property name="sizePolicy">
49-
<sizepolicy hsizetype="Preferred" vsizetype="Ignored">
50-
<horstretch>0</horstretch>
51-
<verstretch>0</verstretch>
52-
</sizepolicy>
53-
</property>
54-
<property name="minimumSize">
55-
<size>
56-
<width>96</width>
57-
<height>464</height>
58-
</size>
59-
</property>
60-
<property name="maximumSize">
61-
<size>
62-
<width>96</width>
63-
<height>564</height>
64-
</size>
65-
</property>
66-
<property name="baseSize">
67-
<size>
68-
<width>96</width>
69-
<height>564</height>
70-
</size>
71-
</property>
72-
<property name="autoFillBackground">
73-
<bool>false</bool>
74-
</property>
75-
<property name="pixmap">
76-
<pixmap resource="../dash.qrc">:/images/about</pixmap>
77-
</property>
78-
<property name="scaledContents">
79-
<bool>false</bool>
80-
</property>
81-
<property name="alignment">
82-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
83-
</property>
84-
</widget>
85-
</item>
8646
</layout>
8747
</item>
8848
<item>

0 commit comments

Comments
 (0)