From c81277f2316abc2bb73bc1fef34028f5e4b10047 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 11:44:41 +0200 Subject: [PATCH 01/34] qt: Send tab - Generalized related CSS and some redesign - Removed grey boxes around labels of SendCoinEntry - Changed button styles for add/clear button - Removed padding for send button --- src/qt/res/css/dark.css | 154 ++----------------------------------- src/qt/res/css/general.css | 148 +++++++++++++++++++++++++++++++++++ src/qt/res/css/light.css | 154 ++----------------------------------- 3 files changed, 162 insertions(+), 294 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 36c11200bec2..ded26f7f29ff 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -1033,107 +1033,9 @@ QWidget#bgWidget .QPushButton#closeButton { } -/* SEND DIALOG */ - -QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ - -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl > .QLabel { /* Default Font Color and Size */ -font-weight:normal; -color: #999; -} - -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; -font-weight:normal; -font-size:14px; -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl > .QLabel { /* Coin Control Inputs Labels */ -padding:2px; -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoinControlChange { /* Custom Change Address */ -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ -font-weight:normal; -qproperty-margin:-6; -margin-right:112px; -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ -color: #ff4500; -} - -QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ -background:transparent; -} - -QDialog#SendCoinsDialog .QPushButton#sendButton { /* Send Button */ -padding-left:10px; -padding-right:10px; -} - -QDialog#SendCoinsDialog .QPushButton#clearButton { /* Clear Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QDialog#SendCoinsDialog .QPushButton#clearButton:hover { -background-color: #aaa; -color: #333; -} - -QDialog#SendCoinsDialog .QPushButton#clearButton:pressed { -border:1px solid #9e9e9e; -} - -QDialog#SendCoinsDialog .QPushButton#addButton { /* Add Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QDialog#SendCoinsDialog .QPushButton#addButton:hover { -background-color: #aaa; -color: #333; -} - -QDialog#SendCoinsDialog .QPushButton#addButton:pressed { -border:1px solid #9e9e9e; -} - -/* 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 { -/*margin-left:20px; -margin-right:-2px; -padding-right:-2px; -color:#616161; -font-size:14px; -font-weight:bold; -border-radius:5px; -padding-top:20px; -padding-bottom:20px;*/ -min-height:27px; -} +/****************************************************** +SendCoinsDialog +******************************************************/ QDialog#SendCoinsDialog QLabel#labelBalance { margin-left:0px; @@ -1146,54 +1048,12 @@ padding-bottom:20px; */ min-height:27px; } -#checkboxSubtractFeeFromAmount { -padding-left:10px; -} - - -/* SEND COINS ENTRY */ +/****************************************************** +SendCoinsEntry +******************************************************/ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ -background-color: #555; -min-width:102px; -font-weight:normal; -/*font-size:11px;*/ -color: #ccc; -min-height:25px; -margin-right:5px; -padding-right:5px; -} - -QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { -color: #444; -background-color:#999; -} - -QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field */ -} - -QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ -background-color:transparent; -padding-left:5px; -padding-right:5px; -border: 0; -outline: 0; -} - -QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ -padding-left:10px; -} - -QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { -} - -QStackedWidget#SendCoinsEntry .QToolButton#pasteButton { -} - -QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { -} - -QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ + color: #ccc; } /* COIN CONTROL POPUP */ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 9bcdaec401b8..4e6211c350ea 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -240,3 +240,151 @@ QTreeWidget::branch::open:hover { padding: 0 -2px 0 2px; image: url(':/images/arrow_down_hover'); } + +/****************************************************** +******************************************************* +STYLING OF SPECIFIC CUSTOM UI PARTS + +Below each section should be for a specific UI class/file +not only Qt standard elements +******************************************************* +******************************************************/ + +/****************************************************** +SendCoinsDialog +******************************************************/ + +QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ + +} + +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; + font-weight:normal; + font-size:14px; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl > .QLabel { /* Coin Control Inputs Labels */ + padding:2px; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoinControlChange { /* Custom Change Address */ +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ + font-weight:normal; + qproperty-margin:-6; + margin-right:112px; +} + +QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ + color: red; +} + +QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ + background:transparent; +} + +QDialog#SendCoinsDialog .QPushButton#addButton, +QDialog#SendCoinsDialog .QPushButton#clearButton { /* Clear Button */ + background-color:#f6f6f6; + border:1px solid #d2d2d2; + color:#616161; + padding-left:10px; + padding-right:10px; +} + +QDialog#SendCoinsDialog .QPushButton#addButton:hover, +QDialog#SendCoinsDialog .QPushButton#clearButton:hover { + background-color: #d2d2d2; + color:#333; +} + +QDialog#SendCoinsDialog .QPushButton#addButton:pressed, +QDialog#SendCoinsDialog .QPushButton#clearButton:pressed { + border:1px solid #9e9e9e; +} + +/* 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 { + /*margin-left:20px; + margin-right:-2px; + padding-right:-2px; + color:#616161; + font-size:14px; + font-weight:bold; + border-radius:5px; + padding-top:20px; + padding-bottom:20px;*/ + min-height:27px; +} + +QDialog#SendCoinsDialog QLabel#labelBalance { + margin-left:0px; + padding-left:0px; + color:#333333; + /* font-weight:bold; + border-radius:5px; + padding-top:20px; + padding-bottom:20px; */ + min-height:27px; +} + +#checkboxSubtractFeeFromAmount { + padding-left:10px; +} + +/****************************************************** +SendCoinsEntry +******************************************************/ + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ + background-color: transparent; + min-width:50px; + font-weight:normal; + font-size:15px; + min-height:25px; + margin-right:5px; + padding-right:5px; +} + +QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { +} + +QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field */ +} + +QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ + background-color:transparent; + padding-left:5px; + padding-right:5px; + border: 0; + outline: 0; +} + +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ + padding-left:10px; +} + +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { +} + +QStackedWidget#SendCoinsEntry .QToolButton#pasteButton { +} + +QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { +} + +QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ +} diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 97869ad61e89..baab7976ded7 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -993,107 +993,9 @@ QWidget#bgWidget .QPushButton#closeButton { } -/* SEND DIALOG */ - -QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ - -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl > .QLabel { /* Default Font Color and Size */ -font-weight:normal; -color: #999; -} - -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; -font-weight:normal; -font-size:14px; -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl > .QLabel { /* Coin Control Inputs Labels */ -padding:2px; -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoinControlChange { /* Custom Change Address */ -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ -font-weight:normal; -qproperty-margin:-6; -margin-right:112px; -} - -QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ -color: red; -} - -QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ -background:transparent; -} - -QDialog#SendCoinsDialog .QPushButton#sendButton { /* Send Button */ -padding-left:10px; -padding-right:10px; -} - -QDialog#SendCoinsDialog .QPushButton#clearButton { /* Clear Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QDialog#SendCoinsDialog .QPushButton#clearButton:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QDialog#SendCoinsDialog .QPushButton#clearButton:pressed { -border:1px solid #9e9e9e; -} - -QDialog#SendCoinsDialog .QPushButton#addButton { /* Add Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QDialog#SendCoinsDialog .QPushButton#addButton:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QDialog#SendCoinsDialog .QPushButton#addButton:pressed { -border:1px solid #9e9e9e; -} - -/* 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 { -/*margin-left:20px; -margin-right:-2px; -padding-right:-2px; -color:#616161; -font-size:14px; -font-weight:bold; -border-radius:5px; -padding-top:20px; -padding-bottom:20px;*/ -min-height:27px; -} +/****************************************************** +SendCoinsDialog +******************************************************/ QDialog#SendCoinsDialog QLabel#labelBalance { margin-left:0px; @@ -1106,54 +1008,12 @@ padding-bottom:20px; */ min-height:27px; } -#checkboxSubtractFeeFromAmount { -padding-left:10px; -} - - -/* SEND COINS ENTRY */ +/****************************************************** +SendCoinsEntry +******************************************************/ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ -background-color:#F8F6F6; -min-width:102px; -font-weight:normal; -/*font-size:11px;*/ -color:#333; -min-height:25px; -margin-right:5px; -padding-right:5px; -} - -QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { -color: #fff; -background-color:#999; -} - -QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field */ -} - -QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ -background-color:transparent; -padding-left:5px; -padding-right:5px; -border: 0; -outline: 0; -} - -QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ -padding-left:10px; -} - -QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { -} - -QStackedWidget#SendCoinsEntry .QToolButton#pasteButton { -} - -QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { -} - -QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ + color: #333; } /* COIN CONTROL POPUP */ From 9ba352ce81a47f754469b9a2a41f924ffe3850fb Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 12:12:56 +0200 Subject: [PATCH 02/34] qt: Overview tab - Generalized related CSS and some redesign - Removed grey boxes around balance labels --- src/qt/res/css/dark.css | 333 ++----------------------------------- src/qt/res/css/general.css | 309 ++++++++++++++++++++++++++++++++++ src/qt/res/css/light.css | 330 ++---------------------------------- 3 files changed, 338 insertions(+), 634 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index ded26f7f29ff..b9de978a2c3f 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -84,7 +84,8 @@ background-color: #555; QLabel, QCheckBox, -QRadioButton { /* Base Text Size & Color */ +QRadioButton, +QListView { /* Base Text Size & Color */ font-size:12px; color: #ccc; } @@ -684,329 +685,25 @@ font-weight:normal; padding-right:5px; } -/* OVERVIEW SCREEN */ - -QWidget .QFrame#frame { /* Wallet Balance */ -min-width:490px; -} - -QWidget .QFrame#frame > .QLabel { -min-width:190px; -font-weight:normal; -min-height:30px; -} - -QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ -min-width:180px; -color:#008de4; -margin-top:0; -margin-right:5px; -padding-right:5px; -font-weight:bold; -font-size:18px; -min-height:30px; -} - -QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -color: #ff4500; -margin-left:3px; -} - -QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:18px; -} - -QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color: #555; -margin-right:5px; -padding-right:5px; -font-size:14px; -font-weight: bold; -min-height:35px; -} - -QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -color: #008de4; -font-size:16px; -font-weight: bold; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -font-size:12px; -background-color: #555; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -font-size:12px; -background-color: #555; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -font-size:12px; -background-color: #555; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -/* PRIVATESEND WIDGET */ - -QWidget .QFrame#framePrivateSend { /* PrivateSend Widget */ -background-color:transparent; -max-width: 451px; -min-width: 451px; -max-height: 350px; -} - -QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */ -background-color:transparent; -max-width: 421px; -min-width: 421px; -} - -QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -min-width:180px; -color:#008de4; -margin-top:0; -margin-right:5px; -padding-right:5px; -font-weight: bold; -font-size:18px; -min-height:30px; -} -/******************************************************************/ -QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -color: #ff4500; -margin-left:2px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget { -max-width: 451px; -max-height: 175px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget > .QLabel { -min-width:175px; -font-weight:normal; -min-height:25px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color: #555; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelCompletitionText { /* PrivateSend Completion Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color: #555; -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; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk { -background-color: #008de4; -width:1px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color: #555; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymized { /* PrivateSend Balance */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountAndRoundsText { /* PrivateSend Amount and Rounds Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color: #555; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountRounds { /* PrivateSend Amount and Rounds */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenomText { /* PrivateSend Submitted Denom Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color: #555; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenom { /* PrivateSend Submitted Denom */ - -} - -QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetLastMessageAndButtons { -max-width: 451px; -} - -QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendLastMessage { /* PrivateSend Status Notifications */ -qproperty-alignment: 'AlignVCenter | AlignCenter'; -min-width: 288px; -min-height: 43px; -font-size:11px; -color: #aaa; -} - -/* PRIVATESEND BUTTONS */ - -QWidget .QFrame#framePrivateSend .QPushButton { /* PrivateSend Buttons - General Attributes */ -border:0px solid #ffffff; -} - -QWidget .QFrame#framePrivateSend QPushButton:focus { -border:none; -outline:none; -} - -QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend { /* Start PrivateSend Mixing */ -min-height: 40px; -font-size:15px; -font-weight:normal; -color:#ffffff; -padding-left:10px; -padding-right:10px; -padding-top:5px; -padding-bottom:6px; -} - -QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover { +/****************************************************** +OverviewPage Balances +******************************************************/ -} +/***** No dark.css specific coloring here yet *****/ -/* RECENT TRANSACTIONS */ +/****************************************************** +OverviewPage PrivateSend +******************************************************/ -QWidget .QFrame#frame_2 { /* Transactions Widget */ -min-width:510px; -margin-right:20px; -margin-left:0; -margin-top:0; -} +/***** No dark.css specific coloring here yet *****/ -QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ -min-width:180px; -color: #008de4; -margin-left:67px; -margin-top:0; -margin-right:5px; -padding-right:5px; -font-weight:bold; -font-size:18px; -min-height:30px; -} - -QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ -qproperty-alignment: 'AlignBottom | AlignRight'; -color: #ff4500; -min-width:93px; -margin-top:0; -margin-left:16px; -margin-right:5px; -min-height:16px; -} +/****************************************************** +OverviewPage RecentTransactions +******************************************************/ -QWidget .QFrame#frame_2 QListView { /* Transaction List */ -color: #ccc; -font-weight:normal; -font-size:12px; -max-width:369px; -margin-top:12px; -margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ -} +/***** No dark.css specific coloring here yet *****/ -/* MODAL OVERLAY */ +/**! MODAL OVERLAY */ QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ background: rgba(0,0,0,220); diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 4e6211c350ea..0c9e1acecd14 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -250,6 +250,315 @@ not only Qt standard elements ******************************************************* ******************************************************/ +/****************************************************** +OverviewPage Balances +******************************************************/ + +QWidget .QFrame#frame { /* Wallet Balance */ + min-width:490px; +} + +QWidget .QFrame#frame > .QLabel { + min-width:100px; + font-weight:normal; + min-height:30px; +} + +QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ + min-width:180px; + color:#008de4; + margin-top:0; + margin-right:5px; + padding-right:5px; + font-weight:bold; + font-size:18px; + min-height:30px; +} + +QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + color: #ff4500; + margin-left:3px; +} + +QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:18px; +} + +QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ + qproperty-alignment: 'AlignVCenter | AlignRight'; + min-width:100px; + margin-right:5px; + padding-right:5px; + font-size:14px; + font-weight: bold; + min-height:35px; +} + +QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + color: #008de4; + font-size:16px; + font-weight: bold; + margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ + qproperty-alignment: 'AlignVCenter | AlignRight'; + min-width:100px; + font-size:12px; + margin-right:5px; + padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ + qproperty-alignment: 'AlignVCenter | AlignRight'; + min-width:100px; + font-size:12px; + margin-right:5px; + padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:16px; +} + +QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ + qproperty-alignment: 'AlignVCenter | AlignRight'; + min-width:100px; + font-size:12px; + margin-right:5px; + padding-right:5px; +} + +QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:0px; +} + +QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + font-size:12px; + margin-left:16px; +} + +/****************************************************** +OverviewPage PrivateSend +******************************************************/ + +QWidget .QFrame#framePrivateSend { /* PrivateSend Widget */ + background-color:transparent; + max-width: 451px; + min-width: 451px; + max-height: 350px; +} + +QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */ + background-color:transparent; + max-width: 421px; + min-width: 421px; +} + +QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + min-width:180px; + color:#008de4; + margin-top:0; + margin-right:5px; + padding-right:5px; + font-weight: bold; + font-size:18px; + min-height:30px; +} + +QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */ + qproperty-alignment: 'AlignVCenter | AlignLeft'; + color: #ff4500; + margin-left:2px; + padding-right:5px; +} + +QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget { + max-width: 451px; + max-height: 175px; +} + +QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget > .QLabel { + min-width:175px; + font-weight:normal; + min-height:25px; +} + +QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ + qproperty-alignment: 'AlignVCenter | AlignRight'; + min-width:160px; + margin-right:5px; + padding-right:5px; +} + +QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ + +} + +QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .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; +} + +QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk { + background-color: #008de4; + width:1px; +} + +QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .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 #privateSendFormLayoutWidget .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 #privateSendFormLayoutWidget .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 .QWidget#layoutWidgetLastMessageAndButtons { + max-width: 451px; +} + +QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendLastMessage { /* PrivateSend Status Notifications */ + qproperty-alignment: 'AlignVCenter | AlignCenter'; + min-width: 288px; + min-height: 43px; + font-size:11px; +} + +QWidget .QFrame#framePrivateSend QPushButton:focus { + border:none; + outline:none; +} + +QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend { /* Start PrivateSend Mixing */ + min-height: 40px; + font-size:15px; + font-weight:normal; + padding-left:10px; + padding-right:10px; + padding-top:5px; + padding-bottom:6px; +} + +QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover { + +} + +/****************************************************** +OverviewPage RecentTransactions +******************************************************/ + +QWidget .QFrame#frame_2 { /* Transactions Widget */ + min-width:510px; + margin-right:20px; + margin-left:0; + margin-top:0; +} + +QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ + min-width:180px; + color: #008de4; + margin-left:67px; + margin-top:0; + margin-right:5px; + padding-right:5px; + font-weight:bold; + font-size:18px; + min-height:30px; +} + +QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ + qproperty-alignment: 'AlignBottom | AlignRight'; + color: #ff4500; + min-width:93px; + margin-top:0; + margin-left:16px; + margin-right:5px; + min-height:16px; +} + +QWidget .QFrame#frame_2 QListView { /* Transaction List */ + font-weight:normal; + font-size:12px; + max-width:369px; + margin-top:12px; + margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ +} + /****************************************************** SendCoinsDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index baab7976ded7..833f5d69d44a 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -82,7 +82,8 @@ background-color:#F8F6F6; QLabel, QCheckBox, -QRadioButton { /* Base Text Size & Color */ +QRadioButton, +QListView { /* Base Text Size & Color */ font-size:12px; color:#333333; } @@ -644,326 +645,23 @@ font-weight:normal; padding-right:5px; } -/* OVERVIEW SCREEN */ - -QWidget .QFrame#frame { /* Wallet Balance */ -min-width:490px; -} - -QWidget .QFrame#frame > .QLabel { -min-width:190px; -font-weight:normal; -min-height:30px; -} - -QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ -min-width:180px; -color:#008de4; -margin-top:0; -margin-right:5px; -padding-right:5px; -font-weight:bold; -font-size:18px; -min-height:30px; -} - -QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -color: red; -margin-left:3px; -} - -QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:18px; -} - -QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -font-size:14px; -font-weight: bold; -min-height:35px; -} - -QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -color:#1c75bc; -font-size:16px; -font-weight: bold; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -font-size:12px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -font-size:12px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -font-size:12px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:0px; -} - -QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -font-size:12px; -margin-left:16px; -} - -/* PRIVATESEND WIDGET */ - -QWidget .QFrame#framePrivateSend { /* PrivateSend Widget */ -background-color:transparent; -max-width: 451px; -min-width: 451px; -max-height: 350px; -} - -QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */ -background-color:transparent; -max-width: 421px; -min-width: 421px; -} - -QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -min-width:180px; -color:#008de4; -margin-top:0; -margin-right:5px; -padding-right:5px; -font-weight: bold; -font-size:18px; -min-height:30px; -} -/******************************************************************/ -QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */ -qproperty-alignment: 'AlignVCenter | AlignLeft'; -color: red; -margin-left:2px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget { -max-width: 451px; -max-height: 175px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget > .QLabel { -min-width:175px; -font-weight:normal; -min-height:25px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelCompletitionText { /* PrivateSend Completion Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress { /* PrivateSend Completion */ -border: 1px solid #818181; -border-radius: 1px; -margin-right:43px; -text-align: right; -color:#818181; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk { -background-color: #008de4; -width:1px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymized { /* PrivateSend Balance */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountAndRoundsText { /* PrivateSend Amount and Rounds Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountRounds { /* PrivateSend Amount and Rounds */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenomText { /* PrivateSend Submitted Denom Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color:#F8F6F6; -margin-right:5px; -padding-right:5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenom { /* PrivateSend Submitted Denom */ - -} - -QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetLastMessageAndButtons { -max-width: 451px; -} - -QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendLastMessage { /* PrivateSend Status Notifications */ -qproperty-alignment: 'AlignVCenter | AlignCenter'; -min-width: 288px; -min-height: 43px; -font-size:11px; -color:#818181; -} - -/* PRIVATESEND BUTTONS */ - -QWidget .QFrame#framePrivateSend .QPushButton { /* PrivateSend Buttons - General Attributes */ -border:0px solid #ffffff; -} - -QWidget .QFrame#framePrivateSend QPushButton:focus { -border:none; -outline:none; -} - -QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend { /* Start PrivateSend Mixing */ -min-height: 40px; -font-size:15px; -font-weight:normal; -color:#ffffff; -padding-left:10px; -padding-right:10px; -padding-top:5px; -padding-bottom:6px; -} - -QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover { - -} +/****************************************************** +OverviewPage Balances +******************************************************/ -/* RECENT TRANSACTIONS */ +/***** No light.css specific coloring here yet *****/ -QWidget .QFrame#frame_2 { /* Transactions Widget */ -min-width:510px; -margin-right:20px; -margin-left:0; -margin-top:0; -} +/****************************************************** +OverviewPage PrivateSend +******************************************************/ -QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ -min-width:180px; -color: #008de4; -margin-left:67px; -margin-top:0; -margin-right:5px; -padding-right:5px; -font-weight:bold; -font-size:18px; -min-height:30px; -} +/***** No light.css specific coloring here yet *****/ -QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ -qproperty-alignment: 'AlignBottom | AlignRight'; -color: red; -min-width:93px; -margin-top:0; -margin-left:16px; -margin-right:5px; -min-height:16px; -} +/****************************************************** +OverviewPage RecentTransactions +******************************************************/ -QWidget .QFrame#frame_2 QListView { /* Transaction List */ -font-weight:normal; -font-size:12px; -max-width:369px; -margin-top:12px; -margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ -} +/***** No light.css specific coloring here yet *****/ /* MODAL OVERLAY */ From 4415e978b225ce1ca7229b33c534d6f186bee853 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 14:05:59 +0200 Subject: [PATCH 03/34] qt: Receive tab & QPushButton - Generalized related CSS and some redesign - Removed grey boxes around "Label", "Amount", "Message" and "Requested payment history" labels and increased their textsize - Changed the color of the "Requested payment history" label - Adjusted the style of the "Clear", "Remove" and "Show" buttons --- src/qt/res/css/dark.css | 134 +++---------------------------------- src/qt/res/css/general.css | 116 ++++++++++++++++++++++++++------ src/qt/res/css/light.css | 118 +++----------------------------- 3 files changed, 117 insertions(+), 251 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index b9de978a2c3f..669f7cafa828 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -1,4 +1,5 @@ -WalletFrame { +WalletFrame, +QDialog { background-color: #444; border-top:0px solid #000; margin:0; @@ -62,6 +63,12 @@ margin: 0; color:#f5f5f5; } +QTextEdit { + border: 1px solid #333; + background-color: #555; + color: #ccc; +} + QToolBar > QToolButton:checked { border: 0; font-weight: bold; @@ -886,133 +893,14 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin } -/* RECEIVE COINS */ - -QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2 { /* Label Label */ -background-color: #555; -border: 1px solid #444; -min-width:102px; -color: #ccc; -/*font-weight:bold; -font-size:11px;*/ -padding-right:5px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label { /* Amount Label */ -background-color:#999; -border: 1px solid #444; -min-width:102px; -color: #444; -/*font-weight:bold; -font-size:11px;*/ -padding-right:5px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3 { /* Message Label */ -background-color: #555; -border: 1px solid #444; -min-width:102px; -color: #ccc; -/*font-weight:bold; -font-size:11px;*/ -padding-right:5px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton { /* Clear Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover { -background-color: #aaa; -color: #333; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed { -border:1px solid #9e9e9e; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton { /* Show Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover { -background-color: #aaa; -color: #333; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed { -border:1px solid #9e9e9e; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled { -background-color: #666; -color: #fff; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton { /* Remove Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover { -background-color: #aaa; -color: #333; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed { -border:1px solid #9e9e9e; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled { -background-color: #666; -color: #fff; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Requested Payments History Label */ -color:#999; -font-weight:normal; -font-size:14px; -} +/****************************************************** +ReceiveCoinsDialog +******************************************************/ QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ color: #aaa; } -/* RECEIVE COINS DIALOG */ - -QDialog#ReceiveRequestDialog { -background-color: #555; -} - -QDialog#ReceiveRequestDialog QTextEdit { /* Contents of Receive Coin Dialog */ -border: 1px solid #333; -background-color: #555; -color: #ccc; -} - -/* General QR-code DIALOG */ - -QDialog#QRDialog { -background-color: #555; -} - -QDialog#QRDialog QTextEdit { /* Contents of QR-code Dialog */ -border:1px solid #333; -background-color: #555; -color: #ccc; -} - /* TRANSACTIONS PAGE */ TransactionView QLineEdit { /* Filters */ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 0c9e1acecd14..192d5d7dbba8 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -217,6 +217,84 @@ QHeaderView::up-arrow:hover { margin-right: 5px; } +/****************************************************** +QPushButton - General blue buttons +******************************************************/ + +QPushButton { /* Global Button Style */ + background-color: #008de4; + border: 0; + border-radius:8px; + color:#ffffff; + font-size:12px; + font-weight:normal; + height: 26px; + padding-left:25px; + padding-right:25px; + padding-top:5px; + padding-bottom:5px; +} + +QPushButton:hover { + background-color: #005e98; +} + +QPushButton:focus { + border:none; + outline:none; +} + +QPushButton:pressed { + background-color: #1f5383; + border: 1px solid #444; +} + +QPushButton:disabled { + background-color: #787878; +} + +/****************************************************** +QPushButton - Special case, light buttons +******************************************************/ + +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 { /* Clear Button */ + background-color:#f6f6f6; + border:1px solid #d2d2d2; + color:#616161; + padding-left:10px; + padding-right:10px; +} + +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 { + background-color: #d2d2d2; + color:#333; +} + +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 { + border:1px solid #9e9e9e; +} + +QDialog#SendCoinsDialog .QPushButton#addButton:disabled, +QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled { + background-color: #787878; + border:1px solid #585858; +} + /****************************************************** QTreeWidget ******************************************************/ @@ -559,6 +637,24 @@ QWidget .QFrame#frame_2 QListView { /* Transaction List */ margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ } +/****************************************************** +ReceiveCoinsDialog +******************************************************/ + + +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; + font-size:15px; +} + +QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ + +} + /****************************************************** SendCoinsDialog ******************************************************/ @@ -603,26 +699,6 @@ QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContent background:transparent; } -QDialog#SendCoinsDialog .QPushButton#addButton, -QDialog#SendCoinsDialog .QPushButton#clearButton { /* Clear Button */ - background-color:#f6f6f6; - border:1px solid #d2d2d2; - color:#616161; - padding-left:10px; - padding-right:10px; -} - -QDialog#SendCoinsDialog .QPushButton#addButton:hover, -QDialog#SendCoinsDialog .QPushButton#clearButton:hover { - background-color: #d2d2d2; - color:#333; -} - -QDialog#SendCoinsDialog .QPushButton#addButton:pressed, -QDialog#SendCoinsDialog .QPushButton#clearButton:pressed { - border:1px solid #9e9e9e; -} - /* This QLabel uses name = "label" which conflicts with Address Book -> New Address */ /* To maximize backwards compatibility this formatting has been removed */ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 833f5d69d44a..7fb401c99a81 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -1,4 +1,5 @@ -WalletFrame { +WalletFrame, +QDialog { background-color: #fff; border-top:0px solid #000; margin:0; @@ -60,6 +61,10 @@ margin: 0; color:#f5f5f5; } +QTextEdit { + border:1px solid #d7d7d7; +} + QToolBar > QToolButton:checked { border: 0; font-weight: bold; @@ -845,114 +850,11 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin } -/* RECEIVE COINS */ - -QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2 { /* Label Label */ -background-color:#F8F6F6; -border: 1px solid #fff; -min-width:102px; -color:#333; -/*font-weight:bold; -font-size:11px;*/ -padding-right:5px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label { /* Amount Label */ -background-color:#999; -border: 1px solid #fff; -min-width:102px; -color:#ffffff; -/*font-weight:bold; -font-size:11px;*/ -padding-right:5px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3 { /* Message Label */ -background-color:#F8F6F6; -border: 1px solid #fff; -min-width:102px; -color:#333; -/*font-weight:bold; -font-size:11px;*/ -padding-right:5px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton { /* Clear Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed { -border:1px solid #9e9e9e; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton { /* Show Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed { -border:1px solid #9e9e9e; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton { /* Remove Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed { -border:1px solid #9e9e9e; -} - -QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Requested Payments History Label */ -color:#999; -font-weight:normal; -font-size:14px; -} - -/* RECEIVE COINS DIALOG */ - -QDialog#ReceiveRequestDialog { -background-color:#F8F6F6; -} - -QDialog#ReceiveRequestDialog QTextEdit { /* Contents of Receive Coin Dialog */ -border:1px solid #d7d7d7; -} - -/* General QR-code DIALOG */ - -QDialog#QRDialog { -background-color:#F8F6F6; -} +/****************************************************** +ReceiveCoinsDialog +******************************************************/ -QDialog#QRDialog QTextEdit { /* Contents of QR-code Dialog */ -border:1px solid #d7d7d7; -} +/***** No light.css specific coloring here yet *****/ /* TRANSACTIONS PAGE */ From 8373b3242281e8260d315058b0d04955003cfcb0 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 14:17:14 +0200 Subject: [PATCH 04/34] qt: Transaction tab - Generalized related CSS and some redesign - Increased size of selected sum labels --- src/qt/res/css/dark.css | 51 +++----------------------------------- src/qt/res/css/general.css | 35 ++++++++++++++++++++++++++ src/qt/res/css/light.css | 49 +++--------------------------------- 3 files changed, 43 insertions(+), 92 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 669f7cafa828..d0e7e44364d1 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -901,54 +901,11 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { / color: #aaa; } -/* TRANSACTIONS PAGE */ - -TransactionView QLineEdit { /* Filters */ -margin-bottom:2px; -margin-right:1px; -min-width:111px; -text-align:center; -} - -TransactionView QLineEdit#addressWidget { /* Address Filter */ -margin-bottom:2px; -margin-right:1px; -min-width:405px; -text-align:center; -} - -TransactionView QLineEdit#amountWidget { /* Amount Filter */ -margin-bottom:2px; -margin-right:1px; -max-width:100px; -text-align:center; -} - -TransactionView QComboBox { -margin-bottom:1px; -margin-right:1px; -} - -QLabel#transactionSumLabel { /* Example of setObjectName for widgets without name */ -color: #ccc; -font-weight:bold; -} - -QLabel#transactionSum { /* Example of setObjectName for widgets without name */ -color: #ccc; -} - -/* TRANSACTION DETAIL DIALOG */ - -QDialog#TransactionDescDialog { -background-color: #555; -} +/****************************************************** +TransactionView +******************************************************/ -QDialog#TransactionDescDialog QTextEdit { /* Contents of Receive Coin Dialog */ -background-color: #444; -color: #ccc; -border:1px solid #333; -} +/***** No dark.css specific coloring here yet *****/ /* MASTERNODE LIST TAB */ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 192d5d7dbba8..d34119c5c318 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -773,3 +773,38 @@ QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ } + +/****************************************************** +TransactionView +******************************************************/ + +TransactionView QLineEdit { /* Filters */ + margin-bottom:2px; + margin-right:1px; + min-width:111px; + text-align:center; +} + +TransactionView QLineEdit#addressWidget { /* Address Filter */ + margin-bottom:2px; + margin-right:1px; + min-width:405px; + text-align:center; +} + +TransactionView QLineEdit#amountWidget { /* Amount Filter */ + margin-bottom:2px; + margin-right:1px; + max-width:100px; + text-align:center; +} + +TransactionView QComboBox { + margin-bottom:1px; + margin-right:1px; +} + +#transactionSumLabel, +#transactionSum { + font-size: 15px; +} diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 7fb401c99a81..ff8591f1a020 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -856,49 +856,8 @@ ReceiveCoinsDialog /***** No light.css specific coloring here yet *****/ -/* TRANSACTIONS PAGE */ - -TransactionView QLineEdit { /* Filters */ -margin-bottom:2px; -margin-right:1px; -min-width:111px; -text-align:center; -} - -TransactionView QLineEdit#addressWidget { /* Address Filter */ -margin-bottom:2px; -margin-right:1px; -min-width:405px; -text-align:center; -} - -TransactionView QLineEdit#amountWidget { /* Amount Filter */ -margin-bottom:2px; -margin-right:1px; -max-width:100px; -text-align:center; -} - -TransactionView QComboBox { -margin-bottom:1px; -margin-right:1px; -} - -QLabel#transactionSumLabel { /* Example of setObjectName for widgets without name */ -color:#333333; -font-weight:bold; -} - -QLabel#transactionSum { /* Example of setObjectName for widgets without name */ -color:#333333; -} - -/* TRANSACTION DETAIL DIALOG */ - -QDialog#TransactionDescDialog { -background-color:#F8F6F6; -} +/****************************************************** +TransactionView +******************************************************/ -QDialog#TransactionDescDialog QTextEdit { /* Contents of Receive Coin Dialog */ -border:1px solid #d7d7d7; -} +/***** No light.css specific coloring here yet *****/ From 3d7956df1e3d68324827e9a9f921906a05ee2e5b Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 15:16:11 +0200 Subject: [PATCH 05/34] qt: Masternode tab - Generalized related CSS and some redesign - Increased the size of the "Filter list" and "Node count" labels --- src/qt/res/css/dark.css | 4 +++- src/qt/res/css/general.css | 10 ++++++++++ src/qt/res/css/light.css | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index d0e7e44364d1..2b16e9eabd99 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -907,7 +907,9 @@ TransactionView /***** No dark.css specific coloring here yet *****/ -/* MASTERNODE LIST TAB */ +/****************************************************** +MasternodeList +******************************************************/ QWidget#MasternodeList QTableWidget#tableWidgetMasternodesDIP3 { color: #aaa; diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index d34119c5c318..628790b6009a 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -328,6 +328,16 @@ not only Qt standard elements ******************************************************* ******************************************************/ +/****************************************************** +MasternodeList +******************************************************/ + +MasternodeList QLabel#label_filter_2, +MasternodeList QLabel#label_count_2, +MasternodeList QLabel#countLabelDIP3 { + font-size: 15px; +} + /****************************************************** OverviewPage Balances ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index ff8591f1a020..de929f8cd6cf 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -861,3 +861,9 @@ TransactionView ******************************************************/ /***** No light.css specific coloring here yet *****/ + +/****************************************************** +MasternodeList +******************************************************/ + +/***** No light.css specific coloring here yet *****/ From fda98c5c78ad5fa64670affe69c347cdccc729ed Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 15:20:46 +0200 Subject: [PATCH 06/34] qt: CoinControl dialog - Generalized related CSS and some redesign - Removed alternated coloring --- src/qt/res/css/dark.css | 136 ++++----------------------------- src/qt/res/css/general.css | 152 +++++++++++++++++++++++++++++++++---- src/qt/res/css/light.css | 134 ++++---------------------------- 3 files changed, 166 insertions(+), 256 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 2b16e9eabd99..c08893ba9ca1 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -89,10 +89,11 @@ background-color: #555; /*******************************************************/ -QLabel, QCheckBox, +QLabel, +QListView, QRadioButton, -QListView { /* Base Text Size & Color */ +QTreeWidget { /* Base Text Size & Color */ font-size:12px; color: #ccc; } @@ -760,137 +761,28 @@ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry L color: #ccc; } -/* COIN CONTROL POPUP */ - -QDialog#CoinControlDialog { /* Coin Control Dialog Window */ -background-color: #555; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlQuantityText { /* Coin Control Quantity Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlQuantity { /* Coin Control Quantity */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlBytesText { /* Coin Control Bytes Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlBytes { /* Coin Control Bytes */ -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAmountText { /* Coin Control Amount Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAmount { /* Coin Control Amount */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlPriorityText { /* Coin Control Priority Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlPriority { /* Coin Control Priority */ -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlFeeText { /* Coin Control Fee Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlFee { /* Coin Control Fee */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutputText { /* Coin Control Low Output Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutput { /* Coin Control Low Output */ -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFeeText { /* Coin Control After Fee Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFee { /* Coin Control After Fee */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlChangeText { /* Coin Control Change Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Change */ - -} - -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 */ -} - -QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number "1" displays in this table for some reason... */ -color:transparent; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget { /* Coin Control Widget Container */ -outline:0; -background-color: #444; -alternate-background-color: #555; -color: #ccc; -border:0px solid #aaa; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { -} +/****************************************************** +CoinControlDialog +******************************************************/ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ -background-color: #666; -color: #ccc; + background-color: #666; + color: #ccc; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ -background-color: #333; -color: #ccc; + background-color: #333; + color: #ccc; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ -background-repeat:no-repeat; -background-position:center; -background-color: #666; -color: #ccc; + background-color: #666; + color: #ccc; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ -background-repeat:no-repeat; -background-position:center; -background-color: #333; -color: #ccc; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator { - -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin Control Widget Checkbox */ - + background-color: #333; + color: #ccc; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 628790b6009a..088140a398f8 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -116,65 +116,52 @@ QRadioButton::indicator:unchecked:disabled { } /****************************************************** -QCheckBox & QTreeWidget::indicator checkboxes +QCheckBox ******************************************************/ QCheckBox{ background-color: transparent; min-height:20px; } -QTreeWidget::indicator, QCheckBox::indicator { width: 15px; height: 15px; margin-right: 5px; } -QTreeWidget::indicator:unchecked, QCheckBox::indicator:unchecked { image: url(':/images/checkbox_normal'); } -QTreeWidget::indicator:hover:unchecked, QCheckBox::indicator:hover:unchecked { image: url(':/images/checkbox_normal_hover'); } -QTreeWidget::indicator:unchecked:pressed, QCheckBox::indicator:unchecked:pressed { image: url(':/images/checkbox_normal_pressed'); } -QTreeWidget::indicator:unchecked:disabled, QCheckBox::indicator:unchecked:disabled { image: url(':/images/checkbox_normal_disabled'); } -QTreeWidget::indicator:checked, QCheckBox::indicator:checked { image: url(':/images/checkbox_checked'); } -QTreeWidget::indicator:checked:hover, QCheckBox::indicator:checked:hover { image: url(':/images/checkbox_checked_hover'); } -QTreeWidget::indicator:checked:pressed, QCheckBox::indicator:checked:pressed { image: url(':/images/checkbox_checked_pressed'); } -QTreeWidget::indicator:checked:disabled, QCheckBox::indicator:checked:disabled { image: url(':/images/checkbox_checked_disabled'); } -QTreeWidget::indicator:indeterminate, QCheckBox::indicator:indeterminate { image: url(':/images/checkbox_partly_checked'); } -QTreeWidget::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:hover { image: url(':/images/checkbox_partly_checked_hover'); } -QTreeWidget::indicator:indeterminate:pressed, QCheckBox::indicator:indeterminate:pressed { image: url(':/images/checkbox_partly_checked_pressed'); } -QTreeWidget::indicator:indeterminate:disabled, QCheckBox::indicator:indeterminate:disabled { image: url(':/images/checkbox_partly_checked_disabled'); } @@ -301,6 +288,9 @@ QTreeWidget QTreeWidget { background-color: transparent; + alternate-background-color: transparent; + outline:0; + border:0px; } QTreeWidget::branch::closed:has-children { padding: 0 -2px 0 2px; @@ -318,6 +308,47 @@ QTreeWidget::branch::open:hover { padding: 0 -2px 0 2px; image: url(':/images/arrow_down_hover'); } +QTreeWidget::indicator { + width: 15px; + height: 15px; + margin-right: 5px; +} +QTreeWidget::indicator:unchecked { + image: url(':/images/checkbox_normal'); +} +QTreeWidget::indicator:hover:unchecked { + image: url(':/images/checkbox_normal_hover'); +} +QTreeWidget::indicator:unchecked:pressed { + image: url(':/images/checkbox_normal_pressed'); +} +QTreeWidget::indicator:unchecked:disabled { + image: url(':/images/checkbox_normal_disabled'); +} +QTreeWidget::indicator:checked { + image: url(':/images/checkbox_checked'); +} +QTreeWidget::indicator:checked:hover { + image: url(':/images/checkbox_checked_hover'); +} +QTreeWidget::indicator:checked:pressed { + image: url(':/images/checkbox_checked_pressed'); +} +QTreeWidget::indicator:checked:disabled { + image: url(':/images/checkbox_checked_disabled'); +} +QTreeWidget::indicator:indeterminate { + image: url(':/images/checkbox_partly_checked'); +} +QTreeWidget::indicator:indeterminate:hover { + image: url(':/images/checkbox_partly_checked_hover'); +} +QTreeWidget::indicator:indeterminate:pressed { + image: url(':/images/checkbox_partly_checked_pressed'); +} +QTreeWidget::indicator:indeterminate:disabled { + image: url(':/images/checkbox_partly_checked_disabled'); +} /****************************************************** ******************************************************* @@ -328,6 +359,99 @@ not only Qt standard elements ******************************************************* ******************************************************/ +/****************************************************** +CoinControlDialog +******************************************************/ + +QDialog#CoinControlDialog .QLabel#labelCoinControlQuantityText { /* Coin Control Quantity Label */ + min-height:30px; + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlQuantity { /* Coin Control Quantity */ + min-height:30px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlBytesText { /* Coin Control Bytes Label */ + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlBytes { /* Coin Control Bytes */ +} +QDialog#CoinControlDialog .QLabel#labelCoinControlAmountText { /* Coin Control Amount Label */ + min-height:30px; + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlAmount { /* Coin Control Amount */ + min-height:30px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlPriorityText { /* Coin Control Priority Label */ + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlPriority { /* Coin Control Priority */ +} +QDialog#CoinControlDialog .QLabel#labelCoinControlFeeText { /* Coin Control Fee Label */ + min-height:30px; + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlFee { /* Coin Control Fee */ + min-height:30px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutputText { /* Coin Control Low Output Label */ + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutput { /* Coin Control Low Output */ +} +QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFeeText { /* Coin Control After Fee Label */ + min-height:30px; + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFee { /* Coin Control After Fee */ + min-height:30px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlChangeText { /* Coin Control Change Label */ + padding-left:15px; +} +QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Change */ + +} + +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 */ +} + +QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number "1" displays in this table for some reason... */ + color:transparent; +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { +} +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ +} +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ + background-repeat:no-repeat; + background-position:center; +} +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ + background-repeat:no-repeat; + background-position:center; +} + +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator { + +} + + /****************************************************** MasternodeList ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index de929f8cd6cf..2942bb212bb8 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -85,10 +85,11 @@ background-color:#F8F6F6; /*******************************************************/ -QLabel, QCheckBox, +QLabel, +QListView, QRadioButton, -QListView { /* Base Text Size & Color */ +QTreeWidget { /* Base Text Size & Color */ font-size:12px; color:#333333; } @@ -719,135 +720,28 @@ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry L color: #333; } -/* COIN CONTROL POPUP */ - -QDialog#CoinControlDialog { /* Coin Control Dialog Window */ -background-color:#F8F6F6; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlQuantityText { /* Coin Control Quantity Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlQuantity { /* Coin Control Quantity */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlBytesText { /* Coin Control Bytes Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlBytes { /* Coin Control Bytes */ -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAmountText { /* Coin Control Amount Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAmount { /* Coin Control Amount */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlPriorityText { /* Coin Control Priority Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlPriority { /* Coin Control Priority */ -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlFeeText { /* Coin Control Fee Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlFee { /* Coin Control Fee */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutputText { /* Coin Control Low Output Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutput { /* Coin Control Low Output */ -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFeeText { /* Coin Control After Fee Label */ -min-height:30px; -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFee { /* Coin Control After Fee */ -min-height:30px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlChangeText { /* Coin Control Change Label */ -padding-left:15px; -} - -QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Change */ - -} - -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 */ -} - -QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number "1" displays in this table for some reason... */ -color:transparent; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget { /* Coin Control Widget Container */ -outline:0; -background-color:#ffffff; -border:0px solid #818181; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { -} +/****************************************************** +CoinControlDialog +******************************************************/ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ -background-color:#f7f7f7; -color:#333; + background-color:#f7f7f7; + color:#333; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ -background-color:#f7f7f7; -color:#333; + background-color:#f7f7f7; + color:#333; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ -background-repeat:no-repeat; -background-position:center; -background-color:#f7f7f7; -color:#333; + background-color:#f7f7f7; + color:#333; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ -background-repeat:no-repeat; -background-position:center; -background-color:#f7f7f7; -color:#333; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator { - -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin Control Widget Checkbox */ - + background-color:#f7f7f7; + color:#333; } /****************************************************** From 5ec4753e7a3c421725073e35574afc9db12b260c Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 16:22:53 +0200 Subject: [PATCH 07/34] qt: Sync overlay - Generalized related CSS and some redesign - Adjusted colors - Added rounded border --- src/qt/res/css/dark.css | 28 ++++++++-------------------- src/qt/res/css/general.css | 27 +++++++++++++++++++++++++++ src/qt/res/css/light.css | 28 +++++++--------------------- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index c08893ba9ca1..56997ca7e03a 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -711,31 +711,19 @@ OverviewPage RecentTransactions /***** No dark.css specific coloring here yet *****/ -/**! MODAL OVERLAY */ +/****************************************************** +ModalOverlay +******************************************************/ QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ -background: rgba(0,0,0,220); -padding-left: 10px; -padding-right: 10px; -} - -QWidget#bgWidget .QPushButton#warningIcon { -width:64px; -height:64px; -padding:5px; -background-color:transparent; + background:rgba(50, 50, 50, 0.8); + color:#616161; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ -background-color: #444; -border-top:0px solid #000; -margin:0; -padding-top:20px; -padding-bottom: 20px; -} - -QWidget#bgWidget .QPushButton#closeButton { - + background-color: #444; + border: 1px solid #555; + border-radius: 10px; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 088140a398f8..86996febea80 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -462,6 +462,33 @@ MasternodeList QLabel#countLabelDIP3 { font-size: 15px; } +/****************************************************** +ModalOverlay +******************************************************/ + +QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ + padding-left:10px; + padding-right:10px; +} + +QWidget#bgWidget .QPushButton#warningIcon { + background-color:transparent; + width:64px; + height:64px; + padding:5px; +} + +QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ + border-top:0px; + margin:0; + padding-top:20px; + padding-bottom: 20px; +} + +QWidget#bgWidget .QPushButton#closeButton { + margin-right: 50px; +} + /****************************************************** OverviewPage Balances ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 2942bb212bb8..e503e2c6e6b8 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -669,32 +669,18 @@ OverviewPage RecentTransactions /***** No light.css specific coloring here yet *****/ -/* MODAL OVERLAY */ +/****************************************************** +ModalOverlay +******************************************************/ QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ - background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); - color:#616161; - padding-left:10px; - padding-right:10px; -} - -QWidget#bgWidget .QPushButton#warningIcon { -width:64px; -height:64px; -padding:5px; -background-color:transparent; + background:rgba(250, 250, 250, 0.8); } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ -background-color: #fff; -border-top:0px solid #000; -margin:0; -padding-top:20px; -padding-bottom: 20px; -} - -QWidget#bgWidget .QPushButton#closeButton { - + background-color: #fff; + border: 1px solid #ccc; + border-radius: 10px; } /****************************************************** From 13df37a50d3ea21616000afc5523526946889e65 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 16:35:00 +0200 Subject: [PATCH 08/34] qt: About dialog - Generalized related CSS --- src/qt/res/css/dark.css | 15 ++++----------- src/qt/res/css/general.css | 12 ++++++++++++ src/qt/res/css/light.css | 15 ++++----------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 56997ca7e03a..c510b5711742 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -668,18 +668,11 @@ border: 1px solid #333; color: #ccc; } -/* About Dash Dialog */ -QDialog#AboutDialog { -background-color: #555; -} - -QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ -margin-left:10px; -} +/****************************************************** +AboutDialog +******************************************************/ -QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ -margin-right:10px; -} +/***** No dark.css specific coloring here yet *****/ /* Edit Address Dialog */ QDialog#EditAddressDialog { diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 86996febea80..7613759c6faf 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -359,6 +359,18 @@ not only Qt standard elements ******************************************************* ******************************************************/ +/****************************************************** +AboutDialog +******************************************************/ + +QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ + margin-left:10px; +} + +QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ + margin-right:10px; +} + /****************************************************** CoinControlDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index e503e2c6e6b8..05e1dc7985e1 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -626,18 +626,11 @@ QDialog#HelpMessageDialog QScrollArea * { background-color:#ffffff; } -/* About Dash Dialog */ -QDialog#AboutDialog { -background-color:#F8F6F6; -} - -QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ -margin-left:10px; -} +/****************************************************** +AboutDialog +******************************************************/ -QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ -margin-right:10px; -} +/***** No light.css specific coloring here yet *****/ /* Edit Address Dialog */ QDialog#EditAddressDialog { From 7f85aa97d907062dd3221e912be485c2d651f783 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 16:41:35 +0200 Subject: [PATCH 09/34] qt: Edit address dialog - Generalized related CSS --- src/qt/res/css/dark.css | 14 ++++---------- src/qt/res/css/general.css | 13 +++++++++++++ src/qt/res/css/light.css | 14 ++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index c510b5711742..1521f14ccea6 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -674,17 +674,11 @@ AboutDialog /***** No dark.css specific coloring here yet *****/ -/* Edit Address Dialog */ -QDialog#EditAddressDialog { -background-color: #555; -} +/****************************************************** +EditAddressDialog +******************************************************/ -QDialog#EditAddressDialog QLabel { -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-height:27px; -font-weight:normal; -padding-right:5px; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** OverviewPage Balances diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 7613759c6faf..ca9b2912091d 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -463,6 +463,19 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator { } +/****************************************************** +EditAddressDialog +******************************************************/ + +QDialog#EditAddressDialog { +} + +QDialog#EditAddressDialog QLabel { +qproperty-alignment: 'AlignVCenter | AlignRight'; +min-height:27px; +font-weight:normal; +padding-right:5px; +} /****************************************************** MasternodeList diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 05e1dc7985e1..b27de58a1ab0 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -632,17 +632,11 @@ AboutDialog /***** No light.css specific coloring here yet *****/ -/* Edit Address Dialog */ -QDialog#EditAddressDialog { -background-color:#F8F6F6; -} +/****************************************************** +EditAddressDialog +******************************************************/ -QDialog#EditAddressDialog QLabel { -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-height:27px; -font-weight:normal; -padding-right:5px; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** OverviewPage Balances From 019823b95845ff7b08152ebc02db6008ab277015 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 29 May 2020 17:15:36 +0200 Subject: [PATCH 10/34] qt: Help message dialog - Generalized related CSS --- src/qt/res/css/dark.css | 17 ++++------------- src/qt/res/css/general.css | 13 +++++++++++++ src/qt/res/css/light.css | 11 ++++------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 1521f14ccea6..f8fa4e088011 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -651,21 +651,12 @@ QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ color: #aaa; } -/* HELP MENU */ - -/* Command Line Options Dialog */ -QDialog#HelpMessageDialog { -background-color: #555; -} +/****************************************************** +HelpMessageDialog +******************************************************/ QDialog#HelpMessageDialog QScrollArea * { -background-color: #444; -} - -QDialog#HelpMessageDialog QTextEdit { -background-color: #444; -border: 1px solid #333; -color: #ccc; + background-color: #555; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index ca9b2912091d..41d828e876a2 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -477,6 +477,19 @@ font-weight:normal; padding-right:5px; } +/****************************************************** +HelpMessageDialog +******************************************************/ + +QDialog#HelpMessageDialog { +} + +QDialog#HelpMessageDialog QScrollArea { +} + +QDialog#HelpMessageDialog QTextEdit { +} + /****************************************************** MasternodeList ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index b27de58a1ab0..68980f1e0dce 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -615,15 +615,12 @@ QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ background-color:#ff0000; } -/* HELP MENU */ - -/* Command Line Options Dialog */ -QDialog#HelpMessageDialog { -background-color:#F8F6F6; -} +/****************************************************** +HelpMessageDialog +******************************************************/ QDialog#HelpMessageDialog QScrollArea * { -background-color:#ffffff; + background-color:#ffffff; } /****************************************************** From 27e188090ff39629387c6550153cfb75a75af044 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sat, 30 May 2020 01:05:32 +0200 Subject: [PATCH 11/34] qt: RPC console - Generalized related CSS and some redesign - Changed colors for network activity legend (signal colors TBD in a code change commit) --- src/qt/res/css/dark.css | 50 ++++---------------------------------- src/qt/res/css/general.css | 47 +++++++++++++++++++++++++++++++++++ src/qt/res/css/light.css | 45 +++------------------------------- 3 files changed, 56 insertions(+), 86 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index f8fa4e088011..166b19dd38d2 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -599,56 +599,16 @@ QDialog#OptionsDialog QGroupBox { color: #ccc; } -/* TOOLS MENU */ +/****************************************************** +RPCConsole +******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ -background-color: #333; -} - -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'; -min-height:25px; -min-width:180px; -} - -QWidget#RPCConsole QWidget#tab_info QPushButton#openDebugLogfileButton { -max-width:60px; -} - -QWidget#RPCConsole QWidget#tab_console QTextEdit#messagesWidget { /* Console Messages Window */ -background-color: transparent; -border: 0; -} - -QWidget#RPCConsole QWidget#tab_console QLineEdit#lineEdit { /* Console Input */ -} - -QWidget#RPCConsole QWidget#tab_console QPushButton#clearButton, -QWidget#RPCConsole QWidget#tab_console QPushButton#fontSmallerButton, -QWidget#RPCConsole QWidget#tab_console QPushButton#fontBiggerButton { /* Console Font and Clear Buttons */ -background-color:transparent; -padding-left:10px; -padding-right:10px; -} - -QWidget#RPCConsole QWidget#tab_console QPushButton#promptIcon { /* Prompt Icon */ -background-color:transparent; -} - -QWidget#RPCConsole QWidget#tab_nettraffic .QGroupBox#groupBox #line { /* Network In Line */ -background-color:#00ff00; -} - -QWidget#RPCConsole QWidget#tab_nettraffic .QGroupBox#groupBox #line_2 { /* Network Out Line */ -background-color:#ff0000; -} - -QWidget#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ -color: #1c75bc; + background-color: #333; } QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ -color: #aaa; + color: #aaa; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 41d828e876a2..b4417dd4a244 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -854,6 +854,53 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { / } +/****************************************************** +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'; + min-height:25px; + min-width:180px; +} + +QWidget#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ + color:#1c75bc; +} + +QWidget#RPCConsole QPushButton#openDebugLogfileButton { + max-width:60px; +} + +QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ + background-color:transparent; + border:0; +} + +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; + padding-left:10px; + padding-right:10px; +} + +QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */ + background-color:transparent; +} + +QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ + background-color:#096e03; +} + +QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ + background-color:#eb4034; +} + /****************************************************** SendCoinsDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 68980f1e0dce..45096a0387ce 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -570,49 +570,12 @@ color:#818181; padding-bottom:8px; } -/* TOOLS MENU */ +/****************************************************** +RPCConsole +******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ -background-color:#F8F6F6; -} - -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'; -min-height:25px; -min-width:180px; -} - -QWidget#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ -color:#1c75bc; -} - -QWidget#RPCConsole QPushButton#openDebugLogfileButton { -max-width:60px; -} - -QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ -border:0; -} - -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; -padding-left:10px; -padding-right:10px; -} - -QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */ -background-color:transparent; -} - -QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ -background-color:#00ff00; -} - -QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ -background-color:#ff0000; + background-color:#F8F6F6; } /****************************************************** From 8e79a3a9b4b40fe0385374cc18f0eca39fe88207 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sat, 30 May 2020 01:14:49 +0200 Subject: [PATCH 12/34] qt: Options dialog - Generalized related CSS --- src/qt/res/css/dark.css | 28 +++++----------------------- src/qt/res/css/general.css | 30 ++++++++++++++++++++++++++++++ src/qt/res/css/light.css | 28 +++++----------------------- 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 166b19dd38d2..98e830df4efd 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -569,30 +569,12 @@ min-width:170px; min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ } -/* Options Dialog */ -QDialog#OptionsDialog { -background-color: #555; -} - -QDialog#OptionsDialog QValueComboBox, QDialog#OptionsDialog QSpinBox { -} - -QDialog#OptionsDialog QValidatedLineEdit, QDialog#OptionsDialog QValidatedLineEdit:disabled, QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { -qproperty-alignment: 'AlignVCenter | AlignLeft'; -} - -QDialog#OptionsDialog > QLabel { -qproperty-alignment: 'AlignVCenter'; -min-height:20px; -} - -QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { -} +/****************************************************** +OptionsDialog +******************************************************/ -QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ -qproperty-alignment: 'AlignVCenter | AlignCenter'; -color: #aaa; -padding-bottom:8px; +QDialog#OptionsDialog { + background-color: #555; } QDialog#OptionsDialog QGroupBox { diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index b4417dd4a244..044cee0336f7 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -654,6 +654,36 @@ QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ margin-left:16px; } +/****************************************************** +OptionsDialog +******************************************************/ + +QDialog#OptionsDialog { +} + +QDialog#OptionsDialog QValueComboBox, QDialog#OptionsDialog QSpinBox { +} + +QDialog#OptionsDialog QValidatedLineEdit, QDialog#OptionsDialog QValidatedLineEdit:disabled, QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { + qproperty-alignment: 'AlignVCenter | AlignLeft'; +} + +QDialog#OptionsDialog > QLabel { + qproperty-alignment: 'AlignVCenter'; + min-height:20px; +} + +QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { +} + +QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ + qproperty-alignment: 'AlignVCenter | AlignCenter'; + padding-bottom:8px; +} + +QDialog#OptionsDialog QGroupBox { +} + /****************************************************** OverviewPage PrivateSend ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 45096a0387ce..6b845e40395f 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -544,30 +544,12 @@ min-width:170px; min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ } -/* Options Dialog */ -QDialog#OptionsDialog { -background-color:#F8F6F6; -} - -QDialog#OptionsDialog QValueComboBox, QDialog#OptionsDialog QSpinBox { -} - -QDialog#OptionsDialog QValidatedLineEdit, QDialog#OptionsDialog QValidatedLineEdit:disabled, QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { -qproperty-alignment: 'AlignVCenter | AlignLeft'; -} - -QDialog#OptionsDialog > QLabel { -qproperty-alignment: 'AlignVCenter'; -min-height:20px; -} - -QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { -} +/****************************************************** +OptionsDialog +******************************************************/ -QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ -qproperty-alignment: 'AlignVCenter | AlignCenter'; -color:#818181; -padding-bottom:8px; +QDialog#OptionsDialog { + background-color:#F8F6F6; } /****************************************************** From 496c42941f1c4de8871f709b9d9a82aa95eb94a6 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sat, 30 May 2020 02:14:27 +0200 Subject: [PATCH 13/34] qt: Ask passphrase dialog - Generalized related CSS --- src/qt/res/css/dark.css | 15 +++++---------- src/qt/res/css/general.css | 10 ++++++++++ src/qt/res/css/light.css | 13 ++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 98e830df4efd..3b7852b51dc6 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -556,17 +556,12 @@ QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ min-width:260px; } -/* SETTINGS MENU */ +/****************************************************** +AskPassphraseDialog +******************************************************/ -/* Encrypt Wallet and Change Passphrase Dialog */ QDialog#AskPassphraseDialog { -background-color: #555; -} - -QDialog#AskPassphraseDialog QLabel#passLabel1, QDialog#AskPassphraseDialog QLabel#passLabel2, QDialog#AskPassphraseDialog QLabel#passLabel3 { -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:170px; -min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ + background-color: #555; } /****************************************************** @@ -578,7 +573,7 @@ QDialog#OptionsDialog { } QDialog#OptionsDialog QGroupBox { -color: #ccc; + color: #ccc; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 044cee0336f7..b7f838015e06 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -371,6 +371,16 @@ QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ margin-right:10px; } +/****************************************************** +AskPassphraseDialog +******************************************************/ + +QDialog#AskPassphraseDialog QLabel#passLabel1, QDialog#AskPassphraseDialog QLabel#passLabel2, QDialog#AskPassphraseDialog QLabel#passLabel3 { + qproperty-alignment: 'AlignVCenter | AlignRight'; + min-width:170px; + min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ +} + /****************************************************** CoinControlDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 6b845e40395f..381c940873ef 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -531,17 +531,12 @@ QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ min-width:260px; } -/* SETTINGS MENU */ +/****************************************************** +AskPassphraseDialog +******************************************************/ -/* Encrypt Wallet and Change Passphrase Dialog */ QDialog#AskPassphraseDialog { -background-color:#F8F6F6; -} - -QDialog#AskPassphraseDialog QLabel#passLabel1, QDialog#AskPassphraseDialog QLabel#passLabel2, QDialog#AskPassphraseDialog QLabel#passLabel3 { -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:170px; -min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ + background-color: #F8F6F6; } /****************************************************** From 43b02b8859b2a580453d57acbafbc4a86afb9b81 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sat, 30 May 2020 02:15:04 +0200 Subject: [PATCH 14/34] qt: Addressbook page - Generalized related CSS --- src/qt/res/css/dark.css | 85 +++----------------------------------- src/qt/res/css/general.css | 34 +++++++++++++++ src/qt/res/css/light.css | 83 +++---------------------------------- 3 files changed, 45 insertions(+), 157 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 3b7852b51dc6..95024008ef1a 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -471,89 +471,16 @@ QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { border:1px solid #9e9e9e; } -/* Dialog: Send and Receive */ -QWidget#AddressBookPage { -background-color: #555; -} - -QWidget#AddressBookPage QPushButton#newAddress { /* New Address Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#newAddress:hover { -background-color: #aaa; -color: #333; -} - -QWidget#AddressBookPage QPushButton#newAddress:pressed { -border:1px solid #9e9e9e; -} - -QWidget#AddressBookPage QPushButton#copyAddress { /* Copy Address Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#copyAddress:hover { -background-color: #aaa; -color: #333; -} - -QWidget#AddressBookPage QPushButton#copyAddress:pressed { -border:1px solid #9e9e9e; -} - -QWidget#AddressBookPage QPushButton#showAddressQRCode { /* Show Address QR code Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#showAddressQRCode:hover { -background-color: #aaa; -color: #333; -} - -QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed { -border:1px solid #9e9e9e; -} - -QWidget#AddressBookPage QPushButton#deleteAddress { /* Delete Address Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#deleteAddress:hover { -background-color: #aaa; -color: #333; -} - -QWidget#AddressBookPage QPushButton#deleteAddress:pressed { -border:1px solid #9e9e9e; -} +/****************************************************** +AddressBookPage +******************************************************/ -QWidget#AddressBookPage QTableView { /* Address Listing */ -font-size:12px; +QWidget#AddressBookPage { + background-color: #555; } QWidget#AddressBookPage QTableView::item { -color: #aaa; -} - -QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ -min-width:260px; + color: #aaa; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index b7f838015e06..f05d2ac0e5a7 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -244,6 +244,10 @@ QPushButton:disabled { QPushButton - Special case, light buttons ******************************************************/ +QWidget#AddressBookPage QPushButton#newAddress, +QWidget#AddressBookPage QPushButton#copyAddress, +QWidget#AddressBookPage QPushButton#showAddressQRCode, +QWidget#AddressBookPage QPushButton#deleteAddress, QDialog#SendCoinsDialog .QPushButton#addButton, QDialog#SendCoinsDialog .QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, @@ -256,6 +260,10 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton { /* Clea padding-right:10px; } +QWidget#AddressBookPage QPushButton#newAddress:hover, +QWidget#AddressBookPage QPushButton#copyAddress:hover, +QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, +QWidget#AddressBookPage QPushButton#deleteAddress:hover, QDialog#SendCoinsDialog .QPushButton#addButton:hover, QDialog#SendCoinsDialog .QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, @@ -265,6 +273,10 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover { color:#333; } +QWidget#AddressBookPage QPushButton#newAddress:pressed, +QWidget#AddressBookPage QPushButton#copyAddress:pressed, +QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, +QWidget#AddressBookPage QPushButton#deleteAddress:pressed, QDialog#SendCoinsDialog .QPushButton#addButton:pressed, QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, @@ -273,6 +285,10 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed { border:1px solid #9e9e9e; } +QWidget#AddressBookPage QPushButton#newAddress:disabled, +QWidget#AddressBookPage QPushButton#copyAddress:disabled, +QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, +QWidget#AddressBookPage QPushButton#deleteAddress:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, @@ -371,6 +387,24 @@ QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ margin-right:10px; } +/****************************************************** +AddressBookPage +******************************************************/ + +QWidget#AddressBookPage { +} + +QWidget#AddressBookPage QTableView { /* Address Listing */ + font-size:12px; +} + +QWidget#AddressBookPage QTableView::item { +} + +QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ + min-width:260px; +} + /****************************************************** AskPassphraseDialog ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 381c940873ef..a2da7eccdc71 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -450,85 +450,12 @@ QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { border:1px solid #9e9e9e; } -/* Dialog: Send and Receive */ -QWidget#AddressBookPage { -background-color:#F8F6F6; -} - -QWidget#AddressBookPage QPushButton#newAddress { /* New Address Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#newAddress:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QWidget#AddressBookPage QPushButton#newAddress:pressed { -border:1px solid #9e9e9e; -} - -QWidget#AddressBookPage QPushButton#copyAddress { /* Copy Address Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#copyAddress:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QWidget#AddressBookPage QPushButton#copyAddress:pressed { -border:1px solid #9e9e9e; -} - -QWidget#AddressBookPage QPushButton#showAddressQRCode { /* Show Address QR code Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#showAddressQRCode:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed { -border:1px solid #9e9e9e; -} - -QWidget#AddressBookPage QPushButton#deleteAddress { /* Delete Address Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QWidget#AddressBookPage QPushButton#deleteAddress:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QWidget#AddressBookPage QPushButton#deleteAddress:pressed { -border:1px solid #9e9e9e; -} - -QWidget#AddressBookPage QTableView { /* Address Listing */ -font-size:12px; -} +/****************************************************** +AddressBookPage +******************************************************/ -QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ -min-width:260px; +QWidget#AddressBookPage { + background-color:#F8F6F6; } /****************************************************** From 2cd7afbd2207f0e6f74f0acd1d687107febe9f7d Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sat, 30 May 2020 02:23:25 +0200 Subject: [PATCH 15/34] qt: Sign/Verify dialog - Generalized related CSS --- src/qt/res/css/dark.css | 77 +++----------------------------------- src/qt/res/css/general.css | 55 +++++++++++++++++++++++++-- src/qt/res/css/light.css | 76 +++---------------------------------- 3 files changed, 63 insertions(+), 145 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 95024008ef1a..d60e88559246 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -98,7 +98,7 @@ font-size:12px; color: #ccc; } -.QValidatedLineEdit, .QLineEdit { /* Text Entry Fields */ +.QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ border: 1px solid #1c75bc; font-size:11px; min-height:31px; @@ -398,77 +398,12 @@ QDialog#OpenURIDialog QPushButton#selectFileButton:pressed { border:1px solid #9e9e9e; } -/* Dialog: Sign / Verify Message */ -QDialog#SignVerifyMessageDialog { -background-color: #555; -} - -QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ -background-color:transparent; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ -border: 1px solid #1c75bc; -background-color: #444; -color: #ccc; -} - -QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ -background-color:transparent; -padding-left:15px; -} - -QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ -font-size:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ -background-color:transparent; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM { /* Clear Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover { -background-color: #aaa; -color: #333; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed { -border:1px solid #9e9e9e; -} - -QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ -background-color:transparent; -border: 0; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { /* Verify Message - Clear Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { -background-color: #aaa; -color: #333; -} +/****************************************************** +SignVerifyMessageDialog +******************************************************/ -QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { -border:1px solid #9e9e9e; +QDialog#SignVerifyMessageDialog { + background-color: #555; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index f05d2ac0e5a7..03b1974b5cc4 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -252,7 +252,9 @@ 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 { /* Clear Button */ +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; @@ -268,7 +270,9 @@ 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 { +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { background-color: #d2d2d2; color:#333; } @@ -281,7 +285,9 @@ 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 { +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { border:1px solid #9e9e9e; } @@ -293,7 +299,9 @@ QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled, -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled { +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { background-color: #787878; border:1px solid #585858; } @@ -1094,6 +1102,45 @@ QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ } +/****************************************************** +SignVerifyMessageDialog +******************************************************/ + +QDialog#SignVerifyMessageDialog { +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ + background-color:transparent; + padding-left:10px; + padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ + min-height: 50px; +} + +QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ + background-color:transparent; + padding-left:15px; +} + +QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ + font-size:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ + background-color:transparent; + padding-left:10px; + padding-right:10px; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ + background-color:transparent; + border: 0; + padding-left:10px; + padding-right:10px; +} + /****************************************************** TransactionView ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index a2da7eccdc71..9080cc51d9b0 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -94,7 +94,7 @@ font-size:12px; color:#333333; } -.QValidatedLineEdit, .QLineEdit { /* Text Entry Fields */ +.QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ border: 1px solid #82C3E6; font-size:11px; min-height:31px; @@ -378,76 +378,12 @@ QDialog#OpenURIDialog QPushButton#selectFileButton:pressed { border:1px solid #9e9e9e; } -/* Dialog: Sign / Verify Message */ -QDialog#SignVerifyMessageDialog { -background-color:#F8F6F6; -} - -QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ -background-color:transparent; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ -border:1px solid #82C3E6; -background-color:#fff; -} - -QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ -background-color:transparent; -padding-left:15px; -} - -QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ -font-size:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ -background-color:transparent; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM { /* Clear Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed { -border:1px solid #9e9e9e; -} - -QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ -background-color:transparent; -border:0; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { /* Verify Message - Clear Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} +/****************************************************** +SignVerifyMessageDialog +******************************************************/ -QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { -border:1px solid #9e9e9e; +QDialog#SignVerifyMessageDialog { + background-color:#F8F6F6; } /****************************************************** From a596963d0daeca36bb5abfae189f52e2dd713ad1 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sat, 30 May 2020 02:33:54 +0200 Subject: [PATCH 16/34] qt: Open URI dialog - Generalized related CSS --- src/qt/res/css/dark.css | 29 ++++------------------------- src/qt/res/css/general.css | 15 +++++++++++++++ src/qt/res/css/light.css | 29 ++++------------------------- 3 files changed, 23 insertions(+), 50 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index d60e88559246..67b23771aea4 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -369,33 +369,12 @@ QWidget#ShutdownWindow { background-color: #444; } -/*******************************************************/ -/* FILE MENU */ +/****************************************************** +OpenURIDialog +******************************************************/ -/* Dialog: Open URI */ QDialog#OpenURIDialog { -background-color: #555; -} - -QDialog#OpenURIDialog QLabel#label { /* URI Label */ -font-weight:bold; -} - -QDialog#OpenURIDialog QPushButton#selectFileButton { /* ... Button */ -background-color: #ddd; -border: 0; -color: #444; -padding-left:10px; -padding-right:10px; -} - -QDialog#OpenURIDialog QPushButton#selectFileButton:hover { -background-color: #aaa; -color: #333; -} - -QDialog#OpenURIDialog QPushButton#selectFileButton:pressed { -border:1px solid #9e9e9e; + background-color: #555; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 03b1974b5cc4..fe028a6a5985 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -248,6 +248,7 @@ 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, @@ -266,6 +267,7 @@ 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, @@ -281,6 +283,7 @@ 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, @@ -295,6 +298,7 @@ QWidget#AddressBookPage QPushButton#newAddress:disabled, QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, QWidget#AddressBookPage QPushButton#deleteAddress:disabled, +QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, @@ -579,6 +583,17 @@ QWidget#bgWidget .QPushButton#closeButton { margin-right: 50px; } +/****************************************************** +OpenURIDialog +******************************************************/ + +QDialog#OpenURIDialog { +} + +QDialog#OpenURIDialog QLabel#label { /* URI Label */ + font-weight:bold; +} + /****************************************************** OverviewPage Balances ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 9080cc51d9b0..81a4d4db42c5 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -349,33 +349,12 @@ QWidget#ShutdownWindow { background-color: #F8F6F6; } -/*******************************************************/ -/* FILE MENU */ +/****************************************************** +OpenURIDialog +******************************************************/ -/* Dialog: Open URI */ QDialog#OpenURIDialog { -background-color:#F8F6F6; -} - -QDialog#OpenURIDialog QLabel#label { /* URI Label */ -font-weight:bold; -} - -QDialog#OpenURIDialog QPushButton#selectFileButton { /* ... Button */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); -border:1px solid #d2d2d2; -color:#616161; -padding-left:10px; -padding-right:10px; -} - -QDialog#OpenURIDialog QPushButton#selectFileButton:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(240, 240, 240, 255), stop: .95 rgba(240, 240, 240, 255), stop: 1 #ebebeb); -color:#333; -} - -QDialog#OpenURIDialog QPushButton#selectFileButton:pressed { -border:1px solid #9e9e9e; + background-color:#F8F6F6; } /****************************************************** From 62858cdaceb918950dc34fb168ee53a939fd13c4 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Sat, 30 May 2020 19:09:47 +0200 Subject: [PATCH 17/34] qt: Generalized remaining individual Qt classes --- src/qt/res/css/dark.css | 405 +++++++++++++------------------------ src/qt/res/css/general.css | 305 +++++++++++++++++++++++++++- src/qt/res/css/light.css | 376 ++++++++++++---------------------- 3 files changed, 582 insertions(+), 504 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 67b23771aea4..6f3b4519e0ab 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -1,372 +1,259 @@ +/****************************************************** +Common stuff +******************************************************/ + WalletFrame, QDialog { -background-color: #444; -border-top:0px solid #000; -margin:0; -padding-top:20px; -padding-bottom: 20px; + background-color: #444; } QStatusBar { -background-color: #555; -color: #ccc; + background-color: #555; + color: #ccc; } -.QFrame { -background-color:transparent; -border:0px solid #fff; +QMessageBox { + background-color: #555; } -QMenuBar { -background-color: #333; +QWidget { /* override text selection background color for all text widgets */ + selection-background-color: #999; } -QMenuBar::item { -background-color: #333; -color: #ccc; +QCheckBox, +QLabel, +QListView, +QRadioButton, +QTreeWidget { /* Base Text Size & Color */ + color: #ccc; } -QMenuBar::item:selected { -background-color: #333; -color: #1c75bc; /* aka Strong Blue */ -} +/****************************************************** +QMenu +******************************************************/ QMenu { -background-color: #555; + background-color: #555; } QMenu::item { -color: #ccc; + color: #ccc; } - QMenu::item:selected { -background-color: #666; -color: #ddd; + background-color: #666; + color: #ddd; } -QToolBar { -background-color: #1c75bc; -border: 0; -padding:0; -margin:0; -} +/****************************************************** +QToolBar / QToolButton +******************************************************/ -QToolBar > QToolButton { -background-color: #1c75bc; -border: 0; -font-size: 14px; -min-width: 70px; -min-height: 48%; -max-height: 48%; -padding: 0 10px; -margin: 0; -color:#f5f5f5; -} +/***** No dark.css specific coloring here yet *****/ -QTextEdit { - border: 1px solid #333; - background-color: #555; - color: #ccc; -} +/****************************************************** +QMenuBar +******************************************************/ -QToolBar > QToolButton:checked { -border: 0; -font-weight: bold; +QMenuBar { + background-color: #333; } -QToolBar > QToolButton:disabled { -color: #444; +QMenuBar::item:selected { + background-color: #333; + color: #1c75bc; } -QToolBar > QLabel { -border: 0; -margin:10px 0 0 0; -} +/****************************************************** +QTextEdit +******************************************************/ -QMessageBox { -background-color: #555; +QTextEdit { + border: #333; + background-color: #555; + color: #ccc; } -/*******************************************************/ - -QCheckBox, -QLabel, -QListView, -QRadioButton, -QTreeWidget { /* Base Text Size & Color */ -font-size:12px; -color: #ccc; -} +/****************************************************** +QLineEdit / QValidatedLineEdit / QPlainTextEdit +******************************************************/ .QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ -border: 1px solid #1c75bc; -font-size:11px; -min-height:31px; -outline:0; -padding: 0px 3px 0px 3px; -background-color: #333; -color: #aaa; -} - -.QLineEdit:!focus { -font-size:12px; + background-color:#333; + border-color: #1c75bc; + color: #aaa; } .QValidatedLineEdit:disabled, .QLineEdit:disabled { -background-color: #3e3e3e; -} - -QWidget { /* override text selection background color for all text widgets */ -selection-background-color: #999; -} - -/*******************************************************/ - -QPushButton { /* Global Button Style */ -background-color: #1c75bc; -border: 0; -border-radius:8px; -color:#ffffff; -font-size:12px; -font-weight:normal; -height: 26px; -padding-left:25px; -padding-right:25px; -padding-top:5px; -padding-bottom:5px; + background-color: #3e3e3e; } -QPushButton:hover { -background-color: #005c96; /* aka Dark Blue */ -} - -QPushButton:focus { -border:none; -outline:none; -} - -QPushButton:pressed { -border: 1px solid #444; -} - -QPushButton:disabled { -background-color: #666; -} +/****************************************************** +QComboBox +******************************************************/ QComboBox { /* Dropdown Menus */ -border: 1px solid #1c75bc; -padding: 0px 5px 0px 5px; -background: #333; -min-height:31px; -color: #aaa; + background: #333; + border-color: #1c75bc; + color: #aaa; } QComboBox:checked { -background: #3e3e3e; + background: #3e3e3e; } QComboBox:editable { -background: #1c75bc; -color:#616161; -border:0px solid transparent; -} - -QComboBox::drop-down { -width:25px; -border:0px; + background: #1c75bc; + color: #616161; } QComboBox QListView { -color: #aaa; -background: #555; -padding: 3px; + background-color: #555; + color: #aaa; } -QComboBox QAbstractItemView::item { margin:4px; } - QComboBox::item { -color: #aaa; + color: #aaa; } QComboBox::item:alternate { -background:#444; + background: #444; } QComboBox::item:selected { -border:0px solid transparent; -background: #666; -color: #ccc; -} - -QComboBox::indicator { -background-color:transparent; -selection-background-color:transparent; -color:transparent; -selection-color:transparent; -} - -QAbstractSpinBox { -border: 1px solid #1c75bc; -padding: 0px 5px 0px 5px; -background: #333; -min-height:31px; -color: #aaa; + background: #666; + color: #ccc; } -QAbstractSpinBox::up-button { -subcontrol-origin: border; -subcontrol-position: top right; -width:21px; -background: #333; -border-left:0px; -border-right: 1px solid #1c75bc; -border-top: 1px solid #1c75bc; -border-bottom:0px; -padding-right:1px; -padding-left:5px; -padding-top:2px; -} +/****************************************************** +QAbstractSpinBox +******************************************************/ +QAbstractSpinBox, +QAbstractSpinBox::up-button, QAbstractSpinBox::down-button { -subcontrol-origin: border; -subcontrol-position: bottom right; -width:21px; -background: #333; -border-top:0px; -border-left:0px; -border-right: 1px solid #1c75bc; -border-bottom: 1px solid #1c75bc; -padding-right:1px; -padding-left:5px; -padding-bottom:2px; + background: #333; + border-color: #1c75bc; + color: #aaa; } -/*******************************************************/ - -QHeaderView { /* Table Header */ -background-color:transparent; -} +/****************************************************** +QHeaderView +******************************************************/ QHeaderView::section { /* Table Header Sections */ -qproperty-alignment:center; -background-color: #1c75bc; -color: #ccc; -min-height:25px; -font-weight:bold; -font-size:11px; -outline:0; -border: 0px solid #ccc; -border-right: 1px solid #ccc; -padding-left:5px; -padding-right:5px; -padding-top:2px; -padding-bottom:2px; -} - -QHeaderView::section:last { -border-right: 0px solid #333; + background-color: #1c75bc; + border-color: #ccc; + color: #ccc; } -.QScrollArea { -background:transparent; -border:0px; -} +/****************************************************** +QTableView +******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ -border: 0px solid #444; -background-color: #333; + background-color: #333; } QTableView::item { /* Table Item */ -background-color: #333; -/*color: #aaa;*/ /* Do not do this!!! This breaks tx format from transactiontablemodel.cpp, apply to individual tables instead */ -font-size:12px; + background-color: #333; } QTableView::item:selected { /* Table Item Selected */ -background-color: #555; -color: #ccc; + background-color: #555; + color: #ccc; } -.QTableWidget { -border: 0px solid #444; -background-color: #333; -} +/****************************************************** +QScrollArea +******************************************************/ + +/***** No light.css specific coloring here yet *****/ + +/****************************************************** +QScrollBar +******************************************************/ /* Do NOT apply any styles to QScrollBar here, - * it's OS dependent and should be handled via platform specific code. +* it's OS dependent and should be handled via platform specific code. */ -/*******************************************************/ +/****************************************************** +QTableWidget +******************************************************/ + +.QTableWidget { + background-color: #333; +} + +/****************************************************** +QTabWidget +******************************************************/ .QTabWidget { -border-bottom: 1px solid #444; + border-color: #444; } .QTabWidget::pane { -border: 1px solid #333; -background-color: #444; + background-color: #444; + border-color: #333; } .QTabWidget QTabBar::tab { -background-color: #ccc; -color: #444; -padding-left:10px; -padding-right:10px; -padding-top:5px; -padding-bottom:5px; -border-top: 1px solid #333; -} - -.QTabWidget QTabBar::tab:first { -border-left: 1px solid #333; + background-color: #ccc; + border-color: #333; + color: #444; } +.QTabWidget QTabBar::tab:first, .QTabWidget QTabBar::tab:last { -border-right: 1px solid #333; + border-color: #333; } -.QTabWidget QTabBar::tab:selected{ -background-color: #444; -color: #ccc; -} - -.QTabWidget QTabBar::tab:hover { -background-color: #555; -color: #ccc; +.QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { + background-color: #555; + color: #ccc; } .QTabWidget .QWidget { -color: #444; -} - -.QTabWidget .QWidget QAbstractSpinBox { -} - -.QTabWidget .QWidget QAbstractSpinBox::down-button { + color: #444; } -.QTabWidget .QWidget QAbstractSpinBox::up-button { -} +/****************************************************** +QPushButton - Special case, light buttons +******************************************************/ -.QTabWidget .QWidget QComboBox { +QWidget#AddressBookPage QPushButton#newAddress:disabled, +QWidget#AddressBookPage QPushButton#copyAddress:disabled, +QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, +QWidget#AddressBookPage QPushButton#deleteAddress:disabled, +QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#SendCoinsDialog .QPushButton#addButton:disabled, +QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, +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; + border:1px solid #585858; + color: #787878; } -/* DIALOG BOXES */ +/****************************************************** +QProgressDialog +******************************************************/ .QProgressDialog { -background-color: #444; -color: #ccc; -} - -QDialog QWidget { /* Remove Annoying Focus Rectangle */ -outline: 0; + background-color: #444; + color: #ccc; } -/* SHUTDOWN WINDOW */ +/****************************************************** +ShutdownWindow +******************************************************/ QWidget#ShutdownWindow { -background-color: #444; + background-color: #444; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index fe028a6a5985..0322984bda36 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -7,10 +7,71 @@ **/ +/****************************************************** +Common stuff +******************************************************/ + +WalletFrame, +QDialog { + border:0px; + margin:0; + padding-top:20px; + padding-bottom: 20px; +} + +QStatusBar { +} + +.QFrame { + background-color:transparent; + border:0px; +} + +QMessageBox { +} + +QCheckBox, +QLabel, +QListView, +QRadioButton, +QTreeWidget { /* Base Text Size & Color */ + font-size:12px; +} + /****************************************************** 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; + border: 0px; + border-top: 1px solid; + border-right: 1px solid; + padding-right:1px; + padding-left:5px; + padding-top:2px; +} + +QAbstractSpinBox::down-button { + subcontrol-origin: border; + subcontrol-position: bottom right; + width:21px; + border: 0px; + border-right: 1px solid; + border-bottom: 1px solid; + padding-right:1px; + padding-left:5px; + padding-bottom:2px; +} + QAbstractSpinBox::up-arrow { width: 20px; height: 20px; @@ -57,6 +118,49 @@ QAbstractSpinBox::down-arrow:disabled { QComboBox ******************************************************/ +QComboBox { /* Dropdown Menus */ + border:1px solid red; + padding: 0px 5px 0px 5px; + min-height:31px; +} + +QComboBox:checked { +} + +QComboBox:editable { + border:0px solid transparent; +} + +QComboBox::drop-down { + width:25px; + border:0px; +} + +QComboBox QListView { + padding: 3px; +} + +QComboBox QAbstractItemView::item { + margin:4px; +} + +QComboBox::item { +} + +QComboBox::item:alternate { +} + +QComboBox::item:selected { + border:0px solid transparent; +} + +QComboBox::indicator { + background-color:transparent; + selection-background-color:transparent; + color:transparent; + selection-color:transparent; +} + QComboBox::down-arrow { width: 20px; height: 20px; @@ -78,6 +182,32 @@ QComboBox::down-arrow:disabled { border-image: url(':/images/arrow_light_down_hover') 0 0 0 0 stretch stretch; } +/****************************************************** +QMenu +******************************************************/ + +QMenu { +} + +QMenu::item { +} + +QMenu::item:selected { +} + +/****************************************************** +QMenuBar +******************************************************/ + +QMenuBar { +} + +QMenuBar::item { +} + +QMenuBar::item:selected { +} + /****************************************************** QRadioButton ******************************************************/ @@ -170,6 +300,27 @@ QCheckBox::indicator:indeterminate:disabled { QHeaderView ******************************************************/ +QHeaderView { /* Table Header */ + background-color:transparent; +} + +QHeaderView::section { /* Table Header Sections */ + qproperty-alignment:center; + min-height:25px; + font-weight:bold; + font-size:11px; + outline:0; + border: 0px solid; + border-right: 1px solid; + padding-left:5px; + padding-right:5px; + padding-top:2px; + padding-bottom:2px; +} +QHeaderView::section:last { + border-right: 0px; +} + QHeaderView::down-arrow { width: 20px; height: 20px; @@ -204,6 +355,31 @@ QHeaderView::up-arrow:hover { margin-right: 5px; } +/****************************************************** +QLineEdit / QValidatedLineEdit / QPlainTextEdit +******************************************************/ +.QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ + border: 1px solid; + font-size:11px; + min-height:31px; + outline:0; + padding: 0px 3px 0px 3px; +} + +.QLineEdit:!focus { + font-size:12px; +} + +.QValidatedLineEdit:disabled, .QLineEdit:disabled { +} + +/****************************************************** +QProgressDialog +******************************************************/ + +.QProgressDialog { +} + /****************************************************** QPushButton - General blue buttons ******************************************************/ @@ -306,8 +482,125 @@ 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: #787878; - border:1px solid #585858; +} + +/****************************************************** +QScrollArea +******************************************************/ + +.QScrollArea { + background:transparent; + border:0px; +} + +/****************************************************** +QScrollBar +******************************************************/ + +/* Do NOT apply any styles to QScrollBar here, +* it's OS dependent and should be handled via platform specific code. +*/ + +/****************************************************** +QTableView +******************************************************/ + +.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ + border:0px; +} + +QTableView::item { /* Table Item */ + font-size:12px; +} + +QTableView::item:selected { /* Table Item Selected */ +} + +/****************************************************** +QTableWidget +******************************************************/ + +.QTableWidget { + border: 0px; +} + +/****************************************************** +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 { +} + +/****************************************************** +QTextEdit +******************************************************/ + +QTextEdit { + border:1px solid red; +} + +/****************************************************** +QToolBar / QToolButton +******************************************************/ + +QToolBar { + background-color:#008de4; + border:0; + padding:0; + margin:0; +} + +QToolBar > QToolButton { + background-color:#008de4; + border:0; + font-size: 14px; + min-width: 70px; + min-height: 48%; + max-height: 48%; + padding: 0 10px; + margin: 0; + color:#f5f5f5; +} + +QToolBar > QToolButton:checked { + border: 0; + font-weight: bold; +} + +QToolBar > QToolButton:disabled { + color: #444; +} + +QToolBar > QLabel { + border:0; + margin:10px 0 0 0; } /****************************************************** @@ -378,6 +671,14 @@ QTreeWidget::indicator:indeterminate:disabled { image: url(':/images/checkbox_partly_checked_disabled'); } +/****************************************************** +QWidget +******************************************************/ + +QWidget { /* Remove Annoying Focus Rectangle */ + outline: 0; +} + /****************************************************** ******************************************************* STYLING OF SPECIFIC CUSTOM UI PARTS diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 81a4d4db42c5..e16ea277a4b8 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -1,352 +1,242 @@ +/****************************************************** +Common stuff +******************************************************/ + WalletFrame, QDialog { -background-color: #fff; -border-top:0px solid #000; -margin:0; -padding-top:20px; -padding-bottom: 20px; + background-color: #fff; } QStatusBar { -background-color:#ffffff; + background-color:#ffffff; } -.QFrame { -background-color:transparent; -border:0px solid #fff; +QMessageBox { + background-color:#F8F6F6; } -QMenuBar { -background-color:#fff; +QWidget { /* override text selection background color for all text widgets */ + selection-background-color: #999; } -QMenuBar::item { -background-color:#fff; +QCheckBox, +QLabel, +QListView, +QRadioButton, +QTreeWidget { /* Base Text Size & Color */ + color:#333333; } -QMenuBar::item:selected { -background-color: #ffffff; -color: #008de4; -} +/****************************************************** +QMenu +******************************************************/ QMenu { -background-color:#f8f6f6; + background-color:#f8f6f6; } QMenu::item { -color:#333; + color:#333; } QMenu::item:selected { -background-color: #ffffff; -color: #008de4; -} - -QToolBar { -background-color:#008de4; -border:0; -padding:0; -margin:0; + background-color: #ffffff; + color: #008de4; } -QToolBar > QToolButton { -background-color:#008de4; -border:0; -font-size: 14px; -min-width: 70px; -min-height: 48%; -max-height: 48%; -padding: 0 10px; -margin: 0; -color:#f5f5f5; -} +/****************************************************** +QToolBar / QToolButton +******************************************************/ -QTextEdit { - border:1px solid #d7d7d7; -} +/***** No light.css specific coloring here yet *****/ -QToolBar > QToolButton:checked { -border: 0; -font-weight: bold; -} +/****************************************************** +QMenuBar +******************************************************/ -QToolBar > QToolButton:disabled { -color: #444; +QMenuBar { + background-color:#fff; } -QToolBar > QLabel { -border:0; -margin:10px 0 0 0; -} +/****************************************************** +QTextEdit +******************************************************/ -QMessageBox { -background-color:#F8F6F6; +QTextEdit { + border-color: #d7d7d7; } -/*******************************************************/ - -QCheckBox, -QLabel, -QListView, -QRadioButton, -QTreeWidget { /* Base Text Size & Color */ -font-size:12px; -color:#333333; -} +/****************************************************** +QLineEdit / QValidatedLineEdit / QPlainTextEdit +******************************************************/ .QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ -border: 1px solid #82C3E6; -font-size:11px; -min-height:31px; -outline:0; -padding: 0px 3px 0px 3px; -background-color:#fcfcfc; -} - -.QLineEdit:!focus { -font-size:12px; + background-color:#fcfcfc; + border-color: #82C3E6; } .QValidatedLineEdit:disabled, .QLineEdit:disabled { -background-color:#f2f2f2; -} - -QWidget { /* override text selection background color for all text widgets */ -selection-background-color: #999; -} - -/*******************************************************/ - -QPushButton { /* Global Button Style */ -background-color: #008DE4; -border:0; -border-radius:8px; -color:#ffffff; -font-size:12px; -font-weight:normal; -height: 26px; -padding-left:25px; -padding-right:25px; -padding-top:5px; -padding-bottom:5px; + background-color:#f2f2f2; } -QPushButton:hover { -background-color: #262626; -} - -QPushButton:focus { -border:none; -outline:none; -} - -QPushButton:pressed { -border:1px solid #333; -} - -QPushButton:disabled { -background-color: #666; -} +/****************************************************** +QComboBox +******************************************************/ QComboBox { /* Dropdown Menus */ -border:1px solid #82C3E6; -padding: 0px 5px 0px 5px; -background:#fcfcfc; -min-height:31px; -color:#818181; + background:#fcfcfc; + border-color: #82C3E6; + color:#818181; } QComboBox:checked { -background:#f2f2f2; + background:#f2f2f2; } QComboBox:editable { -background: #1c75bc; -color:#616161; -border:0px solid transparent; -} - -QComboBox::drop-down { -width:25px; -border:0px; + background: #1c75bc; + color:#616161; } QComboBox QListView { -background:#fff; -padding: 3px; + background:#fff; } -QComboBox QAbstractItemView::item { margin:4px; } - QComboBox::item { -color:#818181; + color:#818181; } QComboBox::item:alternate { -background:#fff; + background:#fff; } QComboBox::item:selected { -border:0px solid transparent; -background:#f2f2f2; -} - -QComboBox::indicator { -background-color:transparent; -selection-background-color:transparent; -color:transparent; -selection-color:transparent; + background:#f2f2f2; } -QAbstractSpinBox { -border:1px solid #82C3E6; -padding: 0px 5px 0px 5px; -background:#fcfcfc; -min-height:31px; -color:#818181; -} - -QAbstractSpinBox::up-button { -subcontrol-origin: border; -subcontrol-position: top right; -width:21px; -background:#fcfcfc; -border-left:0px; -border-right:1px solid #82C3E6; -border-top:1px solid #82C3E6; -border-bottom:0px; -padding-right:1px; -padding-left:5px; -padding-top:2px; -} +/****************************************************** +QAbstractSpinBox +******************************************************/ +QAbstractSpinBox, +QAbstractSpinBox::up-button, QAbstractSpinBox::down-button { -subcontrol-origin: border; -subcontrol-position: bottom right; -width:21px; -background:#fcfcfc; -border-top:0px; -border-left:0px; -border-right:1px solid #82C3E6; -border-bottom:1px solid #82C3E6; -padding-right:1px; -padding-left:5px; -padding-bottom:2px; + background:#fcfcfc; + border-color: #82C3E6; + color:#818181; } -/*******************************************************/ - -QHeaderView { /* Table Header */ -background-color:transparent; -} +/****************************************************** +QHeaderView +******************************************************/ QHeaderView::section { /* Table Header Sections */ -qproperty-alignment:center; -background-color: #008de4; -color:#fff; -min-height:25px; -font-weight:bold; -font-size:11px; -outline:0; -border:0px solid #fff; -border-right:1px solid #fff; -padding-left:5px; -padding-right:5px; -padding-top:2px; -padding-bottom:2px; -} - -QHeaderView::section:last { -border-right: 0px solid #d7d7d7; -} - -.QScrollArea { -background:transparent; -border:0px; + background-color: #008de4; + border-color: #fff; + color:#fff; } -.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ -border:0px solid #fff; -} +/****************************************************** +QTableView +******************************************************/ QTableView::item { /* Table Item */ -background-color:#fcfcfc; -font-size:12px; + background-color:#fcfcfc; } QTableView::item:selected { /* Table Item Selected */ -background-color:#f0f0f0; -color:#333; + background-color:#f0f0f0; + color:#333; } +/****************************************************** +QScrollArea +******************************************************/ + +/***** No light.css specific coloring here yet *****/ + +/****************************************************** +QScrollBar +******************************************************/ + /* Do NOT apply any styles to QScrollBar here, - * it's OS dependent and should be handled via platform specific code. +* it's OS dependent and should be handled via platform specific code. */ -/*******************************************************/ +/****************************************************** +QTableWidget +******************************************************/ + +/***** No light.css specific coloring here yet *****/ + +/****************************************************** +QTabWidget +******************************************************/ .QTabWidget { -border-bottom:1px solid #333; + border-color: #333; } .QTabWidget::pane { -border: 1px solid #d7d7d7; -background-color:#fff; + background-color:#fff; + border-color: #d7d7d7; } .QTabWidget QTabBar::tab { -background-color:#f2f0f0; -color:#333; -padding-left:10px; -padding-right:10px; -padding-top:5px; -padding-bottom:5px; -border-top: 1px solid #d7d7d7; -} - -.QTabWidget QTabBar::tab:first { -border-left: 1px solid #d7d7d7; + background-color:#f2f0f0; + border-color: #d7d7d7; + color:#333; } +.QTabWidget QTabBar::tab:first, .QTabWidget QTabBar::tab:last { -border-right: 1px solid #d7d7d7; + border-color: #d7d7d7; } .QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { -background-color:#ffffff; -color:#333; + background-color:#ffffff; + color:#333; } .QTabWidget .QWidget { -color:#333; -} - -.QTabWidget .QWidget QAbstractSpinBox { -} - -.QTabWidget .QWidget QAbstractSpinBox::down-button { + color:#333; } -.QTabWidget .QWidget QAbstractSpinBox::up-button { -} +/****************************************************** +QPushButton - Special case, light buttons +******************************************************/ -.QTabWidget .QWidget QComboBox { +QWidget#AddressBookPage QPushButton#newAddress:disabled, +QWidget#AddressBookPage QPushButton#copyAddress:disabled, +QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, +QWidget#AddressBookPage QPushButton#deleteAddress:disabled, +QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#SendCoinsDialog .QPushButton#addButton:disabled, +QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, +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; + border:1px solid #d2d2d2; + color: #d2d2d2; } -/* DIALOG BOXES */ +/****************************************************** +QProgressDialog +******************************************************/ .QProgressDialog { -background-color: #F8F6F6; -} - -QDialog QWidget { /* Remove Annoying Focus Rectangle */ -outline: 0; + background-color: #F8F6F6; } -/* SHUTDOWN WINDOW */ +/****************************************************** +ShutdownWindow +******************************************************/ QWidget#ShutdownWindow { -background-color: #F8F6F6; + background-color: #F8F6F6; } /****************************************************** From adf2bf191a3debb18f5399b2902a1762d226491c Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 2 Jun 2020 01:35:56 +0200 Subject: [PATCH 18/34] qt: Fixed indentation in css files --- src/qt/res/css/dark.css | 174 +++++++++++++++++----------------- src/qt/res/css/general.css | 130 ++++++++++++------------- src/qt/res/css/light.css | 146 ++++++++++++++-------------- src/qt/res/css/scrollbars.css | 4 +- src/qt/res/css/trad.css | 16 ++-- 5 files changed, 235 insertions(+), 235 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 6f3b4519e0ab..95d8a792da4f 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -4,20 +4,20 @@ Common stuff WalletFrame, QDialog { - background-color: #444; + background-color: #444; } QStatusBar { - background-color: #555; - color: #ccc; + background-color: #555; + color: #ccc; } QMessageBox { - background-color: #555; + background-color: #555; } QWidget { /* override text selection background color for all text widgets */ - selection-background-color: #999; + selection-background-color: #999; } QCheckBox, @@ -25,7 +25,7 @@ QLabel, QListView, QRadioButton, QTreeWidget { /* Base Text Size & Color */ - color: #ccc; + color: #ccc; } /****************************************************** @@ -33,15 +33,15 @@ QMenu ******************************************************/ QMenu { - background-color: #555; + background-color: #555; } QMenu::item { - color: #ccc; + color: #ccc; } QMenu::item:selected { - background-color: #666; - color: #ddd; + background-color: #666; + color: #ddd; } /****************************************************** @@ -55,12 +55,12 @@ QMenuBar ******************************************************/ QMenuBar { - background-color: #333; + background-color: #333; } QMenuBar::item:selected { - background-color: #333; - color: #1c75bc; + background-color: #333; + color: #1c75bc; } /****************************************************** @@ -68,9 +68,9 @@ QTextEdit ******************************************************/ QTextEdit { - border: #333; - background-color: #555; - color: #ccc; + border: #333; + background-color: #555; + color: #ccc; } /****************************************************** @@ -78,13 +78,13 @@ QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ .QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ - background-color:#333; - border-color: #1c75bc; - color: #aaa; + background-color:#333; + border-color: #1c75bc; + color: #aaa; } .QValidatedLineEdit:disabled, .QLineEdit:disabled { - background-color: #3e3e3e; + background-color: #3e3e3e; } /****************************************************** @@ -92,36 +92,36 @@ QComboBox ******************************************************/ QComboBox { /* Dropdown Menus */ - background: #333; - border-color: #1c75bc; - color: #aaa; + background: #333; + border-color: #1c75bc; + color: #aaa; } QComboBox:checked { - background: #3e3e3e; + background: #3e3e3e; } QComboBox:editable { - background: #1c75bc; - color: #616161; + background: #1c75bc; + color: #616161; } QComboBox QListView { - background-color: #555; - color: #aaa; + background-color: #555; + color: #aaa; } QComboBox::item { - color: #aaa; + color: #aaa; } QComboBox::item:alternate { - background: #444; + background: #444; } QComboBox::item:selected { - background: #666; - color: #ccc; + background: #666; + color: #ccc; } /****************************************************** @@ -131,9 +131,9 @@ QAbstractSpinBox QAbstractSpinBox, QAbstractSpinBox::up-button, QAbstractSpinBox::down-button { - background: #333; - border-color: #1c75bc; - color: #aaa; + background: #333; + border-color: #1c75bc; + color: #aaa; } /****************************************************** @@ -141,9 +141,9 @@ QHeaderView ******************************************************/ QHeaderView::section { /* Table Header Sections */ - background-color: #1c75bc; - border-color: #ccc; - color: #ccc; + background-color: #1c75bc; + border-color: #ccc; + color: #ccc; } /****************************************************** @@ -151,16 +151,16 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background-color: #333; + background-color: #333; } QTableView::item { /* Table Item */ - background-color: #333; + background-color: #333; } QTableView::item:selected { /* Table Item Selected */ - background-color: #555; - color: #ccc; + background-color: #555; + color: #ccc; } /****************************************************** @@ -182,7 +182,7 @@ QTableWidget ******************************************************/ .QTableWidget { - background-color: #333; + background-color: #333; } /****************************************************** @@ -190,32 +190,32 @@ QTabWidget ******************************************************/ .QTabWidget { - border-color: #444; + border-color: #444; } .QTabWidget::pane { - background-color: #444; - border-color: #333; + background-color: #444; + border-color: #333; } .QTabWidget QTabBar::tab { - background-color: #ccc; - border-color: #333; - color: #444; + background-color: #ccc; + border-color: #333; + color: #444; } .QTabWidget QTabBar::tab:first, .QTabWidget QTabBar::tab:last { - border-color: #333; + border-color: #333; } .QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { - background-color: #555; - color: #ccc; + background-color: #555; + color: #ccc; } .QTabWidget .QWidget { - color: #444; + color: #444; } /****************************************************** @@ -236,7 +236,7 @@ QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { background-color: #666; border:1px solid #585858; - color: #787878; + color: #787878; } /****************************************************** @@ -244,8 +244,8 @@ QProgressDialog ******************************************************/ .QProgressDialog { - background-color: #444; - color: #ccc; + background-color: #444; + color: #ccc; } /****************************************************** @@ -253,7 +253,7 @@ ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #444; + background-color: #444; } /****************************************************** @@ -289,7 +289,7 @@ AskPassphraseDialog ******************************************************/ QDialog#AskPassphraseDialog { - background-color: #555; + background-color: #555; } /****************************************************** @@ -297,11 +297,11 @@ OptionsDialog ******************************************************/ QDialog#OptionsDialog { - background-color: #555; + background-color: #555; } QDialog#OptionsDialog QGroupBox { - color: #ccc; + color: #ccc; } /****************************************************** @@ -309,11 +309,11 @@ RPCConsole ******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color: #333; + background-color: #333; } QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ - color: #aaa; + color: #aaa; } /****************************************************** @@ -321,7 +321,7 @@ HelpMessageDialog ******************************************************/ QDialog#HelpMessageDialog QScrollArea * { - background-color: #555; + background-color: #555; } /****************************************************** @@ -358,15 +358,15 @@ OverviewPage RecentTransactions ModalOverlay ******************************************************/ -QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ - background:rgba(50, 50, 50, 0.8); - color:#616161; +QWidget#bgWidget { /* The frame overlaying the overview-page */ + background:rgba(50, 50, 50, 0.8); + color:#616161; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #444; - border: 1px solid #555; - border-radius: 10px; + background-color: #444; + border: 1px solid #555; + border-radius: 10px; } /****************************************************** @@ -374,14 +374,14 @@ SendCoinsDialog ******************************************************/ QDialog#SendCoinsDialog QLabel#labelBalance { -margin-left:0px; -padding-left:0px; -color: #ccc; -/* font-weight:bold; -border-radius:5px; -padding-top:20px; -padding-bottom:20px; */ -min-height:27px; + margin-left:0px; + padding-left:0px; + color: #ccc; + /* font-weight:bold; + border-radius:5px; + padding-top:20px; + padding-bottom:20px; */ + min-height:27px; } /****************************************************** @@ -397,23 +397,23 @@ CoinControlDialog ******************************************************/ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ - background-color: #666; - color: #ccc; + background-color: #666; + color: #ccc; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ - background-color: #333; - color: #ccc; + background-color: #333; + color: #ccc; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ - background-color: #666; - color: #ccc; + background-color: #666; + color: #ccc; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ - background-color: #333; - color: #ccc; + background-color: #333; + color: #ccc; } /****************************************************** @@ -421,7 +421,7 @@ ReceiveCoinsDialog ******************************************************/ QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ -color: #aaa; + color: #aaa; } /****************************************************** @@ -435,5 +435,5 @@ MasternodeList ******************************************************/ QWidget#MasternodeList QTableWidget#tableWidgetMasternodesDIP3 { -color: #aaa; + color: #aaa; } diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 0322984bda36..7170c27c7921 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -1,9 +1,9 @@ /** - Copyright (c) 2020 The Dash Core developers - Distributed under the MIT/X11 software license, see the accompanying - file COPYING or http://www.opensource.org/licenses/mit-license.php. +Copyright (c) 2020 The Dash Core developers +Distributed under the MIT/X11 software license, see the accompanying +file COPYING or http://www.opensource.org/licenses/mit-license.php. - This file contains style changes used by both dash themes: "Light" and "Dark" +This file contains style changes used by both dash themes: "Light" and "Dark" **/ @@ -13,18 +13,18 @@ Common stuff WalletFrame, QDialog { - border:0px; - margin:0; - padding-top:20px; - padding-bottom: 20px; + border:0px; + margin:0; + padding-top:20px; + padding-bottom: 20px; } QStatusBar { } .QFrame { - background-color:transparent; - border:0px; + background-color:transparent; + border:0px; } QMessageBox { @@ -35,7 +35,7 @@ QLabel, QListView, QRadioButton, QTreeWidget { /* Base Text Size & Color */ - font-size:12px; + font-size:12px; } /****************************************************** @@ -43,9 +43,9 @@ QAbstractSpinBox ******************************************************/ QAbstractSpinBox { - border:1px solid red; - padding: 0px 5px 0px 5px; - min-height:31px; + border:1px solid red; + padding: 0px 5px 0px 5px; + min-height:31px; } QAbstractSpinBox::up-button { @@ -119,25 +119,25 @@ QComboBox ******************************************************/ QComboBox { /* Dropdown Menus */ - border:1px solid red; - padding: 0px 5px 0px 5px; - min-height:31px; + border:1px solid red; + padding: 0px 5px 0px 5px; + min-height:31px; } QComboBox:checked { } QComboBox:editable { - border:0px solid transparent; + border:0px solid transparent; } QComboBox::drop-down { - width:25px; - border:0px; + width:25px; + border:0px; } QComboBox QListView { - padding: 3px; + padding: 3px; } QComboBox QAbstractItemView::item { @@ -151,14 +151,14 @@ QComboBox::item:alternate { } QComboBox::item:selected { - border:0px solid transparent; + border:0px solid transparent; } QComboBox::indicator { - background-color:transparent; - selection-background-color:transparent; - color:transparent; - selection-color:transparent; + background-color:transparent; + selection-background-color:transparent; + color:transparent; + selection-color:transparent; } QComboBox::down-arrow { @@ -301,24 +301,24 @@ QHeaderView ******************************************************/ QHeaderView { /* Table Header */ - background-color:transparent; + background-color:transparent; } QHeaderView::section { /* Table Header Sections */ - qproperty-alignment:center; - min-height:25px; - font-weight:bold; - font-size:11px; - outline:0; + qproperty-alignment:center; + min-height:25px; + font-weight:bold; + font-size:11px; + outline:0; border: 0px solid; border-right: 1px solid; - padding-left:5px; - padding-right:5px; - padding-top:2px; - padding-bottom:2px; + padding-left:5px; + padding-right:5px; + padding-top:2px; + padding-bottom:2px; } QHeaderView::section:last { - border-right: 0px; + border-right: 0px; } QHeaderView::down-arrow { @@ -359,15 +359,15 @@ QHeaderView::up-arrow:hover { QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ .QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ - border: 1px solid; - font-size:11px; - min-height:31px; - outline:0; - padding: 0px 3px 0px 3px; + border: 1px solid; + font-size:11px; + min-height:31px; + outline:0; + padding: 0px 3px 0px 3px; } .QLineEdit:!focus { - font-size:12px; + font-size:12px; } .QValidatedLineEdit:disabled, .QLineEdit:disabled { @@ -489,8 +489,8 @@ QScrollArea ******************************************************/ .QScrollArea { - background:transparent; - border:0px; + background:transparent; + border:0px; } /****************************************************** @@ -506,11 +506,11 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - border:0px; + border:0px; } QTableView::item { /* Table Item */ - font-size:12px; + font-size:12px; } QTableView::item:selected { /* Table Item Selected */ @@ -521,7 +521,7 @@ QTableWidget ******************************************************/ .QTableWidget { - border: 0px; + border: 0px; } /****************************************************** @@ -529,27 +529,27 @@ QTabWidget ******************************************************/ .QTabWidget { - border-bottom:1px solid; + border-bottom:1px solid; } .QTabWidget::pane { - border: 1px solid; + border: 1px solid; } .QTabWidget QTabBar::tab { - padding-left:10px; - padding-right:10px; - padding-top:5px; - padding-bottom:5px; - border-top: 1px solid; + padding-left:10px; + padding-right:10px; + padding-top:5px; + padding-bottom:5px; + border-top: 1px solid; } .QTabWidget QTabBar::tab:first { - border-left: 1px solid; + border-left: 1px solid; } .QTabWidget QTabBar::tab:last { - border-right: 1px solid; + border-right: 1px solid; } .QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { @@ -563,7 +563,7 @@ QTextEdit ******************************************************/ QTextEdit { - border:1px solid red; + border:1px solid red; } /****************************************************** @@ -676,7 +676,7 @@ QWidget ******************************************************/ QWidget { /* Remove Annoying Focus Rectangle */ - outline: 0; + outline: 0; } /****************************************************** @@ -796,7 +796,7 @@ QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonToggleLock { /* T QDialog#CoinControlDialog .QDialogButtonBox#buttonBox QPushButton { /* Coin Control 'OK' button */ } -QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number "1" displays in this table for some reason... */ +QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number 1 displays in this table for some reason... */ color:transparent; } @@ -828,10 +828,10 @@ QDialog#EditAddressDialog { } QDialog#EditAddressDialog QLabel { -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-height:27px; -font-weight:normal; -padding-right:5px; + qproperty-alignment: 'AlignVCenter | AlignRight'; + min-height:27px; + font-weight:normal; + padding-right:5px; } /****************************************************** @@ -861,7 +861,7 @@ MasternodeList QLabel#countLabelDIP3 { ModalOverlay ******************************************************/ -QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ +QWidget#bgWidget { /* The frame overlaying the overview-page */ padding-left:10px; padding-right:10px; } diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index e16ea277a4b8..1b82022a6306 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -4,19 +4,19 @@ Common stuff WalletFrame, QDialog { - background-color: #fff; + background-color: #fff; } QStatusBar { - background-color:#ffffff; + background-color:#ffffff; } QMessageBox { - background-color:#F8F6F6; + background-color:#F8F6F6; } QWidget { /* override text selection background color for all text widgets */ - selection-background-color: #999; + selection-background-color: #999; } QCheckBox, @@ -24,7 +24,7 @@ QLabel, QListView, QRadioButton, QTreeWidget { /* Base Text Size & Color */ - color:#333333; + color:#333333; } /****************************************************** @@ -32,16 +32,16 @@ QMenu ******************************************************/ QMenu { - background-color:#f8f6f6; + background-color:#f8f6f6; } QMenu::item { - color:#333; + color:#333; } QMenu::item:selected { - background-color: #ffffff; - color: #008de4; + background-color: #ffffff; + color: #008de4; } /****************************************************** @@ -55,7 +55,7 @@ QMenuBar ******************************************************/ QMenuBar { - background-color:#fff; + background-color:#fff; } /****************************************************** @@ -63,7 +63,7 @@ QTextEdit ******************************************************/ QTextEdit { - border-color: #d7d7d7; + border-color: #d7d7d7; } /****************************************************** @@ -71,12 +71,12 @@ QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ .QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ - background-color:#fcfcfc; - border-color: #82C3E6; + background-color:#fcfcfc; + border-color: #82C3E6; } .QValidatedLineEdit:disabled, .QLineEdit:disabled { - background-color:#f2f2f2; + background-color:#f2f2f2; } /****************************************************** @@ -84,34 +84,34 @@ QComboBox ******************************************************/ QComboBox { /* Dropdown Menus */ - background:#fcfcfc; - border-color: #82C3E6; - color:#818181; + background:#fcfcfc; + border-color: #82C3E6; + color:#818181; } QComboBox:checked { - background:#f2f2f2; + background:#f2f2f2; } QComboBox:editable { - background: #1c75bc; - color:#616161; + background: #1c75bc; + color:#616161; } QComboBox QListView { - background:#fff; + background:#fff; } QComboBox::item { - color:#818181; + color:#818181; } QComboBox::item:alternate { - background:#fff; + background:#fff; } QComboBox::item:selected { - background:#f2f2f2; + background:#f2f2f2; } /****************************************************** @@ -121,9 +121,9 @@ QAbstractSpinBox QAbstractSpinBox, QAbstractSpinBox::up-button, QAbstractSpinBox::down-button { - background:#fcfcfc; - border-color: #82C3E6; - color:#818181; + background:#fcfcfc; + border-color: #82C3E6; + color:#818181; } /****************************************************** @@ -131,9 +131,9 @@ QHeaderView ******************************************************/ QHeaderView::section { /* Table Header Sections */ - background-color: #008de4; - border-color: #fff; - color:#fff; + background-color: #008de4; + border-color: #fff; + color:#fff; } /****************************************************** @@ -141,12 +141,12 @@ QTableView ******************************************************/ QTableView::item { /* Table Item */ - background-color:#fcfcfc; + background-color:#fcfcfc; } QTableView::item:selected { /* Table Item Selected */ - background-color:#f0f0f0; - color:#333; + background-color:#f0f0f0; + color:#333; } /****************************************************** @@ -174,32 +174,32 @@ QTabWidget ******************************************************/ .QTabWidget { - border-color: #333; + border-color: #333; } .QTabWidget::pane { - background-color:#fff; - border-color: #d7d7d7; + background-color:#fff; + border-color: #d7d7d7; } .QTabWidget QTabBar::tab { - background-color:#f2f0f0; - border-color: #d7d7d7; - color:#333; + background-color:#f2f0f0; + border-color: #d7d7d7; + color:#333; } .QTabWidget QTabBar::tab:first, .QTabWidget QTabBar::tab:last { - border-color: #d7d7d7; + border-color: #d7d7d7; } .QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { - background-color:#ffffff; - color:#333; + background-color:#ffffff; + color:#333; } .QTabWidget .QWidget { - color:#333; + color:#333; } /****************************************************** @@ -220,7 +220,7 @@ QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { background-color: #e2e2e2; border:1px solid #d2d2d2; - color: #d2d2d2; + color: #d2d2d2; } /****************************************************** @@ -228,7 +228,7 @@ QProgressDialog ******************************************************/ .QProgressDialog { - background-color: #F8F6F6; + background-color: #F8F6F6; } /****************************************************** @@ -236,7 +236,7 @@ ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #F8F6F6; + background-color: #F8F6F6; } /****************************************************** @@ -244,7 +244,7 @@ OpenURIDialog ******************************************************/ QDialog#OpenURIDialog { - background-color:#F8F6F6; + background-color:#F8F6F6; } /****************************************************** @@ -252,7 +252,7 @@ SignVerifyMessageDialog ******************************************************/ QDialog#SignVerifyMessageDialog { - background-color:#F8F6F6; + background-color:#F8F6F6; } /****************************************************** @@ -260,7 +260,7 @@ AddressBookPage ******************************************************/ QWidget#AddressBookPage { - background-color:#F8F6F6; + background-color:#F8F6F6; } /****************************************************** @@ -268,7 +268,7 @@ AskPassphraseDialog ******************************************************/ QDialog#AskPassphraseDialog { - background-color: #F8F6F6; + background-color: #F8F6F6; } /****************************************************** @@ -276,7 +276,7 @@ OptionsDialog ******************************************************/ QDialog#OptionsDialog { - background-color:#F8F6F6; + background-color:#F8F6F6; } /****************************************************** @@ -284,7 +284,7 @@ RPCConsole ******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color:#F8F6F6; + background-color:#F8F6F6; } /****************************************************** @@ -292,7 +292,7 @@ HelpMessageDialog ******************************************************/ QDialog#HelpMessageDialog QScrollArea * { - background-color:#ffffff; + background-color:#ffffff; } /****************************************************** @@ -329,13 +329,13 @@ OverviewPage RecentTransactions ModalOverlay ******************************************************/ -QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ - background:rgba(250, 250, 250, 0.8); +QWidget#bgWidget { /* The frame overlaying the overview-page */ + background:rgba(250, 250, 250, 0.8); } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #fff; - border: 1px solid #ccc; + background-color: #fff; + border: 1px solid #ccc; border-radius: 10px; } @@ -344,14 +344,14 @@ SendCoinsDialog ******************************************************/ QDialog#SendCoinsDialog QLabel#labelBalance { -margin-left:0px; -padding-left:0px; -color:#333333; -/* font-weight:bold; -border-radius:5px; -padding-top:20px; -padding-bottom:20px; */ -min-height:27px; + margin-left:0px; + padding-left:0px; + color:#333333; + /* font-weight:bold; + border-radius:5px; + padding-top:20px; + padding-bottom:20px; */ + min-height:27px; } /****************************************************** @@ -367,23 +367,23 @@ CoinControlDialog ******************************************************/ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ - background-color:#f7f7f7; - color:#333; + background-color:#f7f7f7; + color:#333; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ - background-color:#f7f7f7; - color:#333; + background-color:#f7f7f7; + color:#333; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ - background-color:#f7f7f7; - color:#333; + background-color:#f7f7f7; + color:#333; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ - background-color:#f7f7f7; - color:#333; + background-color:#f7f7f7; + color:#333; } /****************************************************** diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index dd4ef5a83ed0..4d598f31b8c3 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -115,9 +115,9 @@ QScrollBar:right-arrow:disabled { } QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScrollBar:horizontal { - border:0; + border:0; } .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background:transparent; + background:transparent; } diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index 6ed15d9613bc..bee4d7f2b12d 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -1,12 +1,12 @@ /* MODAL OVERLAY */ -QWidget#bgWidget { /* The 'frame' overlaying the overview-page */ -background: rgba(0,0,0,220); +QWidget#bgWidget { /* The frame overlaying the overview-page */ + background: rgba(0,0,0,220); } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ -background: rgba(255,255,255,240); -border-radius: 6px; + background: rgba(255,255,255,240); + border-radius: 6px; } /* OVERVIEW SCREEN */ @@ -14,16 +14,16 @@ border-radius: 6px; 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: red; } /* SEND DIALOG */ QDialog#SendCoinsDialog QLabel#labelBalance { -margin-left:0px; -padding-left:0px; + margin-left:0px; + padding-left:0px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ -color: red; + color: red; } From dfce74f0dc7ea9fb7ca9e3fd184c62eaa78ed788 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 2 Jun 2020 16:44:20 +0200 Subject: [PATCH 19/34] qt: Use newlines for multiple selector entries --- src/qt/res/css/dark.css | 10 +++++++--- src/qt/res/css/general.css | 32 +++++++++++++++++++++--------- src/qt/res/css/light.css | 10 +++++++--- src/qt/res/css/scrollbars.css | 37 +++++++++++++++++++++-------------- 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 95d8a792da4f..15c7056a29ae 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -77,13 +77,16 @@ QTextEdit { QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ +.QValidatedLineEdit, +.QLineEdit, +QPlainTextEdit { /* Text Entry Fields */ background-color:#333; border-color: #1c75bc; color: #aaa; } -.QValidatedLineEdit:disabled, .QLineEdit:disabled { +.QValidatedLineEdit:disabled, +.QLineEdit:disabled { background-color: #3e3e3e; } @@ -209,7 +212,8 @@ QTabWidget border-color: #333; } -.QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { +.QTabWidget QTabBar::tab:selected, +.QTabWidget QTabBar::tab:hover { background-color: #555; color: #ccc; } diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 7170c27c7921..19d9655990d7 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -358,7 +358,9 @@ QHeaderView::up-arrow:hover { /****************************************************** QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ +.QValidatedLineEdit, +.QLineEdit, +QPlainTextEdit { /* Text Entry Fields */ border: 1px solid; font-size:11px; min-height:31px; @@ -370,7 +372,8 @@ QLineEdit / QValidatedLineEdit / QPlainTextEdit font-size:12px; } -.QValidatedLineEdit:disabled, .QLineEdit:disabled { +.QValidatedLineEdit:disabled, +.QLineEdit:disabled { } /****************************************************** @@ -552,7 +555,8 @@ QTabWidget border-right: 1px solid; } -.QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { +.QTabWidget QTabBar::tab:selected, +.QTabWidget QTabBar::tab:hover { } .QTabWidget .QWidget { @@ -692,7 +696,9 @@ not only Qt standard elements AboutDialog ******************************************************/ -QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ +QDialog#AboutDialog QLabel#label, +QDialog#AboutDialog QLabel#copyrightLabel, +QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ margin-left:10px; } @@ -722,7 +728,9 @@ QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ AskPassphraseDialog ******************************************************/ -QDialog#AskPassphraseDialog QLabel#passLabel1, QDialog#AskPassphraseDialog QLabel#passLabel2, QDialog#AskPassphraseDialog QLabel#passLabel3 { +QDialog#AskPassphraseDialog QLabel#passLabel1, +QDialog#AskPassphraseDialog QLabel#passLabel2, +QDialog#AskPassphraseDialog QLabel#passLabel3 { qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:170px; min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ @@ -1029,10 +1037,13 @@ OptionsDialog QDialog#OptionsDialog { } -QDialog#OptionsDialog QValueComboBox, QDialog#OptionsDialog QSpinBox { +QDialog#OptionsDialog QValueComboBox, +QDialog#OptionsDialog QSpinBox { } -QDialog#OptionsDialog QValidatedLineEdit, QDialog#OptionsDialog QValidatedLineEdit:disabled, QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { +QDialog#OptionsDialog QValidatedLineEdit, +QDialog#OptionsDialog QValidatedLineEdit:disabled, +QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { qproperty-alignment: 'AlignVCenter | AlignLeft'; } @@ -1259,7 +1270,8 @@ 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 */ +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'; min-height:25px; min-width:180px; @@ -1281,7 +1293,9 @@ QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */ } -QWidget#RPCConsole QPushButton#clearButton, QWidget#RPCConsole QPushButton#fontSmallerButton, QWidget#RPCConsole QPushButton#fontBiggerButton { /* Console Font and Clear Buttons */ +QWidget#RPCConsole QPushButton#clearButton, +QWidget#RPCConsole QPushButton#fontSmallerButton, +QWidget#RPCConsole QPushButton#fontBiggerButton { /* Console Font and Clear Buttons */ background-color:transparent; padding-left:10px; padding-right:10px; diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 1b82022a6306..694efd9eb082 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -70,12 +70,15 @@ QTextEdit { QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ +.QValidatedLineEdit, +.QLineEdit, +QPlainTextEdit { /* Text Entry Fields */ background-color:#fcfcfc; border-color: #82C3E6; } -.QValidatedLineEdit:disabled, .QLineEdit:disabled { +.QValidatedLineEdit:disabled, +.QLineEdit:disabled { background-color:#f2f2f2; } @@ -193,7 +196,8 @@ QTabWidget border-color: #d7d7d7; } -.QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { +.QTabWidget QTabBar::tab:selected, +.QTabWidget QTabBar::tab:hover { background-color:#ffffff; color:#333; } diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index 4d598f31b8c3..a2fe83168fb6 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -22,19 +22,26 @@ QScrollBar::handle:horizontal { /* Scroll Bar Slider - horizontal */ min-width:10px; } -QScrollBar::add-page, QScrollBar::sub-page { /* Scroll Bar Background */ - background:#F8F6F6; +QScrollBar::add-page, +QScrollBar::sub-page { /* Scroll Bar Background */ + background-color: #F8F6F6; } -QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */ - background-color:#F8F6F6; +QScrollBar::add-line:vertical, +QScrollBar::sub-line:vertical, +QScrollBar::add-line:horizontal, +QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */ + background-color: #F8F6F6; border: 1px solid #f2f0f0; width:16px; height:16px; } -QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed, QScrollBar::add-line:horizontal:pressed, QScrollBar::sub-line:horizontal:pressed { - background-color:#e0e0e0; +QScrollBar::add-line:vertical:pressed, +QScrollBar::sub-line:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed { + background-color: #e0e0e0; } QScrollBar::sub-line:vertical { /* Vertical - top button position */ @@ -57,9 +64,12 @@ QScrollBar::add-line:horizontal { /* Vertical - right button position */ subcontrol-origin: margin; } -QScrollBar:up-arrow, QScrollBar:down-arrow, QScrollBar:left-arrow, QScrollBar:right-arrow { /* Arrows Icon */ - width:18px; - height:18px; +QScrollBar:up-arrow, +QScrollBar:down-arrow, +QScrollBar:left-arrow, +QScrollBar:right-arrow { /* Arrows Icon */ + width: 18px; + height: 18px; } QScrollBar:up-arrow { @@ -114,10 +124,7 @@ QScrollBar:right-arrow:disabled { border-image: url(':/images/arrow_light_right_hover'); } -QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScrollBar:horizontal { - border:0; -} - -.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background:transparent; +QDialog#HelpMessageDialog QScrollBar:vertical, +QDialog#HelpMessageDialog QScrollBar:horizontal { + border: 0; } From e44ac22cbe9186968727e7b4cdd04b3a3ad0c8ed Mon Sep 17 00:00:00 2001 From: xdustinface Date: Tue, 2 Jun 2020 18:14:33 +0200 Subject: [PATCH 20/34] qt: Formal cleanups in all css files --- src/qt/res/css/dark.css | 354 +++++++------ src/qt/res/css/general.css | 955 +++++++++++++++++----------------- src/qt/res/css/light.css | 358 +++++++------ src/qt/res/css/scrollbars.css | 41 +- src/qt/res/css/trad.css | 26 +- 5 files changed, 899 insertions(+), 835 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 15c7056a29ae..aee224d7509d 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -13,7 +13,7 @@ QStatusBar { } QMessageBox { - background-color: #555; + background-color: #444; } QWidget { /* override text selection background color for all text widgets */ @@ -29,83 +29,33 @@ QTreeWidget { /* Base Text Size & Color */ } /****************************************************** -QMenu -******************************************************/ - -QMenu { - background-color: #555; -} - -QMenu::item { - color: #ccc; -} -QMenu::item:selected { - background-color: #666; - color: #ddd; -} - -/****************************************************** -QToolBar / QToolButton -******************************************************/ - -/***** No dark.css specific coloring here yet *****/ - -/****************************************************** -QMenuBar +QAbstractSpinBox ******************************************************/ -QMenuBar { - background-color: #333; -} - -QMenuBar::item:selected { +QAbstractSpinBox, +QAbstractSpinBox::up-button, +QAbstractSpinBox::down-button { background-color: #333; - color: #1c75bc; -} - -/****************************************************** -QTextEdit -******************************************************/ - -QTextEdit { - border: #333; - background-color: #555; - color: #ccc; -} - -/****************************************************** -QLineEdit / QValidatedLineEdit / QPlainTextEdit -******************************************************/ - -.QValidatedLineEdit, -.QLineEdit, -QPlainTextEdit { /* Text Entry Fields */ - background-color:#333; border-color: #1c75bc; color: #aaa; } -.QValidatedLineEdit:disabled, -.QLineEdit:disabled { - background-color: #3e3e3e; -} - /****************************************************** QComboBox ******************************************************/ QComboBox { /* Dropdown Menus */ - background: #333; + background-color: #333; border-color: #1c75bc; color: #aaa; } QComboBox:checked { - background: #3e3e3e; + background-color: #3e3e3e; } QComboBox:editable { - background: #1c75bc; + background-color: #1c75bc; color: #616161; } @@ -119,53 +69,106 @@ QComboBox::item { } QComboBox::item:alternate { - background: #444; + background-color: #444; } QComboBox::item:selected { - background: #666; + background-color: #666; color: #ccc; } /****************************************************** -QAbstractSpinBox +QHeaderView ******************************************************/ -QAbstractSpinBox, -QAbstractSpinBox::up-button, -QAbstractSpinBox::down-button { - background: #333; +QHeaderView::section { /* Table Header Sections */ + background-color: #1c75bc; + border-color: #ccc; + color: #ccc; +} + +/****************************************************** +QLineEdit / QValidatedLineEdit / QPlainTextEdit +******************************************************/ + +.QValidatedLineEdit, +.QLineEdit, +QPlainTextEdit { /* Text Entry Fields */ + background-color: #333; border-color: #1c75bc; color: #aaa; } +.QValidatedLineEdit:disabled, +.QLineEdit:disabled { + background-color: #3e3e3e; +} + /****************************************************** -QHeaderView +QMenu ******************************************************/ -QHeaderView::section { /* Table Header Sections */ - background-color: #1c75bc; - border-color: #ccc; +QMenu { + background-color: #555; +} + +QMenu::item { color: #ccc; } +QMenu::item:selected { + background-color: #666; + color: #ddd; +} /****************************************************** -QTableView +QMenuBar ******************************************************/ -.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ +QMenuBar { background-color: #333; } -QTableView::item { /* Table Item */ +QMenuBar::item:selected { background-color: #333; + color: #1c75bc; } -QTableView::item:selected { /* Table Item Selected */ - background-color: #555; +/****************************************************** +QProgressDialog +******************************************************/ + +.QProgressDialog { + background-color: #444; color: #ccc; } +/****************************************************** +QPushButton - Special case, light buttons +******************************************************/ + +QWidget#AddressBookPage QPushButton#newAddress:disabled, +QWidget#AddressBookPage QPushButton#copyAddress:disabled, +QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, +QWidget#AddressBookPage QPushButton#deleteAddress:disabled, +QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#SendCoinsDialog .QPushButton#addButton:disabled, +QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, +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; + border-color: #585858; + color: #787878; +} + +/****************************************************** +QRadioButton +******************************************************/ + +/***** No dark.css specific coloring here yet *****/ + /****************************************************** QScrollArea ******************************************************/ @@ -180,6 +183,23 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QTableView +******************************************************/ + +.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ + background-color: #333; +} + +QTableView::item { /* Table Item */ + background-color: #333; +} + +QTableView::item:selected { /* Table Item Selected */ + background-color: #555; + color: #ccc; +} + /****************************************************** QTableWidget ******************************************************/ @@ -223,58 +243,50 @@ QTabWidget } /****************************************************** -QPushButton - Special case, light buttons +QTextEdit ******************************************************/ -QWidget#AddressBookPage QPushButton#newAddress:disabled, -QWidget#AddressBookPage QPushButton#copyAddress:disabled, -QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, -QWidget#AddressBookPage QPushButton#deleteAddress:disabled, -QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, -QDialog#SendCoinsDialog .QPushButton#addButton:disabled, -QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, -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; - border:1px solid #585858; - color: #787878; +QTextEdit { + border-color: #333; + background-color: #555; + color: #ccc; } /****************************************************** -QProgressDialog +QToolBar / QToolButton ******************************************************/ -.QProgressDialog { - background-color: #444; - color: #ccc; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** -ShutdownWindow +QTreeWidget ******************************************************/ -QWidget#ShutdownWindow { - background-color: #444; +QTreeWidget { + background-color: #333; } /****************************************************** -OpenURIDialog +QWidget ******************************************************/ -QDialog#OpenURIDialog { - background-color: #555; -} +/***** No dark.css specific coloring here yet *****/ + /****************************************************** -SignVerifyMessageDialog +******************************************************* +STYLING OF SPECIFIC CUSTOM UI PARTS + +Below each section should be for a specific UI class/file +not only Qt standard elements +******************************************************* ******************************************************/ -QDialog#SignVerifyMessageDialog { - background-color: #555; -} +/****************************************************** +AboutDialog +******************************************************/ + +/***** No dark.css specific coloring here yet *****/ /****************************************************** AddressBookPage @@ -297,28 +309,34 @@ QDialog#AskPassphraseDialog { } /****************************************************** -OptionsDialog +CoinControlDialog ******************************************************/ -QDialog#OptionsDialog { - background-color: #555; +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ + background-color: #666; + color: #ccc; } -QDialog#OptionsDialog QGroupBox { +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ + background-color: #333; color: #ccc; } -/****************************************************** -RPCConsole -******************************************************/ +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ + background-color: #666; + color: #ccc; +} -QWidget#RPCConsole { /* RPC Console Dialog Box */ +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ background-color: #333; + color: #ccc; } -QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ - color: #aaa; -} +/****************************************************** +EditAddressDialog +******************************************************/ + +/***** No dark.css specific coloring here yet *****/ /****************************************************** HelpMessageDialog @@ -329,16 +347,46 @@ QDialog#HelpMessageDialog QScrollArea * { } /****************************************************** -AboutDialog +MasternodeList ******************************************************/ -/***** No dark.css specific coloring here yet *****/ +QWidget#MasternodeList QTableWidget#tableWidgetMasternodesDIP3 { + color: #aaa; +} /****************************************************** -EditAddressDialog +ModalOverlay ******************************************************/ -/***** No dark.css specific coloring here yet *****/ +QWidget#bgWidget { /* The frame overlaying the overview-page */ + background-color: #cc323232; + color: #616161; +} + +QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ + background-color: #444; + border-color: #555; +} + +/****************************************************** +OpenURIDialog +******************************************************/ + +QDialog#OpenURIDialog { + background-color: #555; +} + +/****************************************************** +OptionsDialog +******************************************************/ + +QDialog#OptionsDialog { + background-color: #555; +} + +QDialog#OptionsDialog QGroupBox { + color: #ccc; +} /****************************************************** OverviewPage Balances @@ -359,18 +407,23 @@ OverviewPage RecentTransactions /***** No dark.css specific coloring here yet *****/ /****************************************************** -ModalOverlay +ReceiveCoinsDialog ******************************************************/ -QWidget#bgWidget { /* The frame overlaying the overview-page */ - background:rgba(50, 50, 50, 0.8); - color:#616161; +QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ + color: #aaa; } -QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #444; - border: 1px solid #555; - border-radius: 10px; +/****************************************************** +RPCConsole +******************************************************/ + +QWidget#RPCConsole { /* RPC Console Dialog Box */ + background-color: #333; +} + +QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ + color: #aaa; } /****************************************************** @@ -378,14 +431,7 @@ SendCoinsDialog ******************************************************/ QDialog#SendCoinsDialog QLabel#labelBalance { - margin-left:0px; - padding-left:0px; color: #ccc; - /* font-weight:bold; - border-radius:5px; - padding-top:20px; - padding-bottom:20px; */ - min-height:27px; } /****************************************************** @@ -397,35 +443,19 @@ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry L } /****************************************************** -CoinControlDialog +SignVerifyMessageDialog ******************************************************/ -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#SignVerifyMessageDialog { + background-color: #555; } /****************************************************** -ReceiveCoinsDialog +ShutdownWindow ******************************************************/ -QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ - color: #aaa; +QWidget#ShutdownWindow { + background-color: #444; } /****************************************************** @@ -433,11 +463,3 @@ TransactionView ******************************************************/ /***** No dark.css specific coloring here yet *****/ - -/****************************************************** -MasternodeList -******************************************************/ - -QWidget#MasternodeList QTableWidget#tableWidgetMasternodesDIP3 { - color: #aaa; -} diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 19d9655990d7..90b7689226dc 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -13,18 +13,18 @@ Common stuff WalletFrame, QDialog { - border:0px; - margin:0; - padding-top:20px; + border: 0px; + margin: 0; + padding-top: 20px; padding-bottom: 20px; } -QStatusBar { +.QFrame { + background-color: transparent; + border: 0px; } -.QFrame { - background-color:transparent; - border:0px; +QStatusBar { } QMessageBox { @@ -35,7 +35,7 @@ QLabel, QListView, QRadioButton, QTreeWidget { /* Base Text Size & Color */ - font-size:12px; + font-size: 12px; } /****************************************************** @@ -43,75 +43,126 @@ QAbstractSpinBox ******************************************************/ QAbstractSpinBox { - border:1px solid red; + border: 1px solid red; padding: 0px 5px 0px 5px; - min-height:31px; + min-height: 31px; } QAbstractSpinBox::up-button { subcontrol-origin: border; subcontrol-position: top right; - width:21px; + width: 21px; border: 0px; border-top: 1px solid; border-right: 1px solid; - padding-right:1px; - padding-left:5px; - padding-top:2px; + padding-right: 1px; + padding-left: 5px; + padding-top: 2px; } QAbstractSpinBox::down-button { subcontrol-origin: border; subcontrol-position: bottom right; - width:21px; + width: 21px; border: 0px; border-right: 1px solid; border-bottom: 1px solid; - padding-right:1px; - padding-left:5px; - padding-bottom:2px; + padding-right: 1px; + padding-left: 5px; + padding-bottom: 2px; } QAbstractSpinBox::up-arrow { width: 20px; height: 20px; - image:url(':/images/arrow_up_normal'); + image: url(':/images/arrow_up_normal'); } QAbstractSpinBox::up-arrow:hover { width: 20px; height: 20px; - image:url(':/images/arrow_up_hover'); + image: url(':/images/arrow_up_hover'); } QAbstractSpinBox::up-arrow:pressed { width: 20px; height: 20px; - image:url(':/images/arrow_up_pressed'); + image: url(':/images/arrow_up_pressed'); } QAbstractSpinBox::up-arrow:disabled { width: 20px; height: 20px; - image:url(':/images/arrow_light_up_hover'); + image: url(':/images/arrow_light_up_hover'); } QAbstractSpinBox::down-arrow { width: 20px; height: 20px; - image:url(':/images/arrow_down_normal'); + image: url(':/images/arrow_down_normal'); } QAbstractSpinBox::down-arrow:hover { width: 20px; height: 20px; - image:url(':/images/arrow_down_hover'); + image: url(':/images/arrow_down_hover'); } QAbstractSpinBox::down-arrow:pressed { width: 20px; height: 20px; - image:url(':/images/arrow_down_pressed'); + image: url(':/images/arrow_down_pressed'); } QAbstractSpinBox::down-arrow:disabled { width: 20px; height: 20px; - image:url(':/images/arrow_light_down_hover'); + image: url(':/images/arrow_light_down_hover'); +} + +/****************************************************** +QCheckBox +******************************************************/ + +QCheckBox{ + background-color: transparent; + min-height: 20px; +} +QCheckBox::indicator { + width: 15px; + height: 15px; + margin-right: 5px; +} + +QCheckBox::indicator:unchecked { + image: url(':/images/checkbox_normal'); +} +QCheckBox::indicator:hover:unchecked { + image: url(':/images/checkbox_normal_hover'); +} +QCheckBox::indicator:unchecked:pressed { + image: url(':/images/checkbox_normal_pressed'); +} +QCheckBox::indicator:unchecked:disabled { + image: url(':/images/checkbox_normal_disabled'); +} +QCheckBox::indicator:checked { + image: url(':/images/checkbox_checked'); +} +QCheckBox::indicator:checked:hover { + image: url(':/images/checkbox_checked_hover'); +} +QCheckBox::indicator:checked:pressed { + image: url(':/images/checkbox_checked_pressed'); +} +QCheckBox::indicator:checked:disabled { + image: url(':/images/checkbox_checked_disabled'); +} +QCheckBox::indicator:indeterminate { + image: url(':/images/checkbox_partly_checked'); +} +QCheckBox::indicator:indeterminate:hover { + image: url(':/images/checkbox_partly_checked_hover'); +} +QCheckBox::indicator:indeterminate:pressed { + image: url(':/images/checkbox_partly_checked_pressed'); +} +QCheckBox::indicator:indeterminate:disabled { + image: url(':/images/checkbox_partly_checked_disabled'); } /****************************************************** @@ -119,21 +170,21 @@ QComboBox ******************************************************/ QComboBox { /* Dropdown Menus */ - border:1px solid red; + border: 1px solid red; padding: 0px 5px 0px 5px; - min-height:31px; + min-height: 31px; } QComboBox:checked { } QComboBox:editable { - border:0px solid transparent; + border: 0px solid transparent; } QComboBox::drop-down { - width:25px; - border:0px; + width: 25px; + border: 0px; } QComboBox QListView { @@ -141,7 +192,7 @@ QComboBox QListView { } QComboBox QAbstractItemView::item { - margin:4px; + margin: 4px; } QComboBox::item { @@ -151,14 +202,14 @@ QComboBox::item:alternate { } QComboBox::item:selected { - border:0px solid transparent; + border: 0px solid transparent; } QComboBox::indicator { - background-color:transparent; - selection-background-color:transparent; - color:transparent; - selection-color:transparent; + background-color: transparent; + selection-background-color: transparent; + color: transparent; + selection-color: transparent; } QComboBox::down-arrow { @@ -182,140 +233,26 @@ QComboBox::down-arrow:disabled { border-image: url(':/images/arrow_light_down_hover') 0 0 0 0 stretch stretch; } -/****************************************************** -QMenu -******************************************************/ - -QMenu { -} - -QMenu::item { -} - -QMenu::item:selected { -} - -/****************************************************** -QMenuBar -******************************************************/ - -QMenuBar { -} - -QMenuBar::item { -} - -QMenuBar::item:selected { -} - -/****************************************************** -QRadioButton -******************************************************/ - -QRadioButton { - background-color: transparent; -} -QRadioButton::indicator { - width: 15px; - height: 15px; - margin-right: 5px; -} -QRadioButton::indicator:unchecked { - image: url(':/images/radio_normal'); -} -QRadioButton::indicator:hover:unchecked { - image: url(':/images/radio_normal_hover'); -} -QRadioButton::indicator:unchecked:pressed { - image: url(':/images/radio_normal_pressed'); -} -QRadioButton::indicator:checked { - image: url(':/images/radio_checked'); -} -QRadioButton::indicator:checked:hover { - image: url(':/images/radio_checked_hover'); -} -QRadioButton::indicator:checked:pressed { - image: url(':/images/radio_checked_pressed'); -} -QRadioButton::indicator:checked:disabled { - image: url(':/images/radio_checked_disabled'); -} -QRadioButton::indicator:unchecked:disabled { - image: url(':/images/radio_normal_disabled'); -} - -/****************************************************** -QCheckBox -******************************************************/ - -QCheckBox{ - background-color: transparent; - min-height:20px; -} -QCheckBox::indicator { - width: 15px; - height: 15px; - margin-right: 5px; -} - -QCheckBox::indicator:unchecked { - image: url(':/images/checkbox_normal'); -} -QCheckBox::indicator:hover:unchecked { - image: url(':/images/checkbox_normal_hover'); -} -QCheckBox::indicator:unchecked:pressed { - image: url(':/images/checkbox_normal_pressed'); -} -QCheckBox::indicator:unchecked:disabled { - image: url(':/images/checkbox_normal_disabled'); -} -QCheckBox::indicator:checked { - image: url(':/images/checkbox_checked'); -} -QCheckBox::indicator:checked:hover { - image: url(':/images/checkbox_checked_hover'); -} -QCheckBox::indicator:checked:pressed { - image: url(':/images/checkbox_checked_pressed'); -} -QCheckBox::indicator:checked:disabled { - image: url(':/images/checkbox_checked_disabled'); -} -QCheckBox::indicator:indeterminate { - image: url(':/images/checkbox_partly_checked'); -} -QCheckBox::indicator:indeterminate:hover { - image: url(':/images/checkbox_partly_checked_hover'); -} -QCheckBox::indicator:indeterminate:pressed { - image: url(':/images/checkbox_partly_checked_pressed'); -} -QCheckBox::indicator:indeterminate:disabled { - image: url(':/images/checkbox_partly_checked_disabled'); -} - /****************************************************** QHeaderView ******************************************************/ QHeaderView { /* Table Header */ - background-color:transparent; + background-color: transparent; } QHeaderView::section { /* Table Header Sections */ - qproperty-alignment:center; - min-height:25px; - font-weight:bold; - font-size:11px; - outline:0; + qproperty-alignment: center; + min-height: 25px; + font-weight: bold; + font-size: 11px; + outline: 0; border: 0px solid; border-right: 1px solid; - padding-left:5px; - padding-right:5px; - padding-top:2px; - padding-bottom:2px; + padding-left: 5px; + padding-right: 5px; + padding-top: 2px; + padding-bottom: 2px; } QHeaderView::section:last { border-right: 0px; @@ -358,22 +295,48 @@ QHeaderView::up-arrow:hover { /****************************************************** QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, .QLineEdit, -QPlainTextEdit { /* Text Entry Fields */ +QPlainTextEdit, +.QValidatedLineEdit { /* Text Entry Fields */ border: 1px solid; - font-size:11px; - min-height:31px; - outline:0; + font-size: 11px; + min-height: 31px; + outline: 0; padding: 0px 3px 0px 3px; } .QLineEdit:!focus { - font-size:12px; + font-size: 12px; } -.QValidatedLineEdit:disabled, -.QLineEdit:disabled { +.QLineEdit:disabled, +.QValidatedLineEdit:disabled { +} + +/****************************************************** +QMenu +******************************************************/ + +QMenu { +} + +QMenu::item { +} + +QMenu::item:selected { +} + +/****************************************************** +QMenuBar +******************************************************/ + +QMenuBar { +} + +QMenuBar::item { +} + +QMenuBar::item:selected { } /****************************************************** @@ -390,15 +353,15 @@ QPushButton - General blue buttons QPushButton { /* Global Button Style */ background-color: #008de4; border: 0; - border-radius:8px; - color:#ffffff; - font-size:12px; - font-weight:normal; + border-radius: 8px; + color: #ffffff; + font-size: 12px; + font-weight: normal; height: 26px; - padding-left:25px; - padding-right:25px; - padding-top:5px; - padding-bottom:5px; + padding-left: 25px; + padding-right: 25px; + padding-top: 5px; + padding-bottom: 5px; } QPushButton:hover { @@ -406,8 +369,8 @@ QPushButton:hover { } QPushButton:focus { - border:none; - outline:none; + border: none; + outline: none; } QPushButton:pressed { @@ -435,11 +398,11 @@ 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: #f6f6f6; + border: 1px solid #d2d2d2; + color: #616161; + padding-left: 10px; + padding-right: 10px; } QWidget#AddressBookPage QPushButton#newAddress:hover, @@ -455,7 +418,7 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { background-color: #d2d2d2; - color:#333; + color: #333; } QWidget#AddressBookPage QPushButton#newAddress:pressed, @@ -470,7 +433,7 @@ 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: 1px solid #9e9e9e; } QWidget#AddressBookPage QPushButton#newAddress:disabled, @@ -485,6 +448,44 @@ 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 { + border: 1px solid; +} + +/****************************************************** +QRadioButton +******************************************************/ + +QRadioButton { + background-color: transparent; +} +QRadioButton::indicator { + width: 15px; + height: 15px; + margin-right: 5px; +} +QRadioButton::indicator:unchecked { + image: url(':/images/radio_normal'); +} +QRadioButton::indicator:hover:unchecked { + image: url(':/images/radio_normal_hover'); +} +QRadioButton::indicator:unchecked:pressed { + image: url(':/images/radio_normal_pressed'); +} +QRadioButton::indicator:checked { + image: url(':/images/radio_checked'); +} +QRadioButton::indicator:checked:hover { + image: url(':/images/radio_checked_hover'); +} +QRadioButton::indicator:checked:pressed { + image: url(':/images/radio_checked_pressed'); +} +QRadioButton::indicator:checked:disabled { + image: url(':/images/radio_checked_disabled'); +} +QRadioButton::indicator:unchecked:disabled { + image: url(':/images/radio_normal_disabled'); } /****************************************************** @@ -492,8 +493,8 @@ QScrollArea ******************************************************/ .QScrollArea { - background:transparent; - border:0px; + background-color: transparent; + border: 0px; } /****************************************************** @@ -509,11 +510,12 @@ QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - border:0px; + border: 0px; + background-color: transparent; } QTableView::item { /* Table Item */ - font-size:12px; + font-size: 12px; } QTableView::item:selected { /* Table Item Selected */ @@ -532,7 +534,7 @@ QTabWidget ******************************************************/ .QTabWidget { - border-bottom:1px solid; + border-bottom: 1px solid; } .QTabWidget::pane { @@ -540,10 +542,10 @@ QTabWidget } .QTabWidget QTabBar::tab { - padding-left:10px; - padding-right:10px; - padding-top:5px; - padding-bottom:5px; + padding-left: 10px; + padding-right: 10px; + padding-top: 5px; + padding-bottom: 5px; border-top: 1px solid; } @@ -567,7 +569,7 @@ QTextEdit ******************************************************/ QTextEdit { - border:1px solid red; + border: 1px solid red; } /****************************************************** @@ -575,22 +577,22 @@ QToolBar / QToolButton ******************************************************/ QToolBar { - background-color:#008de4; - border:0; - padding:0; - margin:0; + background-color: #008de4; + border: 0; + padding: 0; + margin: 0; } QToolBar > QToolButton { - background-color:#008de4; - border:0; + background-color: #008de4; + border: 0; font-size: 14px; min-width: 70px; min-height: 48%; max-height: 48%; padding: 0 10px; margin: 0; - color:#f5f5f5; + color: #f5f5f5; } QToolBar > QToolButton:checked { @@ -603,8 +605,8 @@ QToolBar > QToolButton:disabled { } QToolBar > QLabel { - border:0; - margin:10px 0 0 0; + border: 0; + margin: 10px 0 0 0; } /****************************************************** @@ -614,8 +616,8 @@ QTreeWidget QTreeWidget { background-color: transparent; alternate-background-color: transparent; - outline:0; - border:0px; + outline: 0; + border: 0px; } QTreeWidget::branch::closed:has-children { padding: 0 -2px 0 2px; @@ -683,6 +685,7 @@ QWidget { /* Remove Annoying Focus Rectangle */ outline: 0; } + /****************************************************** ******************************************************* STYLING OF SPECIFIC CUSTOM UI PARTS @@ -699,11 +702,11 @@ AboutDialog QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ - margin-left:10px; + margin-left: auto10px; } QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ - margin-right:10px; + margin-right: 10px; } /****************************************************** @@ -714,14 +717,14 @@ QWidget#AddressBookPage { } QWidget#AddressBookPage QTableView { /* Address Listing */ - font-size:12px; + font-size: 12px; } QWidget#AddressBookPage QTableView::item { } QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */ - min-width:260px; + min-width: 260px; } /****************************************************** @@ -732,8 +735,8 @@ QDialog#AskPassphraseDialog QLabel#passLabel1, QDialog#AskPassphraseDialog QLabel#passLabel2, QDialog#AskPassphraseDialog QLabel#passLabel3 { qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:170px; - min-height:33px; /* base width of 25px for QLineEdit, plus padding and border */ + min-width: 170px; + min-height: 33px; /* base width of 25px for QLineEdit, plus padding and border */ } /****************************************************** @@ -741,71 +744,71 @@ CoinControlDialog ******************************************************/ QDialog#CoinControlDialog .QLabel#labelCoinControlQuantityText { /* Coin Control Quantity Label */ - min-height:30px; - padding-left:15px; + min-height: 30px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlQuantity { /* Coin Control Quantity */ - min-height:30px; + min-height: 30px; } QDialog#CoinControlDialog .QLabel#labelCoinControlBytesText { /* Coin Control Bytes Label */ - padding-left:15px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlBytes { /* Coin Control Bytes */ } QDialog#CoinControlDialog .QLabel#labelCoinControlAmountText { /* Coin Control Amount Label */ - min-height:30px; - padding-left:15px; + min-height: 30px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlAmount { /* Coin Control Amount */ - min-height:30px; + min-height: 30px; } QDialog#CoinControlDialog .QLabel#labelCoinControlPriorityText { /* Coin Control Priority Label */ - padding-left:15px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlPriority { /* Coin Control Priority */ } QDialog#CoinControlDialog .QLabel#labelCoinControlFeeText { /* Coin Control Fee Label */ - min-height:30px; - padding-left:15px; + min-height: 30px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlFee { /* Coin Control Fee */ - min-height:30px; + min-height: 30px; } QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutputText { /* Coin Control Low Output Label */ - padding-left:15px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlLowOutput { /* Coin Control Low Output */ } QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFeeText { /* Coin Control After Fee Label */ - min-height:30px; - padding-left:15px; + min-height: 30px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlAfterFee { /* Coin Control After Fee */ - min-height:30px; + min-height: 30px; } QDialog#CoinControlDialog .QLabel#labelCoinControlChangeText { /* Coin Control Change Label */ - padding-left:15px; + padding-left: 15px; } QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Change */ } QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonSelectAll { /* (un)select all button */ - padding-left:10px; - padding-right:10px; - min-height:25px; + 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; + padding-left: 10px; + padding-right: 10px; + min-height: 25px; } QDialog#CoinControlDialog .QDialogButtonBox#buttonBox QPushButton { /* Coin Control 'OK' button */ } QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number 1 displays in this table for some reason... */ - color:transparent; + color: transparent; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { @@ -816,12 +819,12 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* C } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ - background-repeat:no-repeat; - background-position:center; + background-repeat: no-repeat; + background-position: center; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ - background-repeat:no-repeat; - background-position:center; + background-repeat: no-repeat; + background-position: center; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::seperator { @@ -837,9 +840,9 @@ QDialog#EditAddressDialog { QDialog#EditAddressDialog QLabel { qproperty-alignment: 'AlignVCenter | AlignRight'; - min-height:27px; - font-weight:normal; - padding-right:5px; + min-height: 27px; + font-weight: normal; + padding-right: 5px; } /****************************************************** @@ -870,22 +873,23 @@ ModalOverlay ******************************************************/ QWidget#bgWidget { /* The frame overlaying the overview-page */ - padding-left:10px; - padding-right:10px; + padding-left: 10px; + padding-right: 10px; } QWidget#bgWidget .QPushButton#warningIcon { - background-color:transparent; - width:64px; - height:64px; - padding:5px; + background-color: transparent; + width: 64px; + height: 64px; + padding: 5px; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - border-top:0px; - margin:0; - padding-top:20px; + margin: 0; + padding-top: 20px; padding-bottom: 20px; + border: 1px solid; + border-radius: 10px; } QWidget#bgWidget .QPushButton#closeButton { @@ -900,7 +904,40 @@ QDialog#OpenURIDialog { } QDialog#OpenURIDialog QLabel#label { /* URI Label */ - font-weight:bold; + font-weight: bold; +} + +/****************************************************** +OptionsDialog +******************************************************/ + +QDialog#OptionsDialog { +} + +QDialog#OptionsDialog QValueComboBox, +QDialog#OptionsDialog QSpinBox { +} + +QDialog#OptionsDialog QValidatedLineEdit, +QDialog#OptionsDialog QValidatedLineEdit:disabled, +QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { + qproperty-alignment: 'AlignVCenter | AlignLeft'; +} + +QDialog#OptionsDialog > QLabel { + qproperty-alignment: 'AlignVCenter'; + min-height: 20px; +} + +QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { +} + +QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ + qproperty-alignment: 'AlignVCenter | AlignCenter'; + padding-bottom: 8px; +} + +QDialog#OptionsDialog QGroupBox { } /****************************************************** @@ -908,159 +945,126 @@ OverviewPage Balances ******************************************************/ QWidget .QFrame#frame { /* Wallet Balance */ - min-width:490px; + min-width: 490px; } QWidget .QFrame#frame > .QLabel { - min-width:100px; - font-weight:normal; - min-height:30px; + min-width: 100px; + font-weight: normal; + min-height: 30px; } QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ - min-width:180px; - color:#008de4; - margin-top:0; - margin-right:5px; - padding-right:5px; - font-weight:bold; - font-size:18px; - min-height:30px; + min-width: 180px; + color: #008de4; + margin-top: 0; + margin-right: 5px; + padding-right: 5px; + font-weight: bold; + font-size: 18px; + min-height: 30px; } QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; color: #ff4500; - margin-left:3px; + margin-left: 3px; } QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:18px; + font-size: 12px; + margin-left: 18px; } QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:16px; + font-size: 12px; + margin-left: 16px; } QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:100px; - margin-right:5px; - padding-right:5px; - font-size:14px; + min-width: 100px; + margin-right: 5px; + padding-right: 5px; + font-size: 14px; font-weight: bold; - min-height:35px; + min-height: 35px; } QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; color: #008de4; - font-size:16px; + font-size: 16px; font-weight: bold; - margin-left:0px; + margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:16px; + font-size: 12px; + margin-left: 16px; } QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:100px; - font-size:12px; - margin-right:5px; - padding-right:5px; + min-width: 100px; + font-size: 12px; + margin-right: 5px; + padding-right: 5px; } QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:0px; + font-size: 12px; + margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:16px; + font-size: 12px; + margin-left: 16px; } QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:100px; - font-size:12px; - margin-right:5px; - padding-right:5px; + min-width: 100px; + font-size: 12px; + margin-right: 5px; + padding-right: 5px; } QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:0px; + font-size: 12px; + margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:16px; + font-size: 12px; + margin-left: 16px; } QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:100px; - font-size:12px; - margin-right:5px; - padding-right:5px; + min-width: 100px; + font-size: 12px; + margin-right: 5px; + padding-right: 5px; } QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:0px; + font-size: 12px; + margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - font-size:12px; - margin-left:16px; -} - -/****************************************************** -OptionsDialog -******************************************************/ - -QDialog#OptionsDialog { -} - -QDialog#OptionsDialog QValueComboBox, -QDialog#OptionsDialog QSpinBox { -} - -QDialog#OptionsDialog QValidatedLineEdit, -QDialog#OptionsDialog QValidatedLineEdit:disabled, -QDialog#OptionsDialog QLineEdit, QDialog#OptionsDialog QLineEdit:disabled { - qproperty-alignment: 'AlignVCenter | AlignLeft'; -} - -QDialog#OptionsDialog > QLabel { - qproperty-alignment: 'AlignVCenter'; - min-height:20px; -} - -QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { -} - -QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ - qproperty-alignment: 'AlignVCenter | AlignCenter'; - padding-bottom:8px; -} - -QDialog#OptionsDialog QGroupBox { + font-size: 12px; + margin-left: 16px; } /****************************************************** @@ -1068,35 +1072,35 @@ OverviewPage PrivateSend ******************************************************/ QWidget .QFrame#framePrivateSend { /* PrivateSend Widget */ - background-color:transparent; + background-color: transparent; max-width: 451px; min-width: 451px; max-height: 350px; } QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */ - background-color:transparent; + background-color: transparent; max-width: 421px; min-width: 421px; } 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-width: 180px; + color: #008de4; + margin-top: 0; + margin-right: 5px; + padding-right: 5px; font-weight: bold; - font-size:18px; - min-height:30px; + font-size: 18px; + min-height: 30px; } QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; color: #ff4500; - margin-left:2px; - padding-right:5px; + margin-left: 2px; + padding-right: 5px; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget { @@ -1105,16 +1109,16 @@ QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget { } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget > .QLabel { - min-width:175px; - font-weight:normal; - min-height:25px; + min-width: 175px; + font-weight: normal; + min-height: 25px; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:160px; - margin-right:5px; - padding-right:5px; + min-width: 160px; + margin-right: 5px; + padding-right: 5px; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ @@ -1123,29 +1127,29 @@ QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPriva QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelCompletitionText { /* PrivateSend Completion Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:160px; - margin-right:5px; - padding-right:5px; + 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; + margin-right: 43px; text-align: right; color: #aaa; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk { background-color: #008de4; - width:1px; + width: 1px; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:160px; - margin-right:5px; - padding-right:5px; + min-width: 160px; + margin-right: 5px; + padding-right: 5px; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymized { /* PrivateSend Balance */ @@ -1154,9 +1158,9 @@ QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnony QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountAndRoundsText { /* PrivateSend Amount and Rounds Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:160px; - margin-right:5px; - padding-right:5px; + min-width: 160px; + margin-right: 5px; + padding-right: 5px; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountRounds { /* PrivateSend Amount and Rounds */ @@ -1165,9 +1169,9 @@ QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmoun QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenomText { /* PrivateSend Submitted Denom Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width:160px; - margin-right:5px; - padding-right:5px; + min-width: 160px; + margin-right: 5px; + padding-right: 5px; } QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenom { /* PrivateSend Submitted Denom */ @@ -1182,22 +1186,22 @@ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendLastMessage { /* Privat qproperty-alignment: 'AlignVCenter | AlignCenter'; min-width: 288px; min-height: 43px; - font-size:11px; + font-size: 11px; } QWidget .QFrame#framePrivateSend QPushButton:focus { - border:none; - outline:none; + border: none; + outline: none; } QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend { /* Start PrivateSend Mixing */ min-height: 40px; - font-size:15px; - font-weight:normal; - padding-left:10px; - padding-right:10px; - padding-top:5px; - padding-bottom:6px; + font-size: 15px; + font-weight: normal; + padding-left: 10px; + padding-right: 10px; + padding-top: 5px; + padding-bottom: 6px; } QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover { @@ -1209,40 +1213,40 @@ OverviewPage RecentTransactions ******************************************************/ QWidget .QFrame#frame_2 { /* Transactions Widget */ - min-width:510px; - margin-right:20px; - margin-left:0; - margin-top:0; + min-width: 510px; + margin-right: 20px; + margin-left: 0; + margin-top: 0; } QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ - min-width:180px; + min-width: 180px; color: #008de4; - margin-left:67px; - margin-top:0; - margin-right:5px; - padding-right:5px; - font-weight:bold; - font-size:18px; - min-height:30px; + margin-left: 67px; + margin-top: 0; + margin-right: 5px; + padding-right: 5px; + font-weight: bold; + font-size: 18px; + min-height: 30px; } QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ qproperty-alignment: 'AlignBottom | AlignRight'; color: #ff4500; - min-width:93px; - margin-top:0; - margin-left:16px; - margin-right:5px; - min-height:16px; + min-width: 93px; + margin-top: 0; + margin-left: 16px; + margin-right: 5px; + min-height: 16px; } QWidget .QFrame#frame_2 QListView { /* Transaction List */ - font-weight:normal; - font-size:12px; - max-width:369px; - margin-top:12px; - margin-left:0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ + font-weight: normal; + font-size: 12px; + max-width: 369px; + margin-top: 12px; + margin-left: 0px; /* CSS Voodoo - set to -66px to hide default transaction icons */ } /****************************************************** @@ -1254,9 +1258,9 @@ 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; - font-size:15px; + min-width: 102px; + padding-right: 5px; + font-size: 15px; } QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ @@ -1273,21 +1277,21 @@ 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'; - min-height:25px; - min-width:180px; + min-height: 25px; + min-width: 180px; } QWidget#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ - color:#1c75bc; + color: #1c75bc; } QWidget#RPCConsole QPushButton#openDebugLogfileButton { - max-width:60px; + max-width: 60px; } QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ - background-color:transparent; - border:0; + background-color: transparent; + border: 0; } QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */ @@ -1296,21 +1300,21 @@ 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; - padding-left:10px; - padding-right:10px; + background-color: transparent; + padding-left: 10px; + padding-right: 10px; } QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */ - background-color:transparent; + background-color: transparent; } QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ - background-color:#096e03; + background-color: #096e03; } QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ - background-color:#eb4034; + background-color: #eb4034; } /****************************************************** @@ -1322,31 +1326,31 @@ QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QPushButton#pushButtonCoinControl { /* Coin Control Inputs Button */ - padding-left:10px; - padding-right:10px; - min-height:25px; + padding-left: 10px; + padding-right: 10px; + min-height: 25px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */ - color:#999; - font-weight:normal; - font-size:14px; + color: #999; + font-weight: normal; + font-size: 14px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl > .QLabel { /* Coin Control Inputs Labels */ - padding:2px; + padding: 2px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoinControlChange { /* Custom Change Address */ } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ - font-weight:normal; - qproperty-margin:-6; - margin-right:112px; + font-weight: normal; + qproperty-margin: -6; + margin-right: 112px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ @@ -1354,38 +1358,24 @@ QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffF } QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ - background:transparent; + background-color: transparent; } /* 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 { - /*margin-left:20px; - margin-right:-2px; - padding-right:-2px; - color:#616161; - font-size:14px; - font-weight:bold; - border-radius:5px; - padding-top:20px; - padding-bottom:20px;*/ - min-height:27px; + min-height: 27px; } QDialog#SendCoinsDialog QLabel#labelBalance { - margin-left:0px; - padding-left:0px; - color:#333333; - /* font-weight:bold; - border-radius:5px; - padding-top:20px; - padding-bottom:20px; */ - min-height:27px; + margin-left: 0px; + padding-left: 0px; + min-height: 27px; } #checkboxSubtractFeeFromAmount { - padding-left:10px; + padding-left: 10px; } /****************************************************** @@ -1394,12 +1384,12 @@ SendCoinsEntry QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ background-color: transparent; - min-width:50px; - font-weight:normal; - font-size:15px; - min-height:25px; - margin-right:5px; - padding-right:5px; + min-width: 50px; + font-weight: normal; + font-size: 15px; + min-height: 25px; + margin-right: 5px; + padding-right: 5px; } QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { @@ -1409,15 +1399,15 @@ QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field } QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ - background-color:transparent; - padding-left:5px; - padding-right:5px; + background-color: transparent; + padding-left: 5px; + padding-right: 5px; border: 0; outline: 0; } QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ - padding-left:10px; + padding-left: 10px; } QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { @@ -1440,9 +1430,9 @@ QDialog#SignVerifyMessageDialog { } QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ - background-color:transparent; - padding-left:10px; - padding-right:10px; + background-color: transparent; + padding-left: 10px; + padding-right: 10px; } QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ @@ -1450,25 +1440,32 @@ QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ } QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ - background-color:transparent; - padding-left:15px; + background-color: transparent; + padding-left: 15px; } QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ - font-size:10px; + font-size: 10px; } QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ - background-color:transparent; - padding-left:10px; - padding-right:10px; + background-color: transparent; + padding-left: 10px; + padding-right: 10px; } QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ - background-color:transparent; + background-color: transparent; border: 0; - padding-left:10px; - padding-right:10px; + padding-left: 10px; + padding-right: 10px; +} + +/****************************************************** +ShutdownWindow +******************************************************/ + +QWidget#ShutdownWindow { } /****************************************************** @@ -1476,29 +1473,29 @@ TransactionView ******************************************************/ TransactionView QLineEdit { /* Filters */ - margin-bottom:2px; - margin-right:1px; - min-width:111px; - text-align:center; + margin-bottom: 2px; + margin-right: 1px; + min-width: 111px; + text-align: center; } TransactionView QLineEdit#addressWidget { /* Address Filter */ - margin-bottom:2px; - margin-right:1px; - min-width:405px; - text-align:center; + margin-bottom: 2px; + margin-right: 1px; + min-width: 405px; + text-align: center; } TransactionView QLineEdit#amountWidget { /* Amount Filter */ - margin-bottom:2px; - margin-right:1px; - max-width:100px; - text-align:center; + margin-bottom: 2px; + margin-right: 1px; + max-width: 100px; + text-align: center; } TransactionView QComboBox { - margin-bottom:1px; - margin-right:1px; + margin-bottom: 1px; + margin-right: 1px; } #transactionSumLabel, diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 694efd9eb082..6c63cd31027a 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -4,15 +4,15 @@ Common stuff WalletFrame, QDialog { - background-color: #fff; + background-color: #f6f6f6; } QStatusBar { - background-color:#ffffff; + background-color: #ffffff; } QMessageBox { - background-color:#F8F6F6; + background-color: #f6f6f6; } QWidget { /* override text selection background color for all text widgets */ @@ -23,47 +23,65 @@ QCheckBox, QLabel, QListView, QRadioButton, -QTreeWidget { /* Base Text Size & Color */ - color:#333333; +QTreeWidget { + color: #333333; } /****************************************************** -QMenu +QAbstractSpinBox ******************************************************/ -QMenu { - background-color:#f8f6f6; +QAbstractSpinBox, +QAbstractSpinBox::up-button, +QAbstractSpinBox::down-button { + background-color: #fcfcfc; + border-color: #82C3E6; + color: #818181; } -QMenu::item { - color:#333; +/****************************************************** +QComboBox +******************************************************/ + +QComboBox { /* Dropdown Menus */ + background-color: #fcfcfc; + border-color: #82C3E6; + color: #818181; } -QMenu::item:selected { - background-color: #ffffff; - color: #008de4; +QComboBox:checked { + background-color: #f2f2f2; } -/****************************************************** -QToolBar / QToolButton -******************************************************/ +QComboBox:editable { + background-color: #1c75bc; + color: #616161; +} -/***** No light.css specific coloring here yet *****/ +QComboBox QListView { + background-color: #fff; +} -/****************************************************** -QMenuBar -******************************************************/ +QComboBox::item { + color: #818181; +} -QMenuBar { - background-color:#fff; +QComboBox::item:alternate { + background-color: #fff; +} + +QComboBox::item:selected { + background-color: #f2f2f2; } /****************************************************** -QTextEdit +QHeaderView ******************************************************/ -QTextEdit { - border-color: #d7d7d7; +QHeaderView::section { /* Table Header Sections */ + background-color: #008de4; + border-color: #fff; + color: #fff; } /****************************************************** @@ -73,84 +91,74 @@ QLineEdit / QValidatedLineEdit / QPlainTextEdit .QValidatedLineEdit, .QLineEdit, QPlainTextEdit { /* Text Entry Fields */ - background-color:#fcfcfc; + background-color: #fcfcfc; border-color: #82C3E6; } .QValidatedLineEdit:disabled, .QLineEdit:disabled { - background-color:#f2f2f2; + background-color: #f2f2f2; } /****************************************************** -QComboBox +QMenu ******************************************************/ -QComboBox { /* Dropdown Menus */ - background:#fcfcfc; - border-color: #82C3E6; - color:#818181; -} - -QComboBox:checked { - background:#f2f2f2; -} - -QComboBox:editable { - background: #1c75bc; - color:#616161; +QMenu { + background-color: #f6f6f6; } -QComboBox QListView { - background:#fff; +QMenu::item { + color: #333; } -QComboBox::item { - color:#818181; +QMenu::item:selected { + background-color: #ffffff; + color: #008de4; } -QComboBox::item:alternate { - background:#fff; -} +/****************************************************** +QMenuBar +******************************************************/ -QComboBox::item:selected { - background:#f2f2f2; +QMenuBar { + background-color: #fff; } /****************************************************** -QAbstractSpinBox +QProgressDialog ******************************************************/ -QAbstractSpinBox, -QAbstractSpinBox::up-button, -QAbstractSpinBox::down-button { - background:#fcfcfc; - border-color: #82C3E6; - color:#818181; +.QProgressDialog { + background-color: #f6f6f6; } /****************************************************** -QHeaderView +QPushButton - Special case, light buttons ******************************************************/ -QHeaderView::section { /* Table Header Sections */ - background-color: #008de4; - border-color: #fff; - color:#fff; +QWidget#AddressBookPage QPushButton#newAddress:disabled, +QWidget#AddressBookPage QPushButton#copyAddress:disabled, +QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, +QWidget#AddressBookPage QPushButton#deleteAddress:disabled, +QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#SendCoinsDialog .QPushButton#addButton:disabled, +QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, +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; + border-color: #d2d2d2; + color: #d2d2d2; } /****************************************************** -QTableView +QRadioButton ******************************************************/ -QTableView::item { /* Table Item */ - background-color:#fcfcfc; -} - -QTableView::item:selected { /* Table Item Selected */ - background-color:#f0f0f0; - color:#333; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** QScrollArea @@ -166,11 +174,30 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QTableView +******************************************************/ + +.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ + background-color: #fff; +} + +QTableView::item { /* Table Item */ + background-color: #fcfcfc; +} + +QTableView::item:selected { /* Table Item Selected */ + background-color: #f0f0f0; + color: #333; +} + /****************************************************** QTableWidget ******************************************************/ -/***** No light.css specific coloring here yet *****/ +QTableWidget { + background-color: #fff; +} /****************************************************** QTabWidget @@ -181,14 +208,14 @@ QTabWidget } .QTabWidget::pane { - background-color:#fff; + background-color: #fff; border-color: #d7d7d7; } .QTabWidget QTabBar::tab { - background-color:#f2f0f0; + background-color: #f2f0f0; border-color: #d7d7d7; - color:#333; + color: #333; } .QTabWidget QTabBar::tab:first, @@ -198,73 +225,64 @@ QTabWidget .QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover { - background-color:#ffffff; - color:#333; + background-color: #ffffff; + color: #333; } .QTabWidget .QWidget { - color:#333; + color: #333; } /****************************************************** -QPushButton - Special case, light buttons +QTextEdit ******************************************************/ -QWidget#AddressBookPage QPushButton#newAddress:disabled, -QWidget#AddressBookPage QPushButton#copyAddress:disabled, -QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, -QWidget#AddressBookPage QPushButton#deleteAddress:disabled, -QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, -QDialog#SendCoinsDialog .QPushButton#addButton:disabled, -QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, -QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, -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; - border:1px solid #d2d2d2; - color: #d2d2d2; +QTextEdit { + border-color: #d7d7d7; } /****************************************************** -QProgressDialog +QToolBar / QToolButton ******************************************************/ -.QProgressDialog { - background-color: #F8F6F6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** -ShutdownWindow +QTreeWidget ******************************************************/ -QWidget#ShutdownWindow { - background-color: #F8F6F6; +QTreeWidget { + background-color: #fff; } /****************************************************** -OpenURIDialog +QWidget ******************************************************/ -QDialog#OpenURIDialog { - background-color:#F8F6F6; -} +/***** No light.css specific coloring here yet *****/ + /****************************************************** -SignVerifyMessageDialog +******************************************************* +STYLING OF SPECIFIC CUSTOM UI PARTS + +Below each section should be for a specific UI class/file +not only Qt standard elements +******************************************************* ******************************************************/ -QDialog#SignVerifyMessageDialog { - background-color:#F8F6F6; -} +/****************************************************** +AboutDialog +******************************************************/ + +/***** No light.css specific coloring here yet *****/ /****************************************************** AddressBookPage ******************************************************/ QWidget#AddressBookPage { - background-color:#F8F6F6; + background-color: #f6f6f6; } /****************************************************** @@ -272,44 +290,81 @@ AskPassphraseDialog ******************************************************/ QDialog#AskPassphraseDialog { - background-color: #F8F6F6; + background-color: #f6f6f6; } /****************************************************** -OptionsDialog +CoinControlDialog ******************************************************/ -QDialog#OptionsDialog { - background-color:#F8F6F6; +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; } /****************************************************** -RPCConsole +EditAddressDialog ******************************************************/ -QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color:#F8F6F6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** HelpMessageDialog ******************************************************/ QDialog#HelpMessageDialog QScrollArea * { - background-color:#ffffff; + background-color: #ffffff; } /****************************************************** -AboutDialog +MasternodeList ******************************************************/ /***** No light.css specific coloring here yet *****/ /****************************************************** -EditAddressDialog +ModalOverlay ******************************************************/ -/***** No light.css specific coloring here yet *****/ +QWidget#bgWidget { /* The frame overlaying the overview-page */ + background-color: #ccfafafa; +} + +QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ + background-color: #fff; + border-color: #ccc; +} + +/****************************************************** +OpenURIDialog +******************************************************/ + +QDialog#OpenURIDialog { + background-color: #f6f6f6; +} + +/****************************************************** +OptionsDialog +******************************************************/ + +QDialog#OptionsDialog { + background-color: #f6f6f6; +} /****************************************************** OverviewPage Balances @@ -330,17 +385,17 @@ OverviewPage RecentTransactions /***** No light.css specific coloring here yet *****/ /****************************************************** -ModalOverlay +ReceiveCoinsDialog ******************************************************/ -QWidget#bgWidget { /* The frame overlaying the overview-page */ - background:rgba(250, 250, 250, 0.8); -} +/***** No light.css specific coloring here yet *****/ -QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #fff; - border: 1px solid #ccc; - border-radius: 10px; +/****************************************************** +RPCConsole +******************************************************/ + +QWidget#RPCConsole { /* RPC Console Dialog Box */ + background-color: #f6f6f6; } /****************************************************** @@ -348,14 +403,7 @@ SendCoinsDialog ******************************************************/ QDialog#SendCoinsDialog QLabel#labelBalance { - margin-left:0px; - padding-left:0px; - color:#333333; - /* font-weight:bold; - border-radius:5px; - padding-top:20px; - padding-bottom:20px; */ - min-height:27px; + color: #333333; } /****************************************************** @@ -367,43 +415,23 @@ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry L } /****************************************************** -CoinControlDialog +SignVerifyMessageDialog ******************************************************/ -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#SignVerifyMessageDialog { + background-color: #f6f6f6; } /****************************************************** -ReceiveCoinsDialog +ShutdownWindow ******************************************************/ -/***** No light.css specific coloring here yet *****/ +QWidget#ShutdownWindow { + background-color: #f6f6f6; +} /****************************************************** TransactionView ******************************************************/ /***** No light.css specific coloring here yet *****/ - -/****************************************************** -MasternodeList -******************************************************/ - -/***** No light.css specific coloring here yet *****/ diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index a2fe83168fb6..d8396fc7bff0 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -1,40 +1,45 @@ + +/****************************************************** +QScrollBar +******************************************************/ + QScrollBar:vertical { /* Vertical Scroll Bar Attributes */ - border:0; - background:#ffffff; - width:18px; + border: 0; + background-color: #ffffff; + width: 18px; margin: 18px 0px 18px 0px; } QScrollBar:horizontal { /* Horizontal Scroll Bar Attributes */ - border:0; - background:#ffffff; - height:18px; + border: 0; + background-color: #ffffff; + height: 18px; margin: 0px 18px 0px 18px; } QScrollBar::handle:vertical { /* Scroll Bar Slider - vertical */ - background:#e0e0e0; - min-height:10px; + background-color: #e0e0e0; + min-height: 10px; } QScrollBar::handle:horizontal { /* Scroll Bar Slider - horizontal */ - background:#e0e0e0; - min-width:10px; + background-color: #e0e0e0; + min-width: 10px; } QScrollBar::add-page, QScrollBar::sub-page { /* Scroll Bar Background */ - background-color: #F8F6F6; + background-color: #f6f6f6; } QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */ - background-color: #F8F6F6; + background-color: #f6f6f6; border: 1px solid #f2f0f0; - width:16px; - height:16px; + width: 16px; + height: 16px; } QScrollBar::add-line:vertical:pressed, @@ -45,22 +50,22 @@ QScrollBar::sub-line:horizontal:pressed { } QScrollBar::sub-line:vertical { /* Vertical - top button position */ - subcontrol-position:top; + subcontrol-position: top; subcontrol-origin: margin; } QScrollBar::add-line:vertical { /* Vertical - bottom button position */ - subcontrol-position:bottom; + subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:horizontal { /* Vertical - left button position */ - subcontrol-position:left; + subcontrol-position: left; subcontrol-origin: margin; } QScrollBar::add-line:horizontal { /* Vertical - right button position */ - subcontrol-position:right; + subcontrol-position: right; subcontrol-origin: margin; } diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index bee4d7f2b12d..71094b9a2980 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -1,15 +1,25 @@ -/* MODAL OVERLAY */ +/****************************************************** +ModalOverlay +******************************************************/ QWidget#bgWidget { /* The frame overlaying the overview-page */ - background: rgba(0,0,0,220); + padding-left: 10px; + padding-right: 10px; + background-color: #fafafacc; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background: rgba(255,255,255,240); + background-color: #fff; + margin: 0; + padding-top: 20px; + padding-bottom: 20px; + border: 1px solid; border-radius: 6px; } -/* OVERVIEW SCREEN */ +/****************************************************** +OverviewPage +******************************************************/ QWidget .QFrame#frame .QLabel#labelWalletStatus, /* Wallet Sync Status */ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus, /* PrivateSend Sync Status */ @@ -17,11 +27,13 @@ QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions color: red; } -/* SEND DIALOG */ +/****************************************************** +SendCoinsDialog +******************************************************/ QDialog#SendCoinsDialog QLabel#labelBalance { - margin-left:0px; - padding-left:0px; + margin-left: 0px; + padding-left: 0px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ From b2980a329813aa844d71254ee397d32d3333c47d Mon Sep 17 00:00:00 2001 From: xdustinface Date: Wed, 3 Jun 2020 03:31:00 +0200 Subject: [PATCH 21/34] qt: Add copyright and file description to all css files --- src/qt/res/css/dark.css | 16 ++++++++++++++++ src/qt/res/css/general.css | 25 +++++++++++++++++++++++-- src/qt/res/css/light.css | 16 ++++++++++++++++ src/qt/res/css/scrollbars.css | 17 +++++++++++++++++ src/qt/res/css/trad.css | 16 ++++++++++++++++ 5 files changed, 88 insertions(+), 2 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index aee224d7509d..8eb835b3bfe9 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -1,3 +1,19 @@ +/** +Copyright (c) 2020 The Dash Core developers +Distributed under the MIT/X11 software license, see the accompanying +file COPYING or http://www.opensource.org/licenses/mit-license.php. + +--------------------------------------------------------------------- + +This file contains color changes for the dash theme "Dark". + +NOTE: This file gets appended to the general.css while its +getting loaded in GUIUtil::loadStyleSheet(). Thus changes made in +general.css may become overwritten by changes in this file. + +Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. +**/ + /****************************************************** Common stuff ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 90b7689226dc..78eb01c00124 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -3,9 +3,30 @@ Copyright (c) 2020 The Dash Core developers Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. -This file contains style changes used by both dash themes: "Light" and "Dark" -**/ +--------------------------------------------------------------------- + +A full theme is a combination of up to three css files. They are all getting +loaded and combined in `GUIUtil::loadStyleSheet()` in guitil.cpp. + +Hierarchy: + +* general.css - base layout: Loaded first if selected theme is not "Traditional" (trad.css) +* scrollbars.css - custom scrollbars: Loaded second only for windows/linux if general.css is loaded +* - theme css file: Always loaded and loaded last. +To replace there are currently the following themes available: + +* Dark (dark.css) +* Light (light.css) +* Traditional (trad.css) + +NOTE: This file is only the base layout which is getting +shared between all full themes (e.g. Dark or Light). It may contain +color changes as long as they fit into all other themes. If an ui element +requires theme based coloring the appropriate css element can be picked +here to overwrite its colors (background-color, border-color, color) +in the file. +**/ /****************************************************** Common stuff diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 6c63cd31027a..b423224c485b 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -1,3 +1,19 @@ +/** +Copyright (c) 2020 The Dash Core developers +Distributed under the MIT/X11 software license, see the accompanying +file COPYING or http://www.opensource.org/licenses/mit-license.php. + +--------------------------------------------------------------------- + +This file contains color changes for the dash theme "Light". + +NOTE: This file gets appended to the general.css while its +getting loaded in GUIUtil::loadStyleSheet(). Thus changes made in +general.css may become overwritten by changes in this file. + +Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. +**/ + /****************************************************** Common stuff ******************************************************/ diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index d8396fc7bff0..7412fd190dfc 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -1,3 +1,20 @@ +/** +Copyright (c) 2020 The Dash Core developers +Distributed under the MIT/X11 software license, see the accompanying +file COPYING or http://www.opensource.org/licenses/mit-license.php. + +--------------------------------------------------------------------- + +This file contains style to customize the scrollbars. It's only loaded +for dash themes (dark/light) and also only by windwos and linux, +not by macOS clients. + +NOTE: This file is getting appended to the general.css while its +getting loaded in GUIUtil::loadStyleSheet(). Thus changes made in +general.css may become overwritten by changes in this file. + +Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. +**/ /****************************************************** QScrollBar diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index 71094b9a2980..eb5131fd40d0 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -1,3 +1,19 @@ +/** +Copyright (c) 2020 The Dash Core developers +Distributed under the MIT/X11 software license, see the accompanying +file COPYING or http://www.opensource.org/licenses/mit-license.php. + +--------------------------------------------------------------------- + +This file contains all changes for the dash theme "Traditional". + +NOTE: This file gets not appended to the general.css. The Traditional +theme is a standalone theme which just fixes some bugs in the OS default +depiction of the Qt elements. + +Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. +**/ + /****************************************************** ModalOverlay ******************************************************/ From 3d63397cb77290b114509241cdfbc4958af4158e Mon Sep 17 00:00:00 2001 From: xdustinface Date: Wed, 3 Jun 2020 04:00:03 +0200 Subject: [PATCH 22/34] qt: Add update_colors.py, prepare css files for scripted color updates - update_colors.py is a python script which parses the css files and prints some details about their color usage into appropriate files in the css/colors directory. It also updates the section for each css file. - Added section to css files for automated color updates by update_colors.py --- src/qt/res/css/dark.css | 6 + src/qt/res/css/general.css | 6 + src/qt/res/css/light.css | 6 + src/qt/res/css/scrollbars.css | 6 + src/qt/res/css/trad.css | 6 + src/qt/res/css/update_colors.py | 207 ++++++++++++++++++++++++++++++++ 6 files changed, 237 insertions(+) create mode 100755 src/qt/res/css/update_colors.py diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 8eb835b3bfe9..be18e2af1e10 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -14,6 +14,12 @@ general.css may become overwritten by changes in this file. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ +/* do not modify! section updated by update_colors.py + + + +*/ + /****************************************************** Common stuff ******************************************************/ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 78eb01c00124..b3fff14ffb0d 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -28,6 +28,12 @@ here to overwrite its colors (background-color, border-color, color) in the file. **/ +/* do not modify! section updated by update_colors.py + + + +*/ + /****************************************************** Common stuff ******************************************************/ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index b423224c485b..3d24669feff6 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -14,6 +14,12 @@ general.css may become overwritten by changes in this file. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ +/* do not modify! section updated by update_colors.py + + + +*/ + /****************************************************** Common stuff ******************************************************/ diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index 7412fd190dfc..e8c0f4a8d576 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -16,6 +16,12 @@ general.css may become overwritten by changes in this file. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ +/* do not modify! section updated by update_colors.py + + + +*/ + /****************************************************** QScrollBar ******************************************************/ diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index eb5131fd40d0..21fb84b7e778 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -14,6 +14,12 @@ depiction of the Qt elements. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ +/* do not modify! section updated by update_colors.py + + + +*/ + /****************************************************** ModalOverlay ******************************************************/ diff --git a/src/qt/res/css/update_colors.py b/src/qt/res/css/update_colors.py new file mode 100755 index 000000000000..5f85f12d8883 --- /dev/null +++ b/src/qt/res/css/update_colors.py @@ -0,0 +1,207 @@ +#!/usr/bin/python3 +# +# update_colors.py updates the color files in css/colors and the `` +# section in all css files. +# file. +# +# Copyright (c) 2020 The Dash Core developers +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +import os +from pathlib import Path +import re +import subprocess +import sys + +USAGE = 'USAGE: ' + Path(__file__).name + '\n\nPARAMETER:\n\n' + +MATCH_REPLACE = '.+?' +MATCH_COLORS = '#(?:[0-9a-f]{2}){2,4}|#(?:[0-9a-f]{1}){3}' + +def error(msg): + exit('\nERROR: ' + msg + "\n\n" + USAGE) + +def parse_css(file_css): + # Temporarily + state = 0 + selectors = [] + + # Results + by_attribute = {} + by_color = {} + + for line in file_css.read_text().splitlines(): + + if line == '': + continue + + # start of a comment + if state == 0 and line.startswith('/*'): + if '*/' in line: + state = 0 + else: + state = 1 + # we are in a comment section + elif state == 1: + # end of the comment + if '*/' in line: + state = 0 + else: + continue + # first line of multiple selector + elif (state == 0 or state == 2) and ',' in line: + state = 2 + # first line of single selector or end of multiple + elif (state == 0 or state == 2) and '{' in line: + state = 3 + # end of element + elif state == 4 and line == '}': + state = 0 + + if state == 0 and len(selectors): + selectors = [] + + if state == 2: + selector = line.split(",")[0].strip(' ') + selectors.append(selector) + + if state == 3: + selector = line.split("{")[0].strip(' ') + selectors.append(selector) + state = 4 + continue + + if state == 4: + matched_colors = re.findall(MATCH_COLORS, line) + + if len(matched_colors) > 1: + error("Multiple colors in a line.\n\n {}\n\nSeems to be an invalid file!".format(line)) + elif len(matched_colors) == 1: + matched_color = matched_colors[0] + element = line.split(":")[0].strip(' ') + + if not matched_color in by_color: + by_color[matched_color] = [] + + by_color[matched_color].append(element) + + entry = element + " " + matched_color + + if not entry in by_attribute: + by_attribute[entry] = [] + + by_attribute[entry].extend(selectors) + + def sort_color(color): + tmp = color[0].replace('#', '0x') + return int(tmp, 0) + + def remove_duplicates(l): + no_duplicates = [] + [no_duplicates.append(i) for i in l if not no_duplicates.count(i)] + return no_duplicates + + colors = [] + + # sort colors just by hex value + if len(by_color): + colors = sorted(by_color.items(), key=lambda x: sort_color(x)) + + for k, l in by_attribute.items(): + by_attribute[k] = remove_duplicates(l) + + for k, l in by_color.items(): + by_color[k] = remove_duplicates(l) + + return {'fileName': file_css.stem, 'byAttribute': by_attribute, 'byColor': by_color, 'colors': colors} + + +def create_color_file(content, commit): + + str_result = "Color analyse of " +\ + content['fileName'] + ".css " + \ + "by " + \ + Path(__file__).name + \ + " for commit " + \ + commit + \ + "\n\n" + + if not len(content['colors']): + return None + + str_result += "# Used colors\n\n" + for c in content['colors']: + str_result += c[0] + '\n' + + str_result += "\n# Grouped by attribute\n" + + for k, v in content['byAttribute'].items(): + str_result += '\n' + k + '\n' + for val in v: + str_result += ' ' + val + '\n' + + str_result += "\n# Grouped by color\n" + + for k, v in content['byColor'].items(): + str_result += '\n' + k + '\n' + for val in v: + str_result += ' ' + val + '\n' + + return str_result + +def run(path, create_color_files=True): + + p = Path(path) + + if not p.exists(): + error("Path doesn't exist: {}".format(Path(path).absolute())) + + if not len(list(p.glob('*.css'))): + error("No .css files found in {}".format(Path(path).absolute())) + + parsed = [parse_css(x) for x in p.glob('*.css') if x.is_file()] + commit = subprocess.check_output(['git', '-C', p.absolute(), 'rev-parse', '--short', 'HEAD']).decode("utf-8") + + if create_color_files: + + for f in parsed: + + str_result = create_color_file(f, commit) + + if str_result is not None: + p = Path(__file__).parent / Path('colors/' + f['fileName'] + '_css_colors.txt') + p.write_text(str_result) + + print('\n{}.css -> {} created!'.format(f['fileName'], p.name)) + else: + print('\n{}.css -> No colors found..'.format(f['fileName'] + ".css")) + + return parsed + + +if __name__ == '__main__': + + if len(sys.argv) > 1: + error('No argument required!') + + path = str(Path(__file__).parent.absolute()) + commit = subprocess.check_output(['git', '-C', path, 'rev-parse', '--short', 'HEAD']).decode("utf-8") + result = run(path) + + for r in result: + + file_path = path + '/' + r['fileName'] + '.css' + css_content = Path(file_path).read_text() + to_replace = re.findall(MATCH_REPLACE, css_content, re.DOTALL) + + str_result = "\n# Used colors in {}.css for commit {}\n".format(r['fileName'], commit) + for c in r['colors']: + str_result += c[0] + '\n' + + str_replace = "\n{}\n".format(str_result) + + css_content = css_content.replace(to_replace[0], str_replace) + + css_file = Path(r['fileName'] + '.css') + css_file.write_text(css_content) From ad0b90d0ef1edb5406c0dd6c7aad50f713090eb7 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Thu, 4 Jun 2020 17:45:07 +0200 Subject: [PATCH 23/34] qt/contrib: Moved update_colors.py to update-css-files.py This also moves the file from src/qt/res/css to contrib/devtools --- .../devtools/update-css-files.py | 73 +++++++------------ src/qt/res/css/dark.css | 2 +- src/qt/res/css/general.css | 2 +- src/qt/res/css/light.css | 2 +- src/qt/res/css/scrollbars.css | 2 +- src/qt/res/css/trad.css | 2 +- 6 files changed, 33 insertions(+), 50 deletions(-) rename src/qt/res/css/update_colors.py => contrib/devtools/update-css-files.py (78%) diff --git a/src/qt/res/css/update_colors.py b/contrib/devtools/update-css-files.py similarity index 78% rename from src/qt/res/css/update_colors.py rename to contrib/devtools/update-css-files.py index 5f85f12d8883..49d0f1e7dbec 100755 --- a/src/qt/res/css/update_colors.py +++ b/contrib/devtools/update-css-files.py @@ -1,8 +1,7 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -# update_colors.py updates the color files in css/colors and the `` -# section in all css files. -# file. +# update-css-files.py creates color analyse files in css/colors and updates the +# `` section in all css files. # # Copyright (c) 2020 The Dash Core developers # Distributed under the MIT/X11 software license, see the accompanying @@ -14,13 +13,11 @@ import subprocess import sys -USAGE = 'USAGE: ' + Path(__file__).name + '\n\nPARAMETER:\n\n' - MATCH_REPLACE = '.+?' MATCH_COLORS = '#(?:[0-9a-f]{2}){2,4}|#(?:[0-9a-f]{1}){3}' def error(msg): - exit('\nERROR: ' + msg + "\n\n" + USAGE) + exit('\nERROR: {}\n'.format(msg)) def parse_css(file_css): # Temporarily @@ -150,49 +147,27 @@ def create_color_file(content, commit): return str_result -def run(path, create_color_files=True): - - p = Path(path) - - if not p.exists(): - error("Path doesn't exist: {}".format(Path(path).absolute())) - - if not len(list(p.glob('*.css'))): - error("No .css files found in {}".format(Path(path).absolute())) - - parsed = [parse_css(x) for x in p.glob('*.css') if x.is_file()] - commit = subprocess.check_output(['git', '-C', p.absolute(), 'rev-parse', '--short', 'HEAD']).decode("utf-8") - - if create_color_files: - - for f in parsed: - - str_result = create_color_file(f, commit) - - if str_result is not None: - p = Path(__file__).parent / Path('colors/' + f['fileName'] + '_css_colors.txt') - p.write_text(str_result) - - print('\n{}.css -> {} created!'.format(f['fileName'], p.name)) - else: - print('\n{}.css -> No colors found..'.format(f['fileName'] + ".css")) - - return parsed - - if __name__ == '__main__': if len(sys.argv) > 1: error('No argument required!') - path = str(Path(__file__).parent.absolute()) + path = Path(__file__).parent.absolute() / Path('../../src/qt/res/css/') commit = subprocess.check_output(['git', '-C', path, 'rev-parse', '--short', 'HEAD']).decode("utf-8") - result = run(path) - for r in result: + if not path.exists(): + error("Path doesn't exist: {}".format(Path(path).absolute())) + + if not len(list(path.glob('*.css'))): + error("No .css files found in {}".format(Path(path).absolute())) + + results = [parse_css(x) for x in path.glob('*.css') if x.is_file()] - file_path = path + '/' + r['fileName'] + '.css' - css_content = Path(file_path).read_text() + for r in results: + + # Update the css file + css_file = path / Path(r['fileName'] + '.css') + css_content = css_file.read_text() to_replace = re.findall(MATCH_REPLACE, css_content, re.DOTALL) str_result = "\n# Used colors in {}.css for commit {}\n".format(r['fileName'], commit) @@ -200,8 +175,16 @@ def run(path, create_color_files=True): str_result += c[0] + '\n' str_replace = "\n{}\n".format(str_result) - css_content = css_content.replace(to_replace[0], str_replace) - - css_file = Path(r['fileName'] + '.css') css_file.write_text(css_content) + + # Write the _color.txt files + str_result = create_color_file(r, commit) + + if str_result is not None: + color_file = path / Path('colors/' + r['fileName'] + '_css_colors.txt') + color_file.write_text(str_result) + + print('\n{}.css -> {} created!'.format(r['fileName'], str(color_file.resolve()))) + else: + print('\n{}.css -> No colors found..'.format(r['fileName'] + ".css")) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index be18e2af1e10..86fe7b19a6c0 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -14,7 +14,7 @@ general.css may become overwritten by changes in this file. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ -/* do not modify! section updated by update_colors.py +/* do not modify! section updated by update-css-files.py diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index b3fff14ffb0d..452dbef2c0c6 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -28,7 +28,7 @@ here to overwrite its colors (background-color, border-color, color) in the file. **/ -/* do not modify! section updated by update_colors.py +/* do not modify! section updated by update-css-files.py diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 3d24669feff6..99a99415838d 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -14,7 +14,7 @@ general.css may become overwritten by changes in this file. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ -/* do not modify! section updated by update_colors.py +/* do not modify! section updated by update-css-files.py diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index e8c0f4a8d576..f06d76bf322c 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -16,7 +16,7 @@ general.css may become overwritten by changes in this file. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ -/* do not modify! section updated by update_colors.py +/* do not modify! section updated by update-css-files.py diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index 21fb84b7e778..d49f99e2e717 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -14,7 +14,7 @@ depiction of the Qt elements. Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. **/ -/* do not modify! section updated by update_colors.py +/* do not modify! section updated by update-css-files.py From bd1e3413b196537c2e22fd92259fd6d214651e4d Mon Sep 17 00:00:00 2001 From: xdustinface Date: Thu, 4 Jun 2020 17:46:10 +0200 Subject: [PATCH 24/34] build: Remove files in src/qt/res/css/colors when running "make clean" --- src/Makefile.qt.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 287bb896e945..854257d03cf1 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -435,7 +435,7 @@ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(R $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(RCCFLAGS) -name dash $< | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ -CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc +CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc qt/res/css/colors/* CLEANFILES += $(CLEAN_QT) From 945c350688096f2f0706dc192ea19b0a251cbb67 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Thu, 4 Jun 2020 17:46:59 +0200 Subject: [PATCH 25/34] git: Add src/qt/res/css/colors/* to gitignore and remove the files from the repo --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1aa74e7cea7e..f722641c4454 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ src/dash-tx src/test/test_dash src/test/test_dash_fuzzy src/qt/test/test_dash-qt +src/qt/res/css/colors/* src/bench/bench_dash # autoreconf From aea40f008b30daa5e8a5f85f9e823c07089bc4e9 Mon Sep 17 00:00:00 2001 From: dustinface <35775977+xdustinface@users.noreply.github.com> Date: Thu, 4 Jun 2020 22:05:59 +0200 Subject: [PATCH 26/34] qt: Fix background-color of bgWidget in trad.css Its #AARRGGBB not #RRGGBBAA! Co-authored-by: UdjinM6 --- src/qt/res/css/trad.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index d49f99e2e717..f80aeab0da01 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -27,7 +27,7 @@ ModalOverlay QWidget#bgWidget { /* The frame overlaying the overview-page */ padding-left: 10px; padding-right: 10px; - background-color: #fafafacc; + background-color: #ccfafafa; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ From 4ad1be234b90c044b818d9a7b495094822256a4a Mon Sep 17 00:00:00 2001 From: xdustinface Date: Thu, 4 Jun 2020 22:10:22 +0200 Subject: [PATCH 27/34] qt: Run update_colors.py --- src/qt/res/css/dark.css | 17 +++++++++++++++++ src/qt/res/css/general.css | 21 +++++++++++++++++++++ src/qt/res/css/light.css | 23 +++++++++++++++++++++++ src/qt/res/css/scrollbars.css | 7 +++++++ src/qt/res/css/trad.css | 5 +++++ 5 files changed, 73 insertions(+) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index 86fe7b19a6c0..d25daedd4b70 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -17,6 +17,23 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py +# Used colors in dark.css for commit 674ccb2a3 + +#333 +#444 +#555 +#666 +#999 +#aaa +#ccc +#ddd +#1c75bc +#3e3e3e +#585858 +#616161 +#787878 +#cc323232 + */ diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 452dbef2c0c6..60023b708710 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -31,6 +31,27 @@ in the file. /* do not modify! section updated by update-css-files.py +# Used colors in general.css for commit 674ccb2a3 + +#333 +#444 +#999 +#aaa +#005e98 +#008de4 +#096e03 +#1c75bc +#1f5383 +#616161 +#787878 +#9e9e9e +#d2d2d2 +#eb4034 +#f5f5f5 +#f6f6f6 +#ff4500 +#ffffff + */ diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 99a99415838d..9bc0d4385f3c 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -17,6 +17,29 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py +# Used colors in light.css for commit 674ccb2a3 + +#333 +#999 +#ccc +#fff +#008de4 +#1c75bc +#333333 +#616161 +#818181 +#d2d2d2 +#d7d7d7 +#e2e2e2 +#f0f0f0 +#f2f0f0 +#f2f2f2 +#f6f6f6 +#f7f7f7 +#fcfcfc +#ffffff +#ccfafafa + */ diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index f06d76bf322c..663b07e5dfc7 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -19,6 +19,13 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py +# Used colors in scrollbars.css for commit 674ccb2a3 + +#e0e0e0 +#f2f0f0 +#f6f6f6 +#ffffff + */ diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index f80aeab0da01..04c8844b8873 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -17,6 +17,11 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py +# Used colors in trad.css for commit 674ccb2a3 + +#fff +#ccfafafa + */ From bf53bcd9266c00b999659c3e1e06b36a8b858254 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 4 Jun 2020 19:52:19 +0300 Subject: [PATCH 28/34] path -> css_folder_path --- contrib/devtools/update-css-files.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/devtools/update-css-files.py b/contrib/devtools/update-css-files.py index 49d0f1e7dbec..94bb95c3cd86 100755 --- a/contrib/devtools/update-css-files.py +++ b/contrib/devtools/update-css-files.py @@ -152,21 +152,21 @@ def create_color_file(content, commit): if len(sys.argv) > 1: error('No argument required!') - path = Path(__file__).parent.absolute() / Path('../../src/qt/res/css/') - commit = subprocess.check_output(['git', '-C', path, 'rev-parse', '--short', 'HEAD']).decode("utf-8") + css_folder_path = Path(__file__).parent.absolute() / Path('../../src/qt/res/css/') + commit = subprocess.check_output(['git', '-C', css_folder_path, 'rev-parse', '--short', 'HEAD']).decode("utf-8") - if not path.exists(): - error("Path doesn't exist: {}".format(Path(path).absolute())) + if not css_folder_path.exists(): + error("Path doesn't exist: {}".format(Path(css_folder_path).absolute())) - if not len(list(path.glob('*.css'))): - error("No .css files found in {}".format(Path(path).absolute())) + if not len(list(css_folder_path.glob('*.css'))): + error("No .css files found in {}".format(Path(css_folder_path).absolute())) - results = [parse_css(x) for x in path.glob('*.css') if x.is_file()] + results = [parse_css(x) for x in css_folder_path.glob('*.css') if x.is_file()] for r in results: # Update the css file - css_file = path / Path(r['fileName'] + '.css') + css_file = css_folder_path / Path(r['fileName'] + '.css') css_content = css_file.read_text() to_replace = re.findall(MATCH_REPLACE, css_content, re.DOTALL) @@ -182,7 +182,7 @@ def create_color_file(content, commit): str_result = create_color_file(r, commit) if str_result is not None: - color_file = path / Path('colors/' + r['fileName'] + '_css_colors.txt') + color_file = css_folder_path / Path('colors/' + r['fileName'] + '_css_colors.txt') color_file.write_text(str_result) print('\n{}.css -> {} created!'.format(r['fileName'], str(color_file.resolve()))) From f379ef666bc2dda539c0c7ed375f145244c0301f Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 4 Jun 2020 20:27:18 +0300 Subject: [PATCH 29/34] Resolve path and fail early --- contrib/devtools/update-css-files.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/devtools/update-css-files.py b/contrib/devtools/update-css-files.py index 94bb95c3cd86..783d5f1bf481 100755 --- a/contrib/devtools/update-css-files.py +++ b/contrib/devtools/update-css-files.py @@ -152,14 +152,16 @@ def create_color_file(content, commit): if len(sys.argv) > 1: error('No argument required!') - css_folder_path = Path(__file__).parent.absolute() / Path('../../src/qt/res/css/') commit = subprocess.check_output(['git', '-C', css_folder_path, 'rev-parse', '--short', 'HEAD']).decode("utf-8") - if not css_folder_path.exists(): - error("Path doesn't exist: {}".format(Path(css_folder_path).absolute())) + try: + css_folder_path = Path(__file__).parent.absolute() / Path('../../src/qt/res/css/') + css_folder_path = css_folder_path.resolve(strict=True) + except Exception: + error("Path doesn't exist: {}".format(css_folder_path)) if not len(list(css_folder_path.glob('*.css'))): - error("No .css files found in {}".format(Path(css_folder_path).absolute())) + error("No .css files found in {}".format(css_folder_path)) results = [parse_css(x) for x in css_folder_path.glob('*.css') if x.is_file()] @@ -185,6 +187,6 @@ def create_color_file(content, commit): color_file = css_folder_path / Path('colors/' + r['fileName'] + '_css_colors.txt') color_file.write_text(str_result) - print('\n{}.css -> {} created!'.format(r['fileName'], str(color_file.resolve()))) + print('\n{}.css -> {} created!'.format(r['fileName'], color_file)) else: print('\n{}.css -> No colors found..'.format(r['fileName'] + ".css")) From 54843f1b8e580c64003dce9816d2c7bd32994424 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 4 Jun 2020 20:28:20 +0300 Subject: [PATCH 30/34] Create 'colors/' if it doesn't exist and fail if smth went wrong --- contrib/devtools/update-css-files.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/devtools/update-css-files.py b/contrib/devtools/update-css-files.py index 783d5f1bf481..ead455ea0dfc 100755 --- a/contrib/devtools/update-css-files.py +++ b/contrib/devtools/update-css-files.py @@ -165,6 +165,13 @@ def create_color_file(content, commit): results = [parse_css(x) for x in css_folder_path.glob('*.css') if x.is_file()] + colors_folder_path = css_folder_path / Path('colors/') + if not colors_folder_path.is_dir(): + try: + colors_folder_path.mkdir() + except Exception: + error("Can't create new folder: {}".format(colors_folder_path)) + for r in results: # Update the css file @@ -184,7 +191,7 @@ def create_color_file(content, commit): str_result = create_color_file(r, commit) if str_result is not None: - color_file = css_folder_path / Path('colors/' + r['fileName'] + '_css_colors.txt') + color_file = colors_folder_path / Path(r['fileName'] + '_css_colors.txt') color_file.write_text(str_result) print('\n{}.css -> {} created!'.format(r['fileName'], color_file)) From 201934939e279c27b95d51cca992b427bd3d18c7 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 4 Jun 2020 20:29:07 +0300 Subject: [PATCH 31/34] Run git after all filesystem preparations are done --- contrib/devtools/update-css-files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/devtools/update-css-files.py b/contrib/devtools/update-css-files.py index ead455ea0dfc..4e5d4e0265d5 100755 --- a/contrib/devtools/update-css-files.py +++ b/contrib/devtools/update-css-files.py @@ -152,8 +152,6 @@ def create_color_file(content, commit): if len(sys.argv) > 1: error('No argument required!') - commit = subprocess.check_output(['git', '-C', css_folder_path, 'rev-parse', '--short', 'HEAD']).decode("utf-8") - try: css_folder_path = Path(__file__).parent.absolute() / Path('../../src/qt/res/css/') css_folder_path = css_folder_path.resolve(strict=True) @@ -172,6 +170,8 @@ def create_color_file(content, commit): except Exception: error("Can't create new folder: {}".format(colors_folder_path)) + commit = subprocess.check_output(['git', '-C', css_folder_path, 'rev-parse', '--short', 'HEAD']).decode("utf-8") + for r in results: # Update the css file From c0026a4d2b32a4cf0a582f1c16b53f440daa18a6 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 5 Jun 2020 00:08:06 +0200 Subject: [PATCH 32/34] contrib: Use case insensitive regex for color matching --- contrib/devtools/update-css-files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/devtools/update-css-files.py b/contrib/devtools/update-css-files.py index 4e5d4e0265d5..4c3f345aea68 100755 --- a/contrib/devtools/update-css-files.py +++ b/contrib/devtools/update-css-files.py @@ -14,7 +14,7 @@ import sys MATCH_REPLACE = '.+?' -MATCH_COLORS = '#(?:[0-9a-f]{2}){2,4}|#(?:[0-9a-f]{1}){3}' +MATCH_COLORS = '#(?:[0-9a-fA-F]{2}){2,4}|#(?:[0-9a-f]{1}){3}' def error(msg): exit('\nERROR: {}\n'.format(msg)) From 51c96e7db5141dd139a3c11255b6152fa91d5967 Mon Sep 17 00:00:00 2001 From: xdustinface Date: Fri, 5 Jun 2020 00:10:50 +0200 Subject: [PATCH 33/34] qt: Update colors in css files --- src/qt/res/css/dark.css | 2 +- src/qt/res/css/general.css | 2 +- src/qt/res/css/light.css | 3 ++- src/qt/res/css/scrollbars.css | 2 +- src/qt/res/css/trad.css | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index d25daedd4b70..2769c999f27f 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -17,7 +17,7 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in dark.css for commit 674ccb2a3 +# Used colors in dark.css for commit 3bebd1a5c #333 #444 diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index 60023b708710..ca68b0fe1caa 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -31,7 +31,7 @@ in the file. /* do not modify! section updated by update-css-files.py -# Used colors in general.css for commit 674ccb2a3 +# Used colors in general.css for commit 3bebd1a5c #333 #444 diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index 9bc0d4385f3c..882d68f1b98c 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -17,7 +17,7 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in light.css for commit 674ccb2a3 +# Used colors in light.css for commit 3bebd1a5c #333 #999 @@ -28,6 +28,7 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. #333333 #616161 #818181 +#82C3E6 #d2d2d2 #d7d7d7 #e2e2e2 diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index 663b07e5dfc7..8deb72bd725b 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 674ccb2a3 +# Used colors in scrollbars.css for commit 3bebd1a5c #e0e0e0 #f2f0f0 diff --git a/src/qt/res/css/trad.css b/src/qt/res/css/trad.css index 04c8844b8873..49c8152e072c 100644 --- a/src/qt/res/css/trad.css +++ b/src/qt/res/css/trad.css @@ -17,7 +17,7 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in trad.css for commit 674ccb2a3 +# Used colors in trad.css for commit 3bebd1a5c #fff #ccfafafa From ded28720327e01683229f5c891a1e6901520377e Mon Sep 17 00:00:00 2001 From: xdustinface Date: Thu, 25 Jun 2020 15:59:10 +0200 Subject: [PATCH 34/34] contrib: Remove obsolete import in update-css-files.py --- contrib/devtools/update-css-files.py | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/devtools/update-css-files.py b/contrib/devtools/update-css-files.py index 4c3f345aea68..ceb48e00258e 100755 --- a/contrib/devtools/update-css-files.py +++ b/contrib/devtools/update-css-files.py @@ -7,7 +7,6 @@ # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -import os from pathlib import Path import re import subprocess