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 2df07ff7d3.

* 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
This commit is contained in:
Nathan Marley 2019-10-31 14:30:21 -03:00 committed by UdjinM6
parent 9bc699ff25
commit d3ce0964b2
57 changed files with 159 additions and 385 deletions

View File

@ -29,9 +29,7 @@ git = 'git'
folders = [
"src/qt/res/movies",
"src/qt/res/icons",
"src/qt/res/icons/light",
"src/qt/res/images",
"src/qt/res/images/light",
"share/pixmaps"
]
basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel'], universal_newlines=True).rstrip('\n')

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 436 B

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 711 B

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 882 B

View File

@ -202,6 +202,7 @@ RES_ICONS = \
qt/res/icons/connect2_16.png \
qt/res/icons/connect3_16.png \
qt/res/icons/connect4_16.png \
qt/res/icons/console_remove.png \
qt/res/icons/debugwindow.png \
qt/res/icons/edit.png \
qt/res/icons/editcopy.png \
@ -213,12 +214,9 @@ RES_ICONS = \
qt/res/icons/filesave.png \
qt/res/icons/hd_disabled.png \
qt/res/icons/hd_enabled.png \
qt/res/icons/history.png \
qt/res/icons/key.png \
qt/res/icons/lock_closed.png \
qt/res/icons/lock_open.png \
qt/res/icons/masternodes.png \
qt/res/icons/overview.png \
qt/res/icons/quit.png \
qt/res/icons/receive.png \
qt/res/icons/remove.png \
@ -231,7 +229,6 @@ RES_ICONS = \
qt/res/icons/tx_input.png \
qt/res/icons/tx_output.png \
qt/res/icons/tx_mined.png \
qt/res/icons/about.png \
qt/res/icons/about_qt.png \
qt/res/icons/verify.png \
qt/res/icons/fontbigger.png \
@ -305,7 +302,6 @@ BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
endif
RES_IMAGES = \
qt/res/images/about.png \
qt/res/images/arrow_down.png \
qt/res/images/arrow_down_small.png \
qt/res/images/arrow_left_small.png \
@ -313,6 +309,7 @@ RES_IMAGES = \
qt/res/images/arrow_up_small.png \
qt/res/images/checked.png \
qt/res/images/dash_logo_horizontal.png \
qt/res/images/dash_logo_toolbar.png \
qt/res/images/qtreeview_selected.png \
qt/res/images/splash.png \
qt/res/images/unchecked.png \

View File

