From 6c7e3385cb352841a2c5bdd9a96f8dffb6c1b463 Mon Sep 17 00:00:00 2001
From: Hofer Julian <30049909+Hofer-Julian@users.noreply.github.com>
Date: Tue, 11 Aug 2020 05:51:14 +0200
Subject: [PATCH] Add correct icon for notifications on Linux. By @Hofer-Julian

---
 Makefile                   |  1 +
 package/icon-symbolic.svg  | 54 ++++++++++++++++++++++++++++++++++++++
 package/icon.svg           | 26 ++++--------------
 src/vorta/notifications.py |  2 +-
 4 files changed, 61 insertions(+), 22 deletions(-)
 create mode 100644 package/icon-symbolic.svg

diff --git a/Makefile b/Makefile
index cfbb282a..d5d7192a 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,7 @@ flatpak-install: translations-to-qm
 	pip3 install --prefix=/app --no-deps .
 	install -D src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml /app/share/metainfo/com.borgbase.Vorta.appdata.xml
 	install -D package/icon.svg /app/share/icons/hicolor/scalable/apps/com.borgbase.Vorta.svg
+	install -D package/icon-symbolic.svg /app/share/icons/hicolor/symbolic/apps/com.borgbase.Vorta-symbolic.svg
 	install -D src/vorta/assets/metadata/com.borgbase.Vorta.desktop /app/share/applications/com.borgbase.Vorta.desktop
 
 help:
