From ff58059770915bd36d48150ec00f9ea392fa6deb Mon Sep 17 00:00:00 2001 From: Ryan Reaves Date: Wed, 21 Oct 2020 21:23:20 -0500 Subject: [PATCH] - Updated installer and removed unnecessary toggle --- xkeysnail-config/gui/kinto-gui.py | 38 ----------- xkeysnail-config/kinto.py | 12 ++-- .../trayapps/appindicator/kintotray.py | 63 ------------------- xkeysnail_service.sh | 1 - 4 files changed, 6 insertions(+), 108 deletions(-) diff --git a/xkeysnail-config/gui/kinto-gui.py b/xkeysnail-config/gui/kinto-gui.py index 45d3c87..bfd99dd 100755 --- a/xkeysnail-config/gui/kinto-gui.py +++ b/xkeysnail-config/gui/kinto-gui.py @@ -66,8 +66,6 @@ class MyWindow(Gtk.Window): ibmkb.signal_id = 0 winmackb.signal_id = 0 - menuitem_enable = Gtk.CheckMenuItem(label="Enabled") - menuitem_enable.signal_id = 0 menuitem_auto = Gtk.CheckMenuItem(label="Autostart") menuitem_auto.signal_id = 0 menuitem_systray = Gtk.CheckMenuItem(label="Tray Enabled") @@ -150,7 +148,6 @@ class MyWindow(Gtk.Window): menubar.append(menuitem_file) submenu_file = Gtk.Menu() menuitem_file.set_submenu(submenu_file) - submenu_file.append(self.menuitem_enable) submenu_file.append(self.menuitem_auto) kintotray = int(self.queryConfig('ps -aux | grep [k]intotray >/dev/null 2>&1 && echo "1" || echo "0"')) if kintotray and os.path.exists(os.environ['HOME']+'/.config/autostart/kintotray.desktop'): @@ -895,32 +892,6 @@ class MyWindow(Gtk.Window): except: Popen(['notify-send','Kinto: Error stopping Kinto!','-i','budgie-desktop-symbolic']) - def setEnable(self,button,enableKinto): - try: - if enableKinto: - res = Popen(['pgrep','xkeysnail']) - res.wait() - print(res.returncode) - - if res.returncode == 0: - pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail']) - pkillxkey.wait() - - Popen(['sudo', 'systemctl','restart','xkeysnail']) - self.menuitem_enable.disconnect(self.menuitem_enable.signal_id) - self.menuitem_enable.set_active(True) - self.menuitem_enable.signal_id = self.menuitem_enable.connect('activate',self.setEnable,False) - self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n" - self.InputToTerm(self.command) - else: - Popen(['sudo', 'systemctl','stop','xkeysnail']) - self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n" - self.menuitem_enable.disconnect(self.menuitem_enable.signal_id) - self.menuitem_enable.set_active(False) - self.menuitem_enable.signal_id = self.menuitem_enable.connect('activate',self.setEnable,True) - except CalledProcessError: - Popen(['notify-send','Kinto: Error enabling!','-i','budgie-desktop-symbolic']) - def setAutostart(self,button,autostart): try: if autostart == False: @@ -1012,15 +983,6 @@ class MyWindow(Gtk.Window): status = self.non_block_read() if self.label.get_text().strip() != self.remove_tags(status): self.label.set_markup(" " + status + " ") - if self.remove_tags(status) == 'active': - self.menuitem_enable.disconnect(self.menuitem_enable.signal_id) - self.menuitem_enable.set_active(True) - self.menuitem_enable.signal_id = self.menuitem_enable.connect('activate',self.setEnable,False) - else: - self.menuitem_enable.disconnect(self.menuitem_enable.signal_id) - self.menuitem_enable.set_active(False) - self.menuitem_enable.signal_id = self.menuitem_enable.connect('activate',self.setEnable,True) - return self.kinto_status.poll() is None def key_press_event(self, widget, event, page): diff --git a/xkeysnail-config/kinto.py b/xkeysnail-config/kinto.py index 563bdad..38c1e05 100644 --- a/xkeysnail-config/kinto.py +++ b/xkeysnail-config/kinto.py @@ -211,12 +211,12 @@ define_keymap(None,{ # K("RC-LC-f"):K("LC-Super-Up"), # popos - Maximize app # K("RC-LC-f"):K("Super-Up"), # eos - Maximize app # K("RC-LC-f"):K("Super-PAGE_UP"), # manjaro - Maximize app - # K("LC-Left"):K("C-M-End") # xfce4 - Change workspace - # K("LC-Left"):K("C-M-Left") # ub/fd - Change workspace - # K("LC-Left"):K("Super-Left") # popos/eos - Change workspace - # K("LC-Right"):K("C-M-Home") # xfce4 - Change workspace - # K("LC-Right"):K("C-M-Right") # ub/fd - Change workspace - # K("LC-Right"):K("Super-Right") # popos/eos - Change workspace + # K("LC-Left"):K("C-M-End"), # xfce4 - Change workspace + # K("LC-Left"):K("C-M-Left"), # ub/fd - Change workspace + # K("LC-Left"):K("Super-Left"), # popos/eos - Change workspace + # K("LC-Right"):K("C-M-Home"), # xfce4 - Change workspace + # K("LC-Right"):K("C-M-Right"), # ub/fd - Change workspace + # K("LC-Right"):K("Super-Right"), # popos/eos - Change workspace # Basic App hotkey functions K("RC-Q"): K("M-F4"), # Default not-popos # K("RC-Q"):K("Super-w"), # popos - Close Apps diff --git a/xkeysnail-config/trayapps/appindicator/kintotray.py b/xkeysnail-config/trayapps/appindicator/kintotray.py index 5f9bd04..212900e 100755 --- a/xkeysnail-config/trayapps/appindicator/kintotray.py +++ b/xkeysnail-config/trayapps/appindicator/kintotray.py @@ -43,7 +43,6 @@ class Indicator(): menu = Gtk.Menu() menukb = Gtk.Menu() checkbox_autostart = Gtk.CheckMenuItem('Autostart') - checkbox_enable = Gtk.CheckMenuItem('Kinto Enabled') restart = Gtk.MenuItem('Restart') stop = Gtk.MenuItem('Stop') keyboards = Gtk.MenuItem('Keyboard Types') @@ -113,26 +112,6 @@ class Indicator(): self.checkbox_autostart.set_active(False) self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,True) - # Kinto Enable - - # res = Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail']) - # res.wait() - # time.sleep(5) - - # self.checkbox_enable.set_label("Kinto Enabled") - # self.checkbox_enable.set_active(True) - # self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,False) - - if res.returncode == 0: - self.checkbox_enable.set_active(True) - # self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto-invert.svg') - self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,False) - else: - self.checkbox_enable.set_active(False) - # self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto-color.svg') - self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,True) - self.menu.append(self.checkbox_enable) - self.restart.connect('activate',self.runRestart) self.menu.append(self.restart) self.stop.connect('activate',self.runStop) @@ -301,21 +280,9 @@ class Indicator(): status = self.non_block_read().strip() nowts = int(time.time()) if (nowts - self.unixts) > 5 and (status=='active' and self.indicator.get_icon() != os.environ['HOME']+'/.config/kinto/kinto-invert.svg'): - self.checkbox_enable.disconnect(self.enable_id) - self.checkbox_enable.set_active(True) - self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,False) self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto-invert.svg') elif (nowts - self.unixts) > 5 and (status == 'inactive' and self.indicator.get_icon() != os.environ['HOME']+'/.config/kinto/kinto.svg'): - self.checkbox_enable.disconnect(self.enable_id) - self.checkbox_enable.set_active(False) - self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,True) self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto.svg') - - # print('stats: ' + status + ' last: ' + self.last_status) - # if status != self.last_status and status == 'active': - # # print('inside') - # self.refreshKB() - self.last_status = status return self.kinto_status.poll() is None @@ -633,36 +600,6 @@ class Indicator(): res.wait() return res.communicate()[0].strip().decode('UTF-8') - def setEnable(self,button,enableKinto): - try: - if enableKinto: - res = Popen(['pgrep','xkeysnail']) - res.wait() - print(res.returncode) - - if res.returncode == 0: - # Popen(['notify-send','Kinto: Err in debug mode?','-i','budgie-desktop-symbolic']) - pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail']) - pkillxkey.wait() - - Popen(['sudo', 'systemctl','restart','xkeysnail']) - self.checkbox_enable.disconnect(self.enable_id) - self.checkbox_enable.set_active(True) - self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,False) - self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto-invert.svg') - - else: - Popen(['sudo', 'systemctl','stop','xkeysnail']) - self.checkbox_enable.disconnect(self.enable_id) - self.checkbox_enable.set_active(False) - self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,True) - self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto.svg') - - self.unixts = int(time.time()) - - except CalledProcessError: - Popen(['notify-send','Kinto: Error enabling!','-i','budgie-desktop-symbolic']) - def setAutostart(self,button,autostart): try: if autostart == False: diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index fb97cbd..30a1d6f 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -236,7 +236,6 @@ yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.n yes | cp -rf ./xkeysnail-config/gui/ ~/.config/kinto/ yes | cp -nrf ./xkeysnail-config/initkb ~/.config/kinto/initkb yes | cp -rf ./xkeysnail-config/killdups.sh ~/.config/kinto/killdups.sh -yes | cp -rf ./xkeysnail-config/appleKB.sh ~/.config/kinto/appleKB.sh yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.py ~/.config/kinto/kintotray.py yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.desktop ~/.config/kinto/kintotray.desktop yes | cp -rf ./xkeysnail-config/gui/kinto.desktop ./xkeysnail-config/gui/kinto.desktop.new