Actually apply CSS styling to RPC console (#3201)

UdjinM6 · web-flow · commit 7677b55781e2 · 2019-11-19T01:25:59.000+03:00
diff --git a/src/qt/res/css/light-hires.css b/src/qt/res/css/light-hires.css
@@ -326,17 +326,16 @@ color:#333;
 
 /*******************************************************/
 
-/* DIALOG BOXES */
-
-QDialog .QTabWidget {
+.QTabWidget {
 border-bottom:1px solid #333;
 }
 
-QDialog .QTabWidget::pane {
+.QTabWidget::pane {
 border: 1px solid #d7d7d7;
+background-color:#fff;
 }
 
-QDialog .QTabWidget QTabBar::tab {
+.QTabWidget QTabBar::tab {
 background-color:#f2f0f0;
 color:#333;
 padding-left:10px;
@@ -346,36 +345,37 @@ padding-bottom:5px;
 border-top: 1px solid #d7d7d7;
 }
 
-QDialog .QTabWidget QTabBar::tab:first {
+.QTabWidget QTabBar::tab:first {
 border-left: 1px solid #d7d7d7;
 }
 
-QDialog .QTabWidget QTabBar::tab:last {
+.QTabWidget QTabBar::tab:last {
 border-right: 1px solid #d7d7d7;
 }
 
-QDialog .QTabWidget QTabBar::tab:selected, QDialog .QTabWidget QTabBar::tab:hover {
+.QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover {
 background-color:#ffffff;
 color:#333;
 }
 
-QDialog .QTabWidget .QWidget {
-background-color:#fff;
+.QTabWidget .QWidget {
 color:#333;
 }
 
-QDialog .QTabWidget .QWidget QAbstractSpinBox {
+.QTabWidget .QWidget QAbstractSpinBox {
 }
 
-QDialog .QTabWidget .QWidget QAbstractSpinBox::down-button {
+.QTabWidget .QWidget QAbstractSpinBox::down-button {
 }
 
-QDialog .QTabWidget .QWidget QAbstractSpinBox::up-button {
+.QTabWidget .QWidget QAbstractSpinBox::up-button {
 }
 
-QDialog .QTabWidget .QWidget QComboBox {
+.QTabWidget .QWidget QComboBox {
 }
 
+/* DIALOG BOXES */
+
 QDialog QWidget { /* Remove Annoying Focus Rectangle */
 outline: 0;
 }
@@ -612,44 +612,47 @@ min-height:33px;
 
 /* TOOLS MENU */
 
-QDialog#RPCConsole { /* RPC Console Dialog Box */
+QWidget#RPCConsole { /* RPC Console Dialog Box */
 background-color:#F8F6F6;
 }
 
-QDialog#RPCConsole QWidget#tab_info QLabel#label_11, QDialog#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;
 }
 
-QDialog#RPCConsole QWidget#tab_peers  QLabel#peerHeading { /* Peers Info Header */
+QWidget#RPCConsole QWidget#tab_peers  QLabel#peerHeading { /* Peers Info Header */
 color:#1c75bc;
 }
 
-QDialog#RPCConsole QPushButton#openDebugLogfileButton {
+QWidget#RPCConsole QPushButton#openDebugLogfileButton {
 max-width:60px;
 }
 
-QDialog#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */
+QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */
 border:0;
 }
 
-QDialog#RPCConsole QLineEdit#lineEdit { /* Console Input */
-margin-right:5px;
+QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */
 }
 
-QDialog#RPCConsole QPushButton#clearButton { /* Console Clear Button */
+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;
 }
 
-QDialog#RPCConsole .QGroupBox #line { /* Network In Line */
+QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */
+background-color:transparent;
+}
+
+QWidget#RPCConsole .QGroupBox #line { /* Network In Line */
 background-color:#00ff00;
 }
 
-QDialog#RPCConsole .QGroupBox #line_2 { /* Network Out Line */
-background:#ff0000;
+QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */
+background-color:#ff0000;
 }
 
 /* HELP MENU */
diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css
@@ -326,17 +326,16 @@ color:#333;
 
 /*******************************************************/
 
-/* DIALOG BOXES */
-
-QDialog .QTabWidget {
+.QTabWidget {
 border-bottom:1px solid #333;
 }
 
-QDialog .QTabWidget::pane {
+.QTabWidget::pane {
 border: 1px solid #d7d7d7;
+background-color:#fff;
 }
 
-QDialog .QTabWidget QTabBar::tab {
+.QTabWidget QTabBar::tab {
 background-color:#f2f0f0;
 color:#333;
 padding-left:10px;
@@ -346,36 +345,37 @@ padding-bottom:5px;
 border-top: 1px solid #d7d7d7;
 }
 
-QDialog .QTabWidget QTabBar::tab:first {
+.QTabWidget QTabBar::tab:first {
 border-left: 1px solid #d7d7d7;
 }
 
-QDialog .QTabWidget QTabBar::tab:last {
+.QTabWidget QTabBar::tab:last {
 border-right: 1px solid #d7d7d7;
 }
 
-QDialog .QTabWidget QTabBar::tab:selected, QDialog .QTabWidget QTabBar::tab:hover {
+.QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover {
 background-color:#ffffff;
 color:#333;
 }
 
-QDialog .QTabWidget .QWidget {
-background-color:#fff;
+.QTabWidget .QWidget {
 color:#333;
 }
 
-QDialog .QTabWidget .QWidget QAbstractSpinBox {
+.QTabWidget .QWidget QAbstractSpinBox {
 }
 
-QDialog .QTabWidget .QWidget QAbstractSpinBox::down-button {
+.QTabWidget .QWidget QAbstractSpinBox::down-button {
 }
 
-QDialog .QTabWidget .QWidget QAbstractSpinBox::up-button {
+.QTabWidget .QWidget QAbstractSpinBox::up-button {
 }
 
-QDialog .QTabWidget .QWidget QComboBox {
+.QTabWidget .QWidget QComboBox {
 }
 
+/* DIALOG BOXES */
+
 QDialog QWidget { /* Remove Annoying Focus Rectangle */
 outline: 0;
 }
@@ -612,44 +612,47 @@ min-height:33px;
 
 /* TOOLS MENU */
 
-QDialog#RPCConsole { /* RPC Console Dialog Box */
+QWidget#RPCConsole { /* RPC Console Dialog Box */
 background-color:#F8F6F6;
 }
 
-QDialog#RPCConsole QWidget#tab_info QLabel#label_11, QDialog#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;
 }
 
-QDialog#RPCConsole QWidget#tab_peers  QLabel#peerHeading { /* Peers Info Header */
+QWidget#RPCConsole QWidget#tab_peers  QLabel#peerHeading { /* Peers Info Header */
 color:#1c75bc;
 }
 
-QDialog#RPCConsole QPushButton#openDebugLogfileButton {
+QWidget#RPCConsole QPushButton#openDebugLogfileButton {
 max-width:60px;
 }
 
-QDialog#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */
+QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */
 border:0;
 }
 
-QDialog#RPCConsole QLineEdit#lineEdit { /* Console Input */
-margin-right:5px;
+QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */
 }
 
-QDialog#RPCConsole QPushButton#clearButton { /* Console Clear Button */
+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;
 }
 
-QDialog#RPCConsole .QGroupBox #line { /* Network In Line */
+QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */
+background-color:transparent;
+}
+
+QWidget#RPCConsole .QGroupBox #line { /* Network In Line */
 background-color:#00ff00;
 }
 
-QDialog#RPCConsole .QGroupBox #line_2 { /* Network Out Line */
-background:#ff0000;
+QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */
+background-color:#ff0000;
 }
 
 /* HELP MENU */
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -440,6 +440,10 @@ RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
     consoleFontSize(0)
 {
     ui->setupUi(this);
+
+    /* Open CSS when configured */
+    this->setStyleSheet(GUIUtil::loadStyleSheet());
+
     QSettings settings;
     if (!restoreGeometry(settings.value("RPCConsoleWindowGeometry").toByteArray())) {
         // Restore failed (perhaps missing setting), center the window

Original file line number	Diff line number	Diff line change
`@@ -326,17 +326,16 @@ color:#333;`
`326`	`326`
`327`	`327`	`/*******************************************************/`
`328`	`328`
`329`		`-/* DIALOG BOXES */`
`330`		`-`
`331`		`-QDialog .QTabWidget {`
	`329`	`+.QTabWidget {`
`332`	`330`	`border-bottom:1px solid #333;`
`333`	`331`	`}`
`334`	`332`
`335`		`-QDialog .QTabWidget::pane {`
	`333`	`+.QTabWidget::pane {`
`336`	`334`	`border: 1px solid #d7d7d7;`
	`335`	`+background-color:#fff;`
`337`	`336`	`}`
`338`	`337`
`339`		`-QDialog .QTabWidget QTabBar::tab {`
	`338`	`+.QTabWidget QTabBar::tab {`
`340`	`339`	`background-color:#f2f0f0;`
`341`	`340`	`color:#333;`
`342`	`341`	`padding-left:10px;`
`@@ -346,36 +345,37 @@ padding-bottom:5px;`
`346`	`345`	`border-top: 1px solid #d7d7d7;`
`347`	`346`	`}`
`348`	`347`
`349`		`-QDialog .QTabWidget QTabBar::tab:first {`
	`348`	`+.QTabWidget QTabBar::tab:first {`
`350`	`349`	`border-left: 1px solid #d7d7d7;`
`351`	`350`	`}`
`352`	`351`
`353`		`-QDialog .QTabWidget QTabBar::tab:last {`
	`352`	`+.QTabWidget QTabBar::tab:last {`
`354`	`353`	`border-right: 1px solid #d7d7d7;`
`355`	`354`	`}`
`356`	`355`
`357`		`-QDialog .QTabWidget QTabBar::tab:selected, QDialog .QTabWidget QTabBar::tab:hover {`
	`356`	`+.QTabWidget QTabBar::tab:selected, .QTabWidget QTabBar::tab:hover {`
`358`	`357`	`background-color:#ffffff;`
`359`	`358`	`color:#333;`
`360`	`359`	`}`
`361`	`360`
`362`		`-QDialog .QTabWidget .QWidget {`
`363`		`-background-color:#fff;`
	`361`	`+.QTabWidget .QWidget {`
`364`	`362`	`color:#333;`
`365`	`363`	`}`
`366`	`364`
`367`		`-QDialog .QTabWidget .QWidget QAbstractSpinBox {`
	`365`	`+.QTabWidget .QWidget QAbstractSpinBox {`
`368`	`366`	`}`
`369`	`367`
`370`		`-QDialog .QTabWidget .QWidget QAbstractSpinBox::down-button {`
	`368`	`+.QTabWidget .QWidget QAbstractSpinBox::down-button {`
`371`	`369`	`}`
`372`	`370`
`373`		`-QDialog .QTabWidget .QWidget QAbstractSpinBox::up-button {`
	`371`	`+.QTabWidget .QWidget QAbstractSpinBox::up-button {`
`374`	`372`	`}`
`375`	`373`
`376`		`-QDialog .QTabWidget .QWidget QComboBox {`
	`374`	`+.QTabWidget .QWidget QComboBox {`
`377`	`375`	`}`
`378`	`376`
	`377`	`+/* DIALOG BOXES */`
	`378`	`+`
`379`	`379`	`QDialog QWidget { /* Remove Annoying Focus Rectangle */`
`380`	`380`	`outline: 0;`
`381`	`381`	`}`
`@@ -612,44 +612,47 @@ min-height:33px;`
`612`	`612`
`613`	`613`	`/* TOOLS MENU */`
`614`	`614`
`615`		`-QDialog#RPCConsole { /* RPC Console Dialog Box */`
	`615`	`+QWidget#RPCConsole { /* RPC Console Dialog Box */`
`616`	`616`	`background-color:#F8F6F6;`
`617`	`617`	`}`
`618`	`618`
`619`		`-QDialog#RPCConsole QWidget#tab_info QLabel#label_11, QDialog#RPCConsole QWidget#tab_info QLabel#label_10 { /* Margin between Network and Block Chain headers */`
	`619`	`+QWidget#RPCConsole QWidget#tab_info QLabel#label_11, QWidget#RPCConsole QWidget#tab_info QLabel#label_10 { /* Margin between Network and Block Chain headers */`
`620`	`620`	`qproperty-alignment: 'AlignBottom';`
`621`	`621`	`min-height:25px;`
`622`	`622`	`min-width:180px;`
`623`	`623`	`}`
`624`	`624`
`625`		`-QDialog#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */`
	`625`	`+QWidget#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */`
`626`	`626`	`color:#1c75bc;`
`627`	`627`	`}`
`628`	`628`
`629`		`-QDialog#RPCConsole QPushButton#openDebugLogfileButton {`
	`629`	`+QWidget#RPCConsole QPushButton#openDebugLogfileButton {`
`630`	`630`	`max-width:60px;`
`631`	`631`	`}`
`632`	`632`
`633`		`-QDialog#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */`
	`633`	`+QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */`
`634`	`634`	`border:0;`
`635`	`635`	`}`
`636`	`636`
`637`		`-QDialog#RPCConsole QLineEdit#lineEdit { /* Console Input */`
`638`		`-margin-right:5px;`
	`637`	`+QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */`
`639`	`638`	`}`
`640`	`639`
`641`		`-QDialog#RPCConsole QPushButton#clearButton { /* Console Clear Button */`
	`640`	`+QWidget#RPCConsole QPushButton#clearButton, QWidget#RPCConsole QPushButton#fontSmallerButton, QWidget#RPCConsole QPushButton#fontBiggerButton { /* Console Font and Clear Buttons */`
`642`	`641`	`background-color:transparent;`
`643`	`642`	`padding-left:10px;`
`644`	`643`	`padding-right:10px;`
`645`	`644`	`}`
`646`	`645`
`647`		`-QDialog#RPCConsole .QGroupBox #line { /* Network In Line */`
	`646`	`+QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */`
	`647`	`+background-color:transparent;`
	`648`	`+}`
	`649`	`+`
	`650`	`+QWidget#RPCConsole .QGroupBox #line { /* Network In Line */`
`648`	`651`	`background-color:#00ff00;`
`649`	`652`	`}`
`650`	`653`
`651`		`-QDialog#RPCConsole .QGroupBox #line_2 { /* Network Out Line */`
`652`		`-background:#ff0000;`
	`654`	`+QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */`
	`655`	`+background-color:#ff0000;`
`653`	`656`	`}`
`654`	`657`
`655`	`658`	`/* HELP MENU */`