From 22e0114d055b0ac6cdc47af2968b5dc742ba055a Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 21 Feb 2021 20:30:01 +0200
Subject: qt: Choose monospaced font in C++ code rather in `*.ui` file

Setting the "Monospace" font family in a `*.ui` file does not work on
macOS, at least on Big Sur with Qt 5.15 (neither via the "font" property
nor via the "styleSheet" property). Qt chooses the ".AppleSystemUIFont"
instead of ".AppleSystemUIFontMonospaced".

This change makes macOS choose the correct monospaced font.
---
 src/qt/forms/overviewpage.ui | 56 --------------------------------------------
 1 file changed, 56 deletions(-)

(limited to 'src/qt/forms')

diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index ee9d4a113c..b82143e1ba 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -116,13 +116,6 @@
             </property>
             <item row="2" column="2">
              <widget class="QLabel" name="labelWatchPending">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
@@ -142,13 +135,6 @@
             </item>
             <item row="2" column="1">
              <widget class="QLabel" name="labelUnconfirmed">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
@@ -168,13 +154,6 @@
             </item>
             <item row="3" column="2">
              <widget class="QLabel" name="labelWatchImmature">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
@@ -227,13 +206,6 @@
             </item>
             <item row="3" column="1">
              <widget class="QLabel" name="labelImmature">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
@@ -273,13 +245,6 @@
             </item>
             <item row="5" column="1">
              <widget class="QLabel" name="labelTotal">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
@@ -299,13 +264,6 @@
             </item>
             <item row="5" column="2">
              <widget class="QLabel" name="labelWatchTotal">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
@@ -342,13 +300,6 @@
             </item>
             <item row="1" column="1">
              <widget class="QLabel" name="labelBalance">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
@@ -368,13 +319,6 @@
             </item>
             <item row="1" column="2">
              <widget class="QLabel" name="labelWatchAvailable">
-              <property name="font">
-               <font>
-                <family>Monospace</family>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
               <property name="cursor">
                <cursorShape>IBeamCursor</cursorShape>
               </property>
-- 
cgit v1.2.3


From 67f26319a0ca7e34e3db17d9330133622a40de09 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 21 Feb 2021 20:58:19 +0200
Subject: gui: Add monospaced font settings

---
 src/qt/forms/optionsdialog.ui | 100 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

(limited to 'src/qt/forms')

diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index 8181cc47e2..6d279540e9 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -705,6 +705,106 @@
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="QGroupBox" name="font_groupBox">
+         <property name="title">
+          <string>Monospaced font in the Overview tab:</string>
+         </property>
+         <layout class="QVBoxLayout" name="font_verticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="embeddedFont_horizontalLayout">
+            <item>
+             <widget class="QRadioButton" name="embeddedFont_radioButton">
+              <property name="text">
+               <string>embedded &quot;%1&quot;</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="embeddedFont_horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="embeddedFont_verticalLayout">
+              <item>
+               <widget class="QLabel" name="embeddedFont_label_1">
+                <property name="text">
+                 <string>111.11111111 BTC</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="embeddedFont_label_9">
+                <property name="text">
+                 <string>909.09090909 BTC</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="Line" name="font_line">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="systemFont_horizontalLayout">
+            <item>
+             <widget class="QRadioButton" name="systemFont_radioButton">
+              <property name="text">
+               <string>closest matching &quot;%1&quot;</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="systemFont_horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="systemFont_verticalLayout">
+              <item>
+               <widget class="QLabel" name="systemFont_label_1">
+                <property name="text">
+                 <string>111.11111111 BTC</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="systemFont_label_9">
+                <property name="text">
+                 <string>909.09090909 BTC</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_Display">
          <property name="orientation">
-- 
cgit v1.2.3