diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index d28d66627a..85dc2bd309 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -190,37 +190,39 @@ QT_RES_ICONS = \ qt/res/icons/about_qt.png \ qt/res/icons/add.png \ qt/res/icons/address-book.png \ - qt/res/icons/arrow_left.png \ - qt/res/icons/arrow_right.png \ - qt/res/icons/browse.png \ + qt/res/icons/clock0.png \ qt/res/icons/clock1.png \ qt/res/icons/clock2.png \ qt/res/icons/clock3.png \ qt/res/icons/clock4.png \ qt/res/icons/clock5.png \ qt/res/icons/clock6.png \ - qt/res/icons/configure.png \ - qt/res/icons/connect0_16.png \ - qt/res/icons/connect1_16.png \ - 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/connect_0.png \ + qt/res/icons/connect_1.png \ + qt/res/icons/connect_2.png \ + qt/res/icons/connect_3.png \ + qt/res/icons/connect_4.png \ qt/res/icons/editcopy.png \ qt/res/icons/editpaste.png \ qt/res/icons/edit.png \ - qt/res/icons/export.png \ qt/res/icons/eye_minus.png \ qt/res/icons/eye_plus.png \ qt/res/icons/eye.png \ - qt/res/icons/filesave.png \ qt/res/icons/fontbigger.png \ qt/res/icons/fontsmaller.png \ qt/res/icons/hd_enabled.png \ - qt/res/icons/key.png \ qt/res/icons/lock_closed.png \ qt/res/icons/lock_open.png \ + qt/res/icons/menu_assets.png \ + qt/res/icons/menu_coinjoin.png \ + qt/res/icons/menu_create_asset.png \ + qt/res/icons/menu_overview.png \ + qt/res/icons/menu_receive.png \ + qt/res/icons/menu_send_asset.png \ + qt/res/icons/menu_send.png \ + qt/res/icons/menu_smartnodes.png \ + qt/res/icons/menu_transactions.png \ + qt/res/icons/menu_update_asset.png \ qt/res/icons/proxy.png \ qt/res/icons/quit.png \ qt/res/icons/raptoreum.ico \ @@ -230,13 +232,8 @@ QT_RES_ICONS = \ qt/res/icons/remove.png \ qt/res/icons/send.png \ qt/res/icons/synced.png \ - qt/res/icons/transaction0.png \ - qt/res/icons/transaction2.png \ qt/res/icons/transaction_abandoned.png \ qt/res/icons/transaction_locked.png \ - qt/res/icons/tx_inout.png \ - qt/res/icons/tx_input.png \ - qt/res/icons/tx_output.png \ qt/res/icons/warning.png BITCOIN_QT_BASE_CPP = \ @@ -318,21 +315,29 @@ endif QT_RES_IMAGES = \ qt/res/images/arrow_down_dark.png \ + qt/res/images/arrow_down_dark_disabled.png \ + qt/res/images/arrow_down_dark_hover.png \ qt/res/images/arrow_down_light.png \ + qt/res/images/arrow_down_light_disabled.png \ + qt/res/images/arrow_down_light_hover.png \ qt/res/images/arrow_left_dark.png \ + qt/res/images/arrow_left_dark_disabled.png \ + qt/res/images/arrow_left_dark_hover.png \ qt/res/images/arrow_left_light.png \ + qt/res/images/arrow_left_light_disabled.png \ + qt/res/images/arrow_left_light_hover.png \ qt/res/images/arrow_right_dark.png \ + qt/res/images/arrow_right_dark_disabled.png \ + qt/res/images/arrow_right_dark_hover.png \ qt/res/images/arrow_right_light.png \ + qt/res/images/arrow_right_light_disabled.png \ + qt/res/images/arrow_right_light_hover.png \ qt/res/images/arrow_up_dark.png \ + qt/res/images/arrow_up_dark_disabled.png \ + qt/res/images/arrow_up_dark_hover.png \ qt/res/images/arrow_up_light.png \ - qt/res/images/arrow_light_down_normal.png \ - qt/res/images/arrow_light_down_hover.png \ - qt/res/images/arrow_light_left_normal.png \ - qt/res/images/arrow_light_left_hover.png \ - qt/res/images/arrow_light_right_normal.png \ - qt/res/images/arrow_light_right_hover.png \ - qt/res/images/arrow_light_up_normal.png \ - qt/res/images/arrow_light_up_hover.png \ + qt/res/images/arrow_up_light_disabled.png \ + qt/res/images/arrow_up_light_hover.png \ qt/res/images/checkbox_normal_dark.png \ qt/res/images/checkbox_normal_hover_dark.png \ qt/res/images/checkbox_normal_disabled_dark.png \ @@ -351,8 +356,8 @@ QT_RES_IMAGES = \ qt/res/images/checkbox_partly_checked_light.png \ qt/res/images/checkbox_partly_checked_hover_light.png \ qt/res/images/checkbox_partly_checked_disabled_light.png \ - qt/res/images/raptoreum_logo_toolbar.png \ - qt/res/images/raptoreum_logo_toolbar_blue.png \ + qt/res/images/raptoreum_logo_toolbar_dark.png \ + qt/res/images/raptoreum_logo_toolbar_light.png \ qt/res/images/radio_normal_dark.png \ qt/res/images/radio_normal_hover_dark.png \ qt/res/images/radio_checked_dark.png \ @@ -365,7 +370,8 @@ QT_RES_IMAGES = \ qt/res/images/radio_checked_hover_light.png \ qt/res/images/radio_normal_disabled_light.png \ qt/res/images/radio_checked_disabled_light.png \ - qt/res/images/splash.png + qt/res/images/splash_dark.png \ + qt/res/images/splash_light.png QT_RES_CSS = \ qt/res/css/dark.css \ @@ -391,7 +397,25 @@ QT_RES_FONTS = \ qt/res/fonts/Montserrat/Montserrat-SemiBold.otf \ qt/res/fonts/Montserrat/Montserrat-SemiBoldItalic.otf \ qt/res/fonts/Montserrat/Montserrat-Thin.otf \ - qt/res/fonts/Montserrat/Montserrat-ThinItalic.otf + qt/res/fonts/Montserrat/Montserrat-ThinItalic.otf \ + qt/res/fonts/Manrope/Manrope-Black.otf \ + qt/res/fonts/Manrope/Manrope-BlackItalic.otf \ + qt/res/fonts/Manrope/Manrope-Bold.otf \ + qt/res/fonts/Manrope/Manrope-BoldItalic.otf \ + qt/res/fonts/Manrope/Manrope-ExtraBold.otf \ + qt/res/fonts/Manrope/Manrope-ExtraBoldItalic.otf \ + qt/res/fonts/Manrope/Manrope-ExtraLight.otf \ + qt/res/fonts/Manrope/Manrope-ExtraLightItalic.otf \ + qt/res/fonts/Manrope/Manrope-Italic.otf \ + qt/res/fonts/Manrope/Manrope-Light.otf \ + qt/res/fonts/Manrope/Manrope-LightItalic.otf \ + qt/res/fonts/Manrope/Manrope-Medium.otf \ + qt/res/fonts/Manrope/Manrope-MediumItalic.otf \ + qt/res/fonts/Manrope/Manrope-Regular.otf \ + qt/res/fonts/Manrope/Manrope-SemiBold.otf \ + qt/res/fonts/Manrope/Manrope-SemiBoldItalic.otf \ + qt/res/fonts/Manrope/Manrope-Thin.otf \ + qt/res/fonts/Manrope/Manrope-ThinItalic.otf QT_RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png) diff --git a/src/qt/appearancewidget.cpp b/src/qt/appearancewidget.cpp index be199cbd23..cf14cd6599 100644 --- a/src/qt/appearancewidget.cpp +++ b/src/qt/appearancewidget.cpp @@ -29,9 +29,11 @@ AppearanceWidget::AppearanceWidget(QWidget *parent) : GUIUtil::FontFamily fontSystem = GUIUtil::FontFamily::SystemDefault; GUIUtil::FontFamily fontMontserrat = GUIUtil::FontFamily::Montserrat; + GUIUtil::FontFamily fontManrope = GUIUtil::FontFamily::Manrope; ui->fontFamily->addItem(GUIUtil::fontFamilyToString(fontSystem), QVariant(static_cast(fontSystem))); ui->fontFamily->addItem(GUIUtil::fontFamilyToString(fontMontserrat), QVariant(static_cast(fontMontserrat))); + ui->fontFamily->addItem(GUIUtil::fontFamilyToString(fontManrope), QVariant(static_cast(fontManrope))); updateWeightSlider(); diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index a6e4c8bc6d..f5fe865b5c 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -397,28 +397,28 @@ void BitcoinGUI::stopConnectingAnimation() { } void BitcoinGUI::createActions() { - sendCoinsMenuAction = new QAction(tr("&Send"), this); + sendCoinsMenuAction = new QAction(tr(" Send"), this); sendCoinsMenuAction->setStatusTip(tr("Send coins to a Raptoreum address")); sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip()); QString strCoinJoinName = QString::fromStdString(gCoinJoinName); - coinJoinCoinsMenuAction = new QAction(QString("&%1").arg(strCoinJoinName), this); + coinJoinCoinsMenuAction = new QAction(QString(" %1").arg(strCoinJoinName), this); coinJoinCoinsMenuAction->setStatusTip(tr("Send %1 funds to a Raptoreum address").arg(strCoinJoinName)); coinJoinCoinsMenuAction->setToolTip(coinJoinCoinsMenuAction->statusTip()); - receiveCoinsMenuAction = new QAction(tr("&Receive"), this); + receiveCoinsMenuAction = new QAction(tr(" Receive"), this); receiveCoinsMenuAction->setStatusTip(tr("Request payments (generates QR codes and raptoreum: URIs)")); receiveCoinsMenuAction->setToolTip(receiveCoinsMenuAction->statusTip()); - sendAssetsMenuAction = new QAction(tr("&Send Asset"), this); + sendAssetsMenuAction = new QAction(tr(" Send Asset"), this); sendAssetsMenuAction->setStatusTip(tr("Send assets to a Raptoreum address")); sendAssetsMenuAction->setToolTip(sendAssetsMenuAction->statusTip()); - createAssetsMenuAction = new QAction(tr("&Create Asset"), this); + createAssetsMenuAction = new QAction(tr(" Create Asset"), this); createAssetsMenuAction->setStatusTip(tr("Create a new asset")); createAssetsMenuAction->setToolTip(createAssetsMenuAction->statusTip()); - updateAssetsMenuAction = new QAction(tr("&Update Asset"), this); + updateAssetsMenuAction = new QAction(tr(" Update Asset"), this); updateAssetsMenuAction->setStatusTip(tr("Update asset")); updateAssetsMenuAction->setToolTip(updateAssetsMenuAction->statusTip()); @@ -714,29 +714,44 @@ void BitcoinGUI::createToolBars() { toolbar->setToolButtonStyle(Qt::ToolButtonTextOnly); toolbar->setMovable(false); // remove unused icon in upper left corner + QLabel *logoLabel = new QLabel(); + logoLabel->setObjectName("lblToolbarLogo"); + logoLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); + appToolBarLogoAction = toolbar->addWidget(logoLabel); + tabGroup = new QButtonGroup(this); overviewButton = new QToolButton(this); - overviewButton->setText(tr("&Overview")); + overviewButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + overviewButton->setIcon(GUIUtil::getIcon("menu_overview", GUIUtil::ThemedColor::PRIMARY)); + overviewButton->setText(tr(" Overview")); overviewButton->setStatusTip(tr("Show general overview of wallet")); tabGroup->addButton(overviewButton); sendCoinsButton = new QToolButton(this); + sendCoinsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + sendCoinsButton->setIcon(GUIUtil::getIcon("menu_send", GUIUtil::ThemedColor::PRIMARY)); sendCoinsButton->setText(sendCoinsMenuAction->text()); sendCoinsButton->setStatusTip(sendCoinsMenuAction->statusTip()); tabGroup->addButton(sendCoinsButton); receiveCoinsButton = new QToolButton(this); + receiveCoinsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + receiveCoinsButton->setIcon(GUIUtil::getIcon("menu_receive", GUIUtil::ThemedColor::PRIMARY)); receiveCoinsButton->setText(receiveCoinsMenuAction->text()); receiveCoinsButton->setStatusTip(receiveCoinsMenuAction->statusTip()); tabGroup->addButton(receiveCoinsButton); historyButton = new QToolButton(this); - historyButton->setText(tr("&Transactions")); + historyButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + historyButton->setIcon(GUIUtil::getIcon("menu_transactions", GUIUtil::ThemedColor::PRIMARY)); + historyButton->setText(tr(" Transactions")); historyButton->setStatusTip(tr("Browse transaction history")); tabGroup->addButton(historyButton); coinJoinCoinsButton = new QToolButton(this); + coinJoinCoinsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + coinJoinCoinsButton->setIcon(GUIUtil::getIcon("menu_coinjoin", GUIUtil::ThemedColor::PRIMARY)); coinJoinCoinsButton->setText(coinJoinCoinsMenuAction->text()); coinJoinCoinsButton->setStatusTip(coinJoinCoinsMenuAction->statusTip()); tabGroup->addButton(coinJoinCoinsButton); @@ -744,7 +759,9 @@ void BitcoinGUI::createToolBars() { QSettings settings; if (settings.value("fShowSmartnodesTab").toBool()) { smartnodeButton = new QToolButton(this); - smartnodeButton->setText(tr("&Smartnodes")); + smartnodeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + smartnodeButton->setIcon(GUIUtil::getIcon("menu_smartnodes", GUIUtil::ThemedColor::PRIMARY)); + smartnodeButton->setText(tr(" Smartnodes")); smartnodeButton->setStatusTip(tr("Browse smartnodes")); tabGroup->addButton(smartnodeButton); connect(smartnodeButton, &QToolButton::clicked, this, &BitcoinGUI::gotoSmartnodePage); @@ -752,21 +769,29 @@ void BitcoinGUI::createToolBars() { } myAssetsButton = new QToolButton(this); - myAssetsButton->setText("&Assets"); + myAssetsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + myAssetsButton->setIcon(GUIUtil::getIcon("menu_assets", GUIUtil::ThemedColor::PRIMARY)); + myAssetsButton->setText(" Assets"); myAssetsButton->setStatusTip("Show general overview of assets"); tabGroup->addButton(myAssetsButton); sendAssetsButton = new QToolButton(this); + sendAssetsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + sendAssetsButton->setIcon(GUIUtil::getIcon("menu_send_asset", GUIUtil::ThemedColor::PRIMARY)); sendAssetsButton->setText(sendAssetsMenuAction->text()); sendAssetsButton->setStatusTip(sendAssetsMenuAction->statusTip()); tabGroup->addButton(sendAssetsButton); createAssetsButton = new QToolButton(this); + createAssetsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + createAssetsButton->setIcon(GUIUtil::getIcon("menu_create_asset", GUIUtil::ThemedColor::PRIMARY)); createAssetsButton->setText(createAssetsMenuAction->text()); createAssetsButton->setStatusTip(createAssetsMenuAction->statusTip()); tabGroup->addButton(createAssetsButton); updateAssetsButton = new QToolButton(this); + updateAssetsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + updateAssetsButton->setIcon(GUIUtil::getIcon("menu_update_asset", GUIUtil::ThemedColor::PRIMARY)); updateAssetsButton->setText(updateAssetsMenuAction->text()); updateAssetsButton->setStatusTip(updateAssetsMenuAction->statusTip()); tabGroup->addButton(updateAssetsButton); @@ -781,9 +806,6 @@ void BitcoinGUI::createToolBars() { connect(receiveCoinsButton, &QToolButton::clicked, this, &BitcoinGUI::gotoReceiveCoinsPage); connect(historyButton, &QToolButton::clicked, this, &BitcoinGUI::gotoHistoryPage); - // Give the selected tab button a bolder font. - connect(tabGroup, static_cast(&QButtonGroup::buttonToggled), this, &BitcoinGUI::highlightTabButton); - for (auto button : tabGroup->buttons()) { GUIUtil::setFont({button}, GUIUtil::FontWeight::Normal, 16); button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); @@ -797,16 +819,16 @@ void BitcoinGUI::createToolBars() { #ifdef ENABLE_WALLET m_wallet_selector = new QComboBox(this); - m_wallet_selector->setSizeAdjustPolicy(QComboBox::AdjustToContents); + m_wallet_selector->setMinimumContentsLength(200); connect(m_wallet_selector, static_cast(&QComboBox::currentIndexChanged), this, &BitcoinGUI::setCurrentWalletBySelectorIndex); QVBoxLayout* walletSelectorLayout = new QVBoxLayout(this); walletSelectorLayout->addWidget(m_wallet_selector); walletSelectorLayout->setSpacing(0); walletSelectorLayout->setMargin(0); - walletSelectorLayout->setContentsMargins(5, 0, 5, 0); + walletSelectorLayout->setContentsMargins(15, 7, 15, 0); QWidget* walletSelector = new QWidget(this); - walletSelector->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + walletSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); walletSelector->setObjectName("walletSelector"); walletSelector->setLayout(walletSelectorLayout); m_wallet_selector_action = appToolBar->insertWidget(appToolBarLogoAction, walletSelector); @@ -817,18 +839,12 @@ void BitcoinGUI::createToolBars() { spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); toolbar->addWidget(spacer); - QLabel *logoLabel = new QLabel(); - logoLabel->setObjectName("lblToolbarLogo"); - logoLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - - appToolBarLogoAction = 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. */ QHBoxLayout *layout = new QHBoxLayout; if (!settings.value("fHideToolbar").toBool()) - layout->addWidget(toolbar); + layout->addWidget(toolbar); layout->addWidget(walletFrame); layout->setSpacing(0); layout->setContentsMargins(QMargins()); @@ -1270,7 +1286,7 @@ void BitcoinGUI::updateNetworkState() { int count = clientModel->getNumConnections(); bool fNetworkActive = m_node.getNetworkActive(); QString icon; - GUIUtil::ThemedColor color = GUIUtil::ThemedColor::ORANGE; + GUIUtil::ThemedColor color = GUIUtil::ThemedColor::BLUE; switch (count) { case 0: icon = "connect_4"; @@ -1279,6 +1295,7 @@ void BitcoinGUI::updateNetworkState() { case 1: case 2: icon = "connect_1"; + color = GUIUtil::ThemedColor::ORANGE; break; case 3: case 4: @@ -1328,7 +1345,7 @@ void BitcoinGUI::updateNetworkState() { labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Raptoreum network", "", count)); } else { labelConnectionsIcon->setToolTip(tr("Network activity disabled")); - icon = "connect_4"; + icon = "connect_0"; color = GUIUtil::ThemedColor::RED; } @@ -1337,7 +1354,7 @@ void BitcoinGUI::updateNetworkState() { } if (!fNetworkActive || count > 0) { stopConnectingAnimation(); - labelConnectionsIcon->setPixmap(GUIUtil::getIcon(icon, color).pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE)); + labelConnectionsIcon->setPixmap(GUIUtil::getIcon(icon, color).pixmap(STATUSBAR_ICONSIZE * 1.2, STATUSBAR_ICONSIZE * 1.2)); } } @@ -1399,7 +1416,7 @@ void BitcoinGUI::updateCoinJoinVisibility() { // Hiding the QToolButton itself doesn't work for the GUI part // but is still needed for shortcuts to work properly. if (appToolBar != nullptr) { - appToolBar->actions()[4]->setVisible(fEnabled); + appToolBar->actions()[6]->setVisible(fEnabled); coinJoinCoinsButton->setVisible(fEnabled); GUIUtil::updateButtonGroupShortcuts(tabGroup); } @@ -1422,7 +1439,7 @@ void BitcoinGUI::updateWidth() { nWidthWidestButton = std::max(nWidthWidestButton, GUIUtil::TextWidth(fm, button->text())); } - nWidth = nWidthWidestButton + 50; + nWidth = nWidthWidestButton + 65; appToolBar->setMaximumWidth(nWidth); // 980 is the minimum required to show all tab's contents int minWidth = 980; diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui index 6df1bd454c..8e563085b3 100644 --- a/src/qt/forms/debugwindow.ui +++ b/src/qt/forms/debugwindow.ui @@ -125,9 +125,6 @@ User Agent - - 10 - diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index 91d4553ce7..8164c4eb6e 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -203,7 +203,7 @@ - When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched. + When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched. true diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 77918c36a8..6acd732ef8 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -84,9 +84,11 @@ namespace GUIUtil { // The name of the traditional theme static const QString traditionalTheme = "Traditional"; // The theme to set by default if settings are missing or incorrect - static const QString defaultTheme = "Light"; + static const QString defaultTheme = "Dark"; // The prefix a theme name should have if we want to apply dark colors and styles to it static const QString darkThemePrefix = "Dark"; +// The prefix a theme name should have if we want to apply light colors and styles to it + static const QString lightThemePrefix = "Light"; // The theme to set as a base one for non-traditional themes static const QString generalTheme = "general"; // Mapping theme => css file @@ -104,12 +106,12 @@ namespace GUIUtil { static const int defaultFontSize = 12; static const double fontScaleSteps = 0.01; #ifdef Q_OS_MAC - static const QFont::Weight defaultFontWeightNormal = QFont::ExtraLight; - static const QFont::Weight defaultFontWeightBold = QFont::Medium; + static const QFont::Weight defaultFontWeightNormal = QFont::Normal; + static const QFont::Weight defaultFontWeightBold = QFont::DemiBold; static const int defaultFontScale = 0; #else - static const QFont::Weight defaultFontWeightNormal = QFont::Light; - static const QFont::Weight defaultFontWeightBold = QFont::Medium; + static const QFont::Weight defaultFontWeightNormal = QFont::Normal; + static const QFont::Weight defaultFontWeightBold = QFont::DemiBold; static const int defaultFontScale = 0; #endif @@ -132,55 +134,57 @@ namespace GUIUtil { #endif static const std::map themedColors = { - {ThemedColor::DEFAULT, QColor(85, 85, 85)}, {ThemedColor::UNCONFIRMED, QColor(128, 128, 128)}, - {ThemedColor::BLUE, QColor(0, 141, 228)}, - {ThemedColor::ORANGE, QColor(199, 147, 4)}, - {ThemedColor::RED, QColor(168, 72, 50)}, - {ThemedColor::GREEN, QColor(94, 140, 65)}, - {ThemedColor::BAREADDRESS, QColor(140, 140, 140)}, {ThemedColor::TX_STATUS_OPENUNTILDATE, QColor(64, 64, 255)}, - {ThemedColor::BACKGROUND_WIDGET, QColor(234, 234, 236)}, - {ThemedColor::BORDER_WIDGET, QColor(220, 220, 220)}, - {ThemedColor::BACKGROUND_NETSTATS, QColor(210, 210, 210, 230)}, - {ThemedColor::BORDER_NETSTATS, QColor(180, 180, 180)}, - {ThemedColor::QR_PIXEL, QColor(85, 85, 85)}, - {ThemedColor::ICON_ALTERNATIVE_COLOR, QColor(167, 167, 167)}, + {ThemedColor::QR_PIXEL, QColor(17, 21, 34, 1)}, + {ThemedColor::BACKGROUND_WIDGET, QColor(247, 235, 232)}, + {ThemedColor::BORDER_WIDGET, QColor(194, 192, 192)}, + {ThemedColor::BACKGROUND_NETSTATS, QColor(239, 189, 177)}, + {ThemedColor::BORDER_NETSTATS, QColor(32, 36, 42)}, + {ThemedColor::DEFAULT, QColor(17, 21, 34)}, + {ThemedColor::ICON_ALTERNATIVE_COLOR, QColor(194, 192, 192)}, + {ThemedColor::BLUE, QColor(97, 123, 209)}, + {ThemedColor::GREEN, QColor(10, 173, 6)}, + {ThemedColor::ORANGE, QColor(235, 127, 0)}, + {ThemedColor::PRIMARY, QColor(183, 68, 38)}, + {ThemedColor::RED, QColor(243, 35, 73)}, + {ThemedColor::SECONDARY, QColor(194, 192, 192)}, }; static const std::map themedDarkColors = { - {ThemedColor::DEFAULT, QColor(199, 199, 199)}, - {ThemedColor::UNCONFIRMED, QColor(170, 170, 170)}, - {ThemedColor::BLUE, QColor(0, 89, 154)}, - {ThemedColor::ORANGE, QColor(199, 147, 4)}, - {ThemedColor::RED, QColor(168, 72, 50)}, - {ThemedColor::GREEN, QColor(94, 140, 65)}, - {ThemedColor::BAREADDRESS, QColor(140, 140, 140)}, + {ThemedColor::UNCONFIRMED, QColor(85, 91, 112)}, {ThemedColor::TX_STATUS_OPENUNTILDATE, QColor(64, 64, 255)}, - {ThemedColor::BACKGROUND_WIDGET, QColor(45, 45, 46)}, - {ThemedColor::BORDER_WIDGET, QColor(74, 74, 75)}, - {ThemedColor::BACKGROUND_NETSTATS, QColor(45, 45, 46, 230)}, - {ThemedColor::BORDER_NETSTATS, QColor(74, 74, 75)}, - {ThemedColor::QR_PIXEL, QColor(199, 199, 199)}, - {ThemedColor::ICON_ALTERNATIVE_COLOR, QColor(74, 74, 75)}, + {ThemedColor::QR_PIXEL, QColor(194, 192, 192)}, + {ThemedColor::BACKGROUND_WIDGET, QColor(17, 21, 34)}, + {ThemedColor::BORDER_WIDGET, QColor(85, 91, 112)}, + {ThemedColor::BACKGROUND_NETSTATS, QColor(27, 31, 44)}, + {ThemedColor::BORDER_NETSTATS, QColor(194, 192, 192)}, + {ThemedColor::DEFAULT, QColor(194, 192, 192)}, + {ThemedColor::ICON_ALTERNATIVE_COLOR, QColor(128, 134, 154)}, + {ThemedColor::BLUE, QColor(171, 186, 237)}, + {ThemedColor::GREEN, QColor(10, 173, 6)}, + {ThemedColor::ORANGE, QColor(235, 127, 0)}, + {ThemedColor::PRIMARY, QColor(180, 90, 70)}, + {ThemedColor::RED, QColor(243, 35, 72)}, + {ThemedColor::SECONDARY, QColor(128, 134, 154)}, }; static const std::map themedStyles = { - {ThemedStyle::TS_INVALID, "background:#a84832;"}, - {ThemedStyle::TS_ERROR, "color:#a84832;"}, - {ThemedStyle::TS_SUCCESS, "color:#5e8c41;"}, - {ThemedStyle::TS_COMMAND, "color:#008de4;"}, - {ThemedStyle::TS_PRIMARY, "color:#333;"}, - {ThemedStyle::TS_SECONDARY, "color:#444;"}, + {ThemedStyle::TS_INVALID, "border: 1px solid #F90000; background: rgb(255, 20, 20, 0.2);"}, + {ThemedStyle::TS_ERROR, "color:#F32349;"}, + {ThemedStyle::TS_SUCCESS, "color:#56AA01;"}, + {ThemedStyle::TS_COMMAND, "color:#617BD1;"}, + {ThemedStyle::TS_PRIMARY, "color:#555B70;"}, + {ThemedStyle::TS_SECONDARY, "color:#c2c0c0;"}, }; static const std::map themedDarkStyles = { - {ThemedStyle::TS_INVALID, "background:#a84832;"}, - {ThemedStyle::TS_ERROR, "color:#a84832;"}, - {ThemedStyle::TS_SUCCESS, "color:#5e8c41;"}, - {ThemedStyle::TS_COMMAND, "color:#00599a;"}, - {ThemedStyle::TS_PRIMARY, "color:#c7c7c7;"}, - {ThemedStyle::TS_SECONDARY, "color:#aaa;"}, + {ThemedStyle::TS_INVALID, "border: 1px solid #FF1414; background: rgb(255, 20, 20, 0.4);"}, + {ThemedStyle::TS_ERROR, "color:#F32349;"}, + {ThemedStyle::TS_SUCCESS, "color:#0AAD06;"}, + {ThemedStyle::TS_COMMAND, "color:#ABBAED;"}, + {ThemedStyle::TS_PRIMARY, "color:#d2d0d0;"}, + {ThemedStyle::TS_SECONDARY, "color:#80869A;"}, }; QColor getThemedQColor(ThemedColor color) { @@ -195,8 +199,28 @@ namespace GUIUtil { QIcon getIcon(const QString &strIcon, const ThemedColor color, const ThemedColor colorAlternative, const QString &strIconPath) { + QColor qcolor = getThemedQColor(color); + QColor qcolorAlternative = getThemedQColor(colorAlternative); QIcon icon(strIconPath + strIcon); - return icon; + QIcon themedIcon; + for (const QSize& size : icon.availableSizes()) { + QImage image(icon.pixmap(size).toImage()); + image = image.convertToFormat(QImage::Format_ARGB32); + for (int x = 0; x < image.width(); ++x) { + for (int y = 0; y < image.height(); ++y) { + const QRgb rgb = image.pixel(x, y); + QColor* pColor; + if ((rgb & RGB_MASK) < RGB_HALF) { + pColor = &qcolor; + } else { + pColor = &qcolorAlternative; + } + image.setPixel(x, y, qRgba(pColor->red(), pColor->green(), pColor->blue(), qAlpha(rgb))); + } + } + themedIcon.addPixmap(QPixmap::fromImage(image)); + } + return themedIcon; } QIcon getIcon(const QString &strIcon, const ThemedColor color, const QString &strIconPath) { @@ -884,7 +908,8 @@ namespace GUIUtil { } bool isValidTheme(const QString &strTheme) { - return strTheme == defaultTheme || strTheme == darkThemePrefix || strTheme == traditionalTheme; + // return strTheme == defaultTheme || strTheme == darkThemePrefix || strTheme == traditionalTheme; + return strTheme == lightThemePrefix || strTheme == darkThemePrefix || strTheme == traditionalTheme; } void loadStyleSheet(bool fForceUpdate) { @@ -994,6 +1019,9 @@ namespace GUIUtil { if (strFamily == "Montserrat") { return FontFamily::Montserrat; } + if (strFamily == "Manrope") { + return FontFamily::Manrope; + } throw std::invalid_argument(strprintf("Invalid font-family: %s", strFamily.toStdString())); } @@ -1003,6 +1031,8 @@ namespace GUIUtil { return "SystemDefault"; case FontFamily::Montserrat: return "Montserrat"; + case FontFamily::Manrope: + return "Manrope"; default: assert(false); } @@ -1213,6 +1243,7 @@ namespace GUIUtil { mapSupportedWeights.insert( std::make_pair(FontFamily::SystemDefault, supportedWeights(FontFamily::SystemDefault))); mapSupportedWeights.insert(std::make_pair(FontFamily::Montserrat, supportedWeights(FontFamily::Montserrat))); + mapSupportedWeights.insert(std::make_pair(FontFamily::Manrope, supportedWeights(FontFamily::Manrope))); auto getBestMatch = [&](FontFamily fontFamily, QFont::Weight targetWeight) { auto &vecSupported = mapSupportedWeights[fontFamily]; @@ -1245,6 +1276,7 @@ namespace GUIUtil { addBestDefaults(FontFamily::SystemDefault); addBestDefaults(FontFamily::Montserrat); + addBestDefaults(FontFamily::Manrope); // Load supported defaults. May become overwritten later. mapWeights = mapDefaultWeights; @@ -1275,6 +1307,19 @@ namespace GUIUtil { #else font = std::make_unique(family); font->setWeight(getFontWeightNormal()); +#endif + } else if (fontFamily == FontFamily::Manrope) { + QString family = fontFamilyToString(FontFamily::Manrope); +#ifdef Q_OS_MAC + if (getFontWeightNormal() != getFontWeightNormalDefault()) { + font = std::make_unique(getFontNormal()); + } else { + font = std::make_unique(family); + font->setWeight(getFontWeightNormalDefault()); + } +#else + font = std::make_unique(family); + font->setWeight(getFontWeightNormal()); #endif } else { font = std::make_unique(*osDefaultFont); @@ -1429,8 +1474,8 @@ namespace GUIUtil { {QFont::Normal, "Regular"}, {QFont::Bold, "Bold"}, #else - {QFont::Normal, ""}, - {QFont::Bold, ""}, + {QFont::Normal, "Regular"}, + {QFont::Bold, "Bold"}, #endif }; @@ -1454,6 +1499,45 @@ namespace GUIUtil { font.setFamily(fontFamilyToString(FontFamily::Montserrat) + " " + mapMontserratMapping[qWeight]); font.setWeight(qWeight); font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal); +#endif + } else if (family == FontFamily::Manrope) { + static std::map mapManropeMapping{ + {QFont::Thin, "Thin"}, + {QFont::ExtraLight, "ExtraLight"}, + {QFont::Light, "Light"}, + {QFont::Medium, "Medium"}, + {QFont::DemiBold, "SemiBold"}, + {QFont::ExtraBold, "ExtraBold"}, + {QFont::Black, "Black"}, +#ifdef Q_OS_MAC + {QFont::Normal, "Regular"}, + {QFont::Bold, "Bold"}, +#else + {QFont::Normal, "Regular"}, + {QFont::Bold, "Bold"}, +#endif + }; + + assert(mapManropeMapping.count(qWeight)); + +#ifdef Q_OS_MAC + + QString styleName = mapManropeMapping[qWeight]; + + if (fItalic) { + if (styleName == "Regular") { + styleName = "Italic"; + } else { + styleName += " Italic"; + } + } + + font.setFamily(fontFamilyToString(FontFamily::Manrope)); + font.setStyleName(styleName); +#else + font.setFamily(fontFamilyToString(FontFamily::Manrope) + " " + mapManropeMapping[qWeight]); + font.setWeight(qWeight); + font.setStyle(fItalic ? QFont::StyleItalic : QFont::StyleNormal); #endif } else { font.setFamily(osDefaultFont->family()); diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index e8700b0a93..e91cfab077 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -64,14 +64,17 @@ namespace GUIUtil { UNCONFIRMED, /* Theme related blue color */ BLUE, + /* Eye-friendly green color */ + GREEN, /* Eye-friendly orange color */ ORANGE, + /* Primary color */ + PRIMARY, /* Eye-friendly red color, e.g. Transaction list -- negative amount */ RED, - /* Eye-friendly green color */ - GREEN, - /* Transaction list -- bare address (without label) */ - BAREADDRESS, + /* Secondary color */ + SECONDARY, + /* Transaction list -- TX status decoration - open until date */ TX_STATUS_OPENUNTILDATE, /* Background used for some widgets. Its slightly darker than the wallets frame background. */ @@ -331,6 +334,7 @@ namespace GUIUtil { enum class FontFamily { SystemDefault, Montserrat, + Manrope, }; FontFamily fontFamilyFromString(const QString &strFamily); diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index 7108b7095a..b192657642 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -80,7 +80,8 @@ NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift, appIcon = QIcon(appIconPixmap); trayAndWindowIcon = QIcon(appIconPixmap.scaled(QSize(256, 256))); - splashImage = QPixmap(":/images/splash"); + QString theme = GUIUtil::getActiveTheme(); + splashImage = theme.startsWith("Dark") ? QPixmap(":/images/splash_dark") : QPixmap(":/images/splash_light"); } const NetworkStyle *NetworkStyle::instantiate(const QString &networkId) { diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 45adc883e2..a2fa5903af 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -331,7 +331,7 @@ void OptionsDialog::showPage(int index) { } } - GUIUtil::setFont({btnActive}, GUIUtil::FontWeight::Bold, 16); + GUIUtil::setFont({btnActive}, GUIUtil::FontWeight::Normal, 16); GUIUtil::setFont(vecNormal, GUIUtil::FontWeight::Normal, 16); GUIUtil::updateFonts(); diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 55c667ec5b..d3988ba046 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -149,11 +149,10 @@ void OptionsModel::Init(bool resetSettings) { settings.setValue("digits", "2"); if (!settings.contains("fHideToolbar")) - settings.setValue("fHideToolbar", true); + settings.setValue("fHideToolbar", false); - // CoinJoin if (!settings.contains("fCoinJoinEnabled")) { - settings.setValue("fCoinJoinEnabled", true); + settings.setValue("fCoinJoinEnabled", false); } if (!gArgs.SoftSetBoolArg("-enablecoinjoin", settings.value("fCoinJoinEnabled").toBool())) { addOverriddenOption("-enablecoinjoin"); diff --git a/src/qt/raptoreum.cpp b/src/qt/raptoreum.cpp index ffe21da9ff..8b2de2444f 100644 --- a/src/qt/raptoreum.cpp +++ b/src/qt/raptoreum.cpp @@ -394,7 +394,7 @@ static void SetupUIArgs() { "Set a directory which contains custom css files. Those will be used as stylesheets for the UI.", ArgsManager::ALLOW_ANY, OptionsCategory::GUI); gArgs.AddArg("-font-family", QObject::tr("Set the font family. Possible values: %1. (default: %2)").arg( - "SystemDefault, Montserrat").arg( + "SystemDefault, Montserrat, Manrope").arg( GUIUtil::fontFamilyToString(GUIUtil::getFontFamilyDefault())).toStdString(), ArgsManager::ALLOW_ANY, OptionsCategory::GUI); gArgs.AddArg("-font-scale", QObject::tr( @@ -624,7 +624,7 @@ int GuiMain(int argc, char *argv[]) { } catch (const std::exception &e) { QMessageBox::critical(nullptr, PACKAGE_NAME, QObject::tr("Error: Specified font-family invalid. Valid values: %1.").arg( - "SystemDefault, Montserrat")); + "SystemDefault, Montserrat, Manrope")); return EXIT_FAILURE; } GUIUtil::setFontFamily(family); diff --git a/src/qt/raptoreum.qrc b/src/qt/raptoreum.qrc index e9d9b50fa2..f8f87da0ea 100644 --- a/src/qt/raptoreum.qrc +++ b/src/qt/raptoreum.qrc @@ -4,31 +4,32 @@ res/icons/about_qt.png res/icons/add.png res/icons/address-book.png - res/icons/arrow_left.png - res/icons/arrow_right.png - res/icons/browse.png - res/icons/configure.png - res/icons/connect0_16.png - res/icons/connect1_16.png - res/icons/connect2_16.png - res/icons/connect3_16.png - res/icons/connect4_16.png - res/icons/console_remove.png - res/icons/debugwindow.png + res/icons/connect_0.png + res/icons/connect_1.png + res/icons/connect_2.png + res/icons/connect_3.png + res/icons/connect_4.png res/icons/edit.png res/icons/editcopy.png res/icons/editpaste.png - res/icons/export.png res/icons/eye.png res/icons/eye_minus.png res/icons/eye_plus.png - res/icons/filesave.png res/icons/fontbigger.png res/icons/fontsmaller.png res/icons/hd_enabled.png - res/icons/key.png res/icons/lock_closed.png res/icons/lock_open.png + res/icons/menu_assets.png + res/icons/menu_coinjoin.png + res/icons/menu_create_asset.png + res/icons/menu_overview.png + res/icons/menu_receive.png + res/icons/menu_send_asset.png + res/icons/menu_send.png + res/icons/menu_smartnodes.png + res/icons/menu_transactions.png + res/icons/menu_update_asset.png res/icons/proxy.png res/icons/quit.png res/icons/raptoreum.png @@ -36,7 +37,7 @@ res/icons/remove.png res/icons/send.png res/icons/synced.png - res/icons/transaction0.png + res/icons/clock0.png res/icons/clock1.png res/icons/clock2.png res/icons/clock3.png @@ -45,9 +46,6 @@ res/icons/clock6.png res/icons/transaction_abandoned.png res/icons/transaction_locked.png - res/icons/tx_inout.png - res/icons/tx_input.png - res/icons/tx_output.png res/icons/warning.png @@ -75,24 +73,51 @@ res/fonts/Montserrat/Montserrat-SemiBoldItalic.otf res/fonts/Montserrat/Montserrat-Thin.otf res/fonts/Montserrat/Montserrat-ThinItalic.otf + res/fonts/Manrope/Manrope-Black.otf + res/fonts/Manrope/Manrope-BlackItalic.otf + res/fonts/Manrope/Manrope-Bold.otf + res/fonts/Manrope/Manrope-BoldItalic.otf + res/fonts/Manrope/Manrope-ExtraBold.otf + res/fonts/Manrope/Manrope-ExtraBoldItalic.otf + res/fonts/Manrope/Manrope-ExtraLight.otf + res/fonts/Manrope/Manrope-ExtraLightItalic.otf + res/fonts/Manrope/Manrope-Italic.otf + res/fonts/Manrope/Manrope-Light.otf + res/fonts/Manrope/Manrope-LightItalic.otf + res/fonts/Manrope/Manrope-Medium.otf + res/fonts/Manrope/Manrope-MediumItalic.otf + res/fonts/Manrope/Manrope-Regular.otf + res/fonts/Manrope/Manrope-SemiBold.otf + res/fonts/Manrope/Manrope-SemiBoldItalic.otf + res/fonts/Manrope/Manrope-Thin.otf + res/fonts/Manrope/Manrope-ThinItalic.otf + res/images/arrow_down_dark.png + res/images/arrow_down_dark_disabled.png + res/images/arrow_down_dark_hover.png res/images/arrow_down_light.png + res/images/arrow_down_light_disabled.png + res/images/arrow_down_light_hover.png res/images/arrow_left_dark.png + res/images/arrow_left_dark_disabled.png + res/images/arrow_left_dark_hover.png res/images/arrow_left_light.png + res/images/arrow_left_light_disabled.png + res/images/arrow_left_light_hover.png res/images/arrow_right_dark.png + res/images/arrow_right_dark_disabled.png + res/images/arrow_right_dark_hover.png res/images/arrow_right_light.png + res/images/arrow_right_light_disabled.png + res/images/arrow_right_light_hover.png res/images/arrow_up_dark.png + res/images/arrow_up_dark_disabled.png + res/images/arrow_up_dark_hover.png res/images/arrow_up_light.png - res/images/arrow_light_down_normal.png - res/images/arrow_light_down_hover.png - res/images/arrow_light_left_normal.png - res/images/arrow_light_left_hover.png - res/images/arrow_light_right_normal.png - res/images/arrow_light_right_hover.png - res/images/arrow_light_up_normal.png - res/images/arrow_light_up_hover.png + res/images/arrow_up_light_disabled.png + res/images/arrow_up_light_hover.png res/images/checkbox_normal_dark.png res/images/checkbox_normal_hover_dark.png res/images/checkbox_normal_disabled_dark.png @@ -111,8 +136,8 @@ res/images/checkbox_partly_checked_light.png res/images/checkbox_partly_checked_hover_light.png res/images/checkbox_partly_checked_disabled_dark.png - res/images/raptoreum_logo_toolbar.png - res/images/raptoreum_logo_toolbar_blue.png + res/images/raptoreum_logo_toolbar_dark.png + res/images/raptoreum_logo_toolbar_light.png res/images/radio_normal_dark.png res/images/radio_normal_hover_dark.png res/images/radio_checked_dark.png @@ -125,7 +150,8 @@ res/images/radio_checked_hover_light.png res/images/radio_normal_disabled_light.png res/images/radio_checked_disabled_light.png - res/images/splash.png + res/images/splash_dark.png + res/images/splash_light.png res/movies/spinner-000.png diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 1a2dd54b55..e96cd68811 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -17,23 +17,25 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in dark.css for commit d1e3d76b1 +# Used colors in dark.css for commit f877c1680 #00000000 -#222 -#333 -#303030 -#323233 -#363637 -#39393b -#4a4a4b -#585858 -#818181 -#8f330b -#909090 -#b7410e -#c7c7c7 -#f6f6f6 +#111522 +#1B1F2C +#232531 +#242732 +#373D50 +#555B70 +#646161 +#80869A +#A39B99 +#ABBAED +#B45A46 +#C2C0C0 +#D9D9D9 +#F32349 +#FF6B46 +#FFFFFF */ @@ -46,12 +48,12 @@ QDialog, QMainWindow, QMessageBox WalletFrame { - background-color: #323233; + background-color: #1B1F2C; } QWidget { /* override text selection background color for all text widgets */ - selection-color: #363637; - selection-background-color: #c7c7c7; + selection-color: #111522; + selection-background-color: #C2C0C0; } QCheckBox, @@ -59,14 +61,14 @@ QLabel, QListView, QRadioButton, QTreeWidget { /* Base Text Size & Color */ - color: #c7c7c7; + color: #C2C0C0; } QCheckBox:disabled, QLabel:disabled, QListView:disabled, QRadioButton:disabled { - color: #585858; + color: #555B70; } /****************************************************** @@ -76,11 +78,12 @@ User-input widget style BitcoinAmountField, QAbstractSpinBox, QComboBox, +QComboBox:editable, QPlainTextEdit, QLineEdit { - background-color: #303030; - border-color: #b7410e; - color: #c7c7c7; + background-color: #111522; + border-color: #C2C0C0; + color: #C2C0C0; } BitcoinAmountField:hover:!focus, @@ -88,8 +91,8 @@ QAbstractSpinBox:hover:!focus, QComboBox:hover:!focus, QPlainTextEdit:hover:!focus, QLineEdit:hover:!focus { - background-color: #303030; - border-color: #8f330b; + background-color: #111522; + border-color: #B45A46; } @@ -99,8 +102,8 @@ QComboBox:checked, QComboBox:focus, QPlainTextEdit:focus, QLineEdit:focus { - background-color: #39393b; - border-color: #b7410e; + background-color: #111522; + border-color: #B45A46; } BitcoinAmountField:disabled, @@ -108,9 +111,9 @@ QAbstractSpinBox:disabled, QComboBox:disabled, QPlainTextEdit:disabled, QLineEdit:disabled { - background-color: #363637; - border-color: #585858; - color: #585858; + background-color: #242732; + border-color: #555B70; + color: #242732; } /****************************************************** @@ -121,25 +124,25 @@ QAbstractSpinBox::up-arrow { image: url(':/images/arrow_up_dark'); } QAbstractSpinBox::up-arrow:hover { - image: url(':/images/arrow_up_light'); + image: url(':/images/arrow_up_dark_hover'); } QAbstractSpinBox::up-arrow:pressed { image: url(':/images/arrow_up_dark'); } QAbstractSpinBox::up-arrow:disabled { - image: url(':/images/arrow_light_up_hover'); + image: url(':/images/arrow_up_dark_disabled'); } QAbstractSpinBox::down-arrow { image: url(':/images/arrow_down_dark'); } QAbstractSpinBox::down-arrow:hover { - image: url(':/images/arrow_down_light'); + image: url(':/images/arrow_down_dark_hover'); } QAbstractSpinBox::down-arrow:pressed { image: url(':/images/arrow_down_dark'); } QAbstractSpinBox::down-arrow:disabled { - image: url(':/images/arrow_light_down_hover'); + image: url(':/images/arrow_down_dark_disabled'); } /****************************************************** @@ -153,7 +156,7 @@ QCalendarWidget, #qt_calendar_nextmonth, #qt_calendar_monthbutton, #qt_calendar_yearbutton { - background-color: #303030; + background-color: #1B1F2C; } #qt_calendar_calendarview, @@ -162,14 +165,15 @@ QCalendarWidget, #qt_calendar_nextmonth, #qt_calendar_monthbutton, #qt_calendar_yearbutton { - border-color: #4a4a4b; + border-color: #373D50; } #qt_calendar_prevmonth:hover, #qt_calendar_nextmonth:hover, #qt_calendar_monthbutton:hover, #qt_calendar_yearbutton:hover { - background-color: #39393b; + background-color: #1B1F2C; + color: #B45A46; } #qt_calendar_prevmonth { @@ -180,21 +184,21 @@ QCalendarWidget, } QCalendarWidget QToolButton { - color: #c7c7c7; + color: #C2C0C0; } QCalendarWidget QWidget { - alternate-background-color: #585858; + alternate-background-color: #111522; } QCalendarWidget QAbstractItemView:enabled { - color: #c7c7c7; - selection-background-color: #4a4a4b; - selection-color: #c7c7c7; + color: #80869A; + selection-background-color: #555B70; + selection-color: #B45A46; } QCalendarWidget QAbstractItemView:disabled { - color: #818181; + color: #555B70; } /****************************************************** @@ -237,57 +241,50 @@ QComboBox ******************************************************/ QComboBox QListView { - background-color: #39393b; + background-color: #1B1F2C; + border: 0.5px solid #373D50; } QComboBox::item { - color: #c7c7c7; + color: #C2C0C0; } QComboBox::item:alternate { - background-color: #4a4a4b; + background-color: #1B1F2C; } QComboBox::item:selected { - background-color: #585858; - color: #c7c7c7; + background-color: #1B1F2C; + border: 1px solid #B45A46; + border-radius: 2px; } QComboBox::down-arrow { image: url(':/images/arrow_down_dark') 0 0 0 0 stretch stretch; } QComboBox::down-arrow:hover { - image: url(':/images/arrow_down_light') 0 0 0 0 stretch stretch; + image: url(':/images/arrow_down_dark_hover') 0 0 0 0 stretch stretch; } QComboBox::down-arrow:pressed { image: url(':/images/arrow_down_dark') 0 0 0 0 stretch stretch; } QComboBox::down-arrow:disabled { - image: url(':/images/arrow_light_down_hover') 0 0 0 0 stretch stretch; -} - -/****************************************************** -QGroupBox -******************************************************/ - -QGroupBox { - background-color: #39393b; - color: #c7c7c7; - font-size: 16px; + image: url(':/images/arrow_down_dark_disabled') 0 0 0 0 stretch stretch; } /****************************************************** QHeaderView ******************************************************/ + QHeaderView::section { /* Table Header Sections */ - background-color: #b7410e; - color: #c7c7c7; + background-color: #B45A46; + color: #FFFFFF; } QHeaderView::section:hover { /* Table Header Sections */ - background-color: #8f330b; - color: #c7c7c7; + background-color: #FF6B46; + color: #FFFFFF; } /****************************************************** @@ -301,23 +298,26 @@ QMenu ******************************************************/ QMenu { - background-color: #39393b; - border-color: #4a4a4b; + background-color: #1B1F2C; + border-color: #373D50; } QMenu::item { - color: #c7c7c7; + color: #C2C0C0; } + QMenu::item:selected:!disabled { - background-color: #585858; - color: #c7c7c7; + background-color: #1B1F2C; + border: 1px solid #B45A46; + color: #C2C0C0; } + QMenu::item:disabled { - color: #585858; + color: #555B70; } QMenu::separator { - background-color: #585858; + background-color: #373D50; } /****************************************************** @@ -325,19 +325,17 @@ QMenuBar ******************************************************/ QMenuBar { - background-color: #39393b; - color: #c7c7c7; - border-bottom: 1px solid; - border-color: #4a4a4b; + background-color: #111522; + color: #C2C0C0; } -QMenuBar::item { - color: #c7c7c7; +QMenuBar::item:hover { + color: #FF6B46; } QMenuBar::item:selected { - background-color: #585858; - color: #c7c7c7; + background-color: #111522; + color: #FF6B46; } /****************************************************** @@ -345,12 +343,12 @@ QProgressBar ******************************************************/ QProgressBar { - background-color: #c7c7c7; + background-color: #C2C0C0; color: #00000000; } QProgressBar::chunk { - background-color: #b7410e; + background-color: #FF6B46; } /****************************************************** @@ -358,8 +356,8 @@ QProgressDialog ******************************************************/ QProgressDialog { - background-color: #222; - color: #c7c7c7; + background-color: #111522; + color: #C2C0C0; } /****************************************************** @@ -367,12 +365,12 @@ QPushButton ******************************************************/ QPushButton { - background-color: #b7410e; - color: #c7c7c7; + background-color: #B45A46; + color: #FFFFFF; } QPushButton:hover { - background-color: #8f330b; + background-color: #FF6B46; } QPushButton:focus { @@ -381,13 +379,12 @@ QPushButton:focus { } QPushButton:pressed { - background-color: #b7410e; + background-color: #B45A46; } QPushButton:disabled { - background-color: #39393b; - border-color: #585858; - color: #585858; + background-color: #D9D9D9; + color: #FFFFFF; } /****************************************************** @@ -411,8 +408,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { - background-color: #c7c7c7; - color: #333; + background-color: #80869A; + color: #111522; } QWidget#AddressBookPage QPushButton#newAddress:hover, @@ -432,8 +429,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { - background-color: #818181; - color: #303030; + background-color: #C2C0C0; + color: #111522; } QWidget#AddressBookPage QPushButton#newAddress:pressed, @@ -453,8 +450,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { - background-color: #f6f6f6; - color: #585858; + background-color: #80869A; + color: #111522; } QWidget#AddressBookPage QPushButton#newAddress:disabled, @@ -474,9 +471,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { - background-color: #39393b; - border-color: #585858; - color: #585858; + background-color: #A39B99; + border: none; + color: #FFFFFF; } /****************************************************** @@ -499,8 +496,8 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage, #btnVerifyMessage { - border-color: #b7410e; - color: #818181; + border: none; + color: #C2C0C0; } /* Debug window buttons */ @@ -519,8 +516,8 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:checked, #btnVerifyMessage:hover:checked { - border-color: #c7c7c7; - color: #c7c7c7; + border: none; + color: #B45A46; } /* Debug window buttons */ @@ -539,8 +536,9 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { - border-color: #8f330b; - color: #c7c7c7; + border: none; + color: #B45A46; + } /* Debug window buttons */ @@ -559,8 +557,8 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:checked, #btnVerifyMessage:checked { - border-color: #c7c7c7; - color: #c7c7c7; + border: none; + color: #B45A46; } /****************************************************** @@ -608,16 +606,16 @@ QSlider ******************************************************/ QSlider::handle:horizontal { - background-color: #b7410e; + background-color: #B45A46; } QSlider::handle:horizontal:hover { - background-color: #8f330b; + background-color: #FF6B46; } QSlider::sub-page:horizontal { - background-color: #c7c7c7; + background-color: #C2C0C0; } QSlider::add-page:horizontal { - background-color: #c7c7c7; + background-color: #C2C0C0; } /****************************************************** @@ -625,8 +623,8 @@ QStatusBar ******************************************************/ QStatusBar { - background-color: #323233; - color: #c7c7c7; + background-color: #1B1F2C; + color: #C2C0C0; } /****************************************************** @@ -634,18 +632,19 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background-color: #303030; - border-color: #4a4a4b; + background-color: #111522; + border-color: #555B70; } QTableView::item { /* Table Item */ - background-color: #303030; - border-color: #4a4a4b; + background-color: #111522; + border-color: #555B70; + color: #C2C0C0; } QTableView::item:selected { /* Table Item Selected */ - background-color: #39393b; - color: #c7c7c7; + background-color: #232531; + color: #C2C0C0; } /****************************************************** @@ -653,9 +652,9 @@ QTableWidget ******************************************************/ .QTableWidget { - background-color: #4a4a4b; - border-color: #4a4a4b; - color: #c7c7c7; + background-color: #111522; + border-color: #80869A; + color: #FFFFFF; } /****************************************************** @@ -669,9 +668,9 @@ QTextEdit ******************************************************/ QTextEdit { - background-color: #303030; - border-color: #4a4a4b; - color: #c7c7c7; + background-color: #111522; + border-color: #373D50; + color: #C2C0C0; } /****************************************************** @@ -679,26 +678,42 @@ QToolBar / QToolButton ******************************************************/ QToolBar { - background-color: #b7410e; + background-color: #111522; } QToolBar > QToolButton { - background-color: #00000000; - color: #c7c7c7; + border: none; + border: 1px solid #111522; + background-color: #111522; + color: #C2C0C0; + padding-left: 15px; + padding-right: 15px; + background-repeat: no-repeat; + background-size: 10px; + background-position: left; } QToolBar > QToolButton:hover:!checked { - background-color: #8f330b; - color: #c7c7c7; + background-color: #111522; + border: 1px solid #B45A46; + border-radius: 5px; + color: #C2C0C0; } QToolBar > QToolButton:checked { - background-color: #323233; - color: #c7c7c7; + background-color: #111522; + border: 1px solid #111522; + color: #B45A46; } QToolBar > QToolButton:disabled { - color: #4a4a4b; + background-color: #111522; + border: 1px solid #111522; + color: #646161; +} + +QToolBar QLabel#lblToolbarLogo { + background-image: url(':/images/raptoreum_logo_toolbar_dark'); } /****************************************************** @@ -706,9 +721,9 @@ QToolTip ******************************************************/ QToolTip { - background-color: #303030; - border-color: #4a4a4b; - color: #c7c7c7; + background-color: #111522; + border-color: #555B70; + color: #C2C0C0; } /****************************************************** @@ -716,21 +731,21 @@ QTreeWidget ******************************************************/ QTreeWidget { - alternate-background-color: #303030; - background-color: #303030; - border-color: #4a4a4b; + alternate-background-color: #111522; + background-color: #111522; + border-color: #555B70; } QTreeWidget::branch::closed:has-children { image: url(':/images/arrow_right_dark'); } QTreeWidget::branch::closed:has-children:hover { - image: url(':/images/arrow_right_light'); + image: url(':/images/arrow_right_dark_hover'); } QTreeWidget::branch::open { image: url(':/images/arrow_down_dark'); } QTreeWidget::branch::open:hover { - image: url(':/images/arrow_down_light'); + image: url(':/images/arrow_down_dark_hover'); } QTreeWidget::indicator:unchecked, QTreeWidget::indicator:unchecked:pressed { @@ -790,7 +805,7 @@ AddressBookPage ******************************************************/ AddressBookPage QTableView { - color: #c7c7c7; + color: #C2C0C0; } /****************************************************** @@ -798,7 +813,7 @@ AppearanceSetup ******************************************************/ QDialog#AppearanceSetup > QFrame { - border-color: #4a4a4b; + border-color: #555B70; } /****************************************************** @@ -818,15 +833,15 @@ CoinControlDialog ******************************************************/ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { - border-color: #4a4a4b; + border-color: #555B70; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected, QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked, QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected, QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { - background-color: #39393b; - color: #c7c7c7; + background-color: #373D50; + color: #C2C0C0; } /****************************************************** @@ -834,15 +849,15 @@ AssetControlDialog ******************************************************/ QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::item { - border-color: #4a4a4b; + border-color: #555B70; } QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::item:selected, QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::item:checked, QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::branch:selected, QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::branch:checked { - background-color: #39393b; - color: #c7c7c7; + background-color: #373D50; + color: #C2C0C0; } /****************************************************** @@ -856,8 +871,8 @@ HelpMessageDialog ******************************************************/ HelpMessageDialog QWidget#scrollAreaWidgetContents { - background-color: #303030; - border-color: #4a4a4b; + background-color: #373D50; + border-color: #555B70; } /****************************************************** @@ -871,13 +886,12 @@ ModalOverlay ******************************************************/ QWidget#bgWidget { /* The frame overlaying the overview-page */ - background-color: #909090; - color: #585858; + background-color: #1B1F2C; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #303030; - border-color: #585858; + background-color: #111522; + border-color: #373D50; } /****************************************************** @@ -892,7 +906,7 @@ OptionsDialog QDialog#OptionsDialog #line, QDialog#OptionsDialog #frame { - border-color: #4a4a4b; + border-color: #555B70; } /****************************************************** @@ -918,37 +932,50 @@ ReceiveCoinsDialog ******************************************************/ ReceiveCoinsDialog QTableView { - color: #c7c7c7; + color: #FFFFFF; } /****************************************************** RPCConsole ******************************************************/ -QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color: #323233; +QWidget#RPCConsole { /* Tools window background */ + background-color: #1B1F2C; } -QWidget#RPCConsole #detailWidget{ - background-color: #323233; +QWidget#RPCConsole #detailWidget{ /* Peers detailed information table */ + background-color: #111522; + border: 1px solid #373D50; +} + +QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ + background-color: #ABBAED; +} + +QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ + background-color: #F32349; } RPCConsole QTableView { - color: #c7c7c7; + color: #FFFFFF; } #rpcAutoCompleter { - background-color: #39393b; - border-color: #4a4a4b; + background-color: #1B1F2C; + border-color: #373D50; } #rpcAutoCompleter::item { - color: #c7c7c7; + color: #C2C0C0; +} + +#rpcAutoCompleter::item:hover { + border: 1px solid #B45A46; } #rpcAutoCompleter::item:selected { - background-color: #4a4a4b; - color: #c7c7c7; + color: #C2C0C0; + border: 1px solid #B45A46; } /****************************************************** @@ -957,7 +984,7 @@ SendCoinsDialog QDialog#SendCoinsDialog .QFrame#frameCoinControl, QDialog#SendCoinsDialog #scrollArea { - border-color: #39393b; + border-color: #555B70; } /****************************************************** @@ -972,7 +999,7 @@ SendAssetsDialog QDialog#SendAssetsDialog .QFrame#frameAssetControl, QDialog#SendAssetsDialog #scrollArea { /* Asset Control Section */ - border-color: #39393b; + border-color: #555B70; } /****************************************************** @@ -981,7 +1008,7 @@ CreateAssetssDialog QDialog#CreateAssetsDialog .QFrame#frameCoinControl, QDialog#CreateAssetsDialog #scrollArea { - border-color: #39393b; + border-color: #555B70; } /****************************************************** @@ -990,7 +1017,7 @@ UpdateAssetsDialog QDialog#UpdateAssetsDialog .QFrame#frameCoinControl, QDialog#UpdateAssetsDialog #scrollArea { - border-color: #39393b; + border-color: #555B70; } /****************************************************** @@ -1004,7 +1031,7 @@ ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #323233; + background-color: #1B1F2C; } /****************************************************** @@ -1047,89 +1074,90 @@ QScrollBar QScrollBar::add-page, QScrollBar::sub-page { - background-color: #39393b; + background-color: #111522; + border: 1px solid #555B70; } QScrollBar::handle:vertical, QScrollBar::handle:horizontal { - background-color: #4a4a4b; + background-color: #C2C0C0; } QScrollBar:handle:horizontal:hover, QScrollBar:handle:vertical:hover { - background-color: #585858; + background-color: #B45A46; } QScrollBar:handle:horizontal:pressed, QScrollBar:handle:vertical:pressed { - background-color: #4a4a4b; + background-color: #C2C0C0; } QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { - background-color: #585858; + background-color: #111522; } QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover, QScrollBar::add-line:horizontal:hover, QScrollBar::sub-line:horizontal:hover { - background-color: #4a4a4b; + background-color: #111522; } QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed, QScrollBar::add-line:horizontal:pressed, QScrollBar::sub-line:horizontal:pressed { - background-color: #39393b; + background-color: #111522; } QScrollBar:up-arrow { image: url(':/images/arrow_up_dark'); } QScrollBar:up-arrow:hover { - image: url(':/images/arrow_up_light'); + image: url(':/images/arrow_up_dark_hover'); } QScrollBar:up-arrow:pressed { image: url(':/images/arrow_up_dark'); } QScrollBar:up-arrow:disabled { - image: url(':/images/arrow_light_up_hover'); + image: url(':/images/arrow_up_dark_disabled'); } QScrollBar:down-arrow { image: url(':/images/arrow_down_dark'); } QScrollBar:down-arrow:hover { - image: url(':/images/arrow_down_light'); + image: url(':/images/arrow_down_dark_hover'); } QScrollBar:down-arrow:pressed { image: url(':/images/arrow_down_dark'); } QScrollBar:down-arrow:disabled { - image: url(':/images/arrow_light_down_hover'); + image: url(':/images/arrow_down_dark_disabled'); } QScrollBar:left-arrow { image: url(':/images/arrow_left_dark'); } QScrollBar:left-arrow:hover { - image: url(':/images/arrow_left_light'); + image: url(':/images/arrow_left_dark_hover'); } QScrollBar:left-arrow:pressed { image: url(':/images/arrow_left_dark'); } QScrollBar:left-arrow:disabled { - image: url(':/images/arrow_light_left_hover'); + image: url(':/images/arrow_left_dark_disabled'); } QScrollBar:right-arrow { image: url(':/images/arrow_right_dark'); } QScrollBar:right-arrow:hover { - image: url(':/images/arrow_right_light'); + image: url(':/images/arrow_right_dark_hover'); } QScrollBar:right-arrow:pressed { image: url(':/images/arrow_right_dark'); } QScrollBar:right-arrow:disabled { - image: url(':/images/arrow_light_right_hover'); + image: url(':/images/arrow_right_dark_disabled'); } - + \ No newline at end of file diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 15de870108..8ddb4f720e 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -30,13 +30,13 @@ in the file. /* do not modify! section updated by update-css-files.py -# Used colors in general.css for commit d1e3d76b1 +# Used colors in general.css for commit f877c1680 #00000000 #222222 -#5e8c41 #a84832 #c79304 +#EB7F00 */ @@ -218,13 +218,11 @@ QCalendarWidget { #qt_calendar_prevmonth { width: 80px; height: 30px; - qproperty-icon: url(':/images/arrow_left_normal'); qproperty-iconSize: 23px 23px; } #qt_calendar_nextmonth { width: 80px; height: 30px; - qproperty-icon: url(':/images/arrow_right_normal'); qproperty-iconSize: 23px 23px; } #qt_calendar_prevmonth:hover, @@ -314,7 +312,6 @@ QComboBox:checked { } QComboBox:editable { - border: 0px solid #00000000; } QComboBox:focus { @@ -328,7 +325,7 @@ QComboBox::drop-down { } QComboBox QListView { - padding: 3px; + padding: 0px; } QComboBox QAbstractItemView::item { @@ -419,7 +416,6 @@ QHeaderView::section:last { QHeaderView::down-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_light_down_normal'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -428,7 +424,6 @@ QHeaderView::down-arrow { QHeaderView::up-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_light_up_normal'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -449,13 +444,15 @@ QMenu QMenu { border: 1px solid red; - border-radius: 5px; } QMenu::item { + border: 1px solid transparent; + padding: 3px 7px 3px 7px; } -QMenu::item:selected { +QMenu::item:selected:!disabled { + border-radius: 2px; } QMenu::separator { @@ -468,9 +465,12 @@ QMenuBar ******************************************************/ QMenuBar { + padding: 14px 5px; + spacing: 15px; } QMenuBar::item { + padding-top: 6px; } QMenuBar::item:selected { @@ -797,18 +797,18 @@ QSlider ******************************************************/ QSlider { - min-height: 30px; + min-height: 26px; } QSlider::groove:horizontal { background: #00000000; - height: 12px; + height: 8px; border-radius: 4px; } QSlider::add-page:horizontal, QSlider::sub-page:horizontal { - height: 12px; + height: 8px; border-radius: 4px; } @@ -816,10 +816,10 @@ QSlider::handle:horizontal { margin-left: 5px; margin-right: 5px; background-color: red; -width: 23px; +width: 19px; margin-top: -5px; margin-bottom: -5px; -border-radius: 11px; +border-radius: 9px; } /****************************************************** @@ -890,18 +890,15 @@ QToolBar { border: none; width: 100%; padding: 0; - margin: 0; spacing: 0; } QToolBar > QToolButton { background-color: #00000000; - border: none; - min-height: 50px; - max-height: 50px; + min-height: 40px; + max-height: 40px; width: 100%; padding: 1px; - text-align: center; } QToolBar > QToolButton:hover:!checked { @@ -914,9 +911,11 @@ QToolBar > QToolButton:disabled { } QToolBar QLabel#lblToolbarLogo { - padding: 12px; - image: url(':/images/raptoreum_logo_toolbar'); - height: 2.5em; + background-repeat: no-repeat; + padding-top: 25px; + padding-bottom: 25px; + background-position: left bottom; + margin: 0px 18px; } /****************************************************** @@ -1392,7 +1391,7 @@ QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ qproperty-alignment: 'AlignVCenter | AlignLeft'; padding-left: 8px; min-height: 60px; - color: #c79304; + color: #EB7F00; } QDialog#OptionsDialog #line, @@ -1728,11 +1727,9 @@ QWidget#RPCConsole .QToolButton { /* Console buttons fontbigger/fontsmaller/clea } QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ - background-color: #5e8c41; } QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ - background-color: #a84832; } #rpcAutoCompleter { @@ -1747,6 +1744,9 @@ QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ #rpcAutoCompleter::item { background-color: #00000000; color: red; + border: 1px solid transparent; + border-radius: 2px; + padding: 2px 5px 2px 5px; } #rpcAutoCompleter::item:selected { diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index efb9de5cca..966a9f9317 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -17,21 +17,28 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in light.css for commit d1e3d76b1 +# Used colors in light.css for commit f877c1680 #00000000 -#555 -#0f75b5 -#a7a7a7 -#b7410e -#c7c7c7 -#d2d2d2 -#d94d11 -#dcdcdc -#e0e0e0 -#eaeaec -#f2f2f4 -#ccfafafa +#111522 +#323642 +#373D50 +#555B70 +#617BD1 +#646161 +#80869A +#A39B99 +#B74426 +#C2C0C0 +#C6C4C4 +#D1593A +#D9D9D9 +#E5CFC9 +#EFBDB1 +#F32349 +#F3DFD9 +#FF6B46 +#FFFFFF */ @@ -44,12 +51,12 @@ QDialog, QMainWindow, QMessageBox WalletFrame { - background-color: #f2f2f4; + background-color: #FFFFFF; } QWidget { /* override text selection background color for all text widgets */ - selection-color: #eaeaec; - selection-background-color: #555; + selection-color: #F3DFD9; + selection-background-color: #111522; } QCheckBox, @@ -57,14 +64,14 @@ QLabel, QListView, QRadioButton, QTreeWidget { - color: #555; + color: #111522; } QCheckBox:disabled, QLabel:disabled, QListView:disabled, QRadioButton:disabled { - color: #c7c7c7; + color: #C2C0C0; } /****************************************************** @@ -74,11 +81,12 @@ User-input widget style BitcoinAmountField, QAbstractSpinBox, QComboBox, +QComboBox:editable, QPlainTextEdit, QLineEdit { - background-color: #eaeaec; - border-color: #b7410e; - color: #555; + background-color: #F3DFD9; + border-color: #323642; + color: #111522; } BitcoinAmountField:hover:!focus, @@ -86,8 +94,8 @@ QAbstractSpinBox:hover:!focus, QComboBox:hover:!focus, QPlainTextEdit:hover:!focus, QLineEdit:hover:!focus { - background-color: #eaeaec; - border-color: #0f75b5; + background-color: #E5CFC9; + border-color: #FF6B46; } @@ -97,8 +105,8 @@ QComboBox:checked, QComboBox:focus, QPlainTextEdit:focus, QLineEdit:focus { - background-color: #d2d2d2; - border-color: #0f75b5; + background-color: #E5CFC9; + border-color: #FF6B46; } BitcoinAmountField:disabled, @@ -106,9 +114,9 @@ QAbstractSpinBox:disabled, QComboBox:disabled, QPlainTextEdit:disabled, QLineEdit:disabled { - background-color: #eaeaec; - border-color: #d2d2d2; - color: #c7c7c7; + background-color: #FFFFFF; + border-color: #C2C0C0; + color: #C2C0C0; } /****************************************************** @@ -119,25 +127,25 @@ QAbstractSpinBox::up-arrow { image: url(':/images/arrow_up_light'); } QAbstractSpinBox::up-arrow:hover { - image: url(':/images/arrow_up_dark'); + image: url(':/images/arrow_up_light_hover'); } QAbstractSpinBox::up-arrow:pressed { image: url(':/images/arrow_up_light'); } QAbstractSpinBox::up-arrow:disabled { - image: url(':/images/arrow_light_up_normal'); + image: url(':/images/arrow_up_light_disabled'); } QAbstractSpinBox::down-arrow { image: url(':/images/arrow_down_light'); } QAbstractSpinBox::down-arrow:hover { - image: url(':/images/arrow_down_dark'); + image: url(':/images/arrow_down_light_hover'); } QAbstractSpinBox::down-arrow:pressed { image: url(':/images/arrow_down_light'); } QAbstractSpinBox::down-arrow:disabled { - image: url(':/images/arrow_light_down_normal'); + image: url(':/images/arrow_down_light_disabled'); } /****************************************************** @@ -151,7 +159,7 @@ QCalendarWidget, #qt_calendar_nextmonth, #qt_calendar_monthbutton, #qt_calendar_yearbutton { - background-color: #eaeaec; + background-color: #FFFFFF; } #qt_calendar_calendarview, @@ -160,14 +168,15 @@ QCalendarWidget, #qt_calendar_nextmonth, #qt_calendar_monthbutton, #qt_calendar_yearbutton { - border-color: #dcdcdc; + border-color: #EFBDB1; } #qt_calendar_prevmonth:hover, #qt_calendar_nextmonth:hover, #qt_calendar_monthbutton:hover, #qt_calendar_yearbutton:hover { - background-color: #d2d2d2; + background-color: #FFFFFF; + color: #FF6B46; } #qt_calendar_prevmonth { @@ -178,21 +187,21 @@ QCalendarWidget, } QCalendarWidget QToolButton { - color: #555; + color: #111522; } QCalendarWidget QWidget { - alternate-background-color: #c7c7c7; + alternate-background-color: #EFBDB1; } QCalendarWidget QAbstractItemView:enabled { - color: #555; - selection-background-color: #d2d2d2; - selection-color: #555; + color: #111522; + selection-background-color: #C2C0C0; + selection-color: #FF6B46; } QCalendarWidget QAbstractItemView:disabled { - color: #a7a7a7; + color: #C2C0C0; } /****************************************************** @@ -235,42 +244,35 @@ QComboBox ******************************************************/ QComboBox QListView { - background-color: #f2f2f4; - color: #555; + background-color: #FFFFFF; + border: 0.5px solid #373D50; } QComboBox::item { - color: #555; + color: #111522; } QComboBox::item:alternate { - background-color: #f2f2f4; + background-color: #FFFFFF; } QComboBox::item:selected { - background-color: #d2d2d2; + background-color: #FFFFFF; + border: 1px solid #FF6B46; + border-radius: 2px; } QComboBox::down-arrow { image: url(':/images/arrow_down_light') 0 0 0 0 stretch stretch; } QComboBox::down-arrow:hover { - image: url(':/images/arrow_down_dark') 0 0 0 0 stretch stretch; + image: url(':/images/arrow_down_light_hover') 0 0 0 0 stretch stretch; } QComboBox::down-arrow:pressed { image: url(':/images/arrow_down_light') 0 0 0 0 stretch stretch; } QComboBox::down-arrow:disabled { - image: url(':/images/arrow_light_down_normal') 0 0 0 0 stretch stretch; -} - -/****************************************************** -QGroupBox -******************************************************/ - -QGroupBox { - background-color: #f2f2f4; - color: #555; + image: url(':/images/arrow_down_light_hover') 0 0 0 0 stretch stretch; } /****************************************************** @@ -278,14 +280,13 @@ QHeaderView ******************************************************/ QHeaderView::section { /* Table Header Sections */ - background-color: #b7410e; - border-color: #f2f2f4; - color: #f2f2f4; + background-color: #EFBDB1; + color: #111522; } QHeaderView::section:hover { /* Table Header Sections */ - background-color: #d94d11; - color: #f2f2f4; + background-color: #FF6B46; + color: #111522; } /****************************************************** @@ -299,24 +300,26 @@ QMenu ******************************************************/ QMenu { - background-color: #eaeaec; - border-color: #dcdcdc; + background-color: #FFFFFF; + border-color: #80869A; } QMenu::item { - color: #555; + color: #111522; } QMenu::item:selected:!disabled { - background-color: #d2d2d2; + background-color: #FFFFFF; + border: 1px solid #FF6B46; + color: #111522; } QMenu::item:disabled { - color: #a7a7a7; + color: #C2C0C0; } QMenu::separator { - background-color: #c7c7c7; + background-color: #80869A; } /****************************************************** @@ -324,7 +327,17 @@ QMenuBar ******************************************************/ QMenuBar { - background-color: #f2f2f4; + background-color: #EFBDB1; + color: #111522; +} + +QMenuBar::item:hover { + color: #B74426; +} + +QMenuBar::item:selected { + background-color: #EFBDB1; + color: #B74426; } /****************************************************** @@ -332,13 +345,12 @@ QProgressBar ******************************************************/ QProgressBar { - background-color: #c7c7c7; - border-color: #00000000; + background-color: #C6C4C4; color: #00000000; } QProgressBar::chunk { - background-color: #b7410e; + background-color: #111522; } /****************************************************** @@ -346,7 +358,7 @@ QProgressDialog ******************************************************/ .QProgressDialog { - background-color: #f2f2f4; + background-color: #FFFFFF; } /****************************************************** @@ -354,22 +366,21 @@ QPushButton ******************************************************/ QPushButton { - background-color: #b7410e; - color: #f2f2f4; + background-color: #FF6B46; + color: #111522; } QPushButton:hover { - background-color: #d94d11; + background-color: #D1593A; } QPushButton:pressed { - background-color: #d94d11; + background-color: #FF6B46; } QPushButton:disabled { - background-color: #eaeaec; - border-color: #d2d2d2; - color: #d2d2d2; + background-color: #C6C4C4; + color: #FFFFFF; } /****************************************************** @@ -393,8 +404,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { - background-color: #c7c7c7; - color: #555; + background-color: #80869A; + color: #111522; } QWidget#AddressBookPage QPushButton#newAddress:hover, @@ -414,8 +425,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { - background-color: #a7a7a7; - color: #555; + background-color: #C2C0C0; + color: #111522; } QWidget#AddressBookPage QPushButton#newAddress:pressed, @@ -435,8 +446,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { - background-color: #c7c7c7; - color: #555; + background-color: #80869A; + color: #111522; } QWidget#AddressBookPage QPushButton#newAddress:disabled, @@ -456,9 +467,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { - background-color: #eaeaec; - border-color: #d2d2d2; - color: #d2d2d2; + background-color: #A39B99; + border: none; + color: #FFFFFF; } /****************************************************** @@ -481,8 +492,8 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage, #btnVerifyMessage { - border-color: #b7410e; - color: #a7a7a7; + border: none; + color: #111522; } /* Debug window buttons */ @@ -501,8 +512,8 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:checked, #btnVerifyMessage:hover:checked { - border-color: #555; - color: #555; + border: none; + color: #B74426; } /* Debug window buttons */ @@ -521,8 +532,8 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { - border-color: #0f75b5; - color: #555; + border: none; + color: #B74426; } /* Debug window buttons */ @@ -541,8 +552,8 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:checked, #btnVerifyMessage:checked { - border-color: #555; - color: #555; + border: none; + color: #B74426; } /****************************************************** @@ -591,16 +602,16 @@ QSlider ******************************************************/ QSlider::handle:horizontal { - background-color: #b7410e; + background-color: #B74426; } QSlider::handle:horizontal:hover { - background-color: #d94d11; + background-color: #FF6B46; } QSlider::sub-page:horizontal { - background-color: #c7c7c7; + background-color: #C2C0C0; } QSlider::add-page:horizontal { - background-color: #c7c7c7; + background-color: #C2C0C0; } /****************************************************** @@ -608,8 +619,8 @@ QStatusBar ******************************************************/ QStatusBar { - background-color: #f2f2f4; - color: #555; + background-color: #FFFFFF; + color: #B74426; } /****************************************************** @@ -617,19 +628,20 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background-color: #eaeaec; - border-color: #dcdcdc; + background-color: #FFFFFF; + border-color: #80869A; } QTableView::item { /* Table Item */ - background-color: #eaeaec; - border-color: #c7c7c7; + background-color: #FFFFFF; + border-color: #80869A; + color: #111522; } QTableView::item:selected { /* Table Item Selected */ - background-color: #d2d2d2; - border-color: #d2d2d2; - color: #555; + background-color: #C2C0C0; + border-color: #80869A; + color: #111522; } /****************************************************** @@ -637,9 +649,9 @@ QTableWidget ******************************************************/ .QTableWidget { - background-color: #eaeaec; - border-color: #dcdcdc; - color: #555; + background-color: #FFFFFF; + border-color: #80869A; + color: #111522; } /****************************************************** @@ -653,9 +665,9 @@ QTextEdit ******************************************************/ QTextEdit { - background-color: #eaeaec; - border-color: #dcdcdc; - color: #555; + background-color: #FFFFFF; + border-color: #80869A; + color: #111522; } @@ -664,26 +676,42 @@ QToolBar / QToolButton ******************************************************/ QToolBar { - background-color: #b7410e; + background-color: #EFBDB1; } QToolBar > QToolButton { - background-color: #00000000; - color: #f2f2f4; + border: none; + border: 1px solid #EFBDB1; + background-color: #EFBDB1; + color: #111522; + padding-left: 15px; + padding-right: 15px; + background-repeat: no-repeat; + background-size: 10px; + background-position: left; } QToolBar > QToolButton:hover:!checked { - background-color: #d94d11; - color: #dcdcdc; + background-color: #EFBDB1; + border: 1px solid #FF6B46; + border-radius: 5px; + color: #111522; } QToolBar > QToolButton:checked { - background-color: #f2f2f4; - color: #555; + background-color: #EFBDB1; + border: 1px solid #EFBDB1; + color: #B74426; } QToolBar > QToolButton:disabled { - color: #a7a7a7; + background-color: #EFBDB1; + border: 1px solid #EFBDB1; + color: #646161; +} + +QToolBar QLabel#lblToolbarLogo { + background-image: url(':/images/raptoreum_logo_toolbar_light'); } /****************************************************** @@ -691,9 +719,9 @@ QToolTip ******************************************************/ QToolTip { - background-color: #eaeaec; - border-color: #555; - color: #555; + background-color: #FFFFFF; + border-color: #80869A; + color: #111522; } /****************************************************** @@ -701,21 +729,21 @@ QTreeWidget ******************************************************/ QTreeWidget { - alternate-background-color: #eaeaec; - background-color: #eaeaec; - border-color: #dcdcdc; + alternate-background-color: #FFFFFF; + background-color: #FFFFFF; + border-color: #80869A; } QTreeWidget::branch::closed:has-children { image: url(':/images/arrow_right_light'); } QTreeWidget::branch::closed:has-children:hover { - image: url(':/images/arrow_right_dark'); + image: url(':/images/arrow_right_light_hover'); } QTreeWidget::branch::open { image: url(':/images/arrow_down_light'); } QTreeWidget::branch::open:hover { - image: url(':/images/arrow_down_dark'); + image: url(':/images/arrow_down_light_hover'); } QTreeWidget::indicator:unchecked, QTreeWidget::indicator:unchecked:pressed { @@ -775,7 +803,7 @@ AddressBookPage ******************************************************/ AddressBookPage QTableView { - color: #555; + color: #C2C0C0; } /****************************************************** @@ -783,7 +811,7 @@ AppearanceSetup ******************************************************/ QDialog#AppearanceSetup > QFrame { - border-color: #dcdcdc; + border-color: #555B70; } /****************************************************** @@ -803,15 +831,15 @@ CoinControlDialog ******************************************************/ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { - border-color: #c7c7c7; + border-color: #C6C4C4; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected, QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked, QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected, QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { - background-color: #d2d2d2; - color: #555; + background-color: #D9D9D9; + color: #555B70; } /****************************************************** @@ -819,15 +847,15 @@ AssetControlDialog ******************************************************/ QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::item { - border-color: #c7c7c7; + border-color: #C6C4C4; } QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::item:selected, QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::item:checked, QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::branch:selected, QDialog#AssetControlDialog .AssetControlTreeWidget#treeWidget::branch:checked { - background-color: #d2d2d2; - color: #555; + background-color: #D9D9D9; + color: #555B70; } /****************************************************** @@ -841,8 +869,8 @@ HelpMessageDialog ******************************************************/ HelpMessageDialog QWidget#scrollAreaWidgetContents { - background-color: #eaeaec; - border-color: #dcdcdc; + background-color: #EFBDB1; + border-color: #D9D9D9; } /****************************************************** @@ -856,12 +884,12 @@ ModalOverlay ******************************************************/ QWidget#bgWidget { /* The frame overlaying the overview-page */ - background-color: #ccfafafa; + background-color: #EFBDB1; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #f2f2f4; - border-color: #c7c7c7; + background-color: #FFFFFF; + border-color: #80869A; } /****************************************************** @@ -876,7 +904,7 @@ OptionsDialog QDialog#OptionsDialog #line, QDialog#OptionsDialog #frame { - border-color: #dcdcdc; + border-color: #C2C0C0; } /****************************************************** @@ -902,7 +930,7 @@ ReceiveCoinsDialog ******************************************************/ ReceiveCoinsDialog QTableView { - color: #555; + color: #111522; } /****************************************************** @@ -910,29 +938,41 @@ RPCConsole ******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color: #f2f2f4; + background-color: #FFFFFF; } QWidget#RPCConsole #detailWidget{ - background-color: #f2f2f4; + background-color: #EFBDB1; +} + +QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ + background-color: #617BD1; +} + +QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ + background-color: #F32349; } RPCConsole QTableView { - color: #555; + color: #111522; } #rpcAutoCompleter { - background-color: #eaeaec; - border-color: #dcdcdc; + background-color: #FFFFFF; + border-color: #80869A; } #rpcAutoCompleter::item { - color: #555; + color: #111522; +} + +#rpcAutoCompleter::item:hover { + border: 1px solid #FF6B46; } #rpcAutoCompleter::item:selected { - background-color: #d2d2d2; - color: #555; + border: 1px solid #FF6B46; + color: #111522; } /****************************************************** @@ -941,7 +981,7 @@ SendCoinsDialog QDialog#SendCoinsDialog .QFrame#frameCoinControl, QDialog#SendCoinsDialog #scrollArea { - border-color: #dcdcdc; + border-color: #C2C0C0; } /****************************************************** @@ -956,7 +996,7 @@ SendAssetsDialog QDialog#SendAssetsDialog .QFrame#frameAssetControl, QDialog#SendAssetsDialog #scrollArea { - border-color: #dcdcdc; + border-color: #C2C0C0; } /****************************************************** @@ -971,7 +1011,7 @@ CreateAssetsDialog QDialog#CreateAssetsDialog .QFrame#frameCoinControl, QDialog#CreateAssetsDialog #scrollArea { - border-color: #dcdcdc; + border-color: #C2C0C0; } /****************************************************** @@ -980,7 +1020,7 @@ UpdateAssetsDialog QDialog#UpdateAssetsDialog .QFrame#frameCoinControl, QDialog#UpdateAssetsDialog #scrollArea { - border-color: #dcdcdc; + border-color: #C2C0C0; } /****************************************************** @@ -994,7 +1034,7 @@ ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #f2f2f4; + background-color: #FFFFFF; } /****************************************************** @@ -1037,89 +1077,89 @@ QScrollBar QScrollBar::add-page, QScrollBar::sub-page { - background-color: #f2f2f4; + background-color: #FFFFFF; } QScrollBar::handle:vertical, QScrollBar::handle:horizontal { - background-color: #dcdcdc; + background-color: #D9D9D9; } QScrollBar:handle:horizontal:hover, QScrollBar:handle:vertical:hover { - background-color: #d2d2d2; + background-color: #C2C0C0; } QScrollBar:handle:horizontal:pressed, QScrollBar:handle:vertical:pressed { - background-color: #c7c7c7; + background-color: #555B70; } QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { - background-color: #dcdcdc; + background-color: #D9D9D9; } QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover, QScrollBar::add-line:horizontal:hover, QScrollBar::sub-line:horizontal:hover { - background-color: #d2d2d2; + background-color: #C2C0C0; } QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed, QScrollBar::add-line:horizontal:pressed, QScrollBar::sub-line:horizontal:pressed { - background-color: #e0e0e0; + background-color: #555B70; } QScrollBar:up-arrow { image: url(':/images/arrow_up_light'); } QScrollBar:up-arrow:hover { - image: url(':/images/arrow_up_dark'); + image: url(':/images/arrow_up_light_hover'); } QScrollBar:up-arrow:pressed { image: url(':/images/arrow_up_light'); } QScrollBar:up-arrow:disabled { - image: url(':/images/arrow_light_up_normal'); + image: url(':/images/arrow_up_light_disabled'); } QScrollBar:down-arrow { image: url(':/images/arrow_down_light'); } QScrollBar:down-arrow:hover { - image: url(':/images/arrow_down_dark'); + image: url(':/images/arrow_down_light_hover'); } QScrollBar:down-arrow:pressed { image: url(':/images/arrow_down_light'); } QScrollBar:down-arrow:disabled { - image: url(':/images/arrow_light_down_normal'); + image: url(':/images/arrow_down_light_disabled'); } QScrollBar:left-arrow { image: url(':/images/arrow_left_light'); } QScrollBar:left-arrow:hover { - image: url(':/images/arrow_left_dark'); + image: url(':/images/arrow_left_light_hover'); } QScrollBar:left-arrow:pressed { image: url(':/images/arrow_left_light'); } QScrollBar:left-arrow:disabled { - image: url(':/images/arrow_light_left_normal'); + image: url(':/images/arrow_left_light_disabled'); } QScrollBar:right-arrow { image: url(':/images/arrow_right_light'); } QScrollBar:right-arrow:hover { - image: url(':/images/arrow_right_dark'); + image: url(':/images/arrow_right_light_hover'); } QScrollBar:right-arrow:pressed { image: url(':/images/arrow_right_light'); } QScrollBar:right-arrow:disabled { - image: url(':/images/arrow_light_right_normal'); + image: url(':/images/arrow_right_light_disabled'); } - + \ No newline at end of file diff --git a/src/qt/res/css/traditional.css b/src/qt/res/css/traditional.css index 9220e35c32..25381c9354 100644 --- a/src/qt/res/css/traditional.css +++ b/src/qt/res/css/traditional.css @@ -17,7 +17,7 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in traditional.css for commit d1e3d76b1 +# Used colors in traditional.css for commit f877c1680 #00000000 #333 @@ -38,7 +38,7 @@ QToolBar / QToolButton QToolBar QLabel#lblToolbarLogo { padding: 12px; - image: url(':/images/raptoreum_logo_toolbar'); + background-image: url(':/images/raptoreum_logo_toolbar_light'); height: 2.5em; } diff --git a/src/qt/res/fonts/Manrope/Manrope-Black.otf b/src/qt/res/fonts/Manrope/Manrope-Black.otf new file mode 100644 index 0000000000..b391897a1d Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-Black.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-BlackItalic.otf b/src/qt/res/fonts/Manrope/Manrope-BlackItalic.otf new file mode 100644 index 0000000000..f30016c9fb Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-BlackItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-Bold.otf b/src/qt/res/fonts/Manrope/Manrope-Bold.otf new file mode 100644 index 0000000000..2f8226ae7b Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-Bold.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-BoldItalic.otf b/src/qt/res/fonts/Manrope/Manrope-BoldItalic.otf new file mode 100644 index 0000000000..f30016c9fb Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-BoldItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-ExtraBold.otf b/src/qt/res/fonts/Manrope/Manrope-ExtraBold.otf new file mode 100644 index 0000000000..b391897a1d Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-ExtraBold.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-ExtraBoldItalic.otf b/src/qt/res/fonts/Manrope/Manrope-ExtraBoldItalic.otf new file mode 100644 index 0000000000..9c28fa869b Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-ExtraBoldItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-ExtraLight.otf b/src/qt/res/fonts/Manrope/Manrope-ExtraLight.otf new file mode 100644 index 0000000000..e0f186170b Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-ExtraLight.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-ExtraLightItalic.otf b/src/qt/res/fonts/Manrope/Manrope-ExtraLightItalic.otf new file mode 100644 index 0000000000..ad334f7334 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-ExtraLightItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-Italic.otf b/src/qt/res/fonts/Manrope/Manrope-Italic.otf new file mode 100644 index 0000000000..8551644719 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-Italic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-Light.otf b/src/qt/res/fonts/Manrope/Manrope-Light.otf new file mode 100644 index 0000000000..e0f186170b Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-Light.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-LightItalic.otf b/src/qt/res/fonts/Manrope/Manrope-LightItalic.otf new file mode 100644 index 0000000000..4ad8260c57 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-LightItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-Medium.otf b/src/qt/res/fonts/Manrope/Manrope-Medium.otf new file mode 100644 index 0000000000..1674bf8108 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-Medium.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-MediumItalic.otf b/src/qt/res/fonts/Manrope/Manrope-MediumItalic.otf new file mode 100644 index 0000000000..f87f37f939 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-MediumItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-Regular.otf b/src/qt/res/fonts/Manrope/Manrope-Regular.otf new file mode 100644 index 0000000000..a6135a223c Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-Regular.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-SemiBold.otf b/src/qt/res/fonts/Manrope/Manrope-SemiBold.otf new file mode 100644 index 0000000000..dc9ca8ad19 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-SemiBold.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-SemiBoldItalic.otf b/src/qt/res/fonts/Manrope/Manrope-SemiBoldItalic.otf new file mode 100644 index 0000000000..e1352b0de6 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-SemiBoldItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-Thin.otf b/src/qt/res/fonts/Manrope/Manrope-Thin.otf new file mode 100644 index 0000000000..fcaa96166f Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-Thin.otf differ diff --git a/src/qt/res/fonts/Manrope/Manrope-ThinItalic.otf b/src/qt/res/fonts/Manrope/Manrope-ThinItalic.otf new file mode 100644 index 0000000000..4ad8260c57 Binary files /dev/null and b/src/qt/res/fonts/Manrope/Manrope-ThinItalic.otf differ diff --git a/src/qt/res/fonts/Manrope/README.md b/src/qt/res/fonts/Manrope/README.md new file mode 100644 index 0000000000..d4374c130a --- /dev/null +++ b/src/qt/res/fonts/Manrope/README.md @@ -0,0 +1,43 @@ +# Manrope Font with italic styles +Manrope font is an open-source modern sans-serif font family. Designed by Mikhail Sharanda in 2018-2019. This fork contains italic styles where every glyph is skewed 15 degrees clockwise. + +Preview, download & test: http://manropefont.com/ + +## Features +- Semi-condensed, clean, minimal sans-serif font family +- Variable font + 7 legacy weights +- Desktop and web-font formats +- Geometric Digits +- Packed with OpenType features: Case Sensitive, Auto-Apostrophe, Contextual Alternates, Common Ligatures, Custom Icon-Ligatures, Tabular Figures +- Supports most of Latin & Cyrillic languages: + - Albanian, Belarusian, Bosnian, Bulgarian, Catalan, Croatian, Czech, Danish, English, Estonian, Filipino, Finnish, French, Galician, German, Greek, Hungarian, Icelandic, Indonesian, Irish, Italian, Latvian, Lithuanian, Luxembourgish, Macedonian, Malagasy, Malay, Mongolian, Norwegian, Polish, Portuguese, Romanian, Russian, Scottish Gaelic, Serbian, Slovak, Slovenian, liish, Swahili, Swedish, Taita, Turkish, Welsh, Zulu + +## Changelog +- v 4.5 / March 14, 2020 + - Vietnamese support; + - Esperanto support; + - Fixed Greek I with an accent; + - Updated Latin marks; + - Added currencies: ₣, ₩, ₹, ₱, ₪, ₺, ₮, ₿; +- v 4 / December 4, 2019 + - Variable format; + - Greek support; + - Improved Cyrillic; + - Countless minor adjustments; + - NOTE: adjusted 'units per em' setting, which made line-height slightly bigger than before; + - NOTE: 'thin' weight has been renamed to 'ExtraLight'; +- v 3 / March 25, 2019 +- v 2 / December 4, 2018 +- v 1.2 / August 24, 2018 +- v 1.1 / July 29, 2018 +- v 1 / July 1, 2018 + - First release; + + +## License +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is available with an FAQ at http://scripts.sil.org/OFL + +# 🤜 🤛 +Special thanks to [Mirko Velimirovic](https://mirkovelimirovic.com/) for contribution. diff --git a/src/qt/res/fonts/Manrope/README.txt b/src/qt/res/fonts/Manrope/README.txt new file mode 100644 index 0000000000..5e1dbdb2c2 --- /dev/null +++ b/src/qt/res/fonts/Manrope/README.txt @@ -0,0 +1 @@ +To learn more about the font family and its license, visit https://www.fontmirror.com/manrope \ No newline at end of file diff --git a/src/qt/res/icons/add.png b/src/qt/res/icons/add.png index 6d230d94b3..87adcf2a9d 100644 Binary files a/src/qt/res/icons/add.png and b/src/qt/res/icons/add.png differ diff --git a/src/qt/res/icons/address-book.png b/src/qt/res/icons/address-book.png index a7911b236b..d7351c11d8 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/arrow_left.png b/src/qt/res/icons/arrow_left.png deleted file mode 100644 index 0c2a597fbe..0000000000 Binary files a/src/qt/res/icons/arrow_left.png and /dev/null differ diff --git a/src/qt/res/icons/arrow_right.png b/src/qt/res/icons/arrow_right.png deleted file mode 100644 index 50cf5bdc0d..0000000000 Binary files a/src/qt/res/icons/arrow_right.png and /dev/null differ diff --git a/src/qt/res/icons/browse.png b/src/qt/res/icons/browse.png deleted file mode 100644 index 0c7c45b5f5..0000000000 Binary files a/src/qt/res/icons/browse.png and /dev/null differ diff --git a/src/qt/res/icons/clock0.png b/src/qt/res/icons/clock0.png new file mode 100644 index 0000000000..dd6f867507 Binary files /dev/null and b/src/qt/res/icons/clock0.png differ diff --git a/src/qt/res/icons/clock1.png b/src/qt/res/icons/clock1.png index 8dfb11d1d7..a2a82bb25c 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 6240ffd71e..6e1a3ad0da 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 4947eb33dc..623ed8c6de 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 7096726e11..b3bde8a73e 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 296294a00f..bedf8e4818 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/clock6.png b/src/qt/res/icons/clock6.png index 4d74e89a72..04ec85a103 100644 Binary files a/src/qt/res/icons/clock6.png and b/src/qt/res/icons/clock6.png differ diff --git a/src/qt/res/icons/configure.png b/src/qt/res/icons/configure.png deleted file mode 100644 index 3719e5f2d0..0000000000 Binary files a/src/qt/res/icons/configure.png and /dev/null differ diff --git a/src/qt/res/icons/connect0_16.png b/src/qt/res/icons/connect0_16.png deleted file mode 100644 index 0ad2411c0e..0000000000 Binary files a/src/qt/res/icons/connect0_16.png and /dev/null differ diff --git a/src/qt/res/icons/connect1_16.png b/src/qt/res/icons/connect1_16.png deleted file mode 100644 index 50cf5bdc0d..0000000000 Binary files a/src/qt/res/icons/connect1_16.png and /dev/null differ diff --git a/src/qt/res/icons/connect2_16.png b/src/qt/res/icons/connect2_16.png deleted file mode 100644 index 0c2a597fbe..0000000000 Binary files a/src/qt/res/icons/connect2_16.png and /dev/null differ diff --git a/src/qt/res/icons/connect3_16.png b/src/qt/res/icons/connect3_16.png deleted file mode 100644 index 9d1d4c120f..0000000000 Binary files a/src/qt/res/icons/connect3_16.png and /dev/null differ diff --git a/src/qt/res/icons/connect4_16.png b/src/qt/res/icons/connect4_16.png deleted file mode 100644 index f1377d8202..0000000000 Binary files a/src/qt/res/icons/connect4_16.png and /dev/null differ diff --git a/src/qt/res/icons/connect_0.png b/src/qt/res/icons/connect_0.png new file mode 100644 index 0000000000..059cca5d37 Binary files /dev/null and b/src/qt/res/icons/connect_0.png differ diff --git a/src/qt/res/icons/connect_1.png b/src/qt/res/icons/connect_1.png new file mode 100644 index 0000000000..2f9a69d6ff Binary files /dev/null and b/src/qt/res/icons/connect_1.png differ diff --git a/src/qt/res/icons/connect_2.png b/src/qt/res/icons/connect_2.png new file mode 100644 index 0000000000..5e4e320002 Binary files /dev/null and b/src/qt/res/icons/connect_2.png differ diff --git a/src/qt/res/icons/connect_3.png b/src/qt/res/icons/connect_3.png new file mode 100644 index 0000000000..2bb1e4c52b Binary files /dev/null and b/src/qt/res/icons/connect_3.png differ diff --git a/src/qt/res/icons/connect_4.png b/src/qt/res/icons/connect_4.png new file mode 100644 index 0000000000..bf6b145b81 Binary files /dev/null and b/src/qt/res/icons/connect_4.png differ diff --git a/src/qt/res/icons/console_remove.png b/src/qt/res/icons/console_remove.png deleted file mode 100644 index 006140ff6f..0000000000 Binary files a/src/qt/res/icons/console_remove.png and /dev/null differ diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png deleted file mode 100644 index 155f8001e3..0000000000 Binary files a/src/qt/res/icons/debugwindow.png and /dev/null differ diff --git a/src/qt/res/icons/edit.png b/src/qt/res/icons/edit.png index 203db09b40..b156108913 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 6c30094d14..21fd4f5151 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 c5b66d9953..c58148ec70 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/export.png b/src/qt/res/icons/export.png deleted file mode 100644 index f4438e2687..0000000000 Binary files a/src/qt/res/icons/export.png and /dev/null differ diff --git a/src/qt/res/icons/filesave.png b/src/qt/res/icons/filesave.png deleted file mode 100644 index 52548a4523..0000000000 Binary files a/src/qt/res/icons/filesave.png and /dev/null differ diff --git a/src/qt/res/icons/fontbigger.png b/src/qt/res/icons/fontbigger.png index ff04b73903..728526bf5d 100644 Binary files a/src/qt/res/icons/fontbigger.png and b/src/qt/res/icons/fontbigger.png differ diff --git a/src/qt/res/icons/fontsmaller.png b/src/qt/res/icons/fontsmaller.png index 651ea4a64f..c4dc3aca6d 100644 Binary files a/src/qt/res/icons/fontsmaller.png and b/src/qt/res/icons/fontsmaller.png differ diff --git a/src/qt/res/icons/hd_enabled.png b/src/qt/res/icons/hd_enabled.png index 8ae2fe8fa1..7f80350f85 100644 Binary files a/src/qt/res/icons/hd_enabled.png and b/src/qt/res/icons/hd_enabled.png differ diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png deleted file mode 100644 index 291e01952b..0000000000 Binary files a/src/qt/res/icons/key.png and /dev/null differ diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png index 63e23750a7..1cdb0b7f96 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 47a68f4b08..2ad70f2d70 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/menu_assets.png b/src/qt/res/icons/menu_assets.png new file mode 100644 index 0000000000..2dfdd386b5 Binary files /dev/null and b/src/qt/res/icons/menu_assets.png differ diff --git a/src/qt/res/icons/menu_coinjoin.png b/src/qt/res/icons/menu_coinjoin.png new file mode 100644 index 0000000000..5293fbf586 Binary files /dev/null and b/src/qt/res/icons/menu_coinjoin.png differ diff --git a/src/qt/res/icons/menu_create_asset.png b/src/qt/res/icons/menu_create_asset.png new file mode 100644 index 0000000000..6356bf3117 Binary files /dev/null and b/src/qt/res/icons/menu_create_asset.png differ diff --git a/src/qt/res/icons/menu_overview.png b/src/qt/res/icons/menu_overview.png new file mode 100644 index 0000000000..77a46494d8 Binary files /dev/null and b/src/qt/res/icons/menu_overview.png differ diff --git a/src/qt/res/icons/menu_receive.png b/src/qt/res/icons/menu_receive.png new file mode 100644 index 0000000000..b1e017f497 Binary files /dev/null and b/src/qt/res/icons/menu_receive.png differ diff --git a/src/qt/res/icons/menu_send.png b/src/qt/res/icons/menu_send.png new file mode 100644 index 0000000000..0f3e665871 Binary files /dev/null and b/src/qt/res/icons/menu_send.png differ diff --git a/src/qt/res/icons/menu_send_asset.png b/src/qt/res/icons/menu_send_asset.png new file mode 100644 index 0000000000..9253a02a95 Binary files /dev/null and b/src/qt/res/icons/menu_send_asset.png differ diff --git a/src/qt/res/icons/menu_smartnodes.png b/src/qt/res/icons/menu_smartnodes.png new file mode 100644 index 0000000000..fab774fc6d Binary files /dev/null and b/src/qt/res/icons/menu_smartnodes.png differ diff --git a/src/qt/res/icons/menu_transactions.png b/src/qt/res/icons/menu_transactions.png new file mode 100644 index 0000000000..8da55fac71 Binary files /dev/null and b/src/qt/res/icons/menu_transactions.png differ diff --git a/src/qt/res/icons/menu_update_asset.png b/src/qt/res/icons/menu_update_asset.png new file mode 100644 index 0000000000..b0064f53c7 Binary files /dev/null and b/src/qt/res/icons/menu_update_asset.png differ diff --git a/src/qt/res/icons/proxy.png b/src/qt/res/icons/proxy.png index 67c552d0de..594e5cf503 100644 Binary files a/src/qt/res/icons/proxy.png and b/src/qt/res/icons/proxy.png differ diff --git a/src/qt/res/icons/quit.png b/src/qt/res/icons/quit.png index 0ad2411c0e..ef3e8873b8 100644 Binary files a/src/qt/res/icons/quit.png and b/src/qt/res/icons/quit.png differ diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png index 7fc2d9d015..054cad2d7b 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 0ad2411c0e..ef3e8873b8 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 7fc2d9d015..054cad2d7b 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 7fc2d9d015..054cad2d7b 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 deleted file mode 100644 index 203db09b40..0000000000 Binary files a/src/qt/res/icons/transaction0.png and /dev/null differ diff --git a/src/qt/res/icons/transaction2.png b/src/qt/res/icons/transaction2.png deleted file mode 100644 index 7fc2d9d015..0000000000 Binary files a/src/qt/res/icons/transaction2.png and /dev/null differ diff --git a/src/qt/res/icons/transaction_abandoned.png b/src/qt/res/icons/transaction_abandoned.png index 8d68c2ff9f..ae81a10337 100644 Binary files a/src/qt/res/icons/transaction_abandoned.png and b/src/qt/res/icons/transaction_abandoned.png differ diff --git a/src/qt/res/icons/transaction_locked.png b/src/qt/res/icons/transaction_locked.png index 752d915b65..1cdb0b7f96 100644 Binary files a/src/qt/res/icons/transaction_locked.png and b/src/qt/res/icons/transaction_locked.png differ diff --git a/src/qt/res/icons/trash.png b/src/qt/res/icons/trash.png new file mode 100644 index 0000000000..ae81a10337 Binary files /dev/null and b/src/qt/res/icons/trash.png differ diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png deleted file mode 100644 index 7292e337e9..0000000000 Binary files a/src/qt/res/icons/tx_inout.png and /dev/null differ diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png deleted file mode 100644 index 0abec90b91..0000000000 Binary files a/src/qt/res/icons/tx_input.png and /dev/null differ diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png deleted file mode 100644 index dc69c2fcff..0000000000 Binary files a/src/qt/res/icons/tx_output.png and /dev/null differ diff --git a/src/qt/res/icons/warning.png b/src/qt/res/icons/warning.png index 155f8001e3..5d05c2a771 100644 Binary files a/src/qt/res/icons/warning.png and b/src/qt/res/icons/warning.png differ diff --git a/src/qt/res/images/arrow_down_dark.png b/src/qt/res/images/arrow_down_dark.png index a0cb9c8b17..1c0aba0c34 100644 Binary files a/src/qt/res/images/arrow_down_dark.png and b/src/qt/res/images/arrow_down_dark.png differ diff --git a/src/qt/res/images/arrow_down_dark_disabled.png b/src/qt/res/images/arrow_down_dark_disabled.png new file mode 100644 index 0000000000..46e2dfa459 Binary files /dev/null and b/src/qt/res/images/arrow_down_dark_disabled.png differ diff --git a/src/qt/res/images/arrow_down_dark_hover.png b/src/qt/res/images/arrow_down_dark_hover.png new file mode 100644 index 0000000000..ee14301638 Binary files /dev/null and b/src/qt/res/images/arrow_down_dark_hover.png differ diff --git a/src/qt/res/images/arrow_down_light.png b/src/qt/res/images/arrow_down_light.png index e43dfa5084..179c717607 100644 Binary files a/src/qt/res/images/arrow_down_light.png and b/src/qt/res/images/arrow_down_light.png differ diff --git a/src/qt/res/images/arrow_down_light_disabled.png b/src/qt/res/images/arrow_down_light_disabled.png new file mode 100644 index 0000000000..1c0aba0c34 Binary files /dev/null and b/src/qt/res/images/arrow_down_light_disabled.png differ diff --git a/src/qt/res/images/arrow_down_light_hover.png b/src/qt/res/images/arrow_down_light_hover.png new file mode 100644 index 0000000000..17d670a651 Binary files /dev/null and b/src/qt/res/images/arrow_down_light_hover.png differ diff --git a/src/qt/res/images/arrow_left_dark.png b/src/qt/res/images/arrow_left_dark.png index 39bd87dddc..cfbf7054d9 100644 Binary files a/src/qt/res/images/arrow_left_dark.png and b/src/qt/res/images/arrow_left_dark.png differ diff --git a/src/qt/res/images/arrow_left_dark_disabled.png b/src/qt/res/images/arrow_left_dark_disabled.png new file mode 100644 index 0000000000..7c66083198 Binary files /dev/null and b/src/qt/res/images/arrow_left_dark_disabled.png differ diff --git a/src/qt/res/images/arrow_left_dark_hover.png b/src/qt/res/images/arrow_left_dark_hover.png new file mode 100644 index 0000000000..ae9e6e69c7 Binary files /dev/null and b/src/qt/res/images/arrow_left_dark_hover.png differ diff --git a/src/qt/res/images/arrow_left_light.png b/src/qt/res/images/arrow_left_light.png index aceed0cde8..470b62b15c 100644 Binary files a/src/qt/res/images/arrow_left_light.png and b/src/qt/res/images/arrow_left_light.png differ diff --git a/src/qt/res/images/arrow_left_light_disabled.png b/src/qt/res/images/arrow_left_light_disabled.png new file mode 100644 index 0000000000..cfbf7054d9 Binary files /dev/null and b/src/qt/res/images/arrow_left_light_disabled.png differ diff --git a/src/qt/res/images/arrow_left_light_hover.png b/src/qt/res/images/arrow_left_light_hover.png new file mode 100644 index 0000000000..95beab9b10 Binary files /dev/null and b/src/qt/res/images/arrow_left_light_hover.png differ diff --git a/src/qt/res/images/arrow_light_down_hover.png b/src/qt/res/images/arrow_light_down_hover.png deleted file mode 100644 index 680b60001b..0000000000 Binary files a/src/qt/res/images/arrow_light_down_hover.png and /dev/null differ diff --git a/src/qt/res/images/arrow_light_down_normal.png b/src/qt/res/images/arrow_light_down_normal.png deleted file mode 100644 index efca2811ac..0000000000 Binary files a/src/qt/res/images/arrow_light_down_normal.png and /dev/null differ diff --git a/src/qt/res/images/arrow_light_left_hover.png b/src/qt/res/images/arrow_light_left_hover.png deleted file mode 100644 index 78fbed8965..0000000000 Binary files a/src/qt/res/images/arrow_light_left_hover.png and /dev/null differ diff --git a/src/qt/res/images/arrow_light_left_normal.png b/src/qt/res/images/arrow_light_left_normal.png deleted file mode 100644 index 2b15306aec..0000000000 Binary files a/src/qt/res/images/arrow_light_left_normal.png and /dev/null differ diff --git a/src/qt/res/images/arrow_light_right_hover.png b/src/qt/res/images/arrow_light_right_hover.png deleted file mode 100644 index 61125dc692..0000000000 Binary files a/src/qt/res/images/arrow_light_right_hover.png and /dev/null differ diff --git a/src/qt/res/images/arrow_light_right_normal.png b/src/qt/res/images/arrow_light_right_normal.png deleted file mode 100644 index c5376584d8..0000000000 Binary files a/src/qt/res/images/arrow_light_right_normal.png and /dev/null differ diff --git a/src/qt/res/images/arrow_light_up_hover.png b/src/qt/res/images/arrow_light_up_hover.png deleted file mode 100644 index f3d4828feb..0000000000 Binary files a/src/qt/res/images/arrow_light_up_hover.png and /dev/null differ diff --git a/src/qt/res/images/arrow_light_up_normal.png b/src/qt/res/images/arrow_light_up_normal.png deleted file mode 100644 index 05fcabe26b..0000000000 Binary files a/src/qt/res/images/arrow_light_up_normal.png and /dev/null differ diff --git a/src/qt/res/images/arrow_right_dark.png b/src/qt/res/images/arrow_right_dark.png index 12b2072fdd..e1859226e4 100644 Binary files a/src/qt/res/images/arrow_right_dark.png and b/src/qt/res/images/arrow_right_dark.png differ diff --git a/src/qt/res/images/arrow_right_dark_disabled.png b/src/qt/res/images/arrow_right_dark_disabled.png new file mode 100644 index 0000000000..665da01347 Binary files /dev/null and b/src/qt/res/images/arrow_right_dark_disabled.png differ diff --git a/src/qt/res/images/arrow_right_dark_hover.png b/src/qt/res/images/arrow_right_dark_hover.png new file mode 100644 index 0000000000..f188734b9e Binary files /dev/null and b/src/qt/res/images/arrow_right_dark_hover.png differ diff --git a/src/qt/res/images/arrow_right_light.png b/src/qt/res/images/arrow_right_light.png index bbe1dde1e1..b46a744303 100644 Binary files a/src/qt/res/images/arrow_right_light.png and b/src/qt/res/images/arrow_right_light.png differ diff --git a/src/qt/res/images/arrow_right_light_disabled.png b/src/qt/res/images/arrow_right_light_disabled.png new file mode 100644 index 0000000000..e1859226e4 Binary files /dev/null and b/src/qt/res/images/arrow_right_light_disabled.png differ diff --git a/src/qt/res/images/arrow_right_light_hover.png b/src/qt/res/images/arrow_right_light_hover.png new file mode 100644 index 0000000000..1d4fb820df Binary files /dev/null and b/src/qt/res/images/arrow_right_light_hover.png differ diff --git a/src/qt/res/images/arrow_up_dark.png b/src/qt/res/images/arrow_up_dark.png index 332183be39..4823b08d0e 100644 Binary files a/src/qt/res/images/arrow_up_dark.png and b/src/qt/res/images/arrow_up_dark.png differ diff --git a/src/qt/res/images/arrow_up_dark_disabled.png b/src/qt/res/images/arrow_up_dark_disabled.png new file mode 100644 index 0000000000..46f268b9a7 Binary files /dev/null and b/src/qt/res/images/arrow_up_dark_disabled.png differ diff --git a/src/qt/res/images/arrow_up_dark_hover.png b/src/qt/res/images/arrow_up_dark_hover.png new file mode 100644 index 0000000000..454a0a3578 Binary files /dev/null and b/src/qt/res/images/arrow_up_dark_hover.png differ diff --git a/src/qt/res/images/arrow_up_light.png b/src/qt/res/images/arrow_up_light.png index 481cb629a9..3d86cd0a42 100644 Binary files a/src/qt/res/images/arrow_up_light.png and b/src/qt/res/images/arrow_up_light.png differ diff --git a/src/qt/res/images/arrow_up_light_disabled.png b/src/qt/res/images/arrow_up_light_disabled.png new file mode 100644 index 0000000000..4823b08d0e Binary files /dev/null and b/src/qt/res/images/arrow_up_light_disabled.png differ diff --git a/src/qt/res/images/arrow_up_light_hover.png b/src/qt/res/images/arrow_up_light_hover.png new file mode 100644 index 0000000000..88e23abec1 Binary files /dev/null and b/src/qt/res/images/arrow_up_light_hover.png differ diff --git a/src/qt/res/images/checkbox_checked_dark.png b/src/qt/res/images/checkbox_checked_dark.png index 866824b1d0..578d94b311 100644 Binary files a/src/qt/res/images/checkbox_checked_dark.png and b/src/qt/res/images/checkbox_checked_dark.png differ diff --git a/src/qt/res/images/checkbox_checked_disabled_dark.png b/src/qt/res/images/checkbox_checked_disabled_dark.png index edd09097cc..219e1b2f3b 100644 Binary files a/src/qt/res/images/checkbox_checked_disabled_dark.png and b/src/qt/res/images/checkbox_checked_disabled_dark.png differ diff --git a/src/qt/res/images/checkbox_checked_disabled_light.png b/src/qt/res/images/checkbox_checked_disabled_light.png index 278c1a07c2..219e1b2f3b 100644 Binary files a/src/qt/res/images/checkbox_checked_disabled_light.png and b/src/qt/res/images/checkbox_checked_disabled_light.png differ diff --git a/src/qt/res/images/checkbox_checked_hover_dark.png b/src/qt/res/images/checkbox_checked_hover_dark.png index d0ef2d38c6..52ce196487 100644 Binary files a/src/qt/res/images/checkbox_checked_hover_dark.png and b/src/qt/res/images/checkbox_checked_hover_dark.png differ diff --git a/src/qt/res/images/checkbox_checked_hover_light.png b/src/qt/res/images/checkbox_checked_hover_light.png index 2199a81cd2..52ce196487 100644 Binary files a/src/qt/res/images/checkbox_checked_hover_light.png and b/src/qt/res/images/checkbox_checked_hover_light.png differ diff --git a/src/qt/res/images/checkbox_checked_light.png b/src/qt/res/images/checkbox_checked_light.png index c4e061f28f..578d94b311 100644 Binary files a/src/qt/res/images/checkbox_checked_light.png and b/src/qt/res/images/checkbox_checked_light.png differ diff --git a/src/qt/res/images/checkbox_normal_dark.png b/src/qt/res/images/checkbox_normal_dark.png index c7c3ce10d4..1a9c38c649 100644 Binary files a/src/qt/res/images/checkbox_normal_dark.png and b/src/qt/res/images/checkbox_normal_dark.png differ diff --git a/src/qt/res/images/checkbox_normal_disabled_dark.png b/src/qt/res/images/checkbox_normal_disabled_dark.png index f779814dbf..686227bf64 100644 Binary files a/src/qt/res/images/checkbox_normal_disabled_dark.png and b/src/qt/res/images/checkbox_normal_disabled_dark.png differ diff --git a/src/qt/res/images/checkbox_normal_disabled_light.png b/src/qt/res/images/checkbox_normal_disabled_light.png index a324ae8422..686227bf64 100644 Binary files a/src/qt/res/images/checkbox_normal_disabled_light.png and b/src/qt/res/images/checkbox_normal_disabled_light.png differ diff --git a/src/qt/res/images/checkbox_normal_hover_dark.png b/src/qt/res/images/checkbox_normal_hover_dark.png index 663f127735..93166285ed 100644 Binary files a/src/qt/res/images/checkbox_normal_hover_dark.png and b/src/qt/res/images/checkbox_normal_hover_dark.png differ diff --git a/src/qt/res/images/checkbox_normal_hover_light.png b/src/qt/res/images/checkbox_normal_hover_light.png index d539e99e83..93166285ed 100644 Binary files a/src/qt/res/images/checkbox_normal_hover_light.png and b/src/qt/res/images/checkbox_normal_hover_light.png differ diff --git a/src/qt/res/images/checkbox_normal_light.png b/src/qt/res/images/checkbox_normal_light.png index 00c3d64ee2..1a9c38c649 100644 Binary files a/src/qt/res/images/checkbox_normal_light.png and b/src/qt/res/images/checkbox_normal_light.png differ diff --git a/src/qt/res/images/checkbox_partly_checked_dark.png b/src/qt/res/images/checkbox_partly_checked_dark.png index 0fec9200d1..3682af1b4a 100644 Binary files a/src/qt/res/images/checkbox_partly_checked_dark.png and b/src/qt/res/images/checkbox_partly_checked_dark.png differ diff --git a/src/qt/res/images/checkbox_partly_checked_disabled_dark.png b/src/qt/res/images/checkbox_partly_checked_disabled_dark.png index b4b649f3cb..3a91e69597 100644 Binary files a/src/qt/res/images/checkbox_partly_checked_disabled_dark.png and b/src/qt/res/images/checkbox_partly_checked_disabled_dark.png differ diff --git a/src/qt/res/images/checkbox_partly_checked_disabled_light.png b/src/qt/res/images/checkbox_partly_checked_disabled_light.png index 13d6f22a84..3a91e69597 100644 Binary files a/src/qt/res/images/checkbox_partly_checked_disabled_light.png and b/src/qt/res/images/checkbox_partly_checked_disabled_light.png differ diff --git a/src/qt/res/images/checkbox_partly_checked_hover_dark.png b/src/qt/res/images/checkbox_partly_checked_hover_dark.png index d4bdcbd842..3682af1b4a 100644 Binary files a/src/qt/res/images/checkbox_partly_checked_hover_dark.png and b/src/qt/res/images/checkbox_partly_checked_hover_dark.png differ diff --git a/src/qt/res/images/checkbox_partly_checked_hover_light.png b/src/qt/res/images/checkbox_partly_checked_hover_light.png index f23b1eea34..3682af1b4a 100644 Binary files a/src/qt/res/images/checkbox_partly_checked_hover_light.png and b/src/qt/res/images/checkbox_partly_checked_hover_light.png differ diff --git a/src/qt/res/images/checkbox_partly_checked_light.png b/src/qt/res/images/checkbox_partly_checked_light.png index dc3dc2832b..3682af1b4a 100644 Binary files a/src/qt/res/images/checkbox_partly_checked_light.png and b/src/qt/res/images/checkbox_partly_checked_light.png differ diff --git a/src/qt/res/images/radio_checked_dark.png b/src/qt/res/images/radio_checked_dark.png index 642c58f62a..cea12de51c 100644 Binary files a/src/qt/res/images/radio_checked_dark.png and b/src/qt/res/images/radio_checked_dark.png differ diff --git a/src/qt/res/images/radio_checked_disabled_dark.png b/src/qt/res/images/radio_checked_disabled_dark.png index 828fd6f2cf..66719d66d7 100644 Binary files a/src/qt/res/images/radio_checked_disabled_dark.png and b/src/qt/res/images/radio_checked_disabled_dark.png differ diff --git a/src/qt/res/images/radio_checked_disabled_light.png b/src/qt/res/images/radio_checked_disabled_light.png index b55b82d8eb..12c2deaeb0 100644 Binary files a/src/qt/res/images/radio_checked_disabled_light.png and b/src/qt/res/images/radio_checked_disabled_light.png differ diff --git a/src/qt/res/images/radio_checked_hover_dark.png b/src/qt/res/images/radio_checked_hover_dark.png index f4b3f6310c..e4c5d40474 100644 Binary files a/src/qt/res/images/radio_checked_hover_dark.png and b/src/qt/res/images/radio_checked_hover_dark.png differ diff --git a/src/qt/res/images/radio_checked_hover_light.png b/src/qt/res/images/radio_checked_hover_light.png index 635925e4d5..bc4b0c13b8 100644 Binary files a/src/qt/res/images/radio_checked_hover_light.png and b/src/qt/res/images/radio_checked_hover_light.png differ diff --git a/src/qt/res/images/radio_checked_light.png b/src/qt/res/images/radio_checked_light.png index 6d070b1cda..e4c5d40474 100644 Binary files a/src/qt/res/images/radio_checked_light.png and b/src/qt/res/images/radio_checked_light.png differ diff --git a/src/qt/res/images/radio_normal_dark.png b/src/qt/res/images/radio_normal_dark.png index 7caea4079f..3d4454c83c 100644 Binary files a/src/qt/res/images/radio_normal_dark.png and b/src/qt/res/images/radio_normal_dark.png differ diff --git a/src/qt/res/images/radio_normal_disabled_dark.png b/src/qt/res/images/radio_normal_disabled_dark.png index 9686400547..38ddc61776 100644 Binary files a/src/qt/res/images/radio_normal_disabled_dark.png and b/src/qt/res/images/radio_normal_disabled_dark.png differ diff --git a/src/qt/res/images/radio_normal_disabled_light.png b/src/qt/res/images/radio_normal_disabled_light.png index 8cc8cab8ac..3a99c9f062 100644 Binary files a/src/qt/res/images/radio_normal_disabled_light.png and b/src/qt/res/images/radio_normal_disabled_light.png differ diff --git a/src/qt/res/images/radio_normal_hover_dark.png b/src/qt/res/images/radio_normal_hover_dark.png index 02431cbc1e..d7166b41d5 100644 Binary files a/src/qt/res/images/radio_normal_hover_dark.png and b/src/qt/res/images/radio_normal_hover_dark.png differ diff --git a/src/qt/res/images/radio_normal_hover_light.png b/src/qt/res/images/radio_normal_hover_light.png index 30481462f0..0bbefbd7f6 100644 Binary files a/src/qt/res/images/radio_normal_hover_light.png and b/src/qt/res/images/radio_normal_hover_light.png differ diff --git a/src/qt/res/images/radio_normal_light.png b/src/qt/res/images/radio_normal_light.png index 710721cf43..d7166b41d5 100644 Binary files a/src/qt/res/images/radio_normal_light.png and b/src/qt/res/images/radio_normal_light.png differ diff --git a/src/qt/res/images/raptoreum_bkgrnd.png b/src/qt/res/images/raptoreum_bkgrnd.png deleted file mode 100644 index dc3bdc069a..0000000000 Binary files a/src/qt/res/images/raptoreum_bkgrnd.png and /dev/null differ diff --git a/src/qt/res/images/raptoreum_logo_horizontal.png b/src/qt/res/images/raptoreum_logo_horizontal.png deleted file mode 100644 index 0e66ea0589..0000000000 Binary files a/src/qt/res/images/raptoreum_logo_horizontal.png and /dev/null differ diff --git a/src/qt/res/images/raptoreum_logo_logo_toolbar.png b/src/qt/res/images/raptoreum_logo_logo_toolbar.png deleted file mode 100644 index d5708146a8..0000000000 Binary files a/src/qt/res/images/raptoreum_logo_logo_toolbar.png and /dev/null differ diff --git a/src/qt/res/images/raptoreum_logo_logo_toolbar_blue.png b/src/qt/res/images/raptoreum_logo_logo_toolbar_blue.png deleted file mode 100644 index d5708146a8..0000000000 Binary files a/src/qt/res/images/raptoreum_logo_logo_toolbar_blue.png and /dev/null differ diff --git a/src/qt/res/images/raptoreum_logo_toolbar.png b/src/qt/res/images/raptoreum_logo_toolbar.png deleted file mode 100644 index 01057e44c2..0000000000 Binary files a/src/qt/res/images/raptoreum_logo_toolbar.png and /dev/null differ diff --git a/src/qt/res/images/raptoreum_logo_toolbar_blue.png b/src/qt/res/images/raptoreum_logo_toolbar_blue.png deleted file mode 100644 index d5708146a8..0000000000 Binary files a/src/qt/res/images/raptoreum_logo_toolbar_blue.png and /dev/null differ diff --git a/src/qt/res/images/raptoreum_logo_toolbar_dark.png b/src/qt/res/images/raptoreum_logo_toolbar_dark.png new file mode 100644 index 0000000000..e1b4d196a4 Binary files /dev/null and b/src/qt/res/images/raptoreum_logo_toolbar_dark.png differ diff --git a/src/qt/res/images/raptoreum_logo_toolbar_light.png b/src/qt/res/images/raptoreum_logo_toolbar_light.png new file mode 100644 index 0000000000..53b7f4f4e4 Binary files /dev/null and b/src/qt/res/images/raptoreum_logo_toolbar_light.png differ diff --git a/src/qt/res/images/splash.png b/src/qt/res/images/splash.png deleted file mode 100644 index a710307e52..0000000000 Binary files a/src/qt/res/images/splash.png and /dev/null differ diff --git a/src/qt/res/images/splash_dark.png b/src/qt/res/images/splash_dark.png new file mode 100644 index 0000000000..187040afa2 Binary files /dev/null and b/src/qt/res/images/splash_dark.png differ diff --git a/src/qt/res/images/splash_light.png b/src/qt/res/images/splash_light.png new file mode 100644 index 0000000000..4598af54ea Binary files /dev/null and b/src/qt/res/images/splash_light.png differ diff --git a/src/qt/res/images/splashv2.png b/src/qt/res/images/splashv2.png deleted file mode 100644 index 95f24c9b21..0000000000 Binary files a/src/qt/res/images/splashv2.png and /dev/null differ diff --git a/src/qt/res/movies/makespinner.sh b/src/qt/res/movies/makespinner.sh index 575d0e0b02..95a723cfb3 100755 --- a/src/qt/res/movies/makespinner.sh +++ b/src/qt/res/movies/makespinner.sh @@ -4,9 +4,10 @@ export LC_ALL=C FRAMEDIR=$(dirname $0) -for i in {0..89} +for i in {0..35} do frame=$(printf "%03d" $i) - angle=$(($i * 4)) - convert $FRAMEDIR/../src/spinner.png -background "rgba(0,0,0,0.0)" -distort SRT $angle $FRAMEDIR/spinner-$frame.png + angle=$(($i * 10)) + # convert $FRAMEDIR/../src/spinner.png -background "rgba(0,0,0,0.0)" -distort SRT $angle $FRAMEDIR/spinner-$frame.png + convert $FRAMEDIR/../src/spinner.png -virtual-pixel none -distort SRT $angle $FRAMEDIR/spinner-$frame.png done diff --git a/src/qt/res/movies/spinner-000.png b/src/qt/res/movies/spinner-000.png index 62447df8e4..6822266d4a 100644 Binary files a/src/qt/res/movies/spinner-000.png and b/src/qt/res/movies/spinner-000.png differ diff --git a/src/qt/res/movies/spinner-001.png b/src/qt/res/movies/spinner-001.png index b46d612dc5..54024de395 100644 Binary files a/src/qt/res/movies/spinner-001.png and b/src/qt/res/movies/spinner-001.png differ diff --git a/src/qt/res/movies/spinner-002.png b/src/qt/res/movies/spinner-002.png index 6ada2aa046..fbfdaf4c33 100644 Binary files a/src/qt/res/movies/spinner-002.png and b/src/qt/res/movies/spinner-002.png differ diff --git a/src/qt/res/movies/spinner-003.png b/src/qt/res/movies/spinner-003.png index b07f874a82..75b06efc05 100644 Binary files a/src/qt/res/movies/spinner-003.png and b/src/qt/res/movies/spinner-003.png differ diff --git a/src/qt/res/movies/spinner-004.png b/src/qt/res/movies/spinner-004.png index 92f23cb49c..393bf2371e 100644 Binary files a/src/qt/res/movies/spinner-004.png and b/src/qt/res/movies/spinner-004.png differ diff --git a/src/qt/res/movies/spinner-005.png b/src/qt/res/movies/spinner-005.png index 0c455f57e9..4510535657 100644 Binary files a/src/qt/res/movies/spinner-005.png and b/src/qt/res/movies/spinner-005.png differ diff --git a/src/qt/res/movies/spinner-006.png b/src/qt/res/movies/spinner-006.png index beb3b1e4cd..1831919983 100644 Binary files a/src/qt/res/movies/spinner-006.png and b/src/qt/res/movies/spinner-006.png differ diff --git a/src/qt/res/movies/spinner-007.png b/src/qt/res/movies/spinner-007.png index 36400b3dbf..1dd8ec1b95 100644 Binary files a/src/qt/res/movies/spinner-007.png and b/src/qt/res/movies/spinner-007.png differ diff --git a/src/qt/res/movies/spinner-008.png b/src/qt/res/movies/spinner-008.png index fd5d52d986..6042273f2a 100644 Binary files a/src/qt/res/movies/spinner-008.png and b/src/qt/res/movies/spinner-008.png differ diff --git a/src/qt/res/movies/spinner-009.png b/src/qt/res/movies/spinner-009.png index 3656af5d9c..dec235ddc5 100644 Binary files a/src/qt/res/movies/spinner-009.png and b/src/qt/res/movies/spinner-009.png differ diff --git a/src/qt/res/movies/spinner-010.png b/src/qt/res/movies/spinner-010.png index 0ee4ecf65d..b2b8693e42 100644 Binary files a/src/qt/res/movies/spinner-010.png and b/src/qt/res/movies/spinner-010.png differ diff --git a/src/qt/res/movies/spinner-011.png b/src/qt/res/movies/spinner-011.png index 2c59dd91e2..acdd3450c7 100644 Binary files a/src/qt/res/movies/spinner-011.png and b/src/qt/res/movies/spinner-011.png differ diff --git a/src/qt/res/movies/spinner-012.png b/src/qt/res/movies/spinner-012.png index e5ad9e3bd3..02139b60fe 100644 Binary files a/src/qt/res/movies/spinner-012.png and b/src/qt/res/movies/spinner-012.png differ diff --git a/src/qt/res/movies/spinner-013.png b/src/qt/res/movies/spinner-013.png index c31b0fda8d..f90ae23588 100644 Binary files a/src/qt/res/movies/spinner-013.png and b/src/qt/res/movies/spinner-013.png differ diff --git a/src/qt/res/movies/spinner-014.png b/src/qt/res/movies/spinner-014.png index 45e829cd10..47b13646a9 100644 Binary files a/src/qt/res/movies/spinner-014.png and b/src/qt/res/movies/spinner-014.png differ diff --git a/src/qt/res/movies/spinner-015.png b/src/qt/res/movies/spinner-015.png index 5b0057de82..1ca30ca7d0 100644 Binary files a/src/qt/res/movies/spinner-015.png and b/src/qt/res/movies/spinner-015.png differ diff --git a/src/qt/res/movies/spinner-016.png b/src/qt/res/movies/spinner-016.png index f7aee3a678..c5b16e85fc 100644 Binary files a/src/qt/res/movies/spinner-016.png and b/src/qt/res/movies/spinner-016.png differ diff --git a/src/qt/res/movies/spinner-017.png b/src/qt/res/movies/spinner-017.png index ef6421b818..c2c8a093e2 100644 Binary files a/src/qt/res/movies/spinner-017.png and b/src/qt/res/movies/spinner-017.png differ diff --git a/src/qt/res/movies/spinner-018.png b/src/qt/res/movies/spinner-018.png index 7c3637908f..9362bbc7e4 100644 Binary files a/src/qt/res/movies/spinner-018.png and b/src/qt/res/movies/spinner-018.png differ diff --git a/src/qt/res/movies/spinner-019.png b/src/qt/res/movies/spinner-019.png index c41e5bfbd8..ba9212a480 100644 Binary files a/src/qt/res/movies/spinner-019.png and b/src/qt/res/movies/spinner-019.png differ diff --git a/src/qt/res/movies/spinner-020.png b/src/qt/res/movies/spinner-020.png index 6c869d23a9..039e81521d 100644 Binary files a/src/qt/res/movies/spinner-020.png and b/src/qt/res/movies/spinner-020.png differ diff --git a/src/qt/res/movies/spinner-021.png b/src/qt/res/movies/spinner-021.png index 071b703d10..57bf452aea 100644 Binary files a/src/qt/res/movies/spinner-021.png and b/src/qt/res/movies/spinner-021.png differ diff --git a/src/qt/res/movies/spinner-022.png b/src/qt/res/movies/spinner-022.png index 0e5478f952..a3146bac01 100644 Binary files a/src/qt/res/movies/spinner-022.png and b/src/qt/res/movies/spinner-022.png differ diff --git a/src/qt/res/movies/spinner-023.png b/src/qt/res/movies/spinner-023.png index 59fed7e412..0239618043 100644 Binary files a/src/qt/res/movies/spinner-023.png and b/src/qt/res/movies/spinner-023.png differ diff --git a/src/qt/res/movies/spinner-024.png b/src/qt/res/movies/spinner-024.png index 037c23cbf2..585c470f2d 100644 Binary files a/src/qt/res/movies/spinner-024.png and b/src/qt/res/movies/spinner-024.png differ diff --git a/src/qt/res/movies/spinner-025.png b/src/qt/res/movies/spinner-025.png index 39ca7681ac..93e7f4da3f 100644 Binary files a/src/qt/res/movies/spinner-025.png and b/src/qt/res/movies/spinner-025.png differ diff --git a/src/qt/res/movies/spinner-026.png b/src/qt/res/movies/spinner-026.png index 93a2d061f6..36bb4b5718 100644 Binary files a/src/qt/res/movies/spinner-026.png and b/src/qt/res/movies/spinner-026.png differ diff --git a/src/qt/res/movies/spinner-027.png b/src/qt/res/movies/spinner-027.png index cf2b2ceaec..73dc1f5abf 100644 Binary files a/src/qt/res/movies/spinner-027.png and b/src/qt/res/movies/spinner-027.png differ diff --git a/src/qt/res/movies/spinner-028.png b/src/qt/res/movies/spinner-028.png index d666cbf291..2bb32f70c6 100644 Binary files a/src/qt/res/movies/spinner-028.png and b/src/qt/res/movies/spinner-028.png differ diff --git a/src/qt/res/movies/spinner-029.png b/src/qt/res/movies/spinner-029.png index 410d7ca107..cd5bd69c3b 100644 Binary files a/src/qt/res/movies/spinner-029.png and b/src/qt/res/movies/spinner-029.png differ diff --git a/src/qt/res/movies/spinner-030.png b/src/qt/res/movies/spinner-030.png index 5f3e5d20e6..d987315053 100644 Binary files a/src/qt/res/movies/spinner-030.png and b/src/qt/res/movies/spinner-030.png differ diff --git a/src/qt/res/movies/spinner-031.png b/src/qt/res/movies/spinner-031.png index e867572cd6..a511584401 100644 Binary files a/src/qt/res/movies/spinner-031.png and b/src/qt/res/movies/spinner-031.png differ diff --git a/src/qt/res/movies/spinner-032.png b/src/qt/res/movies/spinner-032.png index 13b1e09412..02de240ad3 100644 Binary files a/src/qt/res/movies/spinner-032.png and b/src/qt/res/movies/spinner-032.png differ diff --git a/src/qt/res/movies/spinner-033.png b/src/qt/res/movies/spinner-033.png index 5c719df339..de32a7f543 100644 Binary files a/src/qt/res/movies/spinner-033.png and b/src/qt/res/movies/spinner-033.png differ diff --git a/src/qt/res/movies/spinner-034.png b/src/qt/res/movies/spinner-034.png index c5f7185588..b83ff112b3 100644 Binary files a/src/qt/res/movies/spinner-034.png and b/src/qt/res/movies/spinner-034.png differ diff --git a/src/qt/res/movies/spinner-035.png b/src/qt/res/movies/spinner-035.png index 0ae9c806f8..a5a5edeed1 100644 Binary files a/src/qt/res/movies/spinner-035.png and b/src/qt/res/movies/spinner-035.png differ diff --git a/src/qt/res/src/spinner.png b/src/qt/res/src/spinner.png index de213b5204..f37dd419cc 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 655fcd8e30..0314d37483 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -1013,7 +1013,7 @@ void RPCConsole::showPage(int index) { } } - GUIUtil::setFont({btnActive}, GUIUtil::FontWeight::Bold, 16); + GUIUtil::setFont({btnActive}, GUIUtil::FontWeight::Normal, 16); GUIUtil::setFont(vecNormal, GUIUtil::FontWeight::Normal, 16); GUIUtil::updateFonts(); @@ -1267,7 +1267,7 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats) { void RPCConsole::setButtonIcons() { const QSize consoleButtonsSize(BUTTON_ICONSIZE * - 0.8, BUTTON_ICONSIZE * 0.8); + 0.9, BUTTON_ICONSIZE * 0.9); GUIUtil::setIcon(ui->clearButton, "remove", GUIUtil::ThemedColor::RED, consoleButtonsSize); GUIUtil::setIcon(ui->fontBiggerButton, "fontbigger", GUIUtil::ThemedColor::BLUE, consoleButtonsSize); GUIUtil::setIcon(ui->fontSmallerButton, "fontsmaller", GUIUtil::ThemedColor::BLUE, consoleButtonsSize); diff --git a/src/qt/sendassetsentry.cpp b/src/qt/sendassetsentry.cpp index ad615de563..75b8159aad 100644 --- a/src/qt/sendassetsentry.cpp +++ b/src/qt/sendassetsentry.cpp @@ -287,8 +287,8 @@ void SendAssetsEntry::changeEvent(QEvent *e) { } void SendAssetsEntry::setButtonIcons() { - GUIUtil::setIcon(ui->addressBookButton, "address-book"); - GUIUtil::setIcon(ui->pasteButton, "editpaste"); + GUIUtil::setIcon(ui->addressBookButton, "address-book", GUIUtil::ThemedColor::BLUE); + GUIUtil::setIcon(ui->pasteButton, "editpaste", GUIUtil::ThemedColor::BLUE); GUIUtil::setIcon(ui->deleteButton, "remove", GUIUtil::ThemedColor::RED); } diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index f8d2f368e4..fbf899ab55 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -266,8 +266,8 @@ void SendCoinsEntry::changeEvent(QEvent *e) { } void SendCoinsEntry::setButtonIcons() { - GUIUtil::setIcon(ui->addressBookButton, "address-book"); - GUIUtil::setIcon(ui->pasteButton, "editpaste"); + GUIUtil::setIcon(ui->addressBookButton, "address-book", GUIUtil::ThemedColor::BLUE); + GUIUtil::setIcon(ui->pasteButton, "editpaste", GUIUtil::ThemedColor::BLUE); GUIUtil::setIcon(ui->deleteButton, "remove", GUIUtil::ThemedColor::RED); GUIUtil::setIcon(ui->deleteButton_is, "remove", GUIUtil::ThemedColor::RED); GUIUtil::setIcon(ui->deleteButton_s, "remove", GUIUtil::ThemedColor::RED); diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 66298b0d28..c78126c85e 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -56,7 +56,7 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) : ui->messageIn_VM->installEventFilter(this); ui->signatureIn_VM->installEventFilter(this); - GUIUtil::setFont({ui->signatureOut_SM, ui->signatureIn_VM}, GUIUtil::FontWeight::Normal, 11, true); + GUIUtil::setFont({ui->signatureOut_SM, ui->signatureIn_VM}, GUIUtil::FontWeight::Normal, 11); GUIUtil::setFont({ui->signatureLabel_SM}, GUIUtil::FontWeight::Bold, 16); GUIUtil::setFont({ui->statusLabel_SM, ui->statusLabel_VM}, GUIUtil::FontWeight::Bold); @@ -105,7 +105,7 @@ void SignVerifyMessageDialog::showPage(int index) { } } - GUIUtil::setFont({btnActive}, GUIUtil::FontWeight::Bold, 16); + GUIUtil::setFont({btnActive}, GUIUtil::FontWeight::Normal, 16); GUIUtil::setFont(vecNormal, GUIUtil::FontWeight::Normal, 16); GUIUtil::updateFonts(); diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 5b2bd90b69..14dc73fb49 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -88,11 +88,10 @@ SplashScreen::SplashScreen(interfaces::Node &node, Qt::WindowFlags f, const Netw pixPaint.drawPixmap((width / 2) - (logoWidth / 2), (height / 2) - (logoHeight / 2) + 0, pixmapLogo.scaled(logoWidth * scale, logoHeight * scale, Qt::KeepAspectRatio, Qt::SmoothTransformation)); - //pixPaint.setPen(GUIUtil::getThemedQColor(GUIUtil::ThemedColor::DEFAULT)); - pixPaint.setPen(Qt::white); + pixPaint.setPen(GUIUtil::getThemedQColor(GUIUtil::ThemedColor::DEFAULT)); // check font size and drawing with - fontBold.setPointSize(50 * fontFactor); + fontBold.setPointSize(40 * fontFactor); pixPaint.setFont(fontBold); QFontMetrics fm = pixPaint.fontMetrics(); int titleTextWidth = GUIUtil::TextWidth(fm, titleText); @@ -161,8 +160,7 @@ static void InitMessage(SplashScreen *splash, const std::string &message) { Qt::QueuedConnection, Q_ARG(QString, QString::fromStdString(message)), Q_ARG(int, Qt::AlignBottom | Qt::AlignHCenter), - Q_ARG(QColor, Qt::white)); -// Q_ARG(QColor, GUIUtil::getThemedQColor(GUIUtil::ThemedColor::DEFAULT))); + Q_ARG(QColor, GUIUtil::getThemedQColor(GUIUtil::ThemedColor::DEFAULT))); assert(invoked); } diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp index fda93a084a..0c6a5d6270 100644 --- a/src/qt/trafficgraphwidget.cpp +++ b/src/qt/trafficgraphwidget.cpp @@ -79,7 +79,7 @@ void TrafficGraphWidget::paintEvent(QPaintEvent *) { if (fMax <= 0.0f) return; - QColor green = GUIUtil::getThemedQColor(GUIUtil::ThemedColor::GREEN); + QColor green = GUIUtil::getThemedQColor(GUIUtil::ThemedColor::BLUE); QColor red = GUIUtil::getThemedQColor(GUIUtil::ThemedColor::RED); QColor axisCol(GUIUtil::getThemedQColor(GUIUtil::ThemedColor::DEFAULT)); QColor axisCol2; diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 0d182b76ef..eae298a824 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -443,7 +443,7 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const case TransactionRecord::FutureReceive: case TransactionRecord::FutureSend: { if (wtx->label.isEmpty()) { - return GUIUtil::getThemedQColor(GUIUtil::ThemedColor::BAREADDRESS); + return GUIUtil::getThemedQColor(GUIUtil::ThemedColor::SECONDARY); } } break; @@ -452,7 +452,7 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const case TransactionRecord::CoinJoinMixing: case TransactionRecord::CoinJoinMakeCollaterals: case TransactionRecord::CoinJoinCollateralPayment: - return GUIUtil::getThemedQColor(GUIUtil::ThemedColor::BAREADDRESS); + return GUIUtil::getThemedQColor(GUIUtil::ThemedColor::SECONDARY); default: break; } @@ -506,17 +506,17 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx) case TransactionStatus::Confirming: switch (wtx->status.depth) { case 1: - return GUIUtil::getIcon("transaction_1", GUIUtil::ThemedColor::ORANGE); + return GUIUtil::getIcon("transaction_1", GUIUtil::ThemedColor::PRIMARY); case 2: - return GUIUtil::getIcon("transaction_2", GUIUtil::ThemedColor::ORANGE); + return GUIUtil::getIcon("transaction_2", GUIUtil::ThemedColor::PRIMARY); case 3: - return GUIUtil::getIcon("transaction_3", GUIUtil::ThemedColor::ORANGE); + return GUIUtil::getIcon("transaction_3", GUIUtil::ThemedColor::PRIMARY); case 4: - return GUIUtil::getIcon("transaction_4", GUIUtil::ThemedColor::ORANGE); + return GUIUtil::getIcon("transaction_4", GUIUtil::ThemedColor::PRIMARY); case 5: - return GUIUtil::getIcon("transaction_5", GUIUtil::ThemedColor::ORANGE); + return GUIUtil::getIcon("transaction_5", GUIUtil::ThemedColor::PRIMARY); default: - return GUIUtil::getIcon("transaction_6", GUIUtil::ThemedColor::ORANGE); + return GUIUtil::getIcon("transaction_6", GUIUtil::ThemedColor::PRIMARY); }; case TransactionStatus::Confirmed: return GUIUtil::getIcon("synced", GUIUtil::ThemedColor::GREEN);