From 7691f0f2967f721f3dee100956982ff625d7d945 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Mon, 4 Oct 2021 12:59:01 +0200
Subject: [ui] workarounds for font in osx

---
 gui/components/Footer.qml    | 10 +++++++++-
 gui/components/Locations.qml |  3 ++-
 gui/components/MainView.qml  |  8 ++++++--
 gui/components/Splash.qml    |  2 +-
 gui/components/VPNState.qml  |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'gui/components')

diff --git a/gui/components/Footer.qml b/gui/components/Footer.qml
index 71477b4..11f5114 100644
--- a/gui/components/Footer.qml
+++ b/gui/components/Footer.qml
@@ -11,7 +11,7 @@ ToolBar {
     Material.background: Theme.bgColor
     Material.foreground: "black"
     Material.elevation: 0
-    visible: stackView.depth > 1 && ctx !== undefined ? false : true
+    visible: isFooterVisible()
 
     Item {
 
@@ -186,4 +186,12 @@ ToolBar {
             return false
         }
     }
+
+    function isFooterVisible() {
+        console.debug(stackView.depth)
+        if (stackView.depth > 1) {
+            return false
+        }
+        return true
+    }
 }
diff --git a/gui/components/Locations.qml b/gui/components/Locations.qml
index a93700a..097f9fe 100644
--- a/gui/components/Locations.qml
+++ b/gui/components/Locations.qml
@@ -60,6 +60,7 @@ ThemedPage {
                 id: recommendedLabel
                 //: Location Selection: label for radio button that selects automatically
                 text: qsTr("Recommended")
+		font.weight: Font.Bold
                 font.bold: true
             }
             WrappedRadioButton {
@@ -203,7 +204,7 @@ ThemedPage {
                 }
             },
             State {
-                when: ctx && ctx.status == "on"
+                when: ctx != undefined && ctx.status == "on"
                 PropertyChanges {
                     target: manualLabel
                     text: manualSelectionLabel
diff --git a/gui/components/MainView.qml b/gui/components/MainView.qml
index 95bb212..c103565 100644
--- a/gui/components/MainView.qml
+++ b/gui/components/MainView.qml
@@ -130,7 +130,7 @@ Page {
             }
             font.pixelSize: 14
             textFormat: Text.RichText
-            text: getLink(ctx.donateURL)
+            text: getLink(ctx)
             onLinkActivated: Qt.openUrlExternally(ctx.donateURL)
         }
 
@@ -150,7 +150,11 @@ Page {
         onYes: Qt.openUrlExternally(ctx.donateURL)
     }
 
-    function getLink(url) {
+    function getLink(ctx) {
+	if (!ctx) {
+		return ""
+	}
+	let url = ctx.donateURL
         return "<style>a:link {color:'" + Theme.blue + "'; }</style><a href='#'>" + url + "</a>"
     }
 
diff --git a/gui/components/Splash.qml b/gui/components/Splash.qml
index 625ab18..cf75108 100644
--- a/gui/components/Splash.qml
+++ b/gui/components/Splash.qml
@@ -57,7 +57,7 @@ Page {
         if (root.error != "") {
             return
         }
-        if (ctx && ctx.isReady) {
+        if (ctx && ctx.isReady || qmlDebug) {
             splashTimer.stop()
             loader.source = "MainView.qml"
         } else {
diff --git a/gui/components/VPNState.qml b/gui/components/VPNState.qml
index 189fd0b..64a109a 100644
--- a/gui/components/VPNState.qml
+++ b/gui/components/VPNState.qml
@@ -20,7 +20,7 @@ StateGroup {
             name: initializing
         },
         State {
-            when: ctx && ctx.status == "off" && startingUI == true
+            when: ctx != undefined && ctx.status == "off" && startingUI == true
             PropertyChanges {
                 target: connectionState
                 text: qsTr("Connecting")
-- 
cgit v1.2.3