@ -303,7 +303,7 @@ void BitcoinGUI::createActions()
{
QActionGroup *tabGroup = new QActionGroup(this);
overviewAction = new QAction(QIcon(":/icons/overview"), tr("&Overview"), this);
overviewAction = new QAction(tr("&Overview"), this);
overviewAction->setStatusTip(tr("Show general overview of wallet"));
overviewAction->setToolTip(overviewAction->statusTip());
overviewAction->setCheckable(true);
@ -314,7 +314,7 @@ void BitcoinGUI::createActions()
#endif
tabGroup->addAction(overviewAction);
sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this);
sendCoinsAction = new QAction(tr("&Send"), this);
sendCoinsAction->setStatusTip(tr("Send coins to a Dash address"));
sendCoinsAction->setToolTip(sendCoinsAction->statusTip());
sendCoinsAction->setCheckable(true);
@ -329,7 +329,7 @@ void BitcoinGUI::createActions()
sendCoinsMenuAction->setStatusTip(sendCoinsAction->statusTip());
sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip());
receiveCoinsAction = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receive"), this);
receiveCoinsAction = new QAction(tr("&Receive"), this);
receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and dash: URIs)"));
receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip());
receiveCoinsAction->setCheckable(true);
@ -344,7 +344,7 @@ void BitcoinGUI::createActions()
receiveCoinsMenuAction->setStatusTip(receiveCoinsAction->statusTip());
receiveCoinsMenuAction->setToolTip(receiveCoinsMenuAction->statusTip());
historyAction = new QAction(QIcon(":/icons/history"), tr("&Transactions"), this);
historyAction = new QAction(tr("&Transactions"), this);
historyAction->setStatusTip(tr("Browse transaction history"));
historyAction->setToolTip(historyAction->statusTip());
historyAction->setCheckable(true);
@ -358,7 +358,7 @@ void BitcoinGUI::createActions()
#ifdef ENABLE_WALLET
QSettings settings;
if (!fLiteMode && settings.value("fShowMasternodesTab").toBool()) {
masternodeAction = new QAction(QIcon(":/icons/masternodes"), tr("&Masternodes"), this);
masternodeAction = new QAction(tr("&Masternodes"), this);
masternodeAction->setStatusTip(tr("Browse masternodes"));
masternodeAction->setToolTip(masternodeAction->statusTip());
masternodeAction->setCheckable(true);
@ -582,6 +582,16 @@ void BitcoinGUI::createToolBars()
toolbar->setMovable(false); // remove unused icon in upper left corner
overviewAction->setChecked(true);
// Add Dash logo on the right side
QWidget* spacer = new QWidget();
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
toolbar->addWidget(spacer);
QLabel *logoLabel = new QLabel();
QPixmap logoPixmap(":/images/dash_logo_toolbar");
logoLabel->setPixmap(logoPixmap);
toolbar->addWidget(logoLabel);
/** Create additional container for toolbar and walletFrame and make it the central widget.
This is a workaround mostly for toolbar styling on Mac OS but should work fine for every other OSes too.
*/

View File

@ -21,6 +21,7 @@
<file alias="transaction_3">res/icons/clock3.png</file>
<file alias="transaction_4">res/icons/clock4.png</file>
<file alias="transaction_5">res/icons/clock5.png</file>
<file alias="console_remove">res/icons/console_remove.png</file>
<file alias="eye">res/icons/eye.png</file>
<file alias="eye_minus">res/icons/eye_minus.png</file>
<file alias="eye_plus">res/icons/eye_plus.png</file>
@ -30,9 +31,6 @@
<file alias="editcopy">res/icons/editcopy.png</file>
<file alias="add">res/icons/add.png</file>
<file alias="edit">res/icons/edit.png</file>
<file alias="history">res/icons/history.png</file>
<file alias="masternodes">res/icons/masternodes.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>
@ -46,7 +44,6 @@
<file alias="filesave">res/icons/filesave.png</file>
<file alias="debugwindow">res/icons/debugwindow.png</file>
<file alias="browse">res/icons/browse.png</file>
<file alias="about">res/icons/about.png</file>
<file alias="about_qt">res/icons/about_qt.png</file>
<file alias="verify">res/icons/verify.png</file>
<file alias="hd_enabled">res/icons/hd_enabled.png</file>
@ -62,7 +59,6 @@
<file alias="trad">res/css/trad.css</file>
</qresource>
<qresource prefix="/images">
<file alias="about">res/images/about.png</file>
<file alias="arrow_down">res/images/arrow_down.png</file>
<file alias="arrow_down_small">res/images/arrow_down_small.png</file>
<file alias="arrow_left_small">res/images/arrow_left_small.png</file>
@ -70,6 +66,7 @@
<file alias="arrow_up_small">res/images/arrow_up_small.png</file>
<file alias="checked">res/images/checked.png</file>
<file alias="dash_logo_horizontal">res/images/dash_logo_horizontal.png</file>
<file alias="dash_logo_toolbar">res/images/dash_logo_toolbar.png</file>
<file alias="qtreeview_selected">res/images/qtreeview_selected.png</file>
<file alias="splash">res/images/splash.png</file>
<file alias="unchecked">res/images/unchecked.png</file>

View File

@ -554,7 +554,7 @@
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
<normaloff>:/icons/console_remove</normaloff>:/icons/console_remove</iconset>
</property>
<property name="shortcut">
<string notr="true">Ctrl+L</string>

View File

@ -43,46 +43,6 @@
<property name="rightMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="aboutLogo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Ignored">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>96</width>
<height>464</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>96</width>
<height>564</height>
</size>
</property>
<property name="baseSize">
<size>
<width>96</width>
<height>564</height>
</size>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="pixmap">
<pixmap resource="../dash.qrc">:/images/about</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</item>
<item>

View File

@ -579,61 +579,6 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_debugbuttons">
<item>
<widget class="QPushButton" name="privateSendAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Try to manually submit a PrivateSend request.</string>
</property>
<property name="text">
<string>Try Mix</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="privateSendReset">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="privateSendInfo">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Information about PrivateSend and Mixing</string>
</property>
<property name="text">
<string>Info</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>

View File

@ -294,15 +294,9 @@ void OverviewPage::setWalletModel(WalletModel *model)
connect(model->getOptionsModel(), SIGNAL(privateSentAmountChanged()), this, SLOT(updatePrivateSendProgress()));
connect(model->getOptionsModel(), SIGNAL(advancedPSUIChanged(bool)), this, SLOT(updateAdvancedPSUI(bool)));
connect(ui->privateSendAuto, SIGNAL(clicked()), this, SLOT(privateSendAuto()));
connect(ui->privateSendReset, SIGNAL(clicked()), this, SLOT(privateSendReset()));
connect(ui->privateSendInfo, SIGNAL(clicked()), this, SLOT(privateSendInfo()));
connect(ui->togglePrivateSend, SIGNAL(clicked()), this, SLOT(togglePrivateSend()));
// privatesend buttons will not react to spacebar must be clicked on
ui->privateSendAuto->setFocusPolicy(Qt::NoFocus);
ui->privateSendReset->setFocusPolicy(Qt::NoFocus);
ui->privateSendInfo->setFocusPolicy(Qt::NoFocus);
ui->togglePrivateSend->setFocusPolicy(Qt::NoFocus);
}
}
@ -455,9 +449,6 @@ void OverviewPage::updateAdvancedPSUI(bool fShowAdvancedPSUI) {
ui->privateSendProgress->setVisible(fShowAdvancedPSUI);
ui->labelSubmittedDenomText->setVisible(fShowAdvancedPSUI);
ui->labelSubmittedDenom->setVisible(fShowAdvancedPSUI);
ui->privateSendAuto->setVisible(fShowAdvancedPSUI);
ui->privateSendReset->setVisible(fShowAdvancedPSUI);
ui->privateSendInfo->setVisible(true);
ui->labelPrivateSendLastMessage->setVisible(fShowAdvancedPSUI);
}
@ -575,23 +566,6 @@ void OverviewPage::privateSendStatus()
ui->labelSubmittedDenom->setText(QString(privateSendClient.GetSessionDenoms().c_str()));
}
void OverviewPage::privateSendAuto(){
privateSendClient.DoAutomaticDenominating(*g_connman);
}
void OverviewPage::privateSendReset(){
privateSendClient.ResetPool();
QMessageBox::warning(this, tr("PrivateSend"),
tr("PrivateSend was successfully reset."),
QMessageBox::Ok, QMessageBox::Ok);
}
void OverviewPage::privateSendInfo(){
HelpMessageDialog dlg(this, HelpMessageDialog::pshelp);
dlg.exec();
}
void OverviewPage::togglePrivateSend(){
QSettings settings;
// Popup some information on first mixing
@ -661,8 +635,6 @@ void OverviewPage::SetupTransactionList(int nNumItems) {
void OverviewPage::DisablePrivateSendCompletely() {
ui->togglePrivateSend->setText("(" + tr("Disabled") + ")");
ui->privateSendAuto->setText("(" + tr("Disabled") + ")");
ui->privateSendReset->setText("(" + tr("Disabled") + ")");
ui->framePrivateSend->setEnabled(false);
if (nWalletBackups <= 0) {
ui->labelPrivateSendEnabled->setText("<span style='color:red;'>(" + tr("Disabled") + ")</span>");

View File

@ -70,9 +70,6 @@ private:
private Q_SLOTS:
void togglePrivateSend();
void privateSendAuto();
void privateSendReset();
void privateSendInfo();
void updateDisplayUnit();
void updatePrivateSendProgress();
void updateAdvancedPSUI(bool fShowAdvancedPSUI);

View File

@ -24,7 +24,8 @@ background-color:#fff;
}
QMenuBar::item:selected {
background-color:#f8f6f6;
background-color: #ffffff;
color: #008de4;
}
QMenu {
@ -36,31 +37,37 @@ color:#333;
}
QMenu::item:selected {
background-color:#f2f0f0;
color:#333;
background-color: #ffffff;
color: #008de4;
}
QToolBar {
background-color:#fff;
border:0px solid #000;
background-color:#008de4;
border:0;
padding:0;
margin:0;
}
QToolBar > QToolButton {
background-color:#fff;
border:0px solid #333;
min-height:2.5em;
min-width: 8em;
padding: 0em 1em;
/*font-weight:bold;*/
color:#333;
background-color:#008de4;
border:0;
font-size: 14px;
min-width: 70px;
min-height: 48%;
max-height: 48%;
padding: 0 10px;
margin: 0;
color:#f5f5f5;
}
QToolBar > QToolButton:checked {
background-color:#1c75bc;
color:#fff;
font-weight:bold;
border: 0;
font-weight: bold;
}
QToolBar > QLabel {
border:0;
margin:10px 0 0 0;
}
QMessageBox {
@ -70,7 +77,7 @@ background-color:#F8F6F6;
/*******************************************************/
QLabel { /* Base Text Size & Color */
font-size:9pt;
font-size:12px;
color:#333333;
}
@ -85,7 +92,7 @@ background-color:transparent;
.QValidatedLineEdit, .QLineEdit { /* Text Entry Fields */
border: 1px solid #82C3E6;
font-size:8pt;
font-size:11px;
min-height:25px;
outline:0;
padding:3px;
@ -93,7 +100,7 @@ background-color:#fcfcfc;
}
.QLineEdit:!focus {
font-size:9pt;
font-size:12px;
}
.QValidatedLineEdit:disabled, .QLineEdit:disabled {
@ -103,11 +110,11 @@ background-color:#f2f2f2;
/*******************************************************/
QPushButton { /* Global Button Style */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #4ca5dc, stop: .1 #2c85cc, stop: .95 #2c85cc, stop: 1 #1D80B5);
background-color: #008DE4;
border:0;
border-radius:3px;
border-radius:8px;
color:#ffffff;
font-size:9pt;
font-size:12px;
font-weight:normal;
height: 26px;
padding-left:25px;
@ -117,7 +124,7 @@ padding-bottom:5px;
}
QPushButton:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #4ca5dc, stop: .1 #4ca5dc, stop: .95 #4ca5dc, stop: 1 #1D80B5);
background-color: #262626;
}
QPushButton:focus {
@ -278,11 +285,11 @@ background-color:transparent;
QHeaderView::section { /* Table Header Sections */
qproperty-alignment:center;
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #1070B0, stop: 1 #1c75bc);
background-color: #008de4;
color:#fff;
min-height:25px;
font-weight:bold;
font-size:8pt;
font-size:11px;
outline:0;
border:0px solid #fff;
border-right:1px solid #fff;
@ -308,7 +315,7 @@ border:0px solid #fff;
QTableView::item { /* Table Item */
background-color:#fcfcfc;
font-size:9pt;
font-size:12px;
}
QTableView::item:selected { /* Table Item Selected */
@ -513,7 +520,7 @@ padding-left:15px;
}
QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */
font-size:8pt;
font-size:10px;
}
QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */
@ -637,7 +644,7 @@ border:1px solid #9e9e9e;
}
QWidget#AddressBookPage QTableView { /* Address Listing */
font-size:9pt;
font-size:12px;
}
QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */
@ -796,12 +803,14 @@ min-height:30px;
}
QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */
qproperty-alignment: 'AlignVCenter | AlignRight';
min-width:160px;
background-color:transparent;
color:#f4f4f5;
min-width:180px;
color:#008de4;
margin-top:0;
margin-right:5px;
padding-right:5px;
font-weight:bold;
font-size:18px;
min-height:30px;
}
QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */
@ -811,46 +820,45 @@ margin-left:3px;
QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:18px;
}
QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:16px;
}
QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */
qproperty-alignment: 'AlignVCenter | AlignRight';
min-width:160px;
background-color:#1c75bc;
color:#ffffff;
background-color:#F8F6F6;
margin-right:5px;
padding-right:5px;
font-size:10pt;
font-size:14px;
font-weight: bold;
min-height:35px;
}
QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:12pt;
color:#1c75bc;
font-size:16px;
font-weight: bold;
margin-left:0px;
font-weight: bold;
}
QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:16px;
}
QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */
qproperty-alignment: 'AlignVCenter | AlignRight';
min-width:160px;
font-size:9pt;
font-size:12px;
background-color:#F8F6F6;
margin-right:5px;
padding-right:5px;
@ -858,20 +866,20 @@ padding-right:5px;
QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:0px;
}
QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:16px;
}
QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */
qproperty-alignment: 'AlignVCenter | AlignRight';
min-width:160px;
font-size:9pt;
font-size:12px;
background-color:#F8F6F6;
margin-right:5px;
padding-right:5px;
@ -879,20 +887,20 @@ padding-right:5px;
QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:0px;
}
QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:16px;
}
QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */
qproperty-alignment: 'AlignVCenter | AlignRight';
min-width:160px;
font-size:9pt;
font-size:12px;
background-color:#F8F6F6;
margin-right:5px;
padding-right:5px;
@ -900,13 +908,13 @@ padding-right:5px;
QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:0px;
}
QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:9pt;
font-size:12px;
margin-left:16px;
}
@ -920,22 +928,21 @@ max-height: 350px;
}
QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */
background-color:transparent;
max-width: 421px;
min-width: 421px;
}
QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */
qproperty-alignment: 'AlignVCenter | AlignCenter';
max-width: 421px;
min-width: 421px;
background-color:#1c75bc;
color:#fff;
margin-right: 5px;
padding-right: 5px;
font-weight:bold;
font-size:10pt;
min-height:35px;
max-height:35px;
qproperty-alignment: 'AlignVCenter | AlignLeft';
min-width:180px;
color:#008de4;
margin-top:0;
margin-right:5px;
padding-right:5px;
font-weight: bold;
font-size:18px;
min-height:30px;
}
/******************************************************************/
QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */
@ -985,7 +992,7 @@ color:#818181;
}
QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk {
background-color: #1c75bc;
background-color: #008de4;
width:1px;
}
@ -1033,7 +1040,7 @@ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendLastMessage { /* Privat
qproperty-alignment: 'AlignVCenter | AlignCenter';
min-width: 288px;
min-height: 43px;
font-size:8pt;
font-size:11px;
color:#818181;
}
@ -1050,7 +1057,7 @@ outline:none;
QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend { /* Start PrivateSend Mixing */
min-height: 40px;
font-size:10pt;
font-size:15px;
font-weight:normal;
color:#ffffff;
padding-left:10px;
@ -1063,81 +1070,25 @@ QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover {
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendAuto { /* Try Mix Button */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb);
border:1px solid #d2d2d2;
color:#616161;
min-height:25px;
font-size:6pt;
padding:0px;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendAuto:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb);
color:#333;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendAuto:pressed {
border:1px solid #9e9e9e;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendReset { /* Reset Button */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb);
border:1px solid #d2d2d2;
color:#616161;
min-height:25px;
font-size:6pt;
padding:0px;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendReset:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb);
color:#333;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendReset:pressed {
border:1px solid #9e9e9e;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendInfo { /* Info Button */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb);
border:1px solid #d2d2d2;
color:#616161;
min-height:25px;
font-size:6pt;
padding:0px;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendInfo:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb);
color:#333;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendInfo:pressed {
border:1px solid #9e9e9e;
}
/* RECENT TRANSACTIONS */
QWidget .QFrame#frame_2 { /* Transactions Widget */
min-width:410px;
min-width:510px;
margin-right:20px;
margin-left:0;
margin-top:15px;
background-image: url(':/images/dash_logo_horizontal');
background-repeat:none;
margin-top:0;
}
QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */
min-width:180px;
color:#999;
color: #008de4;
margin-left:67px;
margin-top:83px;
margin-top:0;
margin-right:5px;
padding-right:5px;
font-weight:normal;
font-size:10pt;
min-height:24px;
font-weight:bold;
font-size:18px;
min-height:30px;
}
QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */
@ -1151,7 +1102,8 @@ min-height:16px;
QWidget .QFrame#frame_2 QListView { /* Transaction List */
font-weight:normal;
font-size:9pt;
font-size:12px;
max-width:369px;
margin-top:12px;
margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */
}
@ -1204,7 +1156,7 @@ min-height:25px;
QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */
color:#999;
font-weight:normal;
font-size:10pt;
font-size:14px;
}
QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */
@ -1287,7 +1239,7 @@ QDialog#SendCoinsDialog QLabel#label {
margin-right:-2px;
padding-right:-2px;
color:#616161;
font-size:10pt;
font-size:14px;
font-weight:bold;
border-radius:5px;
padding-top:20px;
@ -1317,7 +1269,7 @@ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry L
background-color:#F8F6F6;
min-width:102px;
font-weight:normal;
/*font-size:8pt;*/
/*font-size:11px;*/
color:#333;
min-height:25px;
margin-right:5px;
@ -1507,7 +1459,7 @@ border: 1px solid #fff;
min-width:102px;
color:#333;
/*font-weight:bold;
font-size:8pt;*/
font-size:11px;*/
padding-right:5px;
}
@ -1517,7 +1469,7 @@ border: 1px solid #fff;
min-width:102px;
color:#ffffff;
/*font-weight:bold;
font-size:8pt;*/
font-size:11px;*/
padding-right:5px;
}
@ -1527,7 +1479,7 @@ border: 1px solid #fff;
min-width:102px;
color:#333;
/*font-weight:bold;
font-size:8pt;*/
font-size:11px;*/
padding-right:5px;
}
@ -1585,7 +1537,7 @@ border:1px solid #9e9e9e;
QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Requested Payments History Label */
color:#999;
font-weight:normal;
font-size:10pt;
font-size:14px;
}
/* RECEIVE COINS DIALOG */

