diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py index 0d2198832b..548a9faa53 100755 --- a/contrib/devtools/optimize-pngs.py +++ b/contrib/devtools/optimize-pngs.py @@ -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') diff --git a/share/pixmaps/dash128.png b/share/pixmaps/dash128.png index cd32711f4d..d54b8be93d 100644 Binary files a/share/pixmaps/dash128.png and b/share/pixmaps/dash128.png differ diff --git a/share/pixmaps/dash16.png b/share/pixmaps/dash16.png index 59d4506b4b..434377a50b 100644 Binary files a/share/pixmaps/dash16.png and b/share/pixmaps/dash16.png differ diff --git a/share/pixmaps/dash32.png b/share/pixmaps/dash32.png index 41a96dd6f5..dfa929e244 100644 Binary files a/share/pixmaps/dash32.png and b/share/pixmaps/dash32.png differ diff --git a/share/pixmaps/dash64.png b/share/pixmaps/dash64.png index 7ba20afd99..a19bd4f657 100644 Binary files a/share/pixmaps/dash64.png and b/share/pixmaps/dash64.png differ diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 873fbf6fb0..ffe8402bad 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -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 \ diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 05eba6ab87..c0b19089bd 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -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. */ diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc index fea1f3f585..7991649349 100644 --- a/src/qt/dash.qrc +++ b/src/qt/dash.qrc @@ -21,6 +21,7 @@ res/icons/clock3.png res/icons/clock4.png res/icons/clock5.png + res/icons/console_remove.png res/icons/eye.png res/icons/eye_minus.png res/icons/eye_plus.png @@ -30,9 +31,6 @@ res/icons/editcopy.png res/icons/add.png res/icons/edit.png - res/icons/history.png - res/icons/masternodes.png - res/icons/overview.png res/icons/export.png res/icons/synced.png res/icons/remove.png @@ -46,7 +44,6 @@ res/icons/filesave.png res/icons/debugwindow.png res/icons/browse.png - res/icons/about.png res/icons/about_qt.png res/icons/verify.png res/icons/hd_enabled.png @@ -62,7 +59,6 @@ res/css/trad.css - res/images/about.png res/images/arrow_down.png res/images/arrow_down_small.png res/images/arrow_left_small.png @@ -70,6 +66,7 @@ res/images/arrow_up_small.png res/images/checked.png res/images/dash_logo_horizontal.png + res/images/dash_logo_toolbar.png res/images/qtreeview_selected.png res/images/splash.png res/images/unchecked.png diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui index ee7f0d6a94..d1602a9aba 100644 --- a/src/qt/forms/debugwindow.ui +++ b/src/qt/forms/debugwindow.ui @@ -554,7 +554,7 @@ - :/icons/remove:/icons/remove + :/icons/console_remove:/icons/console_remove Ctrl+L diff --git a/src/qt/forms/helpmessagedialog.ui b/src/qt/forms/helpmessagedialog.ui index eb16c64d8f..971afd146c 100644 --- a/src/qt/forms/helpmessagedialog.ui +++ b/src/qt/forms/helpmessagedialog.ui @@ -43,46 +43,6 @@ 0 - - - - - 0 - 0 - - - - - 96 - 464 - - - - - 96 - 564 - - - - - 96 - 564 - - - - false - - - :/images/about - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index a544f414bf..53d618b6c2 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -579,61 +579,6 @@ - - - - - - - 0 - 0 - - - - Try to manually submit a PrivateSend request. - - - Try Mix - - - - - - - - 0 - 0 - - - - Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!) - - - false - - - Reset - - - - - - - - 0 - 0 - - - - Information about PrivateSend and Mixing - - - Info - - - - - diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 0a80221ba4..1f4f86910d 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -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("(" + tr("Disabled") + ")"); diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h index a5f8bbf80d..637cc29959 100644 --- a/src/qt/overviewpage.h +++ b/src/qt/overviewpage.h @@ -70,9 +70,6 @@ private: private Q_SLOTS: void togglePrivateSend(); - void privateSendAuto(); - void privateSendReset(); - void privateSendInfo(); void updateDisplayUnit(); void updatePrivateSendProgress(); void updateAdvancedPSUI(bool fShowAdvancedPSUI); diff --git a/src/qt/res/css/light-hires.css b/src/qt/res/css/light-hires.css index aafa1d9d0c..6049b00313 100644 --- a/src/qt/res/css/light-hires.css +++ b/src/qt/res/css/light-hires.css @@ -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 */ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 3dd6539046..6049b00313 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -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 */ diff --git a/src/qt/res/icons/about.png b/src/qt/res/icons/about.png index 2dbeaaaba5..de07ca4c48 100644 Binary files a/src/qt/res/icons/about.png and b/src/qt/res/icons/about.png differ diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png index 1af1f60f1a..6c92d81ce1 100644 Binary files a/src/qt/res/icons/address-book.png and b/src/qt/res/icons/address-book.png differ diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png index b448456ab9..b8932ad34b 100644 Binary files a/src/qt/res/icons/bitcoin_testnet.png and b/src/qt/res/icons/bitcoin_testnet.png differ diff --git a/src/qt/res/icons/clock1.png b/src/qt/res/icons/clock1.png index 214ac9b9f0..a1a3ffc618 100644 Binary files a/src/qt/res/icons/clock1.png and b/src/qt/res/icons/clock1.png differ diff --git a/src/qt/res/icons/clock2.png b/src/qt/res/icons/clock2.png index 5b0dd7afe3..30ceec987d 100644 Binary files a/src/qt/res/icons/clock2.png and b/src/qt/res/icons/clock2.png differ diff --git a/src/qt/res/icons/clock3.png b/src/qt/res/icons/clock3.png index 523139f8fc..3b275fc4c8 100644 Binary files a/src/qt/res/icons/clock3.png and b/src/qt/res/icons/clock3.png differ diff --git a/src/qt/res/icons/clock4.png b/src/qt/res/icons/clock4.png index c007f501fd..2593089a0e 100644 Binary files a/src/qt/res/icons/clock4.png and b/src/qt/res/icons/clock4.png differ diff --git a/src/qt/res/icons/clock5.png b/src/qt/res/icons/clock5.png index 2d40197a00..d5c8986158 100644 Binary files a/src/qt/res/icons/clock5.png and b/src/qt/res/icons/clock5.png differ diff --git a/src/qt/res/icons/connect0_16.png b/src/qt/res/icons/connect0_16.png index c18e0f408e..2b883f68b4 100644 Binary files a/src/qt/res/icons/connect0_16.png and b/src/qt/res/icons/connect0_16.png differ diff --git a/src/qt/res/icons/connect1_16.png b/src/qt/res/icons/connect1_16.png index daeedd51f6..bf59b1696b 100644 Binary files a/src/qt/res/icons/connect1_16.png and b/src/qt/res/icons/connect1_16.png differ diff --git a/src/qt/res/icons/connect2_16.png b/src/qt/res/icons/connect2_16.png index bd24b1c37e..12a5a89e05 100644 Binary files a/src/qt/res/icons/connect2_16.png and b/src/qt/res/icons/connect2_16.png differ diff --git a/src/qt/res/icons/connect3_16.png b/src/qt/res/icons/connect3_16.png index 1c15e12f9e..a5af91d4d8 100644 Binary files a/src/qt/res/icons/connect3_16.png and b/src/qt/res/icons/connect3_16.png differ diff --git a/src/qt/res/icons/connect4_16.png b/src/qt/res/icons/connect4_16.png index 0eb2b848c9..ab303e2304 100644 Binary files a/src/qt/res/icons/connect4_16.png and b/src/qt/res/icons/connect4_16.png differ diff --git a/src/qt/res/icons/console_remove.png b/src/qt/res/icons/console_remove.png new file mode 100644 index 0000000000..99fd9660e5 Binary files /dev/null and b/src/qt/res/icons/console_remove.png differ diff --git a/src/qt/res/icons/edit.png b/src/qt/res/icons/edit.png index 3be65327d5..7955e763cd 100644 Binary files a/src/qt/res/icons/edit.png and b/src/qt/res/icons/edit.png differ diff --git a/src/qt/res/icons/editcopy.png b/src/qt/res/icons/editcopy.png index 1dd4bf8f30..6fd1ddf09d 100644 Binary files a/src/qt/res/icons/editcopy.png and b/src/qt/res/icons/editcopy.png differ diff --git a/src/qt/res/icons/editpaste.png b/src/qt/res/icons/editpaste.png index 55aa858351..5bd12588e5 100644 Binary files a/src/qt/res/icons/editpaste.png and b/src/qt/res/icons/editpaste.png differ diff --git a/src/qt/res/icons/history.png b/src/qt/res/icons/history.png deleted file mode 100644 index 65d3df6d61..0000000000 Binary files a/src/qt/res/icons/history.png and /dev/null differ diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png index 0677384a2b..f251bd70d0 100644 Binary files a/src/qt/res/icons/lock_closed.png and b/src/qt/res/icons/lock_closed.png differ diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png index 6711c2050a..2301db15da 100644 Binary files a/src/qt/res/icons/lock_open.png and b/src/qt/res/icons/lock_open.png differ diff --git a/src/qt/res/icons/masternodes.png b/src/qt/res/icons/masternodes.png deleted file mode 100644 index b0047b45d2..0000000000 Binary files a/src/qt/res/icons/masternodes.png and /dev/null differ diff --git a/src/qt/res/icons/overview.png b/src/qt/res/icons/overview.png deleted file mode 100644 index 2b3892da5b..0000000000 Binary files a/src/qt/res/icons/overview.png and /dev/null differ diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png index e8cf4134b1..4c0871f727 100644 Binary files a/src/qt/res/icons/receive.png and b/src/qt/res/icons/receive.png differ diff --git a/src/qt/res/icons/remove.png b/src/qt/res/icons/remove.png index 99fd9660e5..0184d57158 100644 Binary files a/src/qt/res/icons/remove.png and b/src/qt/res/icons/remove.png differ diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png index 4aae552efc..526f407bb3 100644 Binary files a/src/qt/res/icons/send.png and b/src/qt/res/icons/send.png differ diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png index 6a64c373b5..1fb4102b1e 100644 Binary files a/src/qt/res/icons/synced.png and b/src/qt/res/icons/synced.png differ diff --git a/src/qt/res/icons/transaction0.png b/src/qt/res/icons/transaction0.png index 4c7a02dfac..ef676c2c87 100644 Binary files a/src/qt/res/icons/transaction0.png and b/src/qt/res/icons/transaction0.png differ diff --git a/src/qt/res/icons/transaction2.png b/src/qt/res/icons/transaction2.png index c95cd8283f..ab34e28ce8 100644 Binary files a/src/qt/res/icons/transaction2.png and b/src/qt/res/icons/transaction2.png differ diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png index eb80fc8b32..1aab93e5d9 100644 Binary files a/src/qt/res/icons/tx_inout.png and b/src/qt/res/icons/tx_inout.png differ diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png index 4dff71bdbd..65d31225a0 100644 Binary files a/src/qt/res/icons/tx_input.png and b/src/qt/res/icons/tx_input.png differ diff --git a/src/qt/res/icons/tx_mined.png b/src/qt/res/icons/tx_mined.png index 3bb60244e7..4fde414e7d 100644 Binary files a/src/qt/res/icons/tx_mined.png and b/src/qt/res/icons/tx_mined.png differ diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png index 224c13b80a..ded75d3898 100644 Binary files a/src/qt/res/icons/tx_output.png and b/src/qt/res/icons/tx_output.png differ diff --git a/src/qt/res/icons/verify.png b/src/qt/res/icons/verify.png index c632d8172e..4c78bccf39 100644 Binary files a/src/qt/res/icons/verify.png and b/src/qt/res/icons/verify.png differ diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png deleted file mode 100644 index 4d00550b2a..0000000000 Binary files a/src/qt/res/images/about.png and /dev/null differ diff --git a/src/qt/res/images/checked.png b/src/qt/res/images/checked.png index 5d3cde4d85..800a756808 100644 Binary files a/src/qt/res/images/checked.png and b/src/qt/res/images/checked.png differ diff --git a/src/qt/res/images/dash_logo_horizontal.png b/src/qt/res/images/dash_logo_horizontal.png index 850a78df12..7fcc8d30d4 100644 Binary files a/src/qt/res/images/dash_logo_horizontal.png and b/src/qt/res/images/dash_logo_horizontal.png differ diff --git a/src/qt/res/images/dash_logo_toolbar.png b/src/qt/res/images/dash_logo_toolbar.png new file mode 100644 index 0000000000..2f58e83e70 Binary files /dev/null and b/src/qt/res/images/dash_logo_toolbar.png differ diff --git a/src/qt/res/images/unchecked.png b/src/qt/res/images/unchecked.png index 38c7ebc48e..a0c31d4cc7 100644 Binary files a/src/qt/res/images/unchecked.png and b/src/qt/res/images/unchecked.png differ diff --git a/src/qt/res/images/walletframe_background.png b/src/qt/res/images/walletframe_background.png index c3d5dff4af..7a6bd49468 100644 Binary files a/src/qt/res/images/walletframe_background.png and b/src/qt/res/images/walletframe_background.png differ diff --git a/src/qt/res/src/spinner.png b/src/qt/res/src/spinner.png index b296a58481..2d2be07709 100644 Binary files a/src/qt/res/src/spinner.png and b/src/qt/res/src/spinner.png differ diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index aa0746750d..ce79fab429 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -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")); diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index a741830c04..069d8185a4 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -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 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()