From d98e6e0b92bd01d3e69ab73225733deda192c59c Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sat, 31 Dec 2016 11:17:58 +0100 Subject: [PATCH] use icon from manjaro-icons package --- data/img/manjaro.png | Bin 245 -> 0 bytes manjaro-hello.desktop | 2 +- src/manjaro_hello.py | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 data/img/manjaro.png diff --git a/data/img/manjaro.png b/data/img/manjaro.png deleted file mode 100644 index 205e570fe4653fd0d37967e52d1b3105f5c31bd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AZi z3@mvd%y?n(rVOBoc5!lIL8@MUQTpt6Hc~)E5&=FT zu0Yy!Pn7AtXp;l6X8U4H_eTTSru$mdKI;Vst0C;9e^8f$< diff --git a/manjaro-hello.desktop b/manjaro-hello.desktop index ac44c59..2616eda 100755 --- a/manjaro-hello.desktop +++ b/manjaro-hello.desktop @@ -5,7 +5,7 @@ Categories=GNOME;GTK;System; StartupNotify=false Name=Manjaro Hello Exec=/usr/bin/manjaro-hello -Icon=/usr/share/manjaro-hello/data/img/manjaro.png +Icon=manjaro Comment=A tool providing access to documentation and support for new Manjaro users. Comment[de]=Ein Tool für schnellen Zugriff auf Support und Dokumentation für neue Manjaro-Nutzer. Comment[es]=Una herramienta que provee acceso a la documentación y soporte para nuevos usuarios de Manjaro. diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py index cccded1..5ede0f8 100644 --- a/src/manjaro_hello.py +++ b/src/manjaro_hello.py @@ -27,15 +27,11 @@ class ManjaroHello(): self.locale_path = "/usr/share/locale/" self.ui_path = "/usr/share/" + self.app + "/ui/" self.desktop_path = "/usr/share/applications/" + self.app + ".desktop" - if not hasattr(self, "logo_path"): - self.logo_path = "/usr/share/" + self.app + "/data/img/manjaro.png" else: self.data_path = "data/" self.locale_path = "locale/" self.ui_path = "ui/" self.desktop_path = os.getcwd() + "/" + self.app + ".desktop" - if not hasattr(self, "logo_path"): - self.logo_path = "data/img/manjaro.png" self.config_path = self.home_path + "/.config/" self.preferences_path = self.config_path + self.app + ".json" self.urls_path = self.data_path + "urls.json"