From 42eb88256f5f064566af9debce20d7bd3a687893 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Mon, 8 Jun 2020 20:51:24 +0200 Subject: [PATCH 01/24] qt: User border-image in place of image For some reason image produced weird outputs on some resolution screens. --- src/qt/res/css/general.css | 96 +++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index a34596c6a751..3bdecf4541b5 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -122,43 +122,43 @@ QAbstractSpinBox::down-button { QAbstractSpinBox::up-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_up_normal'); + border-image: url(':/images/arrow_up_normal'); } QAbstractSpinBox::up-arrow:hover { width: 20px; height: 20px; - image: url(':/images/arrow_up_hover'); + border-image: url(':/images/arrow_up_hover'); } QAbstractSpinBox::up-arrow:pressed { width: 20px; height: 20px; - image: url(':/images/arrow_up_pressed'); + border-image: url(':/images/arrow_up_pressed'); } QAbstractSpinBox::up-arrow:disabled { width: 20px; height: 20px; - image: url(':/images/arrow_light_up_hover'); + border-image: url(':/images/arrow_light_up_hover'); } QAbstractSpinBox::down-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_down_normal'); + border-image: url(':/images/arrow_down_normal'); } QAbstractSpinBox::down-arrow:hover { width: 20px; height: 20px; - image: url(':/images/arrow_down_hover'); + border-image: url(':/images/arrow_down_hover'); } QAbstractSpinBox::down-arrow:pressed { width: 20px; height: 20px; - image: url(':/images/arrow_down_pressed'); + border-image: url(':/images/arrow_down_pressed'); } QAbstractSpinBox::down-arrow:disabled { width: 20px; height: 20px; - image: url(':/images/arrow_light_down_hover'); + border-image: url(':/images/arrow_light_down_hover'); } /****************************************************** @@ -176,40 +176,40 @@ QCheckBox::indicator { } QCheckBox::indicator:unchecked { - image: url(':/images/checkbox_normal'); + border-image: url(':/images/checkbox_normal'); } QCheckBox::indicator:hover:unchecked { - image: url(':/images/checkbox_normal_hover'); + border-image: url(':/images/checkbox_normal_hover'); } QCheckBox::indicator:unchecked:pressed { - image: url(':/images/checkbox_normal_pressed'); + border-image: url(':/images/checkbox_normal_pressed'); } QCheckBox::indicator:unchecked:disabled { - image: url(':/images/checkbox_normal_disabled'); + border-image: url(':/images/checkbox_normal_disabled'); } QCheckBox::indicator:checked { - image: url(':/images/checkbox_checked'); + border-image: url(':/images/checkbox_checked'); } QCheckBox::indicator:checked:hover { - image: url(':/images/checkbox_checked_hover'); + border-image: url(':/images/checkbox_checked_hover'); } QCheckBox::indicator:checked:pressed { - image: url(':/images/checkbox_checked_pressed'); + border-image: url(':/images/checkbox_checked_pressed'); } QCheckBox::indicator:checked:disabled { - image: url(':/images/checkbox_checked_disabled'); + border-image: url(':/images/checkbox_checked_disabled'); } QCheckBox::indicator:indeterminate { - image: url(':/images/checkbox_partly_checked'); + border-image: url(':/images/checkbox_partly_checked'); } QCheckBox::indicator:indeterminate:hover { - image: url(':/images/checkbox_partly_checked_hover'); + border-image: url(':/images/checkbox_partly_checked_hover'); } QCheckBox::indicator:indeterminate:pressed { - image: url(':/images/checkbox_partly_checked_pressed'); + border-image: url(':/images/checkbox_partly_checked_pressed'); } QCheckBox::indicator:indeterminate:disabled { - image: url(':/images/checkbox_partly_checked_disabled'); + border-image: url(':/images/checkbox_partly_checked_disabled'); } /****************************************************** @@ -306,7 +306,7 @@ QHeaderView::section:last { QHeaderView::down-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_light_down_normal'); + border-image: url(':/images/arrow_light_down_normal'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -314,7 +314,7 @@ QHeaderView::down-arrow { QHeaderView::down-arrow:hover { width: 20px; height: 20px; - image: url(':/images/arrow_light_down_hover'); + border-image: url(':/images/arrow_light_down_hover'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -323,7 +323,7 @@ QHeaderView::down-arrow:hover { QHeaderView::up-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_light_up_normal'); + border-image: url(':/images/arrow_light_up_normal'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -331,7 +331,7 @@ QHeaderView::up-arrow { QHeaderView::up-arrow:hover { width: 20px; height: 20px; - image: url(':/images/arrow_light_up_hover'); + border-image: url(':/images/arrow_light_up_hover'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -617,28 +617,28 @@ QRadioButton::indicator { margin-right: 5px; } QRadioButton::indicator:unchecked { - image: url(':/images/radio_normal'); + border-image: url(':/images/radio_normal'); } QRadioButton::indicator:hover:unchecked { - image: url(':/images/radio_normal_hover'); + border-image: url(':/images/radio_normal_hover'); } QRadioButton::indicator:unchecked:pressed { - image: url(':/images/radio_normal_pressed'); + border-image: url(':/images/radio_normal_pressed'); } QRadioButton::indicator:checked { - image: url(':/images/radio_checked'); + border-image: url(':/images/radio_checked'); } QRadioButton::indicator:checked:hover { - image: url(':/images/radio_checked_hover'); + border-image: url(':/images/radio_checked_hover'); } QRadioButton::indicator:checked:pressed { - image: url(':/images/radio_checked_pressed'); + border-image: url(':/images/radio_checked_pressed'); } QRadioButton::indicator:checked:disabled { - image: url(':/images/radio_checked_disabled'); + border-image: url(':/images/radio_checked_disabled'); } QRadioButton::indicator:unchecked:disabled { - image: url(':/images/radio_normal_disabled'); + border-image: url(':/images/radio_normal_disabled'); } /****************************************************** @@ -778,19 +778,19 @@ QTreeWidget { } QTreeWidget::branch::closed:has-children { padding: 0 -2px 0 2px; - image: url(':/images/arrow_right_normal'); + border-image: url(':/images/arrow_right_normal'); } QTreeWidget::branch::closed:has-children:hover { padding: 0 -2px 0 2px; - image: url(':/images/arrow_right_hover'); + border-image: url(':/images/arrow_right_hover'); } QTreeWidget::branch::open { padding: 0 -2px 0 2px; - image: url(':/images/arrow_down_normal'); + border-image: url(':/images/arrow_down_normal'); } QTreeWidget::branch::open:hover { padding: 0 -2px 0 2px; - image: url(':/images/arrow_down_hover'); + border-image: url(':/images/arrow_down_hover'); } QTreeWidget::indicator { width: 15px; @@ -798,40 +798,40 @@ QTreeWidget::indicator { margin-right: 5px; } QTreeWidget::indicator:unchecked { - image: url(':/images/checkbox_normal'); + border-image: url(':/images/checkbox_normal'); } QTreeWidget::indicator:hover:unchecked { - image: url(':/images/checkbox_normal_hover'); + border-image: url(':/images/checkbox_normal_hover'); } QTreeWidget::indicator:unchecked:pressed { - image: url(':/images/checkbox_normal_pressed'); + border-image: url(':/images/checkbox_normal_pressed'); } QTreeWidget::indicator:unchecked:disabled { - image: url(':/images/checkbox_normal_disabled'); + border-image: url(':/images/checkbox_normal_disabled'); } QTreeWidget::indicator:checked { - image: url(':/images/checkbox_checked'); + border-image: url(':/images/checkbox_checked'); } QTreeWidget::indicator:checked:hover { - image: url(':/images/checkbox_checked_hover'); + border-image: url(':/images/checkbox_checked_hover'); } QTreeWidget::indicator:checked:pressed { - image: url(':/images/checkbox_checked_pressed'); + border-image: url(':/images/checkbox_checked_pressed'); } QTreeWidget::indicator:checked:disabled { - image: url(':/images/checkbox_checked_disabled'); + border-image: url(':/images/checkbox_checked_disabled'); } QTreeWidget::indicator:indeterminate { - image: url(':/images/checkbox_partly_checked'); + border-image: url(':/images/checkbox_partly_checked'); } QTreeWidget::indicator:indeterminate:hover { - image: url(':/images/checkbox_partly_checked_hover'); + border-image: url(':/images/checkbox_partly_checked_hover'); } QTreeWidget::indicator:indeterminate:pressed { - image: url(':/images/checkbox_partly_checked_pressed'); + border-image: url(':/images/checkbox_partly_checked_pressed'); } QTreeWidget::indicator:indeterminate:disabled { - image: url(':/images/checkbox_partly_checked_disabled'); + border-image: url(':/images/checkbox_partly_checked_disabled'); } /****************************************************** From bf26072c5fdaf4029253a00514e600fccc9d599a Mon Sep 17 00:00:00 2001 From: xdustinface Date: Mon, 8 Jun 2020 20:56:23 +0200 Subject: [PATCH 02/24] qt: Fix layout issues in TransactionView --- src/qt/res/css/general.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 3bdecf4541b5..1fa9a45f7c72 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1591,7 +1591,7 @@ TransactionView TransactionView QLineEdit { /* Filters */ margin-bottom: 2px; margin-right: 1px; - min-width: 111px; + min-width: 101px; text-align: center; } @@ -1605,10 +1605,15 @@ TransactionView QLineEdit#addressWidget { /* Address Filter */ TransactionView QLineEdit#amountWidget { /* Amount Filter */ margin-bottom: 2px; margin-right: 1px; - max-width: 100px; + min-width: 101px; + max-width: 101px; text-align: center; } +TransactionView QComboBox#instantsendWidget:down-arrow { /* InstantSend Filter */ + margin-right: -5px; +} + TransactionView QComboBox { margin-bottom: 1px; margin-right: 1px; @@ -1616,4 +1621,7 @@ TransactionView QComboBox { #transactionSumLabel, #transactionSum { + qproperty-alignment: 'AlignLeading | AlignLeft'; + min-height: 30px; + margin-top: 15px; } From 5ccca72d614b0e4b74de159a051917d9c55c1d8b Mon Sep 17 00:00:00 2001 From: xdustinface Date: Mon, 8 Jun 2020 22:28:33 +0200 Subject: [PATCH 03/24] qt: Fix layout issues in OverviewPage --- src/qt/res/css/general.css | 91 +++++++++++++------------------------- 1 file changed, 31 insertions(+), 60 deletions(-) diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 1fa9a45f7c72..9e0a7e0e280e 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1140,12 +1140,13 @@ QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - color: #008de4; + margin-bottom: -1px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1158,11 +1159,13 @@ QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1175,11 +1178,13 @@ QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1192,11 +1197,13 @@ QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1211,20 +1218,14 @@ QWidget .QFrame#framePrivateSend { /* PrivateSend Widget */ max-height: 350px; } -QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */ - background-color: transparent; - max-width: 421px; - min-width: 421px; +QWidget .QFrame#framePrivateSend > .QLabel { + min-width: 175px; + min-height: 26px; } QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - min-width: 180px; - color: #008de4; - margin-top: 0; - margin-right: 5px; - padding-right: 5px; - min-height: 30px; + margin-right: 10px; } QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */ @@ -1234,77 +1235,56 @@ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* Private padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget { - max-width: 451px; - max-height: 175px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget > .QLabel { - min-width: 175px; - min-height: 25px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width: 160px; - margin-right: 5px; - padding-right: 5px; + margin-right: 10px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ +QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelCompletitionText { /* PrivateSend Completion Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelCompletitionText { /* PrivateSend Completion Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width: 160px; - margin-right: 5px; - padding-right: 5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress { /* PrivateSend Completion */ - border: 1px solid #aaa; - border-radius: 1px; - margin-right: 43px; - text-align: right; - color: #aaa; + margin-right: 10px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk { - background-color: #008de4; - width: 1px; +QWidget .QFrame#framePrivateSend QProgressBar#privateSendProgress { /* PrivateSend Completion */ + min-height: 13px; + max-height: 13px; + margin-top: 7px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width: 160px; margin-right: 5px; padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymized { /* PrivateSend Balance */ - +QWidget .QFrame#framePrivateSend .QLabel#labelAnonymized { /* PrivateSend Balance */ + margin-bottom: -2px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountAndRoundsText { /* PrivateSend Amount and Rounds Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelAmountAndRoundsText { /* PrivateSend Amount and Rounds Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width: 160px; margin-right: 5px; padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountRounds { /* PrivateSend Amount and Rounds */ +QWidget .QFrame#framePrivateSend .QLabel#labelAmountRounds { /* PrivateSend Amount and Rounds */ } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenomText { /* PrivateSend Submitted Denom Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelSubmittedDenomText { /* PrivateSend Submitted Denom Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width: 160px; margin-right: 5px; padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenom { /* PrivateSend Submitted Denom */ +QWidget .QFrame#framePrivateSend .QLabel#labelSubmittedDenom { /* PrivateSend Submitted Denom */ } @@ -1313,22 +1293,13 @@ QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetLastMessageAndButtons { } QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendLastMessage { /* PrivateSend Status Notifications */ - qproperty-alignment: 'AlignVCenter | AlignCenter'; + qproperty-alignment: 'AlignVCenter | AlignLeft'; min-width: 288px; - min-height: 43px; -} - -QWidget .QFrame#framePrivateSend QPushButton:focus { - border: none; - outline: none; + min-height: 50px; } QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend { /* Start PrivateSend Mixing */ - min-height: 40px; - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 6px; + margin-top: 5px; } QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover { From df596906438edc80e9bba23d480f2cb5ef90a2dd Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 02:21:49 +0200 Subject: [PATCH 04/24] qt: Replace transparent with #00000000 in stylesheets --- src/qt/res/css/general.css | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 9e0a7e0e280e..7498af50cf7e 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -68,7 +68,7 @@ QDialog { } .QFrame { - background-color: transparent; + background-color: #00000000; border: 0px; } @@ -166,7 +166,7 @@ QCheckBox ******************************************************/ QCheckBox{ - background-color: transparent; + background-color: #00000000; min-height: 20px; } QCheckBox::indicator { @@ -226,7 +226,7 @@ QComboBox:checked { } QComboBox:editable { - border: 0px solid transparent; + border: 0px solid #00000000; } QComboBox::drop-down { @@ -249,14 +249,14 @@ QComboBox::item:alternate { } QComboBox::item:selected { - border: 0px solid transparent; + border: 0px solid #00000000; } QComboBox::indicator { - background-color: transparent; - selection-background-color: transparent; - color: transparent; - selection-color: transparent; + background-color: #00000000; + selection-background-color: #00000000; + color: #00000000; + selection-color: #00000000; } QComboBox::down-arrow { @@ -285,7 +285,7 @@ QHeaderView ******************************************************/ QHeaderView { /* Table Header */ - background-color: transparent; + background-color: #00000000; } QHeaderView::section { /* Table Header Sections */ @@ -609,7 +609,7 @@ QRadioButton ******************************************************/ QRadioButton { - background-color: transparent; + background-color: #00000000; } QRadioButton::indicator { width: 15px; @@ -646,7 +646,7 @@ QScrollArea ******************************************************/ .QScrollArea { - background-color: transparent; + background-color: #00000000; border: 0px; } @@ -664,7 +664,7 @@ QTableView .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ border: 0px; - background-color: transparent; + background-color: #00000000; } QTableView::item { /* Table Item */ @@ -740,7 +740,7 @@ QToolBar { } QToolBar > QToolButton { - background-color: transparent; + background-color: #00000000; border: none; min-height: 50px; max-height: 50px; @@ -771,8 +771,8 @@ QTreeWidget ******************************************************/ QTreeWidget { - background-color: transparent; - alternate-background-color: transparent; + background-color: #00000000; + alternate-background-color: #00000000; outline: 0; border: 0px; } @@ -963,7 +963,7 @@ QDialog#CoinControlDialog .QDialogButtonBox#buttonBox QPushButton { /* Coin Cont } QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number 1 displays in this table for some reason... */ - color: transparent; + color: #00000000; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { @@ -1031,7 +1031,7 @@ QWidget#bgWidget { /* The frame overlaying the overview-page */ } QWidget#bgWidget .QPushButton#warningIcon { - background-color: transparent; + background-color: #00000000; width: 64px; height: 64px; padding: 5px; @@ -1212,7 +1212,7 @@ OverviewPage PrivateSend ******************************************************/ QWidget .QFrame#framePrivateSend { /* PrivateSend Widget */ - background-color: transparent; + background-color: #00000000; max-width: 451px; min-width: 451px; max-height: 350px; @@ -1383,7 +1383,7 @@ QWidget#RPCConsole QPushButton#openDebugLogfileButton { } QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ - background-color: transparent; + background-color: #00000000; border: 0; } @@ -1393,13 +1393,13 @@ QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */ QWidget#RPCConsole QPushButton#clearButton, QWidget#RPCConsole QPushButton#fontSmallerButton, QWidget#RPCConsole QPushButton#fontBiggerButton { /* Console Font and Clear Buttons */ - background-color: transparent; + background-color: #00000000; padding-left: 10px; padding-right: 10px; } QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */ - background-color: transparent; + background-color: #00000000; } QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ @@ -1448,7 +1448,7 @@ QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffF } QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ - background-color: transparent; + background-color: #00000000; } /* This QLabel uses name = "label" which conflicts with Address Book -> New Address */ @@ -1473,7 +1473,7 @@ SendCoinsEntry ******************************************************/ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ - background-color: transparent; + background-color: #00000000; min-width: 50px; min-height: 25px; margin-right: 5px; @@ -1487,7 +1487,7 @@ QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field } QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ - background-color: transparent; + background-color: #00000000; padding-left: 5px; padding-right: 5px; border: 0; @@ -1518,7 +1518,7 @@ QDialog#SignVerifyMessageDialog { } QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ - background-color: transparent; + background-color: #00000000; padding-left: 10px; padding-right: 10px; } @@ -1528,7 +1528,7 @@ QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ } QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ - background-color: transparent; + background-color: #00000000; padding-left: 15px; } @@ -1536,13 +1536,13 @@ QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ } QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ - background-color: transparent; + background-color: #00000000; padding-left: 10px; padding-right: 10px; } QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ - background-color: transparent; + background-color: #00000000; border: 0; padding-left: 10px; padding-right: 10px; From b2c3abec7b9b6c5768d2f185dc3f761c6d552c78 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 02:33:33 +0200 Subject: [PATCH 05/24] qt: Use #a84832 as red where possible. This includes css files and any color usage in code. --- src/qt/res/css/general.css | 10 +++++----- src/qt/res/css/traditional.css | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 7498af50cf7e..e961d149c979 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1116,7 +1116,7 @@ QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - color: #ff4500; + color: #a84832; margin-left: 3px; } @@ -1230,7 +1230,7 @@ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - color: #ff4500; + color: #a84832; margin-left: 2px; padding-right: 5px; } @@ -1329,7 +1329,7 @@ QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ qproperty-alignment: 'AlignBottom | AlignRight'; - color: #ff4500; + color: #a84832; min-width: 93px; margin-top: 0; margin-left: 16px; @@ -1407,7 +1407,7 @@ QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ } QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ - background-color: #eb4034; + background-color: #a84832; } /****************************************************** @@ -1444,7 +1444,7 @@ QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeL } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ - color: red; + color: #a84832; } QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ diff --git a/src/qt/res/css/traditional.css b/src/qt/res/css/traditional.css index e82d66a847b0..f3dab76e2e9a 100644 --- a/src/qt/res/css/traditional.css +++ b/src/qt/res/css/traditional.css @@ -162,7 +162,7 @@ OverviewPage QWidget .QFrame#frame .QLabel#labelWalletStatus, /* Wallet Sync Status */ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus, /* PrivateSend Sync Status */ QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ - color: red; + color: #a84832; } /****************************************************** @@ -175,5 +175,5 @@ QDialog#SendCoinsDialog QLabel#labelBalance { } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ - color: red; + color: #a84832; } From bc12236dddd88df76424d4546a3fb9f08271dce7 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 02:49:26 +0200 Subject: [PATCH 06/24] qt: Finetune QPushButton style --- src/qt/res/css/dark.css | 92 ++++++++++++++++++++++++++++++++++---- src/qt/res/css/general.css | 44 +++++++++--------- src/qt/res/css/light.css | 76 ++++++++++++++++++++++++++++++- 3 files changed, 182 insertions(+), 30 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index a81ddb079d99..fd10c640bb43 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -43,16 +43,16 @@ Common stuff WalletFrame, QDialog { - background-color: #444; + background-color: #2f2f31; } QStatusBar { - background-color: #555; + background-color: #39393b; color: #ccc; } QMessageBox { - background-color: #444; + background-color: #2f2f30; } QWidget { /* override text selection background color for all text widgets */ @@ -121,7 +121,7 @@ QHeaderView ******************************************************/ QHeaderView::section { /* Table Header Sections */ - background-color: #1c75bc; + background-color: #205a96; border-color: #ccc; color: #ccc; } @@ -169,7 +169,7 @@ QMenuBar { QMenuBar::item:selected { background-color: #333; - color: #1c75bc; + color: #205a96; } /****************************************************** @@ -181,10 +181,86 @@ QProgressDialog color: #ccc; } +/****************************************************** +QPushButton +******************************************************/ + +QPushButton { + background-color: #205a96; + color: #ccc; +} + +QPushButton:hover { + background-color: #27507a; +} + +QPushButton:focus { + border: none; + outline: none; +} + +QPushButton:pressed { + background-color: #205a96; +} + +QPushButton:disabled { + background-color: #39393b; + border-color: #585858; + color: #585858; +} + /****************************************************** QPushButton - Special case, light buttons ******************************************************/ +QWidget#AddressBookPage QPushButton#newAddress, +QWidget#AddressBookPage QPushButton#copyAddress, +QWidget#AddressBookPage QPushButton#showAddressQRCode, +QWidget#AddressBookPage QPushButton#deleteAddress, +QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#SendCoinsDialog .QPushButton#addButton, +QDialog#SendCoinsDialog .QPushButton#clearButton, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { + background-color: #f6f6f6; + color: #585858; +} + +QWidget#AddressBookPage QPushButton#newAddress:hover, +QWidget#AddressBookPage QPushButton#copyAddress:hover, +QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, +QWidget#AddressBookPage QPushButton#deleteAddress:hover, +QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#SendCoinsDialog .QPushButton#addButton:hover, +QDialog#SendCoinsDialog .QPushButton#clearButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, +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: #c7c7c7; + color: #333; +} + +QWidget#AddressBookPage QPushButton#newAddress:pressed, +QWidget#AddressBookPage QPushButton#copyAddress:pressed, +QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, +QWidget#AddressBookPage QPushButton#deleteAddress:pressed, +QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#SendCoinsDialog .QPushButton#addButton:pressed, +QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, +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; +} + QWidget#AddressBookPage QPushButton#newAddress:disabled, QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, @@ -197,9 +273,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: #666; + background-color: #39393b; border-color: #585858; - color: #787878; + color: #585858; } /****************************************************** @@ -482,7 +558,7 @@ ModalOverlay QWidget#bgWidget { /* The frame overlaying the overview-page */ background-color: #cc323232; - color: #616161; + color: #585858; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index e961d149c979..a8cccf103a81 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -393,20 +393,21 @@ QProgressDialog QPushButton - General blue buttons ******************************************************/ -QPushButton { /* Global Button Style */ - background-color: #008de4; +QPushButton { + background-color: red; border: 0; border-radius: 8px; - color: #ffffff; - height: 26px; - padding-left: 25px; - padding-right: 25px; - padding-top: 5px; - padding-bottom: 5px; + color: red; + max-height: 26px; + min-height: 26px; + padding-left: 12px; + padding-right: 12px; + padding-top: 4px; + padding-bottom: 4px; } QPushButton:hover { - background-color: #005e98; + background-color: red; } QPushButton:focus { @@ -415,12 +416,11 @@ QPushButton:focus { } QPushButton:pressed { - background-color: #1f5383; - border: 1px solid #444; + background-color: red; } QPushButton:disabled { - background-color: #787878; + background-color: red; } /****************************************************** @@ -439,11 +439,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: #f6f6f6; - border: 1px solid #d2d2d2; - color: #616161; - padding-left: 10px; - padding-right: 10px; + background-color: red; + color: red; } QWidget#AddressBookPage QPushButton#newAddress:hover, @@ -458,8 +455,9 @@ 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: #d2d2d2; - color: #333; + background-color: red; + border-color: red; + color: red; } QWidget#AddressBookPage QPushButton#newAddress:pressed, @@ -474,7 +472,10 @@ 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 { - border: 1px solid #9e9e9e; + border: 0; + background-color: red; + border-color: red; + color: red; } QWidget#AddressBookPage QPushButton#newAddress:disabled, @@ -490,6 +491,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { border: 1px solid; + background-color: red; + border-color: red; + color: red; } /****************************************************** diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index faafa7994449..2de819e33092 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -183,6 +183,78 @@ QProgressDialog QPushButton - Special case, light buttons ******************************************************/ +QPushButton { + background-color: #008de4; + color: #ffffff; +} + +QPushButton:hover { + background-color: #047ac2; +} + +QPushButton:pressed { + background-color: #1f5383; + border: 1px solid #444; +} + +QPushButton:disabled { + background-color: #e7e7e7; + border-color: #d2d2d2; + color: #c2c2c2; +} + +/****************************************************** +QPushButton - Special case, light buttons +******************************************************/ + +QWidget#AddressBookPage QPushButton#newAddress, +QWidget#AddressBookPage QPushButton#copyAddress, +QWidget#AddressBookPage QPushButton#showAddressQRCode, +QWidget#AddressBookPage QPushButton#deleteAddress, +QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#SendCoinsDialog .QPushButton#addButton, +QDialog#SendCoinsDialog .QPushButton#clearButton, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, +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; +} + +QWidget#AddressBookPage QPushButton#newAddress:hover, +QWidget#AddressBookPage QPushButton#copyAddress:hover, +QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, +QWidget#AddressBookPage QPushButton#deleteAddress:hover, +QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#SendCoinsDialog .QPushButton#addButton:hover, +QDialog#SendCoinsDialog .QPushButton#clearButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, +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: #333; +} + +QWidget#AddressBookPage QPushButton#newAddress:pressed, +QWidget#AddressBookPage QPushButton#copyAddress:pressed, +QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, +QWidget#AddressBookPage QPushButton#deleteAddress:pressed, +QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#SendCoinsDialog .QPushButton#addButton:pressed, +QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, +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: #333; +} + QWidget#AddressBookPage QPushButton#newAddress:disabled, QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, @@ -195,9 +267,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: #e2e2e2; + background-color: #e7e7e7; border-color: #d2d2d2; - color: #d2d2d2; + color: #c2c2c2; } /****************************************************** From 81a0d10690a359a0a9b5ea8d44738d487d4a9982 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 12:28:26 +0200 Subject: [PATCH 07/24] qt: Customized QSlider (used in the Debug window -> NetworkTraffic) --- src/qt/res/css/dark.css | 17 +++++++++++++++++ src/qt/res/css/general.css | 26 ++++++++++++++++++++++++++ src/qt/res/css/light.css | 17 +++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index fd10c640bb43..d1282f3f26cc 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -378,6 +378,23 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QSlider +******************************************************/ + +QSlider::handle:horizontal { + background-color: #205a96; +} +QSlider::handle:horizontal:hover { + background-color: #27507a; +} +QSlider::sub-page:horizontal { + background-color: #c7c7c7; +} +QSlider::add-page:horizontal { + background-color: #c7c7c7; +} + /****************************************************** QTableView ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index a8cccf103a81..0dbe6ceeeffc 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -662,6 +662,32 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QSlider +******************************************************/ + +QSlider::groove:horizontal { + background: #0000000; + height: 12px; + border-radius: 4px; +} + +QSlider::add-page:horizontal, +QSlider::sub-page:horizontal { + height: 12px; + border-radius: 4px; +} + +QSlider::handle:horizontal { +margin-left: 5px; +margin-right: 5px; +background-color: red; +width: 23px; +margin-top: -5px; +margin-bottom: -5px; +border-radius: 11px; +} + /****************************************************** QTableView ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 2de819e33092..e7fa47fedc45 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -372,6 +372,23 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QSlider +******************************************************/ + +QSlider::handle:horizontal { + background-color: #008de4; +} +QSlider::handle:horizontal:hover { + background-color: #047ac2; +} +QSlider::sub-page:horizontal { + background-color: #c7c7c7; +} +QSlider::add-page:horizontal { + background-color: #c7c7c7; +} + /****************************************************** QTableView ******************************************************/ From 8e95efa9d8d6e6536533d6003159d33e6b11faa4 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 13:13:01 +0200 Subject: [PATCH 08/24] qt: Finetune QToolbar style --- src/qt/res/css/dark.css | 11 ++++++++++- src/qt/res/css/general.css | 10 +++++----- src/qt/res/css/light.css | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index d1282f3f26cc..87d5a1e25d7a 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -468,8 +468,17 @@ QTextEdit { QToolBar / QToolButton ******************************************************/ +QToolBar { + background-color: #205a96; +} + +QToolBar > QToolButton:hover:!checked { + background-color: #27507a; + color: #DCDCDC; +} + QToolBar > QToolButton:checked { - background-color: #444; + background-color: #2f2f30; color: #ccc; } diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 0dbe6ceeeffc..985d3b0ee079 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -759,7 +759,7 @@ QToolBar / QToolButton ******************************************************/ QToolBar { - background-color: #008de4; + background-color: red; border: none; width: 100%; padding: 0; @@ -775,19 +775,19 @@ QToolBar > QToolButton { min-height: 50px; max-height: 50px; letter-spacing: 3px; - color: #ffffff; + color: #ddd; width: 100%; padding: 1px; text-align: center; } QToolBar > QToolButton:hover:!checked { - background-color: #005e98; - color: #DCDCDC; + background-color: red; + color: red; } QToolBar > QToolButton:disabled { - color: #444; + color: red; } QToolBar QLabel#lblToolbarLogo { diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index e7fa47fedc45..3dd8a2b9ed10 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -460,6 +460,20 @@ QTextEdit { QToolBar / QToolButton ******************************************************/ +QToolBar { + background-color: #008de4; +} + +QToolBar > QToolButton { + background-color: #00000000; + color: #ffffff; +} + +QToolBar > QToolButton:hover:!checked { + background-color: #047ac2; + color: #DCDCDC; +} + QToolBar > QToolButton:checked { background-color: #f6f6f6; color: #333333; From ba4717b8566208a7aa6135ec79c11b592ac9ff6d Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 13:53:45 +0200 Subject: [PATCH 09/24] qt: Customized QProgressBar --- src/qt/res/css/dark.css | 13 +++++++++++++ src/qt/res/css/general.css | 18 ++++++++++++++++++ src/qt/res/css/light.css | 14 ++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 87d5a1e25d7a..2cb6bbf53336 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -172,6 +172,19 @@ QMenuBar::item:selected { color: #205a96; } +/****************************************************** +QProgressBar +******************************************************/ + +QProgressBar { + background-color: #c7c7c7; + color: #00000000; +} + +QProgressBar::chunk { + background-color: #005e98; +} + /****************************************************** QProgressDialog ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 985d3b0ee079..56ecaf97c102 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -382,6 +382,24 @@ QMenuBar::item { QMenuBar::item:selected { } +/****************************************************** +QProgressBar +******************************************************/ + +QProgressBar { + background-color: red; + color: #00000000; + border: 0px solid red; + border-radius: 4px; + min-height: 10px; + max-height: 10px; +} + +QProgressBar::chunk { + background-color: red; + border-radius: 4px; +} + /****************************************************** QProgressDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 3dd8a2b9ed10..88fe7e12803c 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -171,6 +171,20 @@ QMenuBar { background-color: #fff; } +/****************************************************** +QProgressBar +******************************************************/ + +QProgressBar { + background-color: #c7c7c7; + border-color: #00000000; + color: #00000000; +} + +QProgressBar::chunk { + background-color: #005e98; +} + /****************************************************** QProgressDialog ******************************************************/ From 271737be013207c7d6e90d32234b7934e5cbcec7 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 23 Jun 2020 14:01:52 +0200 Subject: [PATCH 10/24] qt: Customized QCalendarWidget --- src/qt/res/css/dark.css | 48 +++++++++++++++++++++ src/qt/res/css/general.css | 88 ++++++++++++++++++++++++++++++++++++++ src/qt/res/css/light.css | 48 +++++++++++++++++++++ 3 files changed, 184 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 2cb6bbf53336..a44bff5f6a43 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -79,6 +79,54 @@ QAbstractSpinBox::down-button { color: #aaa; } +/****************************************************** +QCalendarWidget +******************************************************/ + +QCalendarWidget, +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + background-color: #2d2d2e; +} + +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + border-color: #4a4a4b; +} + +#qt_calendar_prevmonth:hover, +#qt_calendar_nextmonth:hover, +#qt_calendar_monthbutton:hover, +#qt_calendar_yearbutton:hover { + background-color: #39393b; +} + +QCalendarWidget QToolButton { + color: #c7c7c7; +} + +QCalendarWidget QWidget { + alternate-background-color: #585858; +} + +QCalendarWidget QAbstractItemView:enabled { + color: #c7c7c7; + selection-background-color: #4a4a4b; + selection-color: #c7c7c7; +} + +QCalendarWidget QAbstractItemView:disabled { + color: #818181; +} + /****************************************************** QComboBox ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 56ecaf97c102..16a363425f78 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -161,6 +161,94 @@ QAbstractSpinBox::down-arrow:disabled { border-image: url(':/images/arrow_light_down_hover'); } +/****************************************************** +QCalendarWidget +******************************************************/ + +QCalendarWidget { + background-color: red; + min-height: 250px; +} + +#qt_calendar_calendarview { + border-top: 0px solid red; + border-right: 1px solid red; + border-bottom: 1px solid red; + border-left: 1px solid red; + background-color: red; +} + +#qt_calendar_navigationbar { + background-color: red; +} + +#qt_calendar_navigationbar, +#qt_calendar_prevmonth { + border-left: 1px solid red; +} + +#qt_calendar_navigationbar, +#qt_calendar_nextmonth { + border-right: 1px solid red; +} + +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + border-top: 1px solid red; +} + +#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, +#qt_calendar_nextmonth:hover, +#qt_calendar_monthbutton:hover, +#qt_calendar_yearbutton:hover { + background-color: red; +} + +QCalendarWidget QToolButton { + width: 80px; + color: red; + background-color: red; +} + +QCalendarWidget QToolButton::menu-indicator { + image: none; +} + +QCalendarWidget QWidget { + alternate-background-color: red; +} + +QCalendarWidget QAbstractItemView { + selection-color: red; +} + +QCalendarWidget QAbstractItemView:enabled +{ + color: red; + background-color: red; + selection-background-color: red; + selection-color: red; +} + +QCalendarWidget QAbstractItemView:disabled { + color: red; +} + /****************************************************** QCheckBox ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 88fe7e12803c..eec6fe8450f5 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -85,6 +85,54 @@ QAbstractSpinBox::down-button { color: #818181; } +/****************************************************** +QCalendarWidget +******************************************************/ + +QCalendarWidget, +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + background-color: #eaeaec; +} + +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + border-color: #dcdcdc; +} + +#qt_calendar_prevmonth:hover, +#qt_calendar_nextmonth:hover, +#qt_calendar_monthbutton:hover, +#qt_calendar_yearbutton:hover { + background-color: #d2d2d2; +} + +QCalendarWidget QToolButton { + color: #555; +} + +QCalendarWidget QWidget { + alternate-background-color: #c7c7c7; +} + +QCalendarWidget QAbstractItemView:enabled { + color: #555; + selection-background-color: #d2d2d2; + selection-color: #555; +} + +QCalendarWidget QAbstractItemView:disabled { + color: #a7a7a7; +} + /****************************************************** QComboBox ******************************************************/ From 6e05fe7dfed50d665caf4bc5ce9ba3d937c7aebc Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 15:56:44 +0200 Subject: [PATCH 11/24] qt: Finetune QStatusBar style - Give the progress label a name as css reference - Set min height and margins --- src/qt/res/css/dark.css | 14 +++++++++----- src/qt/res/css/general.css | 22 +++++++++++++++++++--- src/qt/res/css/light.css | 13 +++++++++---- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index a44bff5f6a43..b71af168712a 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -46,11 +46,6 @@ QDialog { background-color: #2f2f31; } -QStatusBar { - background-color: #39393b; - color: #ccc; -} - QMessageBox { background-color: #2f2f30; } @@ -456,6 +451,15 @@ QSlider::add-page:horizontal { background-color: #c7c7c7; } +/****************************************************** +QStatusBar +******************************************************/ + +QStatusBar { + background-color: #363637; + color: #c7c7c7; +} + /****************************************************** QTableView ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 16a363425f78..ed78010ea84a 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -72,9 +72,6 @@ QDialog { border: 0px; } -QStatusBar { -} - QMessageBox { } @@ -794,6 +791,25 @@ margin-bottom: -5px; border-radius: 11px; } +/****************************************************** +QStatusBar +******************************************************/ + +QStatusBar { + padding-left: 10px; + padding-right: 10px; + min-height: 25px; +} + +QStatusBar QLabel { + margin-right: 5px; +} + +QStatusBar #lblStatusBarProgress { + margin-left: 5px; + margin-right: 5px; +} + /****************************************************** QTableView ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index eec6fe8450f5..68be6594e838 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -53,10 +53,6 @@ QDialog { background-color: #f6f6f6; } -QStatusBar { - background-color: #ffffff; -} - QMessageBox { background-color: #f6f6f6; } @@ -451,6 +447,15 @@ QSlider::add-page:horizontal { background-color: #c7c7c7; } +/****************************************************** +QStatusBar +******************************************************/ + +QStatusBar { + background-color: #ffffff; + color: #333; +} + /****************************************************** QTableView ******************************************************/ From 4b57f0ff3f942db04ebd2923518f6d0e742944a2 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 12 Jun 2020 11:33:41 +0200 Subject: [PATCH 12/24] qt: Finetune QMenu style - Set a light rounded border - Color for disabled items - Color/Style for seperator - Give the items padding --- src/qt/res/css/dark.css | 10 +++++++++- src/qt/res/css/general.css | 8 ++++++++ src/qt/res/css/light.css | 14 +++++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index b71af168712a..465642936da4 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -191,7 +191,8 @@ QMenu ******************************************************/ QMenu { - background-color: #555; + background-color: #39393b; + border-color: #4a4a4b; } QMenu::item { @@ -201,6 +202,13 @@ QMenu::item:selected { background-color: #666; color: #ddd; } +QMenu::item:disabled { + color: #585858; +} + +QMenu::separator { + background-color: #585858; +} /****************************************************** QMenuBar diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index ed78010ea84a..a8c8f4795678 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -446,14 +446,22 @@ QMenu ******************************************************/ QMenu { + border: 1px solid red; + border-radius: 5px; } QMenu::item { + padding: 2px 6px 2px 6px; } QMenu::item:selected { } +QMenu::separator { + height: 1px; + background-color: red; +} + /****************************************************** QMenuBar ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 68be6594e838..814e636c8faa 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -195,7 +195,8 @@ QMenu ******************************************************/ QMenu { - background-color: #f6f6f6; + background-color: #d2d2d2; + border-color: #dcdcdc; } QMenu::item { @@ -203,8 +204,15 @@ QMenu::item { } QMenu::item:selected { - background-color: #ffffff; - color: #008de4; + background-color: #eaeaec; +} + +QMenu::item:disabled { + color: #a7a7a7; +} + +QMenu::separator { + background-color: #c7c7c7; } /****************************************************** From 7a5824ca627bebae0734969af26e5739824d9072 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Wed, 10 Jun 2020 21:50:30 +0200 Subject: [PATCH 13/24] qt: Customized QGroupBox --- src/qt/res/css/dark.css | 10 ++++++++++ src/qt/res/css/general.css | 16 ++++++++++++++++ src/qt/res/css/light.css | 9 +++++++++ 3 files changed, 35 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 465642936da4..9472d11e9ac0 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -159,6 +159,16 @@ QComboBox::item:selected { color: #ccc; } +/****************************************************** +QGroupBox +******************************************************/ + +QGroupBox { + background-color: #39393b; + color: #c7c7c7; + font-size: 16px; +} + /****************************************************** QHeaderView ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index a8c8f4795678..0cda7d563128 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -365,6 +365,22 @@ QComboBox::down-arrow:disabled { border-image: url(':/images/arrow_light_down_hover') 0 0 0 0 stretch stretch; } +/****************************************************** +QGroupBox +******************************************************/ + +QGroupBox { + background-color:red; + color: red; + padding-top: 20px; +} + +QGroupBox:title { + background-color: #00000000; + margin-top: 5px; + margin-left: 7px; +} + /****************************************************** QHeaderView ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 814e636c8faa..111dc0c0a8b8 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -164,6 +164,15 @@ QComboBox::item:selected { background-color: #f2f2f2; } +/****************************************************** +QGroupBox +******************************************************/ + +QGroupBox { + background-color: #f2f2f4; + color: #555; +} + /****************************************************** QHeaderView ******************************************************/ From 38512242f179bf4267b5dd9a49a7561ccec69d01 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Thu, 18 Jun 2020 01:48:16 +0200 Subject: [PATCH 14/24] qt: Customized QToolTip --- src/qt/res/css/dark.css | 10 ++++++++++ src/qt/res/css/general.css | 11 +++++++++++ src/qt/res/css/light.css | 10 ++++++++++ 3 files changed, 31 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 9472d11e9ac0..30862b0de616 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -565,6 +565,16 @@ QToolBar > QToolButton:checked { color: #ccc; } +/****************************************************** +QToolTip +******************************************************/ + +QToolTip { + background-color: #2d2d2e; + border-color: #4a4a4b; + color: #c7c7c7; +} + /****************************************************** QTreeWidget ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 0cda7d563128..0f077f83764b 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -942,6 +942,17 @@ QToolBar QLabel#lblToolbarLogo { height: 2.5em; } +/****************************************************** +QToolTip +******************************************************/ + +QToolTip { + border: 1px solid red; + border-radius: 2px; + background-color: #00000000; + padding: 1px; +} + /****************************************************** QTreeWidget ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 111dc0c0a8b8..dd3f2773a42f 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -563,6 +563,16 @@ QToolBar > QToolButton:checked { color: #333333; } +/****************************************************** +QToolTip +******************************************************/ + +QToolTip { + background-color: #eaeaec; + border-color: #555; + color: #555; +} + /****************************************************** QTreeWidget ******************************************************/ From 004e022c2f4ab338b1bc5b53b5a75b96116ff76c Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 5 Jun 2020 01:56:12 +0200 Subject: [PATCH 15/24] qt: Give inputs widgets a proper hover/focus/selected/disabled style --- src/qt/res/css/dark.css | 77 ++++++++++++++----------- src/qt/res/css/general.css | 111 +++++++++++++++++++++++++------------ src/qt/res/css/light.css | 66 +++++++++++----------- 3 files changed, 156 insertions(+), 98 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 30862b0de616..9fda39e82cc6 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -63,17 +63,56 @@ QTreeWidget { /* Base Text Size & Color */ } /****************************************************** -QAbstractSpinBox +User-input widget style ******************************************************/ +BitcoinAmountField, QAbstractSpinBox, -QAbstractSpinBox::up-button, -QAbstractSpinBox::down-button { - background-color: #333; +QComboBox, +QPlainTextEdit, +QLineEdit { + background-color: #2d2d2e; + border-color: #205a96; + color: #aaa; +} + +BitcoinAmountField:hover:!focus, +QAbstractSpinBox:hover:!focus, +QComboBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + background-color: #2d2d2e; border-color: #1c75bc; color: #aaa; } + +BitcoinAmountField:focus, +QAbstractSpinBox:focus, +QComboBox:checked, +QComboBox:focus, +QPlainTextEdit:focus, +QLineEdit:focus { + background-color: #39393b; + border-color: #1c75bc; +} + +BitcoinAmountField:disabled, +QAbstractSpinBox:disabled, +QComboBox:disabled, +QPlainTextEdit:disabled, +QLineEdit:disabled { + background-color: #363637; + border-color: #585858; + color: #585858; +} + +/****************************************************** +QAbstractSpinBox +******************************************************/ + +/***** No dark.css specific coloring here yet *****/ + /****************************************************** QCalendarWidget ******************************************************/ @@ -126,23 +165,8 @@ QCalendarWidget QAbstractItemView:disabled { QComboBox ******************************************************/ -QComboBox { /* Dropdown Menus */ - background-color: #333; - border-color: #1c75bc; - color: #aaa; -} - -QComboBox:checked { - background-color: #3e3e3e; -} - -QComboBox:editable { - background-color: #1c75bc; - color: #616161; -} - QComboBox QListView { - background-color: #555; + background-color: #39393b; color: #aaa; } @@ -183,18 +207,7 @@ QHeaderView::section { /* Table Header Sections */ QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, -.QLineEdit, -QPlainTextEdit { /* Text Entry Fields */ - background-color: #333; - border-color: #1c75bc; - color: #aaa; -} - -.QValidatedLineEdit:disabled, -.QLineEdit:disabled { - background-color: #3e3e3e; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** QMenu diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 0f077f83764b..5adfbf71b0a1 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -82,38 +82,82 @@ QRadioButton, QTreeWidget { /* Base Text Size & Color */ } +/****************************************************** +User-input widget style +******************************************************/ + +BitcoinAmountField, +QAbstractSpinBox, +QComboBox, +QPlainTextEdit, +QLineEdit { + border: 1px solid red; + border-color: red; + border-radius: 8px; + height: 33px; + min-height: 33px; + max-height: 33px; + /* min-width: 60px; */ + outline: 0; + padding: 0px 8px 0px 8px; +} + +BitcoinAmountField:hover:!focus, +QAbstractSpinBox:hover:!focus, +QComboBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + border: 2px solid red; + border-color: #1c75bc; +} + +BitcoinAmountField:hover:!focus, +QAbstractSpinBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + /* Use the negative padding to counteract the border + QComboBox is excluded here since this would mess + with its dropdown menu */ + padding: -1px 7px -1px 7px; +} + +BitcoinAmountField:focus, +QAbstractSpinBox:focus, +QComboBox:focus, +QPlainTextEdit:focus, +QLineEdit:focus { + border: 2px solid red; + border-color: #1c75bc; + /* Use the negative padding to counteract the border */ + padding: -1px 7px -1px 7px; +} + +BitcoinAmountField:disabled, +QAbstractSpinBox:disabled, +QComboBox:disabled, +QPlainTextEdit:disabled, +QLineEdit:disabled { +} + /****************************************************** QAbstractSpinBox ******************************************************/ QAbstractSpinBox { - border: 1px solid red; - padding: 0px 5px 0px 5px; - min-height: 31px; } QAbstractSpinBox::up-button { - subcontrol-origin: border; - subcontrol-position: top right; - width: 21px; + background-color: #00000000; + width: 20px; border: 0px; - border-top: 1px solid; - border-right: 1px solid; - padding-right: 1px; - padding-left: 5px; - padding-top: 2px; + padding: 2px 1px 0px 5px; } QAbstractSpinBox::down-button { - subcontrol-origin: border; - subcontrol-position: bottom right; - width: 21px; + background-color: #00000000; + width: 20px; border: 0px; - border-right: 1px solid; - border-bottom: 1px solid; - padding-right: 1px; - padding-left: 5px; - padding-bottom: 2px; + padding: 0px 1px 2px 5px; } QAbstractSpinBox::up-arrow { @@ -252,7 +296,7 @@ QCheckBox QCheckBox{ background-color: #00000000; - min-height: 20px; + min-height: 33px; } QCheckBox::indicator { width: 15px; @@ -302,9 +346,6 @@ QComboBox ******************************************************/ QComboBox { /* Dropdown Menus */ - border: 1px solid red; - padding: 0px 5px 0px 5px; - min-height: 31px; } QComboBox:checked { @@ -441,20 +482,10 @@ QHeaderView::up-arrow:hover { /****************************************************** QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ + .QLineEdit, QPlainTextEdit, .QValidatedLineEdit { /* Text Entry Fields */ - border: 1px solid; - min-height: 31px; - outline: 0; - padding: 0px 3px 0px 3px; -} - -.QLineEdit:!focus { -} - -.QLineEdit:disabled, -.QValidatedLineEdit:disabled { } /****************************************************** @@ -1081,6 +1112,18 @@ QDialog#AskPassphraseDialog QLabel#passLabel3 { min-height: 33px; /* base width of 25px for QLineEdit, plus padding and border */ } +/****************************************************** +BitcoinAmountField +******************************************************/ + +BitcoinAmountField{ + /* This is a hacky way to make sure BitcoinAmountField's + * shows completely. + * TODO: Fix the issue properly. + */ + margin-bottom: 5px; +} + /****************************************************** CoinControlDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index dd3f2773a42f..d020f402ebe0 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -70,17 +70,44 @@ QTreeWidget { } /****************************************************** -QAbstractSpinBox +User-input widget style ******************************************************/ +BitcoinAmountField, QAbstractSpinBox, -QAbstractSpinBox::up-button, -QAbstractSpinBox::down-button { - background-color: #fcfcfc; - border-color: #82C3E6; - color: #818181; +QComboBox, +QPlainTextEdit, +QLineEdit { + background-color: #f6f6f6; + border-color: #008de4; + color: #333; +} + +BitcoinAmountField:focus, +QAbstractSpinBox:focus, +QComboBox:checked, +QComboBox:focus, +QPlainTextEdit:focus, +QLineEdit:focus { + background-color: #e8e8e8; } +BitcoinAmountField:disabled, +QAbstractSpinBox:disabled, +QComboBox:disabled, +QPlainTextEdit:disabled, +QLineEdit:disabled { + background-color: #e7e7e7; + border-color: #d2d2d2; + color: #c2c2c2; +} + +/****************************************************** +QAbstractSpinBox +******************************************************/ + +/***** No light.css specific coloring here yet *****/ + /****************************************************** QCalendarWidget ******************************************************/ @@ -133,21 +160,6 @@ QCalendarWidget QAbstractItemView:disabled { QComboBox ******************************************************/ -QComboBox { /* Dropdown Menus */ - background-color: #fcfcfc; - border-color: #82C3E6; - color: #818181; -} - -QComboBox:checked { - background-color: #f2f2f2; -} - -QComboBox:editable { - background-color: #1c75bc; - color: #616161; -} - QComboBox QListView { background-color: #fff; } @@ -187,17 +199,7 @@ QHeaderView::section { /* Table Header Sections */ QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, -.QLineEdit, -QPlainTextEdit { /* Text Entry Fields */ - background-color: #fcfcfc; - border-color: #82C3E6; -} - -.QValidatedLineEdit:disabled, -.QLineEdit:disabled { - background-color: #f2f2f2; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** QMenu From 1b3b720687157912f4ef2013a0e8ae6ca589b286 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 9 Jun 2020 15:33:58 +0200 Subject: [PATCH 16/24] qt: Finetune SendCoinsDialog - Add light line below the coincontrol frame - Add light line above fee frame - Increase header font size - Remove button layout changes of CoinControl button - Fix Layout/Alignment of balance labels --- src/qt/res/css/dark.css | 5 +++++ src/qt/res/css/general.css | 24 +++++++----------------- src/qt/res/css/light.css | 5 +++++ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 9fda39e82cc6..a673d77efb78 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -760,6 +760,11 @@ QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ SendCoinsDialog ******************************************************/ +QDialog#SendCoinsDialog .QFrame#frameCoinControl, +QDialog#SendCoinsDialog #scrollArea { + border-color: #39393b; +} + QDialog#SendCoinsDialog QLabel#labelBalance { color: #ccc; } diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 5adfbf71b0a1..52e2b8564d93 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1644,18 +1644,15 @@ QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ SendCoinsDialog ******************************************************/ -QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ - +QDialog#SendCoinsDialog .QFrame#frameCoinControl, +QDialog#SendCoinsDialog #scrollArea { /* Coin Control Section */ + border-bottom: 1px solid red; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QPushButton#pushButtonCoinControl { /* Coin Control Inputs Button */ - padding-left: 10px; - padding-right: 10px; - min-height: 25px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */ - color: #999; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ @@ -1669,7 +1666,6 @@ QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoi } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ - qproperty-margin: -6; margin-right: 112px; } @@ -1681,17 +1677,11 @@ QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContent background-color: #00000000; } -/* This QLabel uses name = "label" which conflicts with Address Book -> New Address */ -/* To maximize backwards compatibility this formatting has been removed */ - -QDialog#SendCoinsDialog QLabel#label { - min-height: 27px; -} - +QDialog#SendCoinsDialog QLabel#labelBalanceText, QDialog#SendCoinsDialog QLabel#labelBalance { - margin-left: 0px; - padding-left: 0px; - min-height: 27px; + qproperty-alignment: 'AlignLeading | AlignLeft'; + min-height: 20px; + max-height: 20px; } #checkboxSubtractFeeFromAmount { diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index d020f402ebe0..e88533546ab2 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -730,6 +730,11 @@ QWidget#RPCConsole { /* RPC Console Dialog Box */ SendCoinsDialog ******************************************************/ +QDialog#SendCoinsDialog .QFrame#frameCoinControl, +QDialog#SendCoinsDialog #scrollArea { + border-color: #ccc; +} + QDialog#SendCoinsDialog QLabel#labelBalance { color: #333333; } From 5b33e3e39d8d433380a60140d5885638fa4084cb Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sun, 14 Jun 2020 19:08:49 +0200 Subject: [PATCH 17/24] qt: Customized RPC console's autocompletition popup --- src/qt/res/css/dark.css | 14 ++++++++++++++ src/qt/res/css/general.css | 19 +++++++++++++++++++ src/qt/res/css/light.css | 14 ++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index a673d77efb78..bee09cb045de 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -756,6 +756,20 @@ QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ color: #aaa; } +#rpcAutoCompleter { + background-color: #39393b; + border-color: #4a4a4b; +} + +#rpcAutoCompleter::item { + color: #c7c7c7; +} + +#rpcAutoCompleter::item:selected { + background-color: #4a4a4b; + color: #c7c7c7; +} + /****************************************************** SendCoinsDialog ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 52e2b8564d93..ff263be312b2 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1640,6 +1640,25 @@ QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ background-color: #a84832; } +#rpcAutoCompleter { + border: 1px solid red; + background-color: red; +} + +#rpcAutoCompleter QListView { + background-color: red; +} + +#rpcAutoCompleter::item { + background-color: #00000000; + color: red; +} + +#rpcAutoCompleter::item:selected { + color: red; +} + + /****************************************************** SendCoinsDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index e88533546ab2..a556d2e9d6bf 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -726,6 +726,20 @@ QWidget#RPCConsole { /* RPC Console Dialog Box */ background-color: #f6f6f6; } +#rpcAutoCompleter { + background-color: #eaeaec; + border-color: #dcdcdc; +} + +#rpcAutoCompleter::item { + color: #555; +} + +#rpcAutoCompleter::item:selected { + background-color: #d2d2d2; + color: #555; +} + /****************************************************** SendCoinsDialog ******************************************************/ From d96ffcd4b5e8b476f62061836880698c89b69db7 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 23 Jun 2020 15:08:47 +0200 Subject: [PATCH 18/24] qt: Add stylesheets to Intro This is the datadir selection dialog. --- src/qt/res/css/general.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index ff263be312b2..bacf92c36813 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1242,6 +1242,18 @@ QDialog#HelpMessageDialog QScrollArea { QDialog#HelpMessageDialog QTextEdit { } +/****************************************************** +Intro +******************************************************/ + +Intro QRadioButton#dataDirCustom { + margin-top: 10px; +} + +Intro QPushButton#ellipsisButton { + margin-left: 10px; +} + /****************************************************** MasternodeList ******************************************************/ From dae61435156c91e31d6ff7e1ec7da979ae29cd06 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 23 Jun 2020 03:36:42 +0200 Subject: [PATCH 19/24] qt: OptionsDialog - Give the reset button the "light button" style --- src/qt/res/css/dark.css | 4 ++++ src/qt/res/css/general.css | 4 ++++ src/qt/res/css/light.css | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index bee09cb045de..14bd47c87e2f 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -305,6 +305,7 @@ QWidget#AddressBookPage QPushButton#copyAddress, QWidget#AddressBookPage QPushButton#showAddressQRCode, QWidget#AddressBookPage QPushButton#deleteAddress, QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#OptionsDialog QPushButton#resetButton, QDialog#SendCoinsDialog .QPushButton#addButton, QDialog#SendCoinsDialog .QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, @@ -321,6 +322,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:hover, QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, QWidget#AddressBookPage QPushButton#deleteAddress:hover, QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#OptionsDialog QPushButton#resetButton:hover, QDialog#SendCoinsDialog .QPushButton#addButton:hover, QDialog#SendCoinsDialog .QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, @@ -337,6 +339,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:pressed, QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, QWidget#AddressBookPage QPushButton#deleteAddress:pressed, QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#OptionsDialog QPushButton#resetButton:pressed, QDialog#SendCoinsDialog .QPushButton#addButton:pressed, QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, @@ -353,6 +356,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, QWidget#AddressBookPage QPushButton#deleteAddress:disabled, QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#OptionsDialog QPushButton#resetButton:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index bacf92c36813..ae3f4b6f8078 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -590,6 +590,7 @@ QWidget#AddressBookPage QPushButton#copyAddress, QWidget#AddressBookPage QPushButton#showAddressQRCode, QWidget#AddressBookPage QPushButton#deleteAddress, QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#OptionsDialog QPushButton#resetButton, QDialog#SendCoinsDialog .QPushButton#addButton, QDialog#SendCoinsDialog .QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, @@ -606,6 +607,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:hover, QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, QWidget#AddressBookPage QPushButton#deleteAddress:hover, QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#OptionsDialog QPushButton#resetButton:hover, QDialog#SendCoinsDialog .QPushButton#addButton:hover, QDialog#SendCoinsDialog .QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, @@ -623,6 +625,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:pressed, QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, QWidget#AddressBookPage QPushButton#deleteAddress:pressed, QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#OptionsDialog QPushButton#resetButton:pressed, QDialog#SendCoinsDialog .QPushButton#addButton:pressed, QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, @@ -641,6 +644,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, QWidget#AddressBookPage QPushButton#deleteAddress:disabled, QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#OptionsDialog QPushButton#resetButton:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index a556d2e9d6bf..00ae1f6a0ae5 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -289,6 +289,7 @@ QWidget#AddressBookPage QPushButton#copyAddress, QWidget#AddressBookPage QPushButton#showAddressQRCode, QWidget#AddressBookPage QPushButton#deleteAddress, QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#OptionsDialog QPushButton#resetButton, QDialog#SendCoinsDialog .QPushButton#addButton, QDialog#SendCoinsDialog .QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, @@ -305,6 +306,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:hover, QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, QWidget#AddressBookPage QPushButton#deleteAddress:hover, QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#OptionsDialog QPushButton#resetButton:hover, QDialog#SendCoinsDialog .QPushButton#addButton:hover, QDialog#SendCoinsDialog .QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, @@ -321,6 +323,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:pressed, QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, QWidget#AddressBookPage QPushButton#deleteAddress:pressed, QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#OptionsDialog QPushButton#resetButton:pressed, QDialog#SendCoinsDialog .QPushButton#addButton:pressed, QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, @@ -337,6 +340,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, QWidget#AddressBookPage QPushButton#deleteAddress:disabled, QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#OptionsDialog QPushButton#resetButton:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, From eb3d709d1e459a4e2413d300ab2b9645cca0dada Mon Sep 17 00:00:00 2001 From: xdustinface Date: Wed, 10 Jun 2020 21:58:28 +0200 Subject: [PATCH 20/24] qt: Finetune shared styles in general.css --- src/qt/res/css/general.css | 260 +++++++++++++++++++------------------ 1 file changed, 136 insertions(+), 124 deletions(-) diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index ae3f4b6f8078..7e2985508212 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -86,7 +86,6 @@ QTreeWidget { /* Base Text Size & Color */ User-input widget style ******************************************************/ -BitcoinAmountField, QAbstractSpinBox, QComboBox, QPlainTextEdit, @@ -94,24 +93,24 @@ QLineEdit { border: 1px solid red; border-color: red; border-radius: 8px; + padding: 0px 8px 0px 8px; +} + +QAbstractSpinBox, +QComboBox, +QLineEdit { height: 33px; min-height: 33px; max-height: 33px; - /* min-width: 60px; */ - outline: 0; - padding: 0px 8px 0px 8px; } -BitcoinAmountField:hover:!focus, QAbstractSpinBox:hover:!focus, QComboBox:hover:!focus, QPlainTextEdit:hover:!focus, QLineEdit:hover:!focus { border: 2px solid red; - border-color: #1c75bc; } -BitcoinAmountField:hover:!focus, QAbstractSpinBox:hover:!focus, QPlainTextEdit:hover:!focus, QLineEdit:hover:!focus { @@ -121,18 +120,15 @@ QLineEdit:hover:!focus { padding: -1px 7px -1px 7px; } -BitcoinAmountField:focus, QAbstractSpinBox:focus, QComboBox:focus, QPlainTextEdit:focus, QLineEdit:focus { border: 2px solid red; - border-color: #1c75bc; /* Use the negative padding to counteract the border */ padding: -1px 7px -1px 7px; } -BitcoinAmountField:disabled, QAbstractSpinBox:disabled, QComboBox:disabled, QPlainTextEdit:disabled, @@ -296,7 +292,8 @@ QCheckBox QCheckBox{ background-color: #00000000; - min-height: 33px; + min-height: 25px; + margin-right: 10px; } QCheckBox::indicator { width: 15px; @@ -406,6 +403,15 @@ QComboBox::down-arrow:disabled { border-image: url(':/images/arrow_light_down_hover') 0 0 0 0 stretch stretch; } +/****************************************************** +QDateTimeEdit +******************************************************/ + +QDateTimeEdit::drop-down { + width: 25px; + border: 0px; +} + /****************************************************** QGroupBox ******************************************************/ @@ -435,7 +441,6 @@ QHeaderView::section { /* Table Header Sections */ min-height: 25px; outline: 0; border: 0px solid; - border-right: 1px solid; padding-left: 5px; padding-right: 5px; padding-top: 2px; @@ -453,14 +458,6 @@ QHeaderView::down-arrow { subcontrol-origin: margin; margin-right: 5px; } -QHeaderView::down-arrow:hover { - width: 20px; - height: 20px; - border-image: url(':/images/arrow_light_down_hover'); - subcontrol-position: right center; - subcontrol-origin: margin; - margin-right: 5px; -} QHeaderView::up-arrow { width: 20px; @@ -470,14 +467,6 @@ QHeaderView::up-arrow { subcontrol-origin: margin; margin-right: 5px; } -QHeaderView::up-arrow:hover { - width: 20px; - height: 20px; - border-image: url(':/images/arrow_light_up_hover'); - subcontrol-position: right center; - subcontrol-origin: margin; - margin-right: 5px; -} /****************************************************** QLineEdit / QValidatedLineEdit / QPlainTextEdit @@ -537,7 +526,7 @@ QProgressBar { QProgressBar::chunk { background-color: red; - border-radius: 4px; + border-radius: 3px; } /****************************************************** @@ -828,8 +817,12 @@ QScrollBar QSlider ******************************************************/ +QSlider { + min-height: 30px; +} + QSlider::groove:horizontal { - background: #0000000; + background: #00000000; height: 12px; border-radius: 4px; } @@ -857,7 +850,7 @@ QStatusBar QStatusBar { padding-left: 10px; padding-right: 10px; - min-height: 25px; + min-height: 30px; } QStatusBar QLabel { @@ -874,11 +867,13 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - border: 0px; + border: 1px solid red; background-color: #00000000; + qproperty-showGrid: false; } QTableView::item { /* Table Item */ + border-bottom: 1px solid; } QTableView::item:selected { /* Table Item Selected */ @@ -889,43 +884,15 @@ QTableWidget ******************************************************/ .QTableWidget { - border: 0px; + border: 1px solid red; + qproperty-showGrid: false; } /****************************************************** QTabWidget ******************************************************/ -.QTabWidget { - border-bottom: 1px solid; -} - -.QTabWidget::pane { - border: 1px solid; -} - -.QTabWidget QTabBar::tab { - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 5px; - border-top: 1px solid; -} - -.QTabWidget QTabBar::tab:first { - border-left: 1px solid; -} - -.QTabWidget QTabBar::tab:last { - border-right: 1px solid; -} - -.QTabWidget QTabBar::tab:selected, -.QTabWidget QTabBar::tab:hover { -} - -.QTabWidget .QWidget { -} +/***** No general.css specific coloring here yet *****/ /****************************************************** QTextEdit @@ -955,8 +922,6 @@ QToolBar > QToolButton { border: none; min-height: 50px; max-height: 50px; - letter-spacing: 3px; - color: #ddd; width: 100%; padding: 1px; text-align: center; @@ -993,10 +958,9 @@ QTreeWidget ******************************************************/ QTreeWidget { - background-color: #00000000; - alternate-background-color: #00000000; - outline: 0; - border: 0px; + background-color: red; + alternate-background-color: red; + border: 1px solid red; } QTreeWidget::branch::closed:has-children { padding: 0 -2px 0 2px; @@ -1080,7 +1044,7 @@ AboutDialog QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ - margin-left: auto10px; + margin-left: 10px; } QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ @@ -1183,14 +1147,8 @@ QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Chang } QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonSelectAll { /* (un)select all button */ - padding-left: 10px; - padding-right: 10px; - min-height: 25px; } QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonToggleLock { /* Toggle lock state button */ - padding-left: 10px; - padding-right: 10px; - min-height: 25px; } QDialog#CoinControlDialog .QDialogButtonBox#buttonBox QPushButton { /* Coin Control 'OK' button */ @@ -1237,13 +1195,8 @@ QDialog#EditAddressDialog QLabel { HelpMessageDialog ******************************************************/ -QDialog#HelpMessageDialog { -} - -QDialog#HelpMessageDialog QScrollArea { -} - -QDialog#HelpMessageDialog QTextEdit { +HelpMessageDialog QWidget#scrollAreaWidgetContents { + border: 1px solid red; } /****************************************************** @@ -1331,11 +1284,19 @@ QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { } QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ - qproperty-alignment: 'AlignVCenter | AlignCenter'; - padding-bottom: 8px; + qproperty-alignment: 'AlignVCenter | AlignLeft'; + padding-left: 8px; + min-height: 60px; + color: #c79304; +} + +QDialog#OptionsDialog #line, +QDialog#OptionsDialog #frame { + border-top: 1px solid red; } QDialog#OptionsDialog QGroupBox { + margin-top: 10px; } /****************************************************** @@ -1348,16 +1309,14 @@ QWidget .QFrame#frame { /* Wallet Balance */ QWidget .QFrame#frame > .QLabel { min-width: 100px; - min-height: 30px; + min-height: 25px; } QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ min-width: 180px; - color: #008de4; margin-top: 0; margin-right: 5px; padding-right: 5px; - min-height: 30px; } QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ @@ -1368,7 +1327,7 @@ QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - margin-left: 18px; + margin-left: 15px; } QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ @@ -1381,7 +1340,6 @@ QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ min-width: 100px; margin-right: 5px; padding-right: 5px; - min-height: 35px; } QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ @@ -1498,9 +1456,14 @@ QWidget .QFrame#framePrivateSend .QLabel#labelCompletitionText { /* PrivateSend QWidget .QFrame#framePrivateSend QProgressBar#privateSendProgress { /* PrivateSend Completion */ min-height: 13px; max-height: 13px; + border-radius: 5px; margin-top: 7px; } +QWidget .QFrame#framePrivateSend QProgressBar#privateSendProgress:chunk { + border-radius: 5px; +} + QWidget .QFrame#framePrivateSend .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width: 160px; @@ -1565,8 +1528,7 @@ QWidget .QFrame#frame_2 { /* Transactions Widget */ QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ min-width: 180px; - color: #008de4; - margin-left: 67px; + margin-left: 18px; margin-top: 0; margin-right: 5px; padding-right: 5px; @@ -1593,19 +1555,28 @@ QWidget .QFrame#frame_2 QListView { /* Transaction List */ ReceiveCoinsDialog ******************************************************/ +QWidget#ReceiveCoinsDialog .QFrame { +} QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label, QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2, QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3, QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Label Label */ - min-width: 102px; - padding-right: 5px; + min-width: 0px; } QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ } +/****************************************************** +ReceiveRequestDialog +******************************************************/ + +ReceiveRequestDialog #outUri { + margin-top: 20px; +} + /****************************************************** RPCConsole ******************************************************/ @@ -1613,15 +1584,28 @@ RPCConsole QWidget#RPCConsole { /* RPC Console Dialog Box */ } -QWidget#RPCConsole QWidget#tab_info QLabel#label_11, -QWidget#RPCConsole QWidget#tab_info QLabel#label_10 { /* Margin between Network and Block Chain headers */ - qproperty-alignment: 'AlignBottom'; +QWidget#RPCConsole QLabel#label_9, +QWidget#RPCConsole QLabel#labelNetwork, +QWidget#RPCConsole QLabel#label_10, +QWidget#RPCConsole QLabel#labelMempoolTitle, +QWidget#RPCConsole QLabel#label_repair_header, +QWidget#RPCConsole QLabel#peerHeading, +QWidget#RPCConsole QLabel#banHeading { +} + +QWidget#RPCConsole QLabel#labelNetwork, +QWidget#RPCConsole QLabel#label_10, +QWidget#RPCConsole QLabel#labelMempoolTitle { /* Margin between Network and Block Chain headers */ + qproperty-alignment: 'AlignLeft | AlignBottom'; min-height: 25px; - min-width: 180px; + margin-top: 10px; + margin-left: -4px; } -QWidget#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ - color: #1c75bc; +QWidget#RPCConsole QLabel#banHeading { /* Peers Info Header */ + min-height: 30px; + margin-left: -3px; + margin-bottom: 15px; } QWidget#RPCConsole QPushButton#openDebugLogfileButton { @@ -1629,11 +1613,11 @@ QWidget#RPCConsole QPushButton#openDebugLogfileButton { } QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ - background-color: #00000000; - border: 0; + padding: 10px; } QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */ + margin-top: 10px; } QWidget#RPCConsole QPushButton#clearButton, @@ -1719,6 +1703,14 @@ QDialog#SendCoinsDialog QLabel#labelBalance { max-height: 20px; } +QDialog#SendCoinsDialog QLabel#labelBalance { + margin-right: 10px; +} + +QDialog#SendCoinsDialog QPushButton#sendButton { + margin-left:10px; +} + #checkboxSubtractFeeFromAmount { padding-left: 10px; } @@ -1743,23 +1735,20 @@ QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ background-color: #00000000; - padding-left: 5px; - padding-right: 5px; + margin-left: 5px; + margin-right: 5px; border: 0; - outline: 0; } QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ - padding-left: 10px; -} - -QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { -} - -QStackedWidget#SendCoinsEntry .QToolButton#pasteButton { + margin-left: 10px; } -QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton, +QStackedWidget#SendCoinsEntry .QToolButton#pasteButton, +QStackedWidget#SendCoinsEntry .QToolButton#deleteButton, +QStackedWidget#SendCoinsEntry .QToolButton#deleteButton_is { + qproperty-iconSize: 28px 28px; } QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ @@ -1774,33 +1763,56 @@ QDialog#SignVerifyMessageDialog { QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ background-color: #00000000; - padding-left: 10px; - padding-right: 10px; } QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ - min-height: 50px; + min-height: 80px; +} + +QDialog#SignVerifyMessageDialog QLabel#infoLabel_SM, +QDialog#SignVerifyMessageDialog QLabel#infoLabel_VM { + min-height: 60px; + min-width: 200px; +} + +QDialog#SignVerifyMessageDialog QPlainTextEdit#messageIn_SM, +QDialog#SignVerifyMessageDialog QPlainTextEdit#messageIn_VM { + padding: 8px; +} + +QDialog#SignVerifyMessageDialog QLabel#signatureLabel_SM { } QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ background-color: #00000000; - padding-left: 15px; } -QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ +QDialog#SignVerifyMessageDialog QLineEdit#signatureOut_SM, +QDialog#SignVerifyMessageDialog QLineEdit#signatureIn_VM { } QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ background-color: #00000000; - padding-left: 10px; - padding-right: 10px; } QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ background-color: #00000000; - border: 0; - padding-left: 10px; - padding-right: 10px; + border: 0px solid red; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM, +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { + qproperty-iconSize: 28px 28px; + padding-left: -1px; + padding-right: -1px; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM, +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { + margin-left: 8px; } /****************************************************** @@ -1841,7 +1853,7 @@ TransactionView QComboBox#instantsendWidget:down-arrow { /* InstantSend Filter * } TransactionView QComboBox { - margin-bottom: 1px; + margin-bottom: 3px; margin-right: 1px; } From 6c0f342ae731b145c6e9ea56b98fae3523844455 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Wed, 10 Jun 2020 21:58:55 +0200 Subject: [PATCH 21/24] qt: Finetune coloring in dark.css --- src/qt/res/css/dark.css | 248 +++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 140 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 14bd47c87e2f..b2c25048161f 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -43,15 +43,16 @@ Common stuff WalletFrame, QDialog { - background-color: #2f2f31; + background-color: #323233; } QMessageBox { - background-color: #2f2f30; + background-color: #323233; } QWidget { /* override text selection background color for all text widgets */ - selection-background-color: #999; + selection-color: #363637; + selection-background-color: #c7c7c7; } QCheckBox, @@ -59,7 +60,14 @@ QLabel, QListView, QRadioButton, QTreeWidget { /* Base Text Size & Color */ - color: #ccc; + color: #c7c7c7; +} + +QCheckBox:disabled, +QLabel:disabled, +QListView:disabled, +QRadioButton:disabled { + color: #585858; } /****************************************************** @@ -72,8 +80,8 @@ QComboBox, QPlainTextEdit, QLineEdit { background-color: #2d2d2e; - border-color: #205a96; - color: #aaa; + border-color: #00599a; + color: #c7c7c7; } BitcoinAmountField:hover:!focus, @@ -82,8 +90,7 @@ QComboBox:hover:!focus, QPlainTextEdit:hover:!focus, QLineEdit:hover:!focus { background-color: #2d2d2e; - border-color: #1c75bc; - color: #aaa; + border-color: #27507a; } @@ -94,7 +101,7 @@ QComboBox:focus, QPlainTextEdit:focus, QLineEdit:focus { background-color: #39393b; - border-color: #1c75bc; + border-color: #27507a; } BitcoinAmountField:disabled, @@ -167,20 +174,19 @@ QComboBox QComboBox QListView { background-color: #39393b; - color: #aaa; } QComboBox::item { - color: #aaa; + color: #c7c7c7; } QComboBox::item:alternate { - background-color: #444; + background-color: #4a4a4b; } QComboBox::item:selected { - background-color: #666; - color: #ccc; + background-color: #585858; + color: #c7c7c7; } /****************************************************** @@ -198,9 +204,13 @@ QHeaderView ******************************************************/ QHeaderView::section { /* Table Header Sections */ - background-color: #205a96; - border-color: #ccc; - color: #ccc; + background-color: #00599a; + color: #c7c7c7; +} + +QHeaderView::section:hover { /* Table Header Sections */ + background-color: #27507a; + color: #c7c7c7; } /****************************************************** @@ -219,11 +229,11 @@ QMenu { } QMenu::item { - color: #ccc; + color: #c7c7c7; } -QMenu::item:selected { - background-color: #666; - color: #ddd; +QMenu::item:selected:!disabled { + background-color: #585858; + color: #c7c7c7; } QMenu::item:disabled { color: #585858; @@ -238,12 +248,19 @@ QMenuBar ******************************************************/ QMenuBar { - background-color: #333; + background-color: #39393b; + color: #c7c7c7; + border-bottom: 1px solid; + border-color: #4a4a4b; +} + +QMenu::item { + color: #c7c7c7; } QMenuBar::item:selected { - background-color: #333; - color: #205a96; + background-color: #585858; + color: #c7c7c7; } /****************************************************** @@ -256,7 +273,7 @@ QProgressBar { } QProgressBar::chunk { - background-color: #005e98; + background-color: #00599a; } /****************************************************** @@ -264,8 +281,8 @@ QProgressDialog ******************************************************/ .QProgressDialog { - background-color: #444; - color: #ccc; + background-color: #4a4a4b; + color: #c7c7c7; } /****************************************************** @@ -273,8 +290,8 @@ QPushButton ******************************************************/ QPushButton { - background-color: #205a96; - color: #ccc; + background-color: #00599a; + color: #c7c7c7; } QPushButton:hover { @@ -287,7 +304,7 @@ QPushButton:focus { } QPushButton:pressed { - background-color: #205a96; + background-color: #00599a; } QPushButton:disabled { @@ -313,8 +330,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: #f6f6f6; - color: #585858; + background-color: #c7c7c7; + color: #333; } QWidget#AddressBookPage QPushButton#newAddress:hover, @@ -330,8 +347,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: #c7c7c7; - color: #333; + background-color: #818181; + color: #2d2d2e; } QWidget#AddressBookPage QPushButton#newAddress:pressed, @@ -388,7 +405,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage, #btnVerifyMessage { - border-color: #205a96; + border-color: #00599a; color: #818181; } @@ -426,7 +443,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { - border-color: #205a96; + border-color: #00599a; color: #c7c7c7; } @@ -459,7 +476,7 @@ QRadioButton QScrollArea ******************************************************/ -/***** No light.css specific coloring here yet *****/ +/***** No dark.css specific coloring here yet *****/ /****************************************************** QScrollBar @@ -474,7 +491,7 @@ QSlider ******************************************************/ QSlider::handle:horizontal { - background-color: #205a96; + background-color: #00599a; } QSlider::handle:horizontal:hover { background-color: #27507a; @@ -491,7 +508,7 @@ QStatusBar ******************************************************/ QStatusBar { - background-color: #363637; + background-color: #323233; color: #c7c7c7; } @@ -500,16 +517,18 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background-color: #333; + background-color: #2d2d2e; + border-color: #4a4a4b; } QTableView::item { /* Table Item */ - background-color: #333; + background-color: #2d2d2e; + border-color: #4a4a4b; } QTableView::item:selected { /* Table Item Selected */ - background-color: #555; - color: #ccc; + background-color: #39393b; + color: #c7c7c7; } /****************************************************** @@ -517,51 +536,25 @@ QTableWidget ******************************************************/ .QTableWidget { - background-color: #333; + background-color: #4a4a4b; + border-color: #4a4a4b; + color: #c7c7c7; } /****************************************************** QTabWidget ******************************************************/ -.QTabWidget { - border-color: #444; -} - -.QTabWidget::pane { - background-color: #444; - border-color: #333; -} - -.QTabWidget QTabBar::tab { - background-color: #ccc; - border-color: #333; - color: #444; -} - -.QTabWidget QTabBar::tab:first, -.QTabWidget QTabBar::tab:last { - border-color: #333; -} - -.QTabWidget QTabBar::tab:selected, -.QTabWidget QTabBar::tab:hover { - background-color: #555; - color: #ccc; -} - -.QTabWidget .QWidget { - color: #444; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** QTextEdit ******************************************************/ QTextEdit { - border-color: #333; - background-color: #555; - color: #ccc; + background-color: #2d2d2e; + border-color: #4a4a4b; + color: #c7c7c7; } /****************************************************** @@ -569,17 +562,22 @@ QToolBar / QToolButton ******************************************************/ QToolBar { - background-color: #205a96; + background-color: #00599a; +} + +QToolBar > QToolButton { + background-color: #00000000; + color: #c7c7c7; } QToolBar > QToolButton:hover:!checked { background-color: #27507a; - color: #DCDCDC; + color: #c7c7c7; } QToolBar > QToolButton:checked { - background-color: #2f2f30; - color: #ccc; + background-color: #323233; + color: #c7c7c7; } /****************************************************** @@ -597,7 +595,9 @@ QTreeWidget ******************************************************/ QTreeWidget { - background-color: #333; + alternate-background-color: #2d2d2e; + background-color: #2d2d2e; + border-color: #4a4a4b; } /****************************************************** @@ -626,44 +626,26 @@ AboutDialog AddressBookPage ******************************************************/ -QWidget#AddressBookPage { - background-color: #555; -} - -QWidget#AddressBookPage QTableView::item { - color: #aaa; +AddressBookPage QTableView { + color: #c7c7c7; } /****************************************************** AskPassphraseDialog ******************************************************/ -QDialog#AskPassphraseDialog { - background-color: #555; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** CoinControlDialog ******************************************************/ -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ - background-color: #666; - color: #ccc; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ - background-color: #333; - color: #ccc; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ - background-color: #666; - color: #ccc; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ - background-color: #333; - color: #ccc; +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; } /****************************************************** @@ -676,17 +658,16 @@ EditAddressDialog HelpMessageDialog ******************************************************/ -QDialog#HelpMessageDialog QScrollArea * { - background-color: #555; +HelpMessageDialog QWidget#scrollAreaWidgetContents { + background-color: #2d2d2e; + border-color: #4a4a4b; } /****************************************************** MasternodeList ******************************************************/ -QWidget#MasternodeList QTableWidget#tableWidgetMasternodesDIP3 { - color: #aaa; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** ModalOverlay @@ -698,28 +679,23 @@ QWidget#bgWidget { /* The frame overlaying the overview-page */ } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #444; - border-color: #555; + background-color: #4a4a4b; + border-color: #585858; } /****************************************************** OpenURIDialog ******************************************************/ -QDialog#OpenURIDialog { - background-color: #555; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** OptionsDialog ******************************************************/ -QDialog#OptionsDialog { - background-color: #555; -} - -QDialog#OptionsDialog QGroupBox { - color: #ccc; +QDialog#OptionsDialog #line, +QDialog#OptionsDialog #frame { + border-color: #4a4a4b; } /****************************************************** @@ -744,8 +720,8 @@ OverviewPage RecentTransactions ReceiveCoinsDialog ******************************************************/ -QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ - color: #aaa; +ReceiveCoinsDialog QTableView { + color: #c7c7c7; } /****************************************************** @@ -753,11 +729,11 @@ RPCConsole ******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color: #333; + background-color: #323233; } -QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ - color: #aaa; +RPCConsole QTableView { + color: #c7c7c7; } #rpcAutoCompleter { @@ -783,32 +759,24 @@ QDialog#SendCoinsDialog #scrollArea { border-color: #39393b; } -QDialog#SendCoinsDialog QLabel#labelBalance { - color: #ccc; -} - /****************************************************** SendCoinsEntry ******************************************************/ -QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ - color: #ccc; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** SignVerifyMessageDialog ******************************************************/ -QDialog#SignVerifyMessageDialog { - background-color: #555; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #444; + background-color: #323233; } /****************************************************** From 3bc0cf1dc83efefc17034e7378c10ea46520c249 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Wed, 10 Jun 2020 21:59:51 +0200 Subject: [PATCH 22/24] qt: Finetune coloring in light.css --- src/qt/res/css/light.css | 246 +++++++++++++++++++-------------------- 1 file changed, 118 insertions(+), 128 deletions(-) diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 00ae1f6a0ae5..64f0b82598a7 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -50,15 +50,16 @@ Common stuff WalletFrame, QDialog { - background-color: #f6f6f6; + background-color: #f2f2f4; } QMessageBox { - background-color: #f6f6f6; + background-color: #f2f2f4; } QWidget { /* override text selection background color for all text widgets */ - selection-background-color: #999; + selection-color: #eaeaec; + selection-background-color: #555; } QCheckBox, @@ -66,7 +67,14 @@ QLabel, QListView, QRadioButton, QTreeWidget { - color: #333333; + color: #555; +} + +QCheckBox:disabled, +QLabel:disabled, +QListView:disabled, +QRadioButton:disabled { + color: #c7c7c7; } /****************************************************** @@ -78,18 +86,29 @@ QAbstractSpinBox, QComboBox, QPlainTextEdit, QLineEdit { - background-color: #f6f6f6; + background-color: #eaeaec; border-color: #008de4; - color: #333; + color: #555; } +BitcoinAmountField:hover:!focus, +QAbstractSpinBox:hover:!focus, +QComboBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + background-color: #eaeaec; + border-color: #0f75b5; +} + + BitcoinAmountField:focus, QAbstractSpinBox:focus, QComboBox:checked, QComboBox:focus, QPlainTextEdit:focus, QLineEdit:focus { - background-color: #e8e8e8; + background-color: #d2d2d2; + border-color: #0f75b5; } BitcoinAmountField:disabled, @@ -97,9 +116,9 @@ QAbstractSpinBox:disabled, QComboBox:disabled, QPlainTextEdit:disabled, QLineEdit:disabled { - background-color: #e7e7e7; + background-color: #eaeaec; border-color: #d2d2d2; - color: #c2c2c2; + color: #c7c7c7; } /****************************************************** @@ -161,19 +180,20 @@ QComboBox ******************************************************/ QComboBox QListView { - background-color: #fff; + background-color: #f2f2f4; + color: #555; } QComboBox::item { - color: #818181; + color: #555; } QComboBox::item:alternate { - background-color: #fff; + background-color: #f2f2f4; } QComboBox::item:selected { - background-color: #f2f2f2; + background-color: #d2d2d2; } /****************************************************** @@ -191,8 +211,13 @@ QHeaderView QHeaderView::section { /* Table Header Sections */ background-color: #008de4; - border-color: #fff; - color: #fff; + border-color: #f2f2f4; + color: #f2f2f4; +} + +QHeaderView::section:hover { /* Table Header Sections */ + background-color: #0f75b5; + color: #f2f2f4; } /****************************************************** @@ -206,16 +231,16 @@ QMenu ******************************************************/ QMenu { - background-color: #d2d2d2; + background-color: #eaeaec; border-color: #dcdcdc; } QMenu::item { - color: #333; + color: #555; } -QMenu::item:selected { - background-color: #eaeaec; +QMenu::item:selected:!disabled { + background-color: #d2d2d2; } QMenu::item:disabled { @@ -231,7 +256,7 @@ QMenuBar ******************************************************/ QMenuBar { - background-color: #fff; + background-color: #f2f2f4; } /****************************************************** @@ -245,7 +270,7 @@ QProgressBar { } QProgressBar::chunk { - background-color: #005e98; + background-color: #008de4; } /****************************************************** @@ -253,31 +278,30 @@ QProgressDialog ******************************************************/ .QProgressDialog { - background-color: #f6f6f6; + background-color: #f2f2f4; } /****************************************************** -QPushButton - Special case, light buttons +QPushButton ******************************************************/ QPushButton { background-color: #008de4; - color: #ffffff; + color: #f2f2f4; } QPushButton:hover { - background-color: #047ac2; + background-color: #0f75b5; } QPushButton:pressed { - background-color: #1f5383; - border: 1px solid #444; + background-color: #008de4; } QPushButton:disabled { - background-color: #e7e7e7; + background-color: #eaeaec; border-color: #d2d2d2; - color: #c2c2c2; + color: #d2d2d2; } /****************************************************** @@ -298,7 +322,7 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { background-color: #c7c7c7; - color: #333; + color: #555; } QWidget#AddressBookPage QPushButton#newAddress:hover, @@ -315,7 +339,7 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { background-color: #a7a7a7; - color: #333; + color: #555; } QWidget#AddressBookPage QPushButton#newAddress:pressed, @@ -332,7 +356,7 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { background-color: #c7c7c7; - color: #333; + color: #555; } QWidget#AddressBookPage QPushButton#newAddress:disabled, @@ -348,9 +372,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: #e7e7e7; + background-color: #eaeaec; border-color: #d2d2d2; - color: #c2c2c2; + color: #d2d2d2; } /****************************************************** @@ -391,7 +415,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:checked, #btnVerifyMessage:hover:checked { - border-color: #008de4; + border-color: #555; color: #555; } @@ -410,7 +434,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { - border-color: #047ac2; + border-color: #0f75b5; color: #555; } @@ -429,7 +453,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:checked, #btnVerifyMessage:checked { - border-color: #008de4; + border-color: #555; color: #555; } @@ -461,7 +485,7 @@ QSlider::handle:horizontal { background-color: #008de4; } QSlider::handle:horizontal:hover { - background-color: #047ac2; + background-color: #0f75b5; } QSlider::sub-page:horizontal { background-color: #c7c7c7; @@ -475,8 +499,8 @@ QStatusBar ******************************************************/ QStatusBar { - background-color: #ffffff; - color: #333; + background-color: #f2f2f4; + color: #555; } /****************************************************** @@ -484,68 +508,48 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background-color: #fff; + background-color: #eaeaec; + border-color: #dcdcdc; } QTableView::item { /* Table Item */ - background-color: #fcfcfc; + background-color: #eaeaec; + border-color: #c7c7c7; } QTableView::item:selected { /* Table Item Selected */ - background-color: #f0f0f0; - color: #333; + background-color: #d2d2d2; + border-color: #d2d2d2; + color: #555; } /****************************************************** QTableWidget ******************************************************/ -QTableWidget { - background-color: #fff; +.QTableWidget { + background-color: #eaeaec; + border-color: #dcdcdc; + color: #555; } /****************************************************** QTabWidget ******************************************************/ -.QTabWidget { - border-color: #333; -} - -.QTabWidget::pane { - background-color: #fff; - border-color: #d7d7d7; -} - -.QTabWidget QTabBar::tab { - background-color: #f2f0f0; - border-color: #d7d7d7; - color: #333; -} - -.QTabWidget QTabBar::tab:first, -.QTabWidget QTabBar::tab:last { - border-color: #d7d7d7; -} - -.QTabWidget QTabBar::tab:selected, -.QTabWidget QTabBar::tab:hover { - background-color: #ffffff; - color: #333; -} - -.QTabWidget .QWidget { - color: #333; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** QTextEdit ******************************************************/ QTextEdit { - border-color: #d7d7d7; + background-color: #eaeaec; + border-color: #dcdcdc; + color: #555; } + /****************************************************** QToolBar / QToolButton ******************************************************/ @@ -556,17 +560,17 @@ QToolBar { QToolBar > QToolButton { background-color: #00000000; - color: #ffffff; + color: #f2f2f4; } QToolBar > QToolButton:hover:!checked { - background-color: #047ac2; - color: #DCDCDC; + background-color: #0f75b5; + color: #dcdcdc; } QToolBar > QToolButton:checked { - background-color: #f6f6f6; - color: #333333; + background-color: #f2f2f4; + color: #555; } /****************************************************** @@ -584,7 +588,9 @@ QTreeWidget ******************************************************/ QTreeWidget { - background-color: #fff; + alternate-background-color: #eaeaec; + background-color: #eaeaec; + border-color: #dcdcdc; } /****************************************************** @@ -613,40 +619,26 @@ AboutDialog AddressBookPage ******************************************************/ -QWidget#AddressBookPage { - background-color: #f6f6f6; +AddressBookPage QTableView { + color: #555; } /****************************************************** AskPassphraseDialog ******************************************************/ -QDialog#AskPassphraseDialog { - background-color: #f6f6f6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** CoinControlDialog ******************************************************/ -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ - background-color: #f7f7f7; - color: #333; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ - background-color: #f7f7f7; - color: #333; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ - background-color: #f7f7f7; - color: #333; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ - background-color: #f7f7f7; - color: #333; +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; } /****************************************************** @@ -659,8 +651,9 @@ EditAddressDialog HelpMessageDialog ******************************************************/ -QDialog#HelpMessageDialog QScrollArea * { - background-color: #ffffff; +HelpMessageDialog QWidget#scrollAreaWidgetContents { + background-color: #eaeaec; + border-color: #dcdcdc; } /****************************************************** @@ -678,24 +671,23 @@ QWidget#bgWidget { /* The frame overlaying the overview-page */ } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #fff; - border-color: #ccc; + background-color: #f2f2f4; + border-color: #c7c7c7; } /****************************************************** OpenURIDialog ******************************************************/ -QDialog#OpenURIDialog { - background-color: #f6f6f6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** OptionsDialog ******************************************************/ -QDialog#OptionsDialog { - background-color: #f6f6f6; +QDialog#OptionsDialog #line, +QDialog#OptionsDialog #frame { + border-color: #dcdcdc; } /****************************************************** @@ -720,14 +712,20 @@ OverviewPage RecentTransactions ReceiveCoinsDialog ******************************************************/ -/***** No light.css specific coloring here yet *****/ +ReceiveCoinsDialog QTableView { + color: #555; +} /****************************************************** RPCConsole ******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color: #f6f6f6; + background-color: #f2f2f4; +} + +RPCConsole QTableView { + color: #555; } #rpcAutoCompleter { @@ -750,35 +748,27 @@ SendCoinsDialog QDialog#SendCoinsDialog .QFrame#frameCoinControl, QDialog#SendCoinsDialog #scrollArea { - border-color: #ccc; -} - -QDialog#SendCoinsDialog QLabel#labelBalance { - color: #333333; + border-color: #dcdcdc; } /****************************************************** SendCoinsEntry ******************************************************/ -QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ - color: #333; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** SignVerifyMessageDialog ******************************************************/ -QDialog#SignVerifyMessageDialog { - background-color: #f6f6f6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #f6f6f6; + background-color: #f2f2f4; } /****************************************************** From b5ca2869ab699deddd51c92784a22b059381bac5 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Tue, 14 Jul 2020 23:55:55 +0300 Subject: [PATCH 23/24] More fixes for traditional.css No text colors, s/transparent/#00000000/ --- src/qt/res/css/traditional.css | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/qt/res/css/traditional.css b/src/qt/res/css/traditional.css index f3dab76e2e9a..6ff095a6ab1c 100644 --- a/src/qt/res/css/traditional.css +++ b/src/qt/res/css/traditional.css @@ -56,12 +56,10 @@ QPushButton - Special case, tabbar replacement buttons #btnVerifyMessage { background: none; border-radius: 0px; - color: red; border-bottom: 3px solid red; padding-bottom: 5px; - background-color: transparent; + background-color: #00000000; border-color: #008de4; - color: #333; } /* Debug window buttons */ @@ -80,12 +78,10 @@ QPushButton - Special case, tabbar replacement buttons #btnSignMessage:hover:checked, #btnVerifyMessage:hover:checked { border: none; - color: red; border-radius: 0px; border-bottom: 3px solid red; - background-color:transparent; + background-color: #00000000; border-color: #333; - color: #333; } /* Debug window buttons */ @@ -104,12 +100,10 @@ QPushButton - Special case, tabbar replacement buttons #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { border: none; - color: red; border-radius: 0px; border-bottom: 3px solid red; - background-color:transparent; + background-color: #00000000; border-color: #047ac2; - color: #666; } /* Debug window buttons */ @@ -128,12 +122,10 @@ QPushButton - Special case, tabbar replacement buttons #btnSignMessage:checked, #btnVerifyMessage:checked { border: none; - color: red; border-radius: 0px; border-bottom: 3px solid red; - background-color:transparent; + background-color: #00000000; border-color: #333; - color: #333; } /****************************************************** From 2cbd642e2613c822732fbe0b3255f056302cb205 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 26 Jun 2020 14:21:38 +0200 Subject: [PATCH 24/24] qt: Run update-css-files.py --- src/qt/res/css/dark.css | 24 ++++++++++++------------ src/qt/res/css/general.css | 24 +++++------------------- src/qt/res/css/light.css | 28 +++++++++------------------- src/qt/res/css/scrollbars.css | 2 +- src/qt/res/css/traditional.css | 7 ++++++- 5 files changed, 33 insertions(+), 52 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index b2c25048161f..a3e1d5f03f5d 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -17,21 +17,21 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in dark.css for commit 3bebd1a5c +# Used colors in dark.css for commit a50bd2371b +#00000000 #333 -#444 -#555 -#666 -#999 -#aaa -#ccc -#ddd -#1c75bc -#3e3e3e +#00599a +#27507a +#2d2d2e +#323233 +#363637 +#39393b +#4a4a4b #585858 -#616161 -#787878 +#818181 +#c7c7c7 +#f6f6f6 #cc323232 diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 7e2985508212..eaa4ec341d06 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -31,26 +31,12 @@ in the file. /* do not modify! section updated by update-css-files.py -# Used colors in general.css for commit 3bebd1a5c - -#333 -#444 -#999 -#aaa -#005e98 -#008de4 +# Used colors in general.css for commit a50bd2371b + +#00000000 #096e03 -#1c75bc -#1f5383 -#616161 -#787878 -#9e9e9e -#d2d2d2 -#eb4034 -#f5f5f5 -#f6f6f6 -#ff4500 -#ffffff +#a84832 +#c79304 */ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 64f0b82598a7..297de242a9c5 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -17,28 +17,18 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in light.css for commit 3bebd1a5c +# Used colors in light.css for commit a50bd2371b -#333 -#999 -#ccc -#fff +#00000000 +#555 #008de4 -#1c75bc -#333333 -#616161 -#818181 -#82C3E6 +#0f75b5 +#a7a7a7 +#c7c7c7 #d2d2d2 -#d7d7d7 -#e2e2e2 -#f0f0f0 -#f2f0f0 -#f2f2f2 -#f6f6f6 -#f7f7f7 -#fcfcfc -#ffffff +#dcdcdc +#eaeaec +#f2f2f4 #ccfafafa diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index 8deb72bd725b..ee4033bbb635 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -19,7 +19,7 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in scrollbars.css for commit 3bebd1a5c +# Used colors in scrollbars.css for commit a50bd2371b #e0e0e0 #f2f0f0 diff --git a/src/qt/res/css/traditional.css b/src/qt/res/css/traditional.css index 6ff095a6ab1c..0fed15c2307b 100644 --- a/src/qt/res/css/traditional.css +++ b/src/qt/res/css/traditional.css @@ -17,9 +17,14 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in traditional.css for commit 3bebd1a5c +# Used colors in traditional.css for commit a50bd2371b +#00000000 +#333 #fff +#008de4 +#047ac2 +#a84832 #ccfafafa