Merge pull request #1 from jamescowens/PR1908

Modifications to PR1908 to get fonts to initialize correctly
jamescowens · Oct 4, 2020 · 8d1bb87 · 8d1bb87
2 parents 730d3ab + 440c8f3
commit 8d1bb87
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;} "