diff --git a/package/icon-symbolic.svg b/package/icon-symbolic.svg
new file mode 100644
index 00000000..44769ff5
--- /dev/null
+++ b/package/icon-symbolic.svg
@@ -0,0 +1,54 @@
+<?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"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="icon-symbolic.svg"
+   id="svg4"
+   version="1.1"
+   width="16px"
+   viewBox="0 0 16 16"
+   height="16px">
+  <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" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg4"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:cy="8"
+     inkscape:cx="8"
+     inkscape:zoom="42.25"
+     showgrid="false"
+     id="namedview6"
+     inkscape:window-height="836"
+     inkscape:window-width="1600"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     id="path2"
+     fill="#888888"
+     d="m 15.441406 9.246094 v 2.476562 c 0 0.683594 -0.554687 1.238282 -1.238281 1.238282 h -12.386719 c -0.683594 0 -1.238281 -0.554688 -1.238281 -1.238282 v -2.476562 c 0 -0.683594 0.554687 -1.238282 1.238281 -1.238282 h 12.386719 c 0.683594 0 1.238281 0.554688 1.238281 1.238282 z m -1.238281 -2.066406 c 0.273437 0 0.542969 0.054687 0.792969 0.160156 l -2.488282 -3.734375 c -0.230468 -0.347657 -0.617187 -0.554688 -1.03125 -0.554688 h -6.933593 c -0.410157 0 -0.796875 0.207031 -1.027344 0.554688 l -2.492187 3.734375 c 0.25 -0.105469 0.519531 -0.160156 0.792968 -0.160156 z m -1.238281 2.476562 c -0.457032 0 -0.828125 0.371094 -0.828125 0.828125 s 0.371093 0.824219 0.828125 0.824219 c 0.457031 0 0.824218 -0.367188 0.824218 -0.824219 s -0.367187 -0.828125 -0.824218 -0.828125 z m -2.476563 0 c -0.457031 0 -0.828125 0.371094 -0.828125 0.828125 s 0.371094 0.824219 0.828125 0.824219 s 0.824219 -0.367188 0.824219 -0.824219 s -0.367188 -0.828125 -0.824219 -0.828125 z m 0 0" />
+</svg>
diff --git a/package/icon.svg b/package/icon.svg
index 760ef1a3..f08ab3ff 100644
--- a/package/icon.svg
+++ b/package/icon.svg
@@ -1,22 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1"
-	 id="Layer_1" inkscape:version="0.92.4 5da689c313, 2019-01-14" sodipodi:docname="com.borgbase.Vorta.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 576 576"
-	 style="enable-background:new 0 0 576 576;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#888888;}
-	.st1{fill:#E65100;}
-	.st2{fill:#FF9800;}
-</style>
-<sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview15" inkscape:current-layer="Layer_1" inkscape:cx="291.25424" inkscape:cy="192" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="836" inkscape:window-maximized="1" inkscape:window-width="1600" inkscape:window-x="0" inkscape:window-y="27" inkscape:zoom="0.61458333" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
-	</sodipodi:namedview>
-<title  id="title6">vorta</title>
-<path id="path8" inkscape:connector-curvature="0" class="st0" d="M576,342v96c0,26.5-21.5,48-48,48H48c-26.5,0-48-21.5-48-48v-96
-	c0-26.5,21.5-48,48-48h480C554.5,294,576,315.5,576,342z M528,262c10.6,0,21,2.1,30.8,6.2l-96.5-144.8
-	c-8.9-13.4-23.9-21.4-39.9-21.4H153.7c-16,0-31,8-39.9,21.4L17.2,268.2C27,264.1,37.4,262,48,262H528z M480,358
-	c-17.7,0-32,14.3-32,32s14.3,32,32,32s32-14.3,32-32S497.7,358,480,358z M384,358c-17.7,0-32,14.3-32,32s14.3,32,32,32
-	s32-14.3,32-32S401.7,358,384,358z"/>
-<circle id="circle10" class="st1" cx="383.8" cy="390.2" r="32.2"/>
-<circle id="circle12" class="st2" cx="480" cy="390" r="32.2"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg">
+    <path d="m 127.183594 82.421875 v 21.050781 c 0 5.8125 -4.714844 10.527344 -10.527344 10.527344 h -105.265625 c -5.8125 0 -10.527344 -4.714844 -10.527344 -10.527344 v -21.050781 c 0 -5.8125 4.714844 -10.527344 10.527344 -10.527344 h 105.265625 c 5.8125 0 10.527344 4.714844 10.527344 10.527344 z m -10.527344 -17.546875 c 2.324219 0 4.605469 0.460938 6.753906 1.359375 l -21.160156 -31.753906 c -1.953125 -2.9375 -5.242188 -4.691407 -8.75 -4.691407 h -58.929688 c -3.507812 0 -6.796874 1.753907 -8.75 4.691407 l -21.183593 31.753906 c 2.148437 -0.898437 4.429687 -1.359375 6.753906 -1.359375 z m -10.527344 21.054688 c -3.878906 0 -7.015625 3.136718 -7.015625 7.019531 c 0 3.878906 3.136719 7.015625 7.015625 7.015625 c 3.882813 0 7.019532 -3.136719 7.019532 -7.015625 c 0 -3.882813 -3.136719 -7.019531 -7.019532 -7.019531 z m -21.050781 0 c -3.882813 0 -7.019531 3.136718 -7.019531 7.019531 c 0 3.878906 3.136718 7.015625 7.019531 7.015625 c 3.878906 0 7.015625 -3.136719 7.015625 -7.015625 c 0 -3.882813 -3.136719 -7.019531 -7.015625 -7.019531 z m 0 0" fill="#888888"/>
+    <path d="m 92.09375 92.992188 c 0 3.898437 -3.160156 7.0625 -7.058594 7.0625 c -3.902344 0 -7.0625 -3.164063 -7.0625 -7.0625 c 0 -3.902344 3.160156 -7.0625 7.0625 -7.0625 c 3.898438 0 7.058594 3.160156 7.058594 7.0625 z m 0 0" fill="#e65100"/>
+    <path d="m 113.191406 92.949219 c 0 3.898437 -3.160156 7.058593 -7.0625 7.058593 c -3.898437 0 -7.058594 -3.160156 -7.058594 -7.058593 c 0 -3.902344 3.160157 -7.0625 7.058594 -7.0625 c 3.902344 0 7.0625 3.160156 7.0625 7.0625 z m 0 0" fill="#ff9800"/>
 </svg>
diff --git a/src/vorta/notifications.py b/src/vorta/notifications.py
index 1e568a97..0635e387 100644
--- a/src/vorta/notifications.py
+++ b/src/vorta/notifications.py
@@ -78,7 +78,7 @@ class DBusNotifications(VortaNotifications):
         v = QtCore.QVariant(12321)  # random int to identify all notifications
         if v.convert(QtCore.QVariant.UInt):
             id_replace = v
-        icon = ""
+        icon = "com.borgbase.Vorta-symbolic"
         title = header
         text = msg
         actions_list = QtDBus.QDBusArgument([], QtCore.QMetaType.QStringList)