From cc1b7ae17304cfe62da0bb77be507296404918b4 Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 30 Nov 2021 18:56:27 +0100
Subject: [ui] svg love

tweak sizes and alignments
---
 gui/components/Footer.qml        | 12 +++++----
 gui/gui.qrc                      |  2 ++
 gui/main.qml                     | 10 +------
 gui/resources/reception-0@24.svg | 58 ++++++++++++++++++++++++++++++++++++++++
 gui/resources/reception-4.svg    |  2 +-
 gui/resources/reception-4@24.svg | 57 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 126 insertions(+), 15 deletions(-)
 create mode 100644 gui/resources/reception-0@24.svg
 create mode 100644 gui/resources/reception-4@24.svg

(limited to 'gui')

diff --git a/gui/components/Footer.qml b/gui/components/Footer.qml
index 24b6cfa..516d837 100644
--- a/gui/components/Footer.qml
+++ b/gui/components/Footer.qml
@@ -100,12 +100,14 @@ ToolBar {
             id: gwQuality
             height: 24
             width: 24
-            source: "../resources/reception-0.svg"
+            smooth: true
+            source: "../resources/reception-0@24.svg"
             anchors {
                 right: parent.right
-                rightMargin: 20
                 verticalCenter: parent.verticalCenter
-                verticalCenterOffset: 2
+                verticalCenterOffset: 0
+                topMargin: 5
+                rightMargin: 20
             }
             // TODO refactor with SignalIcon
             ColorOverlay{
@@ -132,14 +134,14 @@ ToolBar {
                 name: "on"
                 PropertyChanges {
                     target: gwQuality
-                    source: "../resources/reception-4.svg"
+                    source: "../resources/reception-4@24.svg"
                 }
             },
             State {
                 name: "off"
                 PropertyChanges {
                     target: gwQuality
-                    source: "../resources/reception-0.svg"
+                    source: "../resources/reception-0@24.svg"
                 }
             }
         ]
diff --git a/gui/gui.qrc b/gui/gui.qrc
index b467673..120e94c 100644
--- a/gui/gui.qrc
+++ b/gui/gui.qrc
@@ -52,6 +52,8 @@
         <file>resources/reception-0.svg</file>
         <file>resources/reception-2.svg</file>
         <file>resources/reception-4.svg</file>
+        <file>resources/reception-0@24.svg</file>
+        <file>resources/reception-4@24.svg</file>
         <file>resources/arrow-left.svg</file>
         <file>resources/globe.svg</file>
         <file>resources/ravens.svg</file>
diff --git a/gui/main.qml b/gui/main.qml
index d9cbec4..116aba3 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -30,7 +30,7 @@ ApplicationWindow {
     minimumHeight: appHeight
     maximumHeight: appHeight
 
-    title: ctx ? ctx.appName : "VPN"
+    title: ctx ? ctx.appName : ""
     Material.accent: Material.Green
 
     property var ctx
@@ -98,7 +98,6 @@ ApplicationWindow {
             ctx = JSON.parse(j)
             if (ctx != undefined) {
                 locationsModel = getSortedLocations()
-                //console.debug("Got sorted locations: " + locationsModel)
             }
             if (ctx.errors) {
                 console.debug("errors, setting root.error")
@@ -168,12 +167,5 @@ ApplicationWindow {
 
     Component.onCompleted: {
         loader.source = "components/Splash.qml"
-        // XXX workaround for custom font not working in osx
-        /*
-        if (Qt.platform.os === "osx") {
-            root.font.family = robotoFont.name
-            root.font.weight = Font.Light
-        }
-        */
     }
 }
diff --git a/gui/resources/reception-0@24.svg b/gui/resources/reception-0@24.svg
new file mode 100644
index 0000000..537f990
--- /dev/null
+++ b/gui/resources/reception-0@24.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   fill="currentColor"
+   class="bi bi-reception-0"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="reception-0@24.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1057"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="19.11398"
+     inkscape:cx="12.190695"
+     inkscape:cy="10.742019"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:document-rotation="0" />
+  <path
+     d="M 0.05770788,23.154029 A 0.79949398,0.79949398 0 0 1 0.85720186,22.354535 H 4.0551778 a 0.79949398,0.79949398 0 0 1 0,1.598987 H 0.85720186 A 0.79949398,0.79949398 0 0 1 0.05770788,23.154029 Z m 6.39595182,0 a 0.79949398,0.79949398 0 0 1 0.799494,-0.799494 h 3.1979753 a 0.79949398,0.79949398 0 0 1 0,1.598987 H 7.2531537 a 0.79949398,0.79949398 0 0 1 -0.799494,-0.799493 z m 6.3959513,0 a 0.79949398,0.79949398 0 0 1 0.799494,-0.799494 h 3.197976 a 0.79949398,0.79949398 0 0 1 0,1.598987 h -3.197976 a 0.79949398,0.79949398 0 0 1 -0.799494,-0.799493 z m 6.395952,0 a 0.79949398,0.79949398 0 0 1 0.799494,-0.799494 h 3.197975 a 0.79949398,0.79949398 0 0 1 0,1.598987 h -3.197975 a 0.79949398,0.79949398 0 0 1 -0.799494,-0.799493 z"
+     id="path2"
+     style="stroke-width:1.59899" />
+</svg>
diff --git a/gui/resources/reception-4.svg b/gui/resources/reception-4.svg
index 611bdf1..217680b 100644
--- a/gui/resources/reception-4.svg
+++ b/gui/resources/reception-4.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-reception-4" viewBox="0 0 16 16">
   <path d="M0 11.5a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-2zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-5zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-8zm4-3a.5.5 0 0 1 .5-.5h2a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1-.5-.5v-11z"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/gui/resources/reception-4@24.svg b/gui/resources/reception-4@24.svg
new file mode 100644
index 0000000..caec436
--- /dev/null
+++ b/gui/resources/reception-4@24.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   fill="currentColor"
+   class="bi bi-reception-4"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="reception-4@24.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1057"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="36.041667"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M -2.9802812e-4,17.604914 A 0.80057442,0.80057442 0 0 1 0.80027642,16.80434 H 4.0025741 a 0.80057442,0.80057442 0 0 1 0.8005745,0.800574 v 3.202298 A 0.80057442,0.80057442 0 0 1 4.0025741,21.607786 H 0.80027642 A 0.80057442,0.80057442 0 0 1 -2.9802812e-4,20.807212 Z M 6.4042973,12.801467 a 0.80057442,0.80057442 0 0 1 0.8005745,-0.800574 h 3.2022972 a 0.80057442,0.80057442 0 0 1 0.800574,0.800574 v 8.005745 a 0.80057442,0.80057442 0 0 1 -0.800574,0.800574 H 7.2048718 A 0.80057442,0.80057442 0 0 1 6.4042973,20.807212 Z M 12.808891,7.9980212 a 0.80057442,0.80057442 0 0 1 0.800575,-0.8005745 h 3.202298 a 0.80057442,0.80057442 0 0 1 0.800574,0.8005745 V 20.807212 a 0.80057442,0.80057442 0 0 1 -0.800574,0.800574 h -3.202298 a 0.80057442,0.80057442 0 0 1 -0.800575,-0.800574 z m 6.404596,-4.8034466 a 0.80057442,0.80057442 0 0 1 0.800574,-0.8005744 h 3.202298 a 0.80057442,0.80057442 0 0 1 0.800574,0.8005744 V 20.807212 a 0.80057442,0.80057442 0 0 1 -0.800574,0.800574 h -3.202298 a 0.80057442,0.80057442 0 0 1 -0.800574,-0.800574 z"
+     id="path2"
+     style="stroke-width:1.60115" />
+</svg>
-- 
cgit v1.2.3