From 9103f2f8de3ec59c0b256bf600b5abf30e05a345 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 30 Nov 2021 15:38:04 +0100
Subject: [ui] change fonts

thin font was not rendered properly in osx. workarounds no longer
necessary; main.cpp tried a font load that doesn't need to be done in
c++.
---
 gui/gui.qrc                             |   5 +++--
 gui/main.qml                            |   2 +-
 gui/resources/fonts/Poppins-Bold.ttf    | Bin 0 -> 153900 bytes
 gui/resources/fonts/Poppins-Regular.ttf | Bin 0 -> 158192 bytes
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 gui/resources/fonts/Poppins-Bold.ttf
 create mode 100644 gui/resources/fonts/Poppins-Regular.ttf

diff --git a/gui/gui.qrc b/gui/gui.qrc
index 82730cc..b467673 100644
--- a/gui/gui.qrc
+++ b/gui/gui.qrc
@@ -63,12 +63,13 @@
         <file>resources/angle-right.svg</file>
 
         <!-- fonts -->
-        <file alias="poppins-light.ttf">resources/fonts/Poppins-Thin.ttf</file>
-        <file alias="poppins-bold.ttf">resources/fonts/Poppins-Light.ttf</file>
+        <file alias="poppins-regular.ttf">resources/fonts/Poppins-Regular.ttf</file>
+        <file alias="poppins-bold.ttf">resources/fonts/Poppins-Bold.ttf</file>
         <file alias="monserrat-bold.ttf">resources/fonts/Montserrat-SemiBold.ttf</file>
         <file alias="roboto.ttf">resources/fonts/Roboto-Regular.ttf</file>
         <file alias="roboto-bold.ttf">resources/fonts/Roboto-Bold.ttf</file>
 
+        <!-- systray icons -->
         <file>assets/icon/png/black/vpn_off.png</file>
         <file>assets/icon/png/black/vpn_on.png</file>
         <file>assets/icon/png/black/vpn_wait_0.png</file>
diff --git a/gui/main.qml b/gui/main.qml
index 7fd38ab..a3a0922 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -55,7 +55,7 @@ ApplicationWindow {
 
     FontLoader {
         id: lightFont
-        source: "qrc:/poppins-light.ttf"
+        source: "qrc:/poppins-regular.ttf"
     }
 
     FontLoader {
diff --git a/gui/resources/fonts/Poppins-Bold.ttf b/gui/resources/fonts/Poppins-Bold.ttf
new file mode 100644
index 0000000..b94d47f
Binary files /dev/null and b/gui/resources/fonts/Poppins-Bold.ttf differ
diff --git a/gui/resources/fonts/Poppins-Regular.ttf b/gui/resources/fonts/Poppins-Regular.ttf
new file mode 100644
index 0000000..be06e7f
Binary files /dev/null and b/gui/resources/fonts/Poppins-Regular.ttf differ
-- 
cgit v1.2.3