View File

@ -24,7 +24,8 @@ background-color:#fff;
}
QMenuBar::item:selected {
background-color:#f8f6f6;
background-color: #ffffff;
color: #008de4;
}
QMenu {
@ -36,31 +37,37 @@ color:#333;
}
QMenu::item:selected {
background-color:#f2f0f0;
color:#333;
background-color: #ffffff;
color: #008de4;
}
QToolBar {
background-color:#fff;
border:0px solid #000;
background-color:#008de4;
border:0;
padding:0;
margin:0;
}
QToolBar > QToolButton {
background-color:#fff;
border:0px solid #333;
min-height:2.5em;
min-width: 8em;
padding: 0em 1em;
/*font-weight:bold;*/
color:#333;
background-color:#008de4;
border:0;
font-size: 14px;
min-width: 70px;
min-height: 48%;
max-height: 48%;
padding: 0 10px;
margin: 0;
color:#f5f5f5;
}
QToolBar > QToolButton:checked {
background-color:#1c75bc;
color:#fff;
font-weight:bold;
border: 0;
font-weight: bold;
}
QToolBar > QLabel {
border:0;
margin:10px 0 0 0;
}
QMessageBox {
@ -103,9 +110,9 @@ background-color:#f2f2f2;
/*******************************************************/
QPushButton { /* Global Button Style */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #4ca5dc, stop: .1 #2c85cc, stop: .95 #2c85cc, stop: 1 #1D80B5);
background-color: #008DE4;
border:0;
border-radius:3px;
border-radius:8px;
color:#ffffff;
font-size:12px;
font-weight:normal;
@ -117,7 +124,7 @@ padding-bottom:5px;
}
QPushButton:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #4ca5dc, stop: .1 #4ca5dc, stop: .95 #4ca5dc, stop: 1 #1D80B5);
background-color: #262626;
}
QPushButton:focus {
@ -278,7 +285,7 @@ background-color:transparent;
QHeaderView::section { /* Table Header Sections */
qproperty-alignment:center;
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #1070B0, stop: 1 #1c75bc);
background-color: #008de4;
color:#fff;
min-height:25px;
font-weight:bold;
@ -796,12 +803,14 @@ min-height:30px;
}
QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */
qproperty-alignment: 'AlignVCenter | AlignRight';
min-width:160px;
background-color:transparent;
color:#f4f4f5;
min-width:180px;
color:#008de4;
margin-top:0;
margin-right:5px;
padding-right:5px;
font-weight:bold;
font-size:18px;
min-height:30px;
}
QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */
@ -824,8 +833,7 @@ margin-left:16px;
QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */
qproperty-alignment: 'AlignVCenter | AlignRight';
min-width:160px;
background-color:#1c75bc;
color:#ffffff;
background-color:#F8F6F6;
margin-right:5px;
padding-right:5px;
font-size:14px;
@ -835,10 +843,10 @@ min-height:35px;
QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */
qproperty-alignment: 'AlignVCenter | AlignLeft';
font-size:16px;
color:#1c75bc;
font-size:16px;
font-weight: bold;
margin-left:0px;
font-weight: bold;
}
QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */
@ -920,22 +928,21 @@ max-height: 350px;
}
QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */
background-color:transparent;
max-width: 421px;
min-width: 421px;
}
QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */
qproperty-alignment: 'AlignVCenter | AlignCenter';
max-width: 421px;
min-width: 421px;
background-color:#1c75bc;
color:#fff;
margin-right: 5px;
padding-right: 5px;
font-weight:bold;
font-size:14px;
min-height:35px;
max-height:35px;
qproperty-alignment: 'AlignVCenter | AlignLeft';
min-width:180px;
color:#008de4;
margin-top:0;
margin-right:5px;
padding-right:5px;
font-weight: bold;
font-size:18px;
min-height:30px;
}
/******************************************************************/
QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */
@ -985,7 +992,7 @@ color:#818181;
}
QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk {
background-color: #1c75bc;
background-color: #008de4;
width:1px;
}
@ -1063,81 +1070,25 @@ QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover {
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendAuto { /* Try Mix Button */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb);
border:1px solid #d2d2d2;
color:#616161;
min-height:25px;
font-size:9px;
padding:0px;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendAuto:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb);
color:#333;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendAuto:pressed {
border:1px solid #9e9e9e;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendReset { /* Reset Button */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb);
border:1px solid #d2d2d2;
color:#616161;
min-height:25px;
font-size:9px;
padding:0px;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendReset:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb);
color:#333;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendReset:pressed {
border:1px solid #9e9e9e;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendInfo { /* Info Button */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb);
border:1px solid #d2d2d2;
color:#616161;
min-height:25px;
font-size:9px;
padding:0px;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendInfo:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb);
color:#333;
}
QWidget .QFrame#framePrivateSend .QPushButton#privateSendInfo:pressed {
border:1px solid #9e9e9e;
}
/* RECENT TRANSACTIONS */
QWidget .QFrame#frame_2 { /* Transactions Widget */
min-width:410px;
min-width:510px;
margin-right:20px;
margin-left:0;
margin-top:15px;
background-image: url(':/images/dash_logo_horizontal');
background-repeat:none;
margin-top:0;
}
QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */
min-width:180px;
color:#999;
color: #008de4;
margin-left:67px;
margin-top:83px;
margin-top:0;
margin-right:5px;
padding-right:5px;
font-weight:normal;
font-size:15px;
min-height:24px;
font-weight:bold;
font-size:18px;
min-height:30px;
}
QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 911 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 911 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 921 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 917 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 929 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 856 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 810 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 833 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 794 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 879 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 264 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 618 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 624 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 473 B

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 525 B

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 B

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 B

