From 1ea3837f4f62bc8d07b0f3fdb58acbaafa111bee Mon Sep 17 00:00:00 2001 From: Huluti Date: Thu, 15 Dec 2016 14:56:21 +0100 Subject: [PATCH] Use logos from manjaro-icons package --- data/img/manjaro-hello.png | Bin 399 -> 0 bytes manjaro-hello.desktop | 2 +- src/manjaro-hello.py | 7 ++++--- 3 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 data/img/manjaro-hello.png diff --git a/data/img/manjaro-hello.png b/data/img/manjaro-hello.png deleted file mode 100644 index be7d3e2d218f1ef221e3943e372ccfae245be52f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf2>u z^FWyK!s1OCKtah8*NBqf{Irtt#G+J&^73-M%)IR4(QUNDvu?wu{8uca!rcMyr&EllOp>fckNvNnM&0+uK+D)_M zU+&2Hf zdv>qwZS8}3>zv=ra%C&Xf8Sjtx9z*?Ci})W%tz)r^na`~_jEPyz42+C#r?3?-bcdb zA7t8NSI=?tQ^?Gl3XGfV8L=9TVHfcNYQGu$7X`_OJ#N#f0tOy~r>mdKI;Vst0G7*# ALI3~& diff --git a/manjaro-hello.desktop b/manjaro-hello.desktop index 29c9c85..d6d870e 100755 --- a/manjaro-hello.desktop +++ b/manjaro-hello.desktop @@ -5,5 +5,5 @@ Categories=GNOME;GTK;System; StartupNotify=false Name=Manjaro Hello Exec=/usr/bin/manjaro-hello.py -Icon=/usr/share/manjaro-hello/data/img/manjaro-hello.png +Icon=/usr/share/icons/manjaro.png Comment=The Manjaro Hello utility. diff --git a/src/manjaro-hello.py b/src/manjaro-hello.py index 03d3967..04fc722 100644 --- a/src/manjaro-hello.py +++ b/src/manjaro-hello.py @@ -46,7 +46,7 @@ class ManjaroHello(): self.config_path = os.path.expanduser("~") + "/.config/" self.preferences_path = self.config_path + self.app + ".json" self.autostart_path = self.config_path + "autostart/" + self.app + ".desktop" - self.logo_path = self.data_path + "img/manjaro-hello.png" + self.logo_path = "/usr/share/icons/manjaro.png" # Load preferences self.preferences = self.get_preferences() @@ -61,9 +61,10 @@ class ManjaroHello(): self.window = self.builder.get_object("window") # Load logos + logo = GdkPixbuf.Pixbuf.new_from_file_at_scale(self.logo_path, 75, 75, False) self.window.set_icon_from_file(self.logo_path) - self.builder.get_object("manjaroicon").set_from_file(self.logo_path) - self.builder.get_object("aboutdialog").set_logo(GdkPixbuf.Pixbuf.new_from_file(self.logo_path)) + self.builder.get_object("manjaroicon").set_from_pixbuf(logo) + self.builder.get_object("aboutdialog").set_logo(logo) # Init translation self.default_locale = "en_US"