From 7db6862f4f173fb66f4940dc9ab98e14d336257a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Thu, 22 Oct 2020 17:29:38 -0500 Subject: [PATCH] - Removed Budgie specific iconography from error messages --- xkeysnail-config/gui/kinto-gui.py | 26 ++++++++-------- .../trayapps/appindicator/kintotray.py | 30 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/xkeysnail-config/gui/kinto-gui.py b/xkeysnail-config/gui/kinto-gui.py index bfd99dd..0dd7a2c 100755 --- a/xkeysnail-config/gui/kinto-gui.py +++ b/xkeysnail-config/gui/kinto-gui.py @@ -503,7 +503,7 @@ class MyWindow(Gtk.Window): countkb += 1 if countkb > 1: - Popen(['notify-send','Kinto: Remove ' + str(countkb-1) + ' kb type(s)','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Remove ' + str(countkb-1) + ' kb type(s)']) return @@ -654,7 +654,7 @@ class MyWindow(Gtk.Window): Popen(restart) except CalledProcessError: - Popen(['notify-send','Kinto: Error Resetting KB Type!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error Resetting KB Type!']) def setTweaks(self,button): win = Gtk.Window() @@ -746,7 +746,7 @@ class MyWindow(Gtk.Window): restartsvc = False except CalledProcessError: - Popen(['notify-send','Kinto: Error restarting Kinto after setting tweaks!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error restarting Kinto after setting tweaks!']) if openWin and self.get_title() == "Keyboard Assistant": openWin = False win.show_all() @@ -786,7 +786,7 @@ class MyWindow(Gtk.Window): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error Resetting AltGr!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error Resetting AltGr!']) return @@ -806,7 +806,7 @@ class MyWindow(Gtk.Window): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error Resetting SublimeText remaps for VSCode!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error Resetting SublimeText remaps for VSCode!']) return def setCaps2Esc(self,button): @@ -830,7 +830,7 @@ class MyWindow(Gtk.Window): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error resetting caps2esc!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error resetting caps2esc!']) return @@ -856,7 +856,7 @@ class MyWindow(Gtk.Window): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error resetting caps2cmd!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error resetting caps2cmd!']) return @@ -875,7 +875,7 @@ class MyWindow(Gtk.Window): self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n" self.InputToTerm(self.command) except: - Popen(['notify-send','Kinto: Errror restarting Kinto!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Errror restarting Kinto!']) def runStop(self,button): try: @@ -886,11 +886,11 @@ class MyWindow(Gtk.Window): res.wait() if res.returncode == 0: - # Popen(['notify-send','Kinto: Ending Debug','-i','budgie-desktop-symbolic']) + # Popen(['notify-send','Kinto: Ending Debug']) pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail']) pkillxkey.wait() except: - Popen(['notify-send','Kinto: Error stopping Kinto!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error stopping Kinto!']) def setAutostart(self,button,autostart): try: @@ -906,7 +906,7 @@ class MyWindow(Gtk.Window): self.menuitem_auto.signal_id = self.menuitem_auto.connect('activate',self.setAutostart,False) except CalledProcessError: - Popen(['notify-send','Kinto: Error setting autostart!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error setting autostart!']) def setConfig(self,button): try: @@ -918,7 +918,7 @@ class MyWindow(Gtk.Window): Popen(['mousepad',os.environ['HOME']+'/.config/kinto/kinto.py']) except CalledProcessError: # Notify user about error on running restart commands. - Popen(['notify-send','Kinto: Error could not open config file!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error could not open config file!']) def setService(self,button): try: @@ -930,7 +930,7 @@ class MyWindow(Gtk.Window): Popen(['mousepad','/lib/systemd/system/xkeysnail.service']) except CalledProcessError: # Notify user about error on running restart commands. - Popen(['notify-send','Kinto: Error could not open config file!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error could not open config file!']) def setSysKB(self,button): if self.ostype == "XFCE": diff --git a/xkeysnail-config/trayapps/appindicator/kintotray.py b/xkeysnail-config/trayapps/appindicator/kintotray.py index 212900e..4401106 100755 --- a/xkeysnail-config/trayapps/appindicator/kintotray.py +++ b/xkeysnail-config/trayapps/appindicator/kintotray.py @@ -249,7 +249,7 @@ class Indicator(): countkb += 1 if countkb > 1: - Popen(['notify-send','Kinto: Remove ' + str(countkb-1) + ' kb type(s)','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Remove ' + str(countkb-1) + ' kb type(s)']) return @@ -451,7 +451,7 @@ class Indicator(): restartsvc = False except CalledProcessError: - Popen(['notify-send','Kinto: Error restarting Kinto after setting tweaks!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error restarting Kinto after setting tweaks!']) self.hide() self.destroy() @@ -480,7 +480,7 @@ class Indicator(): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error Resetting AltGr!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error Resetting AltGr!']) return @@ -500,7 +500,7 @@ class Indicator(): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error Resetting SublimeText remaps for VSCode!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error Resetting SublimeText remaps for VSCode!']) return def setCaps2Esc(self,button): @@ -524,7 +524,7 @@ class Indicator(): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error resetting caps2esc!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error resetting caps2esc!']) return @@ -550,7 +550,7 @@ class Indicator(): restartsvc = True except CalledProcessError: - Popen(['notify-send','Kinto: Error resetting caps2cmd!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error resetting caps2cmd!']) return @@ -563,13 +563,13 @@ class Indicator(): res.wait() if res.returncode == 0: - # Popen(['notify-send','Kinto: Ending Debug','-i','budgie-desktop-symbolic']) + # Popen(['notify-send','Kinto: Ending Debug']) pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail']) pkillxkey.wait() Popen(['sudo', 'systemctl','start','xkeysnail']) except: - Popen(['notify-send','Kinto: Error restarting Kinto!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error restarting Kinto!']) def runStop(self,button): try: @@ -580,11 +580,11 @@ class Indicator(): res.wait() if res.returncode == 0: - # Popen(['notify-send','Kinto: Ending Debug','-i','budgie-desktop-symbolic']) + # Popen(['notify-send','Kinto: Ending Debug']) pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail']) pkillxkey.wait() except: - Popen(['notify-send','Kinto: Error stopping Kinto!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error stopping Kinto!']) def runDebug(self,button,opendebug): try: @@ -593,7 +593,7 @@ class Indicator(): else: Popen([os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py']) except: - Popen(['notify-send','Kinto: Error opening Kinto!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error opening Kinto!']) def queryConfig(self,query): res = Popen(query, stdout=PIPE, stderr=None, shell=True) @@ -614,7 +614,7 @@ class Indicator(): self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,False) except CalledProcessError: - Popen(['notify-send','Kinto: Error setting autostart!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error setting autostart!']) def setConfig(self,button): try: @@ -626,7 +626,7 @@ class Indicator(): Popen(['mousepad',os.environ['HOME']+'/.config/kinto/kinto.py']) except CalledProcessError: # Notify user about error on running restart commands. - Popen(['notify-send','Kinto: Error could not open config file!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error could not open config file!']) def setService(self,button): try: @@ -638,7 +638,7 @@ class Indicator(): Popen(['mousepad','/lib/systemd/system/xkeysnail.service']) except CalledProcessError: # Notify user about error on running restart commands. - Popen(['notify-send','Kinto: Error could not open config file!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error could not open config file!']) def setKB(self,button,kbtype): try: @@ -685,7 +685,7 @@ class Indicator(): Popen(restart) except CalledProcessError: - Popen(['notify-send','Kinto: Error Resetting KB Type!','-i','budgie-desktop-symbolic']) + Popen(['notify-send','Kinto: Error Resetting KB Type!']) def setSysKB(self,button): if self.ostype == "XFCE":