summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2021-11-30 15:38:04 +0100
committerkali kaneko (leap communications) <kali@leap.se>2021-11-30 21:22:00 +0100
commit9103f2f8de3ec59c0b256bf600b5abf30e05a345 (patch)
tree096b446a354c5ddb5e744e9a1d03fe99421ac456
parent451f6fef9d707e121cd3d14b3114f7be4e3b2444 (diff)
[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++.
-rw-r--r--gui/gui.qrc5
-rw-r--r--gui/main.qml2
-rw-r--r--gui/resources/fonts/Poppins-Bold.ttfbin0 -> 153900 bytes
-rw-r--r--gui/resources/fonts/Poppins-Regular.ttfbin0 -> 158192 bytes
4 files changed, 4 insertions, 3 deletions
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
--- /dev/null
+++ b/gui/resources/fonts/Poppins-Bold.ttf
Binary files differ
diff --git a/gui/resources/fonts/Poppins-Regular.ttf b/gui/resources/fonts/Poppins-Regular.ttf
new file mode 100644
index 0000000..be06e7f
--- /dev/null
+++ b/gui/resources/fonts/Poppins-Regular.ttf
Binary files differ