After

Width:  |  Height:  |  Size: 96 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -452,7 +452,7 @@ RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
ui->openDebugLogfileButton->setIcon(QIcon(":/icons/export"));
}
// Needed on Mac also
ui->clearButton->setIcon(QIcon(":/icons/remove"));
ui->clearButton->setIcon(QIcon(":/icons/console_remove"));
ui->fontBiggerButton->setIcon(QIcon(":/icons/fontbigger"));
ui->fontSmallerButton->setIcon(QIcon(":/icons/fontsmaller"));

View File

@ -130,7 +130,6 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, HelpMode helpMode) :
ui->helpMessage->moveCursor(QTextCursor::Start);
ui->scrollArea->setVisible(false);
ui->aboutLogo->setVisible(false);
} else if (helpMode == pshelp) {
setWindowTitle(tr("PrivateSend information"));
@ -165,11 +164,7 @@ For more information, see the <a href=\"https://docs.dash.org/en/stable/wallets/
));
ui->aboutMessage->setWordWrap(true);
ui->helpMessage->setVisible(false);
ui->aboutLogo->setVisible(false);
}
QString helpMessageGfx = ":/images/about";
QPixmap pixmap = QPixmap(helpMessageGfx);
ui->aboutLogo->setPixmap(pixmap);
}
HelpMessageDialog::~HelpMessageDialog()