From f8c05f3dee29c7ab1eb3eba82c917fe18333fc41 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Fri, 9 Oct 2020 21:58:15 +0200
Subject: [pkg] add vendor icon to app

---
 gui/build.sh                 |  9 +++++++--
 gui/main.cpp                 |  3 +++
 gui/providers/providers.json |  4 ++--
 gui/qml/AboutDialog.qml      |  1 +
 gui/qml/main.qml             | 10 +++++++---
 5 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'gui')

diff --git a/gui/build.sh b/gui/build.sh
index 8b336fa..deb73a1 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
-set -x
+
+# DEBUG --------------
+# set -x
+# --------------------
 
 XBUILD=${XBUILD-no}
 OSX_TARGET=10.11
@@ -13,6 +16,7 @@ SOURCE_GOLIB=gui/backend.go
 
 QTBUILD=build/qt
 RELEASE=$QTBUILD/release
+VENDOR_PATH=${VENDOR_PATH-providers/riseup}
 
 PLATFORM=$(uname -s)
 LDFLAGS=""
@@ -72,8 +76,9 @@ function buildGoLib {
 function buildQmake {
     echo "[+] Now building Qml app with Qt qmake"
     echo "[+] Using qmake in:" $QMAKE
+    echo "[+] VENDOR_PATH:" $VENDOR_PATH
     mkdir -p $QTBUILD
-    $QMAKE -o $QTBUILD/Makefile "CONFIG-=debug CONFIG+=release" $PROJECT
+    $QMAKE -o $QTBUILD/Makefile "CONFIG-=debug CONFIG+=release VENDOR_PATH=${VENDOR_PATH}" $PROJECT
 }
 
 function renameOutput {
diff --git a/gui/main.cpp b/gui/main.cpp
index 684b0be..893cb4d 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -152,6 +152,9 @@ int main(int argc, char **argv) {
     QTranslator translator;
     translator.load(QLocale(), QLatin1String("main"), QLatin1String("_"), QLatin1String(":/i18n"));
     app.installTranslator(&translator);
+    /* set window icon */
+    app.setWindowIcon(QIcon(":/vendor/icon.svg"));
+
 
     QQmlApplicationEngine engine;
     QQmlContext *ctx = engine.rootContext();
diff --git a/gui/providers/providers.json b/gui/providers/providers.json
index 5c9b08b..6f82ba3 100644
--- a/gui/providers/providers.json
+++ b/gui/providers/providers.json
@@ -15,7 +15,7 @@
             "apiURL": "https://api.black.riseup.net/",
             "geolocationAPI": "https://api.black.riseup.net:9001/json",
             "caCertString": "-----BEGIN CERTIFICATE-----\nMIIFjTCCA3WgAwIBAgIBATANBgkqhkiG9w0BAQ0FADBZMRgwFgYDVQQKDA9SaXNl\ndXAgTmV0d29ya3MxGzAZBgNVBAsMEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UE\nAwwXUmlzZXVwIE5ldHdvcmtzIFJvb3QgQ0EwHhcNMTQwNDI4MDAwMDAwWhcNMjQw\nNDI4MDAwMDAwWjBZMRgwFgYDVQQKDA9SaXNldXAgTmV0d29ya3MxGzAZBgNVBAsM\nEmh0dHBzOi8vcmlzZXVwLm5ldDEgMB4GA1UEAwwXUmlzZXVwIE5ldHdvcmtzIFJv\nb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC76J4ciMJ8Sg0m\nTP7DF2DT9zNe0Csk4myoMFC57rfJeqsAlJCv1XMzBmXrw8wq/9z7XHv6n/0sWU7a\n7cF2hLR33ktjwODlx7vorU39/lXLndo492ZBhXQtG1INMShyv+nlmzO6GT7ESfNE\nLliFitEzwIegpMqxCIHXFuobGSCWF4N0qLHkq/SYUMoOJ96O3hmPSl1kFDRMtWXY\niw1SEKjUvpyDJpVs3NGxeLCaA7bAWhDY5s5Yb2fA1o8ICAqhowurowJpW7n5ZuLK\n5VNTlNy6nZpkjt1QycYvNycffyPOFm/Q/RKDlvnorJIrihPkyniV3YY5cGgP+Qkx\nHUOT0uLA6LHtzfiyaOqkXwc4b0ZcQD5Vbf6Prd20Ppt6ei0zazkUPwxld3hgyw58\nm/4UIjG3PInWTNf293GngK2Bnz8Qx9e/6TueMSAn/3JBLem56E0WtmbLVjvko+LF\nPM5xA+m0BmuSJtrD1MUCXMhqYTtiOvgLBlUm5zkNxALzG+cXB28k6XikXt6MRG7q\nhzIPG38zwkooM55yy5i1YfcIi5NjMH6A+t4IJxxwb67MSb6UFOwg5kFokdONZcwj\nshczHdG9gLKSBIvrKa03Nd3W2dF9hMbRu//STcQxOailDBQCnXXfAATj9pYzdY4k\nha8VCAREGAKTDAex9oXf1yRuktES4QIDAQABo2AwXjAdBgNVHQ4EFgQUC4tdmLVu\nf9hwfK4AGliaet5KkcgwDgYDVR0PAQH/BAQDAgIEMAwGA1UdEwQFMAMBAf8wHwYD\nVR0jBBgwFoAUC4tdmLVuf9hwfK4AGliaet5KkcgwDQYJKoZIhvcNAQENBQADggIB\nAGzL+GRnYu99zFoy0bXJKOGCF5XUXP/3gIXPRDqQf5g7Cu/jYMID9dB3No4Zmf7v\nqHjiSXiS8jx1j/6/Luk6PpFbT7QYm4QLs1f4BlfZOti2KE8r7KRDPIecUsUXW6P/\n3GJAVYH/+7OjA39za9AieM7+H5BELGccGrM5wfl7JeEz8in+V2ZWDzHQO4hMkiTQ\n4ZckuaL201F68YpiItBNnJ9N5nHr1MRiGyApHmLXY/wvlrOpclh95qn+lG6/2jk7\n3AmihLOKYMlPwPakJg4PYczm3icFLgTpjV5sq2md9bRyAg3oPGfAuWHmKj2Ikqch\nTd5CHKGxEEWbGUWEMP0s1A/JHWiCbDigc4Cfxhy56CWG4q0tYtnc2GMw8OAUO6Wf\nXu5pYKNkzKSEtT/MrNJt44tTZWbKV/Pi/N2Fx36my7TgTUj7g3xcE9eF4JV2H/sg\ntsK3pwE0FEqGnT4qMFbixQmc8bGyuakr23wjMvfO7eZUxBuWYR2SkcP26sozF9PF\ntGhbZHQVGZUTVPyvwahMUEhbPGVerOW0IYpxkm0x/eaWdTc4vPpf/rIlgbAjarnJ\nUN9SaWRlWKSdP4haujnzCoJbM7dU9bjvlGZNyXEekgeT0W2qFeGGp+yyUWw8tNsp\n0BuC1b7uW/bBn/xKm319wXVDvBgZgcktMolak39V7DVO\n-----END CERTIFICATE-----",
-            "timeStamp": "2020-10-08 18:10:13"
+            "timeStamp": "2020-10-09 22:41:19"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/gui/qml/AboutDialog.qml b/gui/qml/AboutDialog.qml
index a101ea3..bd3d77e 100644
--- a/gui/qml/AboutDialog.qml
+++ b/gui/qml/AboutDialog.qml
@@ -5,6 +5,7 @@ MessageDialog {
     title: qsTr("About")
     text: getText()
     informativeText: getVersion() 
+    icon: StandardIcon.Information
 
     function getText() {
         var _name = ctx ? ctx.appName : "vpn"
diff --git a/gui/qml/main.qml b/gui/qml/main.qml
index ce72fff..dcffcde 100644
--- a/gui/qml/main.qml
+++ b/gui/qml/main.qml
@@ -42,6 +42,9 @@ ApplicationWindow {
                    showInitFailure()
                }
             }
+            if (ctx.donateURL) {
+                donateItem.visible = true
+            }
         }
     }
 
@@ -98,8 +101,8 @@ ApplicationWindow {
         allowEmptyPass = shouldAllowEmptyPass()
 
         app.visible = true;
-        show();
-        hide();
+        //show();
+        //hide();
     }
 
     function toHuman(st) {
@@ -251,8 +254,9 @@ ApplicationWindow {
             }
 
             MenuItem {
+                id: donateItem
                 text: qsTr("Donate...")
-                visible: ctx && ctx.donateURL
+                visible: ctx ? ctx.donateURL : false
                 onTriggered: { donate.visible = true }
             }
 
-- 
cgit v1.2.3