From 440c8f38ee4104a6ac25613feb166e7239ff6677 Mon Sep 17 00:00:00 2001
From: "James C. Owens" <jamesowens@optonline.net>
Date: Sun, 4 Oct 2020 13:30:59 -0400
Subject: [PATCH] Change resource paths to aliases and move QFontDatabase call

---
 src/qt/bitcoingui.cpp                        | 3 ++-
 src/qt/res/stylesheets/dark_stylesheet.qss   | 2 +-
 src/qt/res/stylesheets/light_stylesheet.qss  | 2 +-
 src/qt/res/stylesheets/native_stylesheet.qss | 2 +-
 src/qt/rpcconsole.cpp                        | 1 -
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 134595fc46..a8fda5c02f 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -110,7 +110,8 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
 
     setGeometry(QStyle::alignedRect(Qt::LeftToRight,Qt::AlignCenter,QDesktopWidget().availableGeometry(this).size() * 0.6,QDesktopWidget().availableGeometry(this)));
 
-    QFontDatabase::addApplicationFont(":/fonts/Inter-Regular.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/inter-regular");
+    QFontDatabase::addApplicationFont(":/fonts/inconsolata-regular");
     setWindowTitle(tr("Gridcoin") + " " + tr("Wallet"));
 
 #ifndef Q_OS_MAC
diff --git a/src/qt/res/stylesheets/dark_stylesheet.qss b/src/qt/res/stylesheets/dark_stylesheet.qss
index 92f7e36112..c6856b4953 100644
--- a/src/qt/res/stylesheets/dark_stylesheet.qss
+++ b/src/qt/res/stylesheets/dark_stylesheet.qss
@@ -374,7 +374,7 @@ QTextEdit {
 }
 
 /* RPC Console */
-#messagesWidget {
+#messagesWidget, #lineEdit {
     font-family: "Inconsolata";
     font-size: 10pt;
 }
diff --git a/src/qt/res/stylesheets/light_stylesheet.qss b/src/qt/res/stylesheets/light_stylesheet.qss
index 944bcab8b9..66c7ab1f71 100644
--- a/src/qt/res/stylesheets/light_stylesheet.qss
+++ b/src/qt/res/stylesheets/light_stylesheet.qss
@@ -357,7 +357,7 @@ QTextEdit {
 }
 
 /* RPC Console */
-#messagesWidget {
+#messagesWidget, #lineEdit {
     font-family: "Inconsolata";
     font-size: 10pt;
 }
diff --git a/src/qt/res/stylesheets/native_stylesheet.qss b/src/qt/res/stylesheets/native_stylesheet.qss
index 13e3c97434..f0a43e36eb 100644
--- a/src/qt/res/stylesheets/native_stylesheet.qss
+++ b/src/qt/res/stylesheets/native_stylesheet.qss
@@ -14,7 +14,7 @@ QTextEdit {
 }
 
 /* RPC Console */
-#messagesWidget {
+#messagesWidget, #lineEdit {
     font-family: "Inconsolata";
     font-size: 10pt;
 }
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 0d1d4306d5..39f4973bdb 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -436,7 +436,6 @@ void RPCConsole::clear()
     }
 
     // Set default style sheet
-    QFontDatabase::addApplicationFont(":/fonts/Inconsolata-Regular.ttf");
     ui->messagesWidget->document()->setDefaultStyleSheet(
                 "table { }"
                 "td.time { color: #808080; valign: bottom;} "