From 45d413a1ba9f87c74afff57891bc1bd25aa2cd01 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 22 Jun 2020 22:15:15 -0500 Subject: [PATCH 01/14] - Added intellij keymaps to autohotkey --- windows/kinto.ahk | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/windows/kinto.ahk b/windows/kinto.ahk index 8304a4d..99da4df 100644 --- a/windows/kinto.ahk +++ b/windows/kinto.ahk @@ -100,6 +100,9 @@ GroupAdd, vscode, ahk_exe Code.exe GroupAdd, vstudio, ahk_exe devenv.exe +GroupAdd, intellij, ahk_exe idea.exe +GroupAdd, intellij, ahk_exe idea64.exe + ; New AltTab and CtrlTab fix *tab:: { @@ -201,6 +204,94 @@ $^+Right::Send +{End} ; Cmd+Space Alternative ^Space::Send ^{Esc} +#IfWinActive ahk_group intellij + ; General + ^0::Send !{0} ;Open corresponding tool window + ^1::Send !{1} ;Open corresponding tool window + ^2::Send !{2} ;Open corresponding tool window + ^3::Send !{3} ;Open corresponding tool window + ^4::Send !{4} ;Open corresponding tool window + ^5::Send !{5} ;Open corresponding tool window + ^6::Send !{6} ;Open corresponding tool window + ^7::Send !{7} ;Open corresponding tool window + ^8::Send !{8} ;Open corresponding tool window + ^9::Send !{9} ;Open corresponding tool window + #`::Send ^` ;Quick switch current scheme + ^,::Send ^!s ;Open Settings dialog + ^;::Send ^!+s ;Open Project Structure dialog + ; Debugging + ^!r::Send F9 ;Resume program + ; Search/Replace + ^g::Send F3 ;Find next + ^+F3::Send Shift+F3 ;Find previous + #g::Send !j ;Select next occurrence + ^#g::Send ^!+j ;Select all occurrences + #+g::Send !+j ;Unselect occurrence + ; Editing + #Space::Send ^Space ;Basic code completion + #+Space::Send ^+Space ;Smart code completion + #j::Send ^q ;Quick documentation lookup + ^n::Send !{Insert} ;Generate code... + #o::Send ^o ;Override methods + #i::Send ^i ;Implement methods + !Up::Send ^w ;Extend selection + !Down::Send ^+w ;Shrink selection + #+q::Send !q ;Context info + #!o::Send ^!o ;Optimize imports + #!i::Send ^!i ;Auto-indent line(s) + ^Backspace::Send ^y ;Delete line at caret + #+j::Send ^+j ;Smart line join + !Delete::Send ^Delete ;Delete to word end + !Backspace::Send ^Backspace ;Delete to word start + ^+::Send ^{NumpadAdd} ;Expand code block + ^-::Send ^{NumpadSub} ;Collapse code block + ^++::Send ^+{NumpadAdd} ;Expand all + ^+-::Send ^+{NumpadSub} ;Collapse all + ^w::Send ^F4 ;Close active editor tab + ; Refactoring + ^Delete::Send !Delete ;Safe Delete + ^T::Send ^!+T ;Refactor this + ; Navigation + ^o::Send ^n ;Go to class + ^+o::Send ^+n ;Go to file + ^!o::Send ^!+n ;Go to symbol + #Right::Send !Right ;Go to next editor tab + #Left::Send !Left ;Go to previous editor tab + #l::Send ^g ;Go to line + #e::Send ^e ;Recent files popup + !Space::Send ^+i ;Open quick definition lookup + ^Y::Send ^+i ;Open quick definition lookup + #+b::Send ^+b ;Go to type declaration + #Up::Send !Up ;Go to previous + #Down::Send !Down ;Go to next method + #h::Send ^h ;Type hierarchy + #!h::Send ^!h ;Call hierarchy + ^Down::Send ^Enter ;Edit source/View source + !Home::Send !Home ;Show navigation bar + F2::Send F11 ;Toggle bookmark + #F3::Send ^F11 ;Toggle bookmark with mnemonic + #0::Send ^{0} ;Go to numbered bookmark + #1::Send ^{1} ;Go to numbered bookmark + #2::Send ^{2} ;Go to numbered bookmark + #3::Send ^{3} ;Go to numbered bookmark + #4::Send ^{4} ;Go to numbered bookmark + #5::Send ^{5} ;Go to numbered bookmark + #6::Send ^{6} ;Go to numbered bookmark + #7::Send ^{7} ;Go to numbered bookmark + #8::Send ^{8} ;Go to numbered bookmark + #9::Send ^{9} ;Go to numbered bookmark + ^F3::Send +F11 ;Show bookmarks + ; Compile and Run + #!r::Send !+F10 ;Select configuration and run + #!d::Send !+F9 ;Select configuration and debug + #r::Send +F10 ;Run + #d::Send +F9 ;Debug + #+r::Send ^+F10 ;Run context configuration from editor + #+d::Send ^+F9 ;Debug context configuration from editor + ; VCS/Local History + #v::Send !` ;VCS quick popup +#If + ; Sublime Text Remaps for VS Code #IfWinActive ahk_group vscode ; Remap Ctrl+Shift to behave like macOS Sublimetext From d727489d4a8088ff5661c26c221e178c96390794 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 13 Jul 2020 13:26:02 -0500 Subject: [PATCH 02/14] - WIP adding proper closing of xkeysnail on logoff --- xkeysnail-config/logoff.sh | 6 ++++++ xkeysnail-config/xkeysnail.desktop | 2 +- xkeysnail-config/xkeysnail.service | 5 ++--- xkeysnail_service.sh | 32 ++++++++++++++++-------------- 4 files changed, 26 insertions(+), 19 deletions(-) create mode 100755 xkeysnail-config/logoff.sh diff --git a/xkeysnail-config/logoff.sh b/xkeysnail-config/logoff.sh new file mode 100755 index 0000000..31ec1b3 --- /dev/null +++ b/xkeysnail-config/logoff.sh @@ -0,0 +1,6 @@ +dbus-monitor --session "type='signal',interface='org.gnome.SessionManager.Logout'" | grep '1' | +while read x; do + echo "$x" + sudo systemctl stop xkeysnail + break +done diff --git a/xkeysnail-config/xkeysnail.desktop b/xkeysnail-config/xkeysnail.desktop index 4ff6059..5e8a1e9 100644 --- a/xkeysnail-config/xkeysnail.desktop +++ b/xkeysnail-config/xkeysnail.desktop @@ -2,7 +2,7 @@ Name=Kinto_xkey GenericName=Kinto_xkey Comment=Make Linux Type Like it's a Mac -Exec=/bin/bash -c "{xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail" +Exec=/bin/bash -c "{xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail && {homedir}/.config/kinto/logoff.sh" Terminal=false Type=Application X-GNOME-Autostart-enabled=true \ No newline at end of file diff --git a/xkeysnail-config/xkeysnail.service b/xkeysnail-config/xkeysnail.service index c7c6276..b6e3c3f 100644 --- a/xkeysnail-config/xkeysnail.service +++ b/xkeysnail-config/xkeysnail.service @@ -4,9 +4,8 @@ Description=xkeysnail [Service] Type=simple KillMode=process -ExecStartPre=/bin/bash -c "{xhost} +SI:localuser:root && /sbin/runuser -l {username} -c {homedir}/.config/kinto/prexk.sh" -ExecStart=/usr/bin/sudo /bin/bash -c '{experimental-caret}{homedir}/.config/kinto/xkeystart.sh /tmp/kinto/xkeysnail/kinto.py' -ExecStop=/bin/bash -c 'me=$$;ps -ef | grep \'[t]mp/kinto\' | awk -v me=$me \'$2 != me {print $2}\' | xargs kill;/usr/bin/killall dbus-monitor;/usr/bin/killall xkeysnail;{kill-caret}' +ExecStart=/usr/bin/sudo /bin/bash -c '/usr/bin/xhost +SI:localuser:root && /usr/local/bin/xkeysnail --quiet --watch {homedir}/.config/kinto/kinto.py' +ExecStop=/usr/bin/killall xkeysnail Restart=on-failure RestartSec=3 Environment=DISPLAY={displayid} diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index bbe8ce9..61c6e42 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -181,21 +181,21 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 * ) break;; esac done - branch=$(git rev-parse --abbrev-ref HEAD) - if [ "$branch" == "dev" ] || [ "$branch" == "alpha" ];then - while true; do - read -rep $'\nExperimental Support for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right)?\n(Keys could get stuck, switch windows or press ctrl &/or super to release) (y/n)\n' yn - case $yn in - [Yy]* ) exp='/sbin/runuser -l {username} -c "export DISPLAY={displayid};{homedir}/.config/kinto/caret_status_xkey.sh\&";'; expsh='"{homedir}/.config/kinto/caret_status_xkey.sh"'; break;; - [Nn]* ) exp=" "; expsh=" " break;; - # * ) echo "Please answer yes or no.";; - esac - done - else - echo -e "\nSupport for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right) disabled on $branch w/ xkeysnail \n" - exp=" " - expsh=" " - fi + # branch=$(git rev-parse --abbrev-ref HEAD) + # if [ "$branch" == "dev" ] || [ "$branch" == "alpha" ];then + # while true; do + # read -rep $'\nExperimental Support for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right)?\n(Keys could get stuck, switch windows or press ctrl &/or super to release) (y/n)\n' yn + # case $yn in + # [Yy]* ) exp='/sbin/runuser -l {username} -c "export DISPLAY={displayid};{homedir}/.config/kinto/caret_status_xkey.sh\&";'; expsh='"{homedir}/.config/kinto/caret_status_xkey.sh"'; break;; + # [Nn]* ) exp=" "; expsh=" " break;; + # # * ) echo "Please answer yes or no.";; + # esac + # done + # else + # echo -e "\nSupport for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right) disabled on $branch w/ xkeysnail \n" + exp=" " + expsh=" " + # fi sudo systemctl enable xkeysnail >/dev/null 2>&1 if ! [ -x "$(command -v inotifywait)" ]; then echo "Will need to install inotify-tools to restart key remapper live for config file changes..." @@ -238,6 +238,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/autostart/xkeysnail.desktop yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh + yes | cp -rf ./xkeysnail-config/logoff.sh ~/.config/kinto/logoff.sh yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new yes | cp -rf ./xkeysnail-config/prexk.sh ~/.config/kinto/prexk.sh @@ -260,6 +261,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/autostart/xkeysnail.desktop sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/autostart/xkeysnail.desktop + sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/autostart/xkeysnail.desktop sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./xkeysnail-config/xkeysnail.service.new sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh From e8d9ae9e8e4c2cc0b63ad6f8d2b3853add29c5cd Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Tue, 14 Jul 2020 00:52:00 -0500 Subject: [PATCH 03/14] - Updated xkeysnail service to properly kill any xkeysnail instances running --- xkeysnail-config/xkeysnail.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkeysnail-config/xkeysnail.service b/xkeysnail-config/xkeysnail.service index b6e3c3f..6935d75 100644 --- a/xkeysnail-config/xkeysnail.service +++ b/xkeysnail-config/xkeysnail.service @@ -5,7 +5,7 @@ Description=xkeysnail Type=simple KillMode=process ExecStart=/usr/bin/sudo /bin/bash -c '/usr/bin/xhost +SI:localuser:root && /usr/local/bin/xkeysnail --quiet --watch {homedir}/.config/kinto/kinto.py' -ExecStop=/usr/bin/killall xkeysnail +ExecStop=/usr/bin/pkill -f xkeysnail Restart=on-failure RestartSec=3 Environment=DISPLAY={displayid} From 0c5a9775ec8ae5b9ebf44ebdf5fae81c10a4c473 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Thu, 30 Jul 2020 02:30:02 -0500 Subject: [PATCH 04/14] - Prepping for Ubuntu Budgie system tray --- xkeysnail-config/limitedadmins | 1 + xkeysnail-config/logoff.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xkeysnail-config/limitedadmins b/xkeysnail-config/limitedadmins index abb66b0..0818189 100644 --- a/xkeysnail-config/limitedadmins +++ b/xkeysnail-config/limitedadmins @@ -3,3 +3,4 @@ %{username} ALL=NOPASSWD: {systemctl} start xkeysnail %{username} ALL=NOPASSWD: {systemctl} stop xkeysnail %{username} ALL=NOPASSWD: {systemctl} status xkeysnail +%{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail \ No newline at end of file diff --git a/xkeysnail-config/logoff.sh b/xkeysnail-config/logoff.sh index 31ec1b3..ac772a7 100755 --- a/xkeysnail-config/logoff.sh +++ b/xkeysnail-config/logoff.sh @@ -1,6 +1,7 @@ +#!/bin/bash dbus-monitor --session "type='signal',interface='org.gnome.SessionManager.Logout'" | grep '1' | while read x; do - echo "$x" + # echo "$x" sudo systemctl stop xkeysnail - break + exit 0 done From b1d4aad618cd3a6e0446605eba1babbd8a6184c9 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Thu, 30 Jul 2020 15:42:47 -0500 Subject: [PATCH 05/14] - Added autostart flag for linux system tray apps --- xkeysnail-config/kinto.py | 1 + 1 file changed, 1 insertion(+) diff --git a/xkeysnail-config/kinto.py b/xkeysnail-config/kinto.py index 3ad6182..897d81b 100644 --- a/xkeysnail-config/kinto.py +++ b/xkeysnail-config/kinto.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# autostart = true import re from xkeysnail.transform import * From 394454aee2f8fa20c9acf96422a2e587c0f6c598 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 31 Jul 2020 13:30:29 -0500 Subject: [PATCH 06/14] - Added Linux system tray files WIP --- .../{logoff.sh => gnome_logoff.sh} | 0 .../BudgieApplet/KintoApplet/Kinto.plugin | 9 + .../BudgieApplet/KintoApplet/kinto.py | 272 +++++++ .../trayapps/BudgieApplet/LICENSE | 674 ++++++++++++++++++ .../trayapps/BudgieApplet/Makefile | 22 + .../trayapps/BudgieApplet/README.md | 4 + .../BudgieApplet/icons/kinto-color.svg | 41 ++ .../BudgieApplet/icons/kinto-invert.svg | 28 + .../trayapps/BudgieApplet/icons/kinto.svg | 27 + .../trayapps/BudgieApplet/install-applet.sh | 23 + .../trayapps/BudgieApplet/remove-applet.sh | 26 + .../GnomeXFCE-Notifier/kintonotify.glade | 36 + .../GnomeXFCE-Notifier/kintonotify.py | 102 +++ xkeysnail_service.sh | 2 +- 14 files changed, 1265 insertions(+), 1 deletion(-) rename xkeysnail-config/{logoff.sh => gnome_logoff.sh} (100%) create mode 100644 xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin create mode 100644 xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py create mode 100644 xkeysnail-config/trayapps/BudgieApplet/LICENSE create mode 100644 xkeysnail-config/trayapps/BudgieApplet/Makefile create mode 100644 xkeysnail-config/trayapps/BudgieApplet/README.md create mode 100644 xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color.svg create mode 100644 xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert.svg create mode 100644 xkeysnail-config/trayapps/BudgieApplet/icons/kinto.svg create mode 100755 xkeysnail-config/trayapps/BudgieApplet/install-applet.sh create mode 100755 xkeysnail-config/trayapps/BudgieApplet/remove-applet.sh create mode 100644 xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade create mode 100755 xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py diff --git a/xkeysnail-config/logoff.sh b/xkeysnail-config/gnome_logoff.sh similarity index 100% rename from xkeysnail-config/logoff.sh rename to xkeysnail-config/gnome_logoff.sh diff --git a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin new file mode 100644 index 0000000..f1453f2 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin @@ -0,0 +1,9 @@ +[Plugin] +Loader=python3 +Module=kinto +Name=Kinto +Description=Kinto Applet +Authors=Ben Reaves +Copyright=Copyright © 2020 Ben Reaves +Website=github.com/rbreaves +Icon=kinto-invert diff --git a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py new file mode 100644 index 0000000..ac888dd --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py @@ -0,0 +1,272 @@ +#!/usr/bin/env python3 + +# Copyright (C) 2017 Gopikrishnan R + +""" + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +""" + +import subprocess,time,os,gi.repository +gi.require_version('Budgie','1.0') +gi.require_version('Gtk','3.0') +from gi.repository import Budgie, GObject, Gtk + +class Kinto(GObject.GObject, Budgie.Plugin): + + __gtype_name__ = "Kinto" + + def __init__(self): + + GObject.Object.__init__(self) + + def do_get_panel_widget(self, uuid): + + return KintoApplet(uuid) + + + + +class KintoApplet(Budgie.Applet): + + homedir = os.path.expanduser("~") + kconfig = homedir+"/.config/kinto/kinto.py" + + box = Gtk.EventBox() + revealer=Gtk.Revealer() # Contains individual restart actions + button=Gtk.Button() # Restart Button, Restarts both panel & WM + button.set_relief(Gtk.ReliefStyle.NONE) + button_arrow=Gtk.Button() # Down arrow + button_arrow.set_relief(Gtk.ReliefStyle.NONE) + img = Gtk.Image.new_from_icon_name("kinto-invert", Gtk.IconSize.BUTTON) + img_arrow=Gtk.Image.new_from_icon_name('pan-down-symbolic',Gtk.IconSize.BUTTON) + revealed=False # Whether Gtk.Revealer is open or not. + checkbox_autostart = Gtk.CheckButton() + button_suspend = Gtk.Button() + button_winmac = Gtk.Button() + button_setscale = Gtk.Button() + button_suspend.set_relief(Gtk.ReliefStyle.NONE) + button_winmac.set_relief(Gtk.ReliefStyle.NONE) + button_setscale.set_relief(Gtk.ReliefStyle.NONE) + suspend_id=0 + winmac_id=0 + chkautostart_id=0 + autostart_bool = False + + subprocess.Popen(['sh',homedir+'/.config/kinto/logoff.sh']) + + with open(kconfig) as configfile: + autostart_line = configfile.read().split('\n')[1] + + if "autostart = true" in autostart_line.casefold(): + autostart_bool = True + + def __init__(self,uuid): + Budgie.Applet.__init__(self) + self.initUI() + + def initUI(self): + self.popover = Budgie.Popover.new(self.box) + seperator = Gtk.Separator(orientation=Gtk.Orientation.VERTICAL) + self.hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0) # To store the Reset(Both) button and arrow + self.vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) # Main VBox + self.vbox_buttons = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) # Vbox inside revealer + + self.box.set_tooltip_text("Kinto") + + self.checkbox_autostart.set_label("Autostart") + # self.checkbox_autostart.modify_fg(Gtk.STATE_NORMAL, Gtk.Gdk.color_parse('#366B7E')); + if self.autostart_bool: + subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) + self.checkbox_autostart.set_active(True) + self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,False) + else: + subprocess.Popen(['sudo', 'systemctl','stop','xkeysnail']) + self.checkbox_autostart.set_active(False) + self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,True) + # self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,True) + self.hbox.pack_start(self.checkbox_autostart,True,False,5) + # self.hbox.pack_start(self.button_autostart,True,False,5) + self.hbox.pack_end(seperator,True,False,0) + self.vbox.pack_start(self.hbox,True,False,5) + # self.vbox.pack_start(seperator,True,False,0) + + time.sleep(5) + res = subprocess.Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail']) + res.wait() + + if res.returncode == 0: + # self.button_suspend = Gtk.Button("Suspend Kinto") + self.button_suspend.set_label("Suspend Kinto") + self.img.set_from_icon_name("kinto-invert", Gtk.IconSize.BUTTON) + self.suspend_id = self.button_suspend.connect("clicked",self.suspend,True) + else: + # self.button_suspend = Gtk.Button("Enable Kinto") + self.button_suspend.set_label("Enable Kinto") + # self.img.set_from_icon_name("kinto", Gtk.IconSize.BUTTON) + self.img.set_from_icon_name("kinto-color", Gtk.IconSize.BUTTON) + self.suspend_id = self.button_suspend.connect("clicked",self.suspend,False) + self.vbox.pack_start(self.button_suspend,True,False,5) + # self.vbox.pack_start(seperator,True,False,0) + + self.box.add(self.img) + self.box.connect("button-press-event", self.on_press) + self.add(self.box) + + command = "perl -ne 'print if /(#.*)(# Mac)\n/' ~/.config/kinto/kinto.py | wc -l" + res = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=None, shell=True) + res.wait() + res = res.communicate()[0] + + if True: + self.button_winmac.set_label("Set Win/Mac KB Type") + self.winmac_id = self.button_winmac.connect("clicked",self.setKB,"winmac") + else: + self.button_winmac.set_label("Set Mac Only KB Type") + self.winmac_id = self.button_winmac.connect("clicked",self.setKB,"mac") + self.vbox.pack_start(self.button_winmac,True,False,5) + # self.vbox.pack_start(seperator,True,False,0) + # self.hbox.pack_end(self.button_arrow,False,False,5) + + # if res.returncode == 0: + # self.button_setscale.set_label("Set 1x DPI Scale") + # self.button_setscale.connect("clicked",self.setScale,1) + # else: + # self.button_setscale.set_label("Set 2x DPI Scale") + # self.button_setscale.connect("clicked",self.setScale,2) + # self.vbox.pack_start(self.button_setscale,True,False,5) + # self.vbox.pack_start(seperator,True,False,0) + + self.vbox.pack_start(self.hbox,False,False,5) + self.vbox.pack_start(self.revealer,False,False,0) + + self.popover.add(self.vbox) + + self.popover.get_child().show_all() + + self.box.show_all() + + self.show_all() + + + + def on_press(self, box, e): + + if e.button != 1: + return Gdk.EVENT_PROPAGATE + + if self.popover.get_visible(): + self.revealer.set_visible(False) + + else: + self.revealer.set_reveal_child(False) # Close Revealer (if open) before showing popover + self.img_arrow.set_from_icon_name('pan-down-symbolic',Gtk.IconSize.BUTTON) # Reset to pan-down icon + self.manager.show_popover(self.box) + + def do_update_popovers(self, manager): + + self.manager = manager + self.manager.register_popover(self.box, self.popover) + + def change_icon(self): + """ Change arrow to down/up """ + + if not self.revealed: + self.img_arrow.set_from_icon_name('pan-up-symbolic',Gtk.IconSize.BUTTON) + self.revealed=True + + else: + self.img_arrow.set_from_icon_name('pan-down-symbolic',Gtk.IconSize.BUTTON) + self.revealed=False + + def revealer_show(self,button): + """ Open/Close the revealer """ + + if self.revealer.get_reveal_child(): + self.change_icon() + self.revealer.set_reveal_child(False) + + else: + self.change_icon() + self.revealer.set_reveal_child(True) + + def suspend(self,button,suspendKinto): + try: + if suspendKinto: + subprocess.Popen(['sudo', 'systemctl','stop','xkeysnail']) + self.button_suspend.set_label("Enable Kinto") + self.img.set_from_icon_name("kinto-color", Gtk.IconSize.BUTTON) + self.button_suspend.disconnect(self.suspend_id) + self.suspend_id = self.button_suspend.connect("clicked",self.suspend,False) + self.box.add(self.img) + + else: + subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) + self.button_suspend.set_label("Suspend Kinto") + self.img.set_from_icon_name("kinto-invert", Gtk.IconSize.BUTTON) + self.button_suspend.disconnect(self.suspend_id) + self.suspend_id = self.button_suspend.connect("clicked",self.suspend,True) + self.box.add(self.img) + + except subprocess.CalledProcessError: # Notify user about error on running restart commands. + subprocess.Popen(['notify-send','Kinto: Error Suspending!','-i','budgie-desktop-symbolic']) + + def setKB(self,button,kbtype): + try: + if kbtype == "winmac": + label = "Set Mac KB Type" + connect = "mac" + + setwinmac = ['s/^(\s{3})(\s{1}#)(.*# WinMac\n|.*# WinMac -)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac\n|Mac -)/ $3$7$6$7$8/g'] + + else: + label = "Set Win/Mac KB Type" + connect = "winmac" + + setwinmac = ['s/^(\s{3})(\s{1}#)(.*# Mac\n|.*# Mac -)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac)/ $3$7$6$7$8/g'] + + restart = ['sudo', 'systemctl','restart','xkeysnail'] + # restart = "sudo systemctl restart xkeysnail" + # stop = "sudo systemctl stop xkeysnail" + # start = "sudo systemctl start xkeysnail" + cmds = ['perl','-pi','-e']+setwinmac+[self.kconfig] + + subprocess.Popen(cmds) + + cmdsTerm = subprocess.Popen(cmds) + cmdsTerm.wait() + + subprocess.Popen(restart) + # cmdsTerm.kill() + # stopTerm = subprocess.Popen(stop,shell=True) + # stopTerm.wait() + # stopTerm.kill() + # time.sleep(2) + # startTerm = subprocess.Popen(start,shell=True) + # startTerm.wait() + # startTerm.kill() + + self.button_winmac.set_label(label) + self.button_winmac.disconnect(self.winmac_id) + self.winmac_id = self.button_winmac.connect("clicked",self.setKB,connect) + + except subprocess.CalledProcessError: # Notify user about error on running restart commands. + subprocess.Popen(['notify-send','Kinto: Error Reseting KB Type!','-i','budgie-desktop-symbolic']) + + def setAutostart(self,button,kbtype): + print('test') + + def setScale(self,button,scale): + print("scale") + +#END diff --git a/xkeysnail-config/trayapps/BudgieApplet/LICENSE b/xkeysnail-config/trayapps/BudgieApplet/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/xkeysnail-config/trayapps/BudgieApplet/Makefile b/xkeysnail-config/trayapps/BudgieApplet/Makefile new file mode 100644 index 0000000..5fd8477 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/Makefile @@ -0,0 +1,22 @@ +#Just for building packages. (eopkg for solus) + +DESTDIR ?= + +INSTALLPATH ?= /usr/lib64/budgie-desktop/plugins + +ICONPATH ?= /usr/share/icons/hicolor/scalable/apps + +budgie-restart-applet: + echo "Nothing to do" +install: budgie-restart-applet + mkdir -p $(DESTDIR)$(INSTALLPATH)/org.budgie-desktop.applet.budgierestart + mkdir -p $(DESTDIR)$(ICONPATH) + #rm -f $(ICONDIR)/icon-theme.cache + for file in BudgieRestart/*; \ + do \ + install -m 0755 "$$file" $(DESTDIR)$(INSTALLPATH)/org.budgie-desktop.applet.budgierestart/; \ + done + for file in icons/*; \ + do \ + install -m 0755 "$$file" $(DESTDIR)$(ICONPATH)/; \ + done diff --git a/xkeysnail-config/trayapps/BudgieApplet/README.md b/xkeysnail-config/trayapps/BudgieApplet/README.md new file mode 100644 index 0000000..e62aaac --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/README.md @@ -0,0 +1,4 @@ +# Kinto Applet + +Based on the open sourced app Budgie Restart Applet originally written by -Gopikrishnan R (github.com/gkr09) + diff --git a/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color.svg b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color.svg new file mode 100644 index 0000000..de1e8b8 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color.svg @@ -0,0 +1,41 @@ + + + + +Symbolic Icons + + + + + + + + + kinto-final + + + + + + + + + + + + + diff --git a/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert.svg b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert.svg new file mode 100644 index 0000000..5b80e19 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert.svg @@ -0,0 +1,28 @@ + + + + +Symbolic Icons + + + + + + + + + + + + + + + + diff --git a/xkeysnail-config/trayapps/BudgieApplet/icons/kinto.svg b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto.svg new file mode 100644 index 0000000..27821e5 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto.svg @@ -0,0 +1,27 @@ + + + + +Symbolic Icons + + + + + + + + + + + + + diff --git a/xkeysnail-config/trayapps/BudgieApplet/install-applet.sh b/xkeysnail-config/trayapps/BudgieApplet/install-applet.sh new file mode 100755 index 0000000..a9b56ce --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/install-applet.sh @@ -0,0 +1,23 @@ +#!/bin/bash +#Budgie Kinto Applet +#This script basically just copies the files to approproate directories. + +APPLETDIR=/usr/lib/budgie-desktop/plugins + +ICONDIR=/usr/share/pixmaps + +PROJECT_NAME='org.budgie-desktop.applet.kinto' + +echo "Installing Budgie Kinto Applet....." + +mkdir -p $APPLETDIR/$PROJECT_NAME + +for file in KintoApplet/*;do + install -m 0755 "$file" $APPLETDIR/$PROJECT_NAME/ +done + +for file in icons/*; do + install -m 0755 "$file" $ICONDIR/ +done + +echo "Finished Installing Applet. Restart or Re-login to find the applet in Budgie." diff --git a/xkeysnail-config/trayapps/BudgieApplet/remove-applet.sh b/xkeysnail-config/trayapps/BudgieApplet/remove-applet.sh new file mode 100755 index 0000000..9b85198 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/remove-applet.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +APPLETDIR=/usr/lib/budgie-desktop/plugins + +ICONDIR=/usr/share/pixmaps + +PROJECT_NAME='org.budgie-desktop.applet.kinto' + +echo "Removing Budgie Kinto Applet....." + +mkdir -p $APPLETDIR/$PROJECT_NAME + +for file in $APPLETDIR/$PROJECT_NAME/*;do + echo "rm $file" + # rm $APPLETDIR/$PROJECT_NAME/$file +done + +sudo rm -rf $APPLETDIR/$PROJECT_NAME + +for file in icons/*; do + file=${file//icons/} + echo "rm $ICONDIR$file" + sudo rm $ICONDIR/$file +done + +echo "Finished Removing Kinto Applet. Restart or Re-login to find the applet in Budgie." \ No newline at end of file diff --git a/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade b/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade new file mode 100644 index 0000000..6c2a28a --- /dev/null +++ b/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade @@ -0,0 +1,36 @@ + + + + + + True + False + + + True + False + Show pop-up + True + + + + + + True + False + Show/hide window + True + + + + + + True + False + Quit + True + + + + + diff --git a/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py b/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py new file mode 100755 index 0000000..e492907 --- /dev/null +++ b/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py @@ -0,0 +1,102 @@ +#!/usr/bin/env python3 + +# Based on +# +# gtk-example.py +# (c) Aleksander Alekseev 2016 +# http://eax.me/ +# +# Additions made by Ben Reaves +# 2020 +# http://kinto.sh +# + +import signal +import os +import gi +gi.require_version('Gtk', '3.0') +gi.require_version('Notify', '0.7') +from gi.repository import Gtk +from gi.repository import Notify + +APPID = "kinto" +CURRDIR = os.path.dirname(os.path.abspath(__file__)) +# could be PNG or SVG as well +ICON = os.path.join(CURRDIR, '../icons/kinto-invert.svg') +# ICON = Gtk.Image.new_from_icon_name("kinto-invert", Gtk.IconSize.BUTTON) + +# Cross-platform tray icon implementation +# See: +# * http://ubuntuforums.org/showthread.php?t=1923373#post11902222 +# * https://github.com/syncthing/syncthing-gtk/blob/master/syncthing_gtk/statusicon.py +class TrayIcon: + + def __init__(self, appid, icon, menu): + self.menu = menu + + APPIND_SUPPORT = 1 + try: + from gi.repository import AppIndicator3 + except: + APPIND_SUPPORT = 0 + + if APPIND_SUPPORT == 1: + self.ind = AppIndicator3.Indicator.new( + appid, icon, + AppIndicator3.IndicatorCategory.APPLICATION_STATUS) + self.ind.set_status(AppIndicator3.IndicatorStatus.ACTIVE) + self.ind.set_menu(self.menu) + else: + self.ind = Gtk.StatusIcon() + self.ind.set_from_file(icon) + self.ind.connect('popup-menu', self.onPopupMenu) + + def onPopupMenu(self, icon, button, time): + self.menu.popup(None, None, Gtk.StatusIcon.position_menu, icon, + button, time) + + +class Handler: + + def __init__(self): + self.window_is_hidden = False + + def onShowButtonClicked(self, button): + msg = "Clicked: " + entry.get_text() + dialog = Gtk.MessageDialog(window, 0, Gtk.MessageType.INFO, + Gtk.ButtonsType.OK, msg) + dialog.run() + dialog.destroy() + + def onNotify(self, *args): + Notify.Notification.new("Notification", "Hello!", ICON).show() + + def onShowOrHide(self, *args): + if self.window_is_hidden: + window.show() + else: + window.hide() + + self.window_is_hidden = not self.window_is_hidden + + def onQuit(self, *args): + Notify.uninit() + Gtk.main_quit() + +# Handle pressing Ctr+C properly, ignored by default +signal.signal(signal.SIGINT, signal.SIG_DFL) + +builder = Gtk.Builder() +builder.add_from_file('kintonotify.glade') +builder.connect_signals(Handler()) + +# window = builder.get_object('window1') +# window.set_icon_from_file(ICON) +# window.show_all() + +entry = builder.get_object('entry1') +menu = builder.get_object('menu1') +icon = TrayIcon(APPID, ICON, menu) +Notify.init(APPID) + +Gtk.main() diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index 61c6e42..37df637 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -238,7 +238,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/autostart/xkeysnail.desktop yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh - yes | cp -rf ./xkeysnail-config/logoff.sh ~/.config/kinto/logoff.sh + yes | cp -rf ./xkeysnail-config/gnome_logoff.sh ~/.config/kinto/gnome_logoff.sh yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new yes | cp -rf ./xkeysnail-config/prexk.sh ~/.config/kinto/prexk.sh From 83aaca7f6b195b754a76293f035c6c691b7551c1 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 31 Jul 2020 13:35:17 -0500 Subject: [PATCH 07/14] - Added kinto solid black svg icon --- .../BudgieApplet/icons/kinto-solid.svg | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid.svg diff --git a/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid.svg b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid.svg new file mode 100644 index 0000000..0f86c4b --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid.svg @@ -0,0 +1,25 @@ + + + +Symbolic Icons + + + + + + + + + + + + + + + + From 57d56261ed19f06240d56cde528e05e3e194dd1f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 31 Jul 2020 21:22:50 -0500 Subject: [PATCH 08/14] - WIP Updated installer to setup budgie system tray --- xkeysnail-config/limitedadmins | 2 +- .../BudgieApplet/KintoApplet/Kinto.plugin | 2 +- .../BudgieApplet/KintoApplet/kinto.py | 6 +- xkeysnail-config/xkeysnail.service | 1 - xkeysnail_service.sh | 78 ++++++++++++++----- 5 files changed, 62 insertions(+), 27 deletions(-) diff --git a/xkeysnail-config/limitedadmins b/xkeysnail-config/limitedadmins index 0818189..7ccec01 100644 --- a/xkeysnail-config/limitedadmins +++ b/xkeysnail-config/limitedadmins @@ -3,4 +3,4 @@ %{username} ALL=NOPASSWD: {systemctl} start xkeysnail %{username} ALL=NOPASSWD: {systemctl} stop xkeysnail %{username} ALL=NOPASSWD: {systemctl} status xkeysnail -%{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail \ No newline at end of file +%{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail diff --git a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin index f1453f2..2c915b6 100644 --- a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin +++ b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/Kinto.plugin @@ -6,4 +6,4 @@ Description=Kinto Applet Authors=Ben Reaves Copyright=Copyright © 2020 Ben Reaves Website=github.com/rbreaves -Icon=kinto-invert +Icon=kinto-solid diff --git a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py index ac888dd..c1937c3 100644 --- a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py +++ b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py @@ -63,7 +63,7 @@ class KintoApplet(Budgie.Applet): chkautostart_id=0 autostart_bool = False - subprocess.Popen(['sh',homedir+'/.config/kinto/logoff.sh']) + # subprocess.Popen(['sh',homedir+'/.config/kinto/logoff.sh']) with open(kconfig) as configfile: autostart_line = configfile.read().split('\n')[1] @@ -87,11 +87,11 @@ class KintoApplet(Budgie.Applet): self.checkbox_autostart.set_label("Autostart") # self.checkbox_autostart.modify_fg(Gtk.STATE_NORMAL, Gtk.Gdk.color_parse('#366B7E')); if self.autostart_bool: - subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) + # subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) self.checkbox_autostart.set_active(True) self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,False) else: - subprocess.Popen(['sudo', 'systemctl','stop','xkeysnail']) + # subprocess.Popen(['sudo', 'systemctl','stop','xkeysnail']) self.checkbox_autostart.set_active(False) self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,True) # self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,True) diff --git a/xkeysnail-config/xkeysnail.service b/xkeysnail-config/xkeysnail.service index 6935d75..d11ff4f 100644 --- a/xkeysnail-config/xkeysnail.service +++ b/xkeysnail-config/xkeysnail.service @@ -5,7 +5,6 @@ Description=xkeysnail Type=simple KillMode=process ExecStart=/usr/bin/sudo /bin/bash -c '/usr/bin/xhost +SI:localuser:root && /usr/local/bin/xkeysnail --quiet --watch {homedir}/.config/kinto/kinto.py' -ExecStop=/usr/bin/pkill -f xkeysnail Restart=on-failure RestartSec=3 Environment=DISPLAY={displayid} diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index 37df637..ddbe8a3 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -86,6 +86,39 @@ function removeAppleKB { fi } +function trayApp { + if [ -f /usr/bin/budgie-desktop ];then + while true; do + read -rep $'Would you like to install the Kinto Budgie Applet? (y/n)\n(You will need log off & back on and go to Budgie Desktop Settings & add Kinto to your top panel.)\n' yn + case $yn in + [Yy]* ) yn="y"; break;; + [Nn]* ) yn="n";break;; + * ) echo "Please answer yes or no.";; + esac + done + if [ "$yn" == "y" ]; then + cd ./xkeysnail-config/trayapps/BudgieApplet/ + sudo ./install-applet.sh + cd ../../../ + echo "Please logoff and back on for the Applet to be available for the top panel." + ~/.config/kinto/gnome_logoff.sh& + fi + else + while true; do + read -rep $'Would you like to install the Kinto Gnome/XFCE System Tray? (y/n)\n' yn + case $yn in + [Yy]* ) yn="y"; break;; + [Nn]* ) yn="n";break;; + * ) echo "Please answer yes or no.";; + esac + done + if [ "$yn" == "y" ]; then + echo "Kinto Gnome/XFCE System Tray Installed." + fi + fi +} + + function budgieUninstall { if [ -f /usr/bin/budgie-desktop ];then read -n 1 -s -r -p "Your system may log you off immediately during the restoration of budgie-daemon. Press any key to continue..." @@ -104,7 +137,7 @@ function budgieUpdate { # Check for budgie and install App Switching hack if [ -f /usr/bin/budgie-desktop ];then while true; do - read -rep $'Would you like to update Budgie to support proper App Switching? (y/n)\n(Your system will immediately log you out after this runs.)\n' yn + read -rep $'Would you like to update Budgie to support proper App Switching? (y/n)\n(Your system may immediately log you out after this runs.)\n' yn case $yn in [Yy]* ) yn="y"; break;; [Nn]* ) yn="n";break;; @@ -197,10 +230,10 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 expsh=" " # fi sudo systemctl enable xkeysnail >/dev/null 2>&1 - if ! [ -x "$(command -v inotifywait)" ]; then - echo "Will need to install inotify-tools to restart key remapper live for config file changes..." - sudo ./system-config/unipkg.sh inotify-tools - fi + # if ! [ -x "$(command -v inotifywait)" ]; then + # echo "Will need to install inotify-tools to restart key remapper live for config file changes..." + # sudo ./system-config/unipkg.sh inotify-tools + # fi if ! [ -x "$(command -v pip3)" ]; then echo "Will need to install python3-pip..." sudo ./system-config/unipkg.sh python3-pip @@ -229,20 +262,20 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 mkdir -p ~/.config/kinto # KDE xhost fix - mkdir -p ~/.kde/Autostart - echo -e '#!/bin/sh\rxhost +SI:localuser:root' > ~/.kde/Autostart/kintohost.sh - chmod +x ~/.kde/Autostart/kintohost.sh + # mkdir -p ~/.kde/Autostart + # echo -e '#!/bin/sh\rxhost +SI:localuser:root' > ~/.kde/Autostart/kintohost.sh + # chmod +x ~/.kde/Autostart/kintohost.sh # KDE startup - xhost fix mkdir -p ~/.config/autostart yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/autostart/xkeysnail.desktop - yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh + # yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh yes | cp -rf ./xkeysnail-config/gnome_logoff.sh ~/.config/kinto/gnome_logoff.sh yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new - yes | cp -rf ./xkeysnail-config/prexk.sh ~/.config/kinto/prexk.sh - yes | cp -rf ./system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh + # yes | cp -rf ./xkeysnail-config/prexk.sh ~/.config/kinto/prexk.sh + # yes | cp -rf ./system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh yes | cp -rf ./xkeysnail-config/xkeysnail.service ./xkeysnail-config/xkeysnail.service.new # yes | cp -rf ./xkeysnail-config/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer sed -i "s#{experimental-caret}#$exp#g" ./xkeysnail-config/xkeysnail.service.new @@ -255,16 +288,15 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 sed -i "s#{homedir}#`echo "$HOME"`#g" ./xkeysnail-config/xkeysnail.service.new sed -i "s#{xhost}#`\\which xhost`#g" ./xkeysnail-config/xkeysnail.service.new sed -i "s/{username}/`whoami`/g" ./xkeysnail-config/limitedadmins.new - sed -i "s#{homedir}#`echo "$HOME"`#g" ./xkeysnail-config/limitedadmins.new sed -i "s#{systemctl}#`\\which systemctl`#g" ./xkeysnail-config/limitedadmins.new sudo chown root:root ./xkeysnail-config/limitedadmins.new sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/autostart/xkeysnail.desktop sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/autostart/xkeysnail.desktop sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/autostart/xkeysnail.desktop - sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh + # sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./xkeysnail-config/xkeysnail.service.new - sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh + # sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh if $vssublime ; then perl -pi -e "s/(# )(.*)(- Sublime)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1 @@ -333,12 +365,13 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 sudo pip3 install --upgrade . cd .. sudo systemctl daemon-reload - sudo systemctl --state=not-found --all | grep xkeysnail - if [ "$distro" == "fedora" ];then - systemctl enable xkeysnail.service - else - sudo systemctl enable xkeysnail.service - fi + sudo systemctl disable xkeysnail + # sudo systemctl --state=not-found --all | grep xkeysnail + # if [ "$distro" == "fedora" ];then + # systemctl enable xkeysnail.service + # else + # sudo systemctl enable xkeysnail.service + # fi sudo systemctl restart xkeysnail echo -e "Adding xhost fix...\n" @@ -381,6 +414,9 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 if $rightalt ; then echo -e "\e[1m\e[32mEnabled\e[0m mutli-language support." fi + + trayApp + elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then echo "Uninstalling Kinto - xkeysnail (udev)" uninstall @@ -397,7 +433,7 @@ elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then sudo systemctl --state=not-found --all | grep xkeysnail budgieUninstall exit 0 -elif [[ $1 == "5" || $1 == "budgieUpdate" ]]; then +elif [[ $1 == "budgieUpdate" ]]; then budgieUpdate else echo "Expected argument was not provided" From 6da72654bacea8b374c350c1c344afd5147bd956 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 31 Jul 2020 23:30:19 -0500 Subject: [PATCH 09/14] - Budgie Applet Completed --- .../BudgieApplet/KintoApplet/kinto.py | 55 +++++++++++-------- xkeysnail-config/xkeysnail.desktop | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py index c1937c3..9b2ea0f 100644 --- a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py +++ b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py @@ -52,10 +52,9 @@ class KintoApplet(Budgie.Applet): img_arrow=Gtk.Image.new_from_icon_name('pan-down-symbolic',Gtk.IconSize.BUTTON) revealed=False # Whether Gtk.Revealer is open or not. checkbox_autostart = Gtk.CheckButton() - button_suspend = Gtk.Button() + checkbox_suspend = Gtk.CheckButton() button_winmac = Gtk.Button() button_setscale = Gtk.Button() - button_suspend.set_relief(Gtk.ReliefStyle.NONE) button_winmac.set_relief(Gtk.ReliefStyle.NONE) button_setscale.set_relief(Gtk.ReliefStyle.NONE) suspend_id=0 @@ -87,7 +86,7 @@ class KintoApplet(Budgie.Applet): self.checkbox_autostart.set_label("Autostart") # self.checkbox_autostart.modify_fg(Gtk.STATE_NORMAL, Gtk.Gdk.color_parse('#366B7E')); if self.autostart_bool: - # subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) + subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) self.checkbox_autostart.set_active(True) self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,False) else: @@ -95,28 +94,27 @@ class KintoApplet(Budgie.Applet): self.checkbox_autostart.set_active(False) self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,True) # self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,True) - self.hbox.pack_start(self.checkbox_autostart,True,False,5) - # self.hbox.pack_start(self.button_autostart,True,False,5) + self.vbox.pack_start(self.checkbox_autostart,True,False,5) self.hbox.pack_end(seperator,True,False,0) - self.vbox.pack_start(self.hbox,True,False,5) + # self.vbox.pack_start(self.hbox,True,False,5) # self.vbox.pack_start(seperator,True,False,0) time.sleep(5) res = subprocess.Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail']) res.wait() + self.checkbox_suspend.set_label("Kinto Enabled") + if res.returncode == 0: - # self.button_suspend = Gtk.Button("Suspend Kinto") - self.button_suspend.set_label("Suspend Kinto") + self.checkbox_suspend.set_active(True) self.img.set_from_icon_name("kinto-invert", Gtk.IconSize.BUTTON) - self.suspend_id = self.button_suspend.connect("clicked",self.suspend,True) + self.suspend_id = self.checkbox_suspend.connect("clicked",self.suspend,True) else: - # self.button_suspend = Gtk.Button("Enable Kinto") - self.button_suspend.set_label("Enable Kinto") - # self.img.set_from_icon_name("kinto", Gtk.IconSize.BUTTON) + self.checkbox_suspend.set_active(False) self.img.set_from_icon_name("kinto-color", Gtk.IconSize.BUTTON) - self.suspend_id = self.button_suspend.connect("clicked",self.suspend,False) - self.vbox.pack_start(self.button_suspend,True,False,5) + self.suspend_id = self.checkbox_suspend.connect("clicked",self.suspend,False) + self.vbox.pack_start(self.checkbox_suspend,True,False,5) + self.hbox.pack_end(seperator,True,False,0) # self.vbox.pack_start(seperator,True,False,0) self.box.add(self.img) @@ -204,18 +202,18 @@ class KintoApplet(Budgie.Applet): try: if suspendKinto: subprocess.Popen(['sudo', 'systemctl','stop','xkeysnail']) - self.button_suspend.set_label("Enable Kinto") + self.checkbox_suspend.set_active(False) self.img.set_from_icon_name("kinto-color", Gtk.IconSize.BUTTON) - self.button_suspend.disconnect(self.suspend_id) - self.suspend_id = self.button_suspend.connect("clicked",self.suspend,False) + self.checkbox_suspend.disconnect(self.suspend_id) + self.suspend_id = self.checkbox_suspend.connect("clicked",self.suspend,False) self.box.add(self.img) else: subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) - self.button_suspend.set_label("Suspend Kinto") + self.checkbox_suspend.set_active(True) self.img.set_from_icon_name("kinto-invert", Gtk.IconSize.BUTTON) - self.button_suspend.disconnect(self.suspend_id) - self.suspend_id = self.button_suspend.connect("clicked",self.suspend,True) + self.checkbox_suspend.disconnect(self.suspend_id) + self.suspend_id = self.checkbox_suspend.connect("clicked",self.suspend,True) self.box.add(self.img) except subprocess.CalledProcessError: # Notify user about error on running restart commands. @@ -263,8 +261,21 @@ class KintoApplet(Budgie.Applet): except subprocess.CalledProcessError: # Notify user about error on running restart commands. subprocess.Popen(['notify-send','Kinto: Error Reseting KB Type!','-i','budgie-desktop-symbolic']) - def setAutostart(self,button,kbtype): - print('test') + def setAutostart(self,button,autostart): + try: + if autostart == False: + subprocess.Popen(['perl','-pi','-e','s/autostart = true/autostart = false/g',self.homedir+'/.config/kinto/kinto.py']) + self.checkbox_autostart.set_active(False) + self.checkbox_autostart.disconnect(self.chkautostart_id) + self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,True) + else: + subprocess.Popen(['perl','-pi','-e','s/autostart = false/autostart = true/g',self.homedir+'/.config/kinto/kinto.py']) + self.checkbox_autostart.set_active(True) + self.checkbox_autostart.disconnect(self.chkautostart_id) + self.chkautostart_id = self.checkbox_autostart.connect("clicked",self.setAutostart,False) + + except subprocess.CalledProcessError: # Notify user about error on running restart commands. + subprocess.Popen(['notify-send','Kinto: Error setting autostart!','-i','budgie-desktop-symbolic']) def setScale(self,button,scale): print("scale") diff --git a/xkeysnail-config/xkeysnail.desktop b/xkeysnail-config/xkeysnail.desktop index 5e8a1e9..8893956 100644 --- a/xkeysnail-config/xkeysnail.desktop +++ b/xkeysnail-config/xkeysnail.desktop @@ -2,7 +2,7 @@ Name=Kinto_xkey GenericName=Kinto_xkey Comment=Make Linux Type Like it's a Mac -Exec=/bin/bash -c "{xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail && {homedir}/.config/kinto/logoff.sh" +Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && {xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail;{homedir}/.config/kinto/gnome_logoff.sh" Terminal=false Type=Application X-GNOME-Autostart-enabled=true \ No newline at end of file From 333c8b387beec2ea0fd48918eaea65ef787264a9 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 1 Aug 2020 01:01:04 -0500 Subject: [PATCH 10/14] - Added config, keyboard, and region buttons to budgie applet --- .../BudgieApplet/KintoApplet/kinto.py | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py index 9b2ea0f..9956934 100644 --- a/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py +++ b/xkeysnail-config/trayapps/BudgieApplet/KintoApplet/kinto.py @@ -20,6 +20,7 @@ import subprocess,time,os,gi.repository gi.require_version('Budgie','1.0') gi.require_version('Gtk','3.0') +from shutil import which from gi.repository import Budgie, GObject, Gtk class Kinto(GObject.GObject, Budgie.Plugin): @@ -53,8 +54,14 @@ class KintoApplet(Budgie.Applet): revealed=False # Whether Gtk.Revealer is open or not. checkbox_autostart = Gtk.CheckButton() checkbox_suspend = Gtk.CheckButton() + button_region = Gtk.Button() + button_syskb = Gtk.Button() + button_config = Gtk.Button() button_winmac = Gtk.Button() button_setscale = Gtk.Button() + button_region.set_relief(Gtk.ReliefStyle.NONE) + button_syskb.set_relief(Gtk.ReliefStyle.NONE) + button_config.set_relief(Gtk.ReliefStyle.NONE) button_winmac.set_relief(Gtk.ReliefStyle.NONE) button_setscale.set_relief(Gtk.ReliefStyle.NONE) suspend_id=0 @@ -115,7 +122,11 @@ class KintoApplet(Budgie.Applet): self.suspend_id = self.checkbox_suspend.connect("clicked",self.suspend,False) self.vbox.pack_start(self.checkbox_suspend,True,False,5) self.hbox.pack_end(seperator,True,False,0) - # self.vbox.pack_start(seperator,True,False,0) + + self.button_config.set_label("Edit Config") + self.button_config.connect("clicked",self.setConfig) + self.vbox.pack_start(self.button_config,True,False,5) + self.hbox.pack_end(seperator,True,False,0) self.box.add(self.img) self.box.connect("button-press-event", self.on_press) @@ -126,13 +137,24 @@ class KintoApplet(Budgie.Applet): res.wait() res = res.communicate()[0] - if True: + if res: self.button_winmac.set_label("Set Win/Mac KB Type") self.winmac_id = self.button_winmac.connect("clicked",self.setKB,"winmac") else: self.button_winmac.set_label("Set Mac Only KB Type") self.winmac_id = self.button_winmac.connect("clicked",self.setKB,"mac") self.vbox.pack_start(self.button_winmac,True,False,5) + self.hbox.pack_end(seperator,True,False,0) + + self.button_syskb.set_label("System Shortcuts") + self.button_syskb.connect("clicked",self.setSysKB) + self.vbox.pack_start(self.button_syskb,True,False,5) + self.hbox.pack_end(seperator,True,False,0) + + self.button_region.set_label("Change Language") + self.button_region.connect("clicked",self.setRegion) + self.vbox.pack_start(self.button_region,True,False,5) + # self.vbox.pack_start(seperator,True,False,0) # self.hbox.pack_end(self.button_arrow,False,False,5) @@ -277,6 +299,22 @@ class KintoApplet(Budgie.Applet): except subprocess.CalledProcessError: # Notify user about error on running restart commands. subprocess.Popen(['notify-send','Kinto: Error setting autostart!','-i','budgie-desktop-symbolic']) + def setConfig(self,button): + try: + if os.path.exists('/opt/sublime_text/sublime_text'): + subprocess.Popen(['/opt/sublime_text/sublime_text',self.homedir+'/.config/kinto/kinto.py']) + elif which(gedit) is not None: + subprocess.Popen(['gedit',self.homedir+'/.config/kinto/kinto.py']) + + except subprocess.CalledProcessError: # Notify user about error on running restart commands. + subprocess.Popen(['notify-send','Kinto: Error could not open config file!','-i','budgie-desktop-symbolic']) + + def setSysKB(self,button): + subprocess.Popen(['gnome-control-center','keyboard']) + + def setRegion(self,button): + subprocess.Popen(['gnome-control-center','region']) + def setScale(self,button,scale): print("scale") From 791ab4e94ad262da9fd376d3792c848e73ef435a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 1 Aug 2020 03:30:40 -0500 Subject: [PATCH 11/14] - Updated Budgie Applet to stopping xkeysnail universally --- xkeysnail-config/limitedadmins | 2 ++ xkeysnail-config/root_logoff.sh | 6 ++++++ xkeysnail-config/xkeysnail.desktop | 2 +- xkeysnail_service.sh | 8 ++++++-- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100755 xkeysnail-config/root_logoff.sh diff --git a/xkeysnail-config/limitedadmins b/xkeysnail-config/limitedadmins index 7ccec01..b140516 100644 --- a/xkeysnail-config/limitedadmins +++ b/xkeysnail-config/limitedadmins @@ -3,4 +3,6 @@ %{username} ALL=NOPASSWD: {systemctl} start xkeysnail %{username} ALL=NOPASSWD: {systemctl} stop xkeysnail %{username} ALL=NOPASSWD: {systemctl} status xkeysnail +%{username} ALL=(root) NOPASSWD: /usr/local/bin/logoff.sh +%{username} ALL=NOPASSWD: {pkill} -f logoff %{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail diff --git a/xkeysnail-config/root_logoff.sh b/xkeysnail-config/root_logoff.sh new file mode 100755 index 0000000..d2af6e2 --- /dev/null +++ b/xkeysnail-config/root_logoff.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# /usr/local/bin/logoff.sh +while true; do + w | grep -E "$1.*$2" > /dev/null 2>&1 || (sudo systemctl stop xkeysnail && sudo pkill -f logoff) + sleep 5 +done \ No newline at end of file diff --git a/xkeysnail-config/xkeysnail.desktop b/xkeysnail-config/xkeysnail.desktop index 8893956..bd55e6f 100644 --- a/xkeysnail-config/xkeysnail.desktop +++ b/xkeysnail-config/xkeysnail.desktop @@ -2,7 +2,7 @@ Name=Kinto_xkey GenericName=Kinto_xkey Comment=Make Linux Type Like it's a Mac -Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && {xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail;{homedir}/.config/kinto/gnome_logoff.sh" +Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && {xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail;sudo /usr/local/bin/logoff.sh $USER $DISPLAY" Terminal=false Type=Application X-GNOME-Autostart-enabled=true \ No newline at end of file diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index ddbe8a3..4b48aad 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -101,7 +101,7 @@ function trayApp { sudo ./install-applet.sh cd ../../../ echo "Please logoff and back on for the Applet to be available for the top panel." - ~/.config/kinto/gnome_logoff.sh& + sudo /usr/local/bin/logoff.sh $USER $DISPLAY& fi else while true; do @@ -271,7 +271,10 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/autostart/xkeysnail.desktop # yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh - yes | cp -rf ./xkeysnail-config/gnome_logoff.sh ~/.config/kinto/gnome_logoff.sh + yes | sudo cp -rf xkeysnail-config/root_logoff.sh /usr/local/bin/logoff.sh + sudo chown root:root /usr/local/bin/logoff.sh + sudo chmod u+rwx /usr/local/bin/logoff.sh + sudo chmod go-w+rx /usr/local/bin/logoff.sh yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new # yes | cp -rf ./xkeysnail-config/prexk.sh ~/.config/kinto/prexk.sh @@ -289,6 +292,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 sed -i "s#{xhost}#`\\which xhost`#g" ./xkeysnail-config/xkeysnail.service.new sed -i "s/{username}/`whoami`/g" ./xkeysnail-config/limitedadmins.new sed -i "s#{systemctl}#`\\which systemctl`#g" ./xkeysnail-config/limitedadmins.new + sed -i "s#{pkill}#`\\which pkill`#g" ./xkeysnail-config/limitedadmins.new sudo chown root:root ./xkeysnail-config/limitedadmins.new sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/autostart/xkeysnail.desktop From dafaaeb2a46a016f6d03c53f8514a4819fecce0f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 1 Aug 2020 18:34:46 -0500 Subject: [PATCH 12/14] - Added additional icons for system tray --- .../BudgieApplet/icons/kinto-color-16.svg | 41 +++++++++++++++++++ .../BudgieApplet/icons/kinto-invert-16.svg | 28 +++++++++++++ .../BudgieApplet/icons/kinto-solid-16.svg | 24 +++++++++++ 3 files changed, 93 insertions(+) create mode 100644 xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color-16.svg create mode 100644 xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert-16.svg create mode 100644 xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid-16.svg diff --git a/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color-16.svg b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color-16.svg new file mode 100644 index 0000000..40fbda0 --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color-16.svg @@ -0,0 +1,41 @@ + + + + +Symbolic Icons + + + + + + + + + kinto-final + + + + + + + + + + + + + diff --git a/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert-16.svg b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert-16.svg new file mode 100644 index 0000000..7f34b0e --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert-16.svg @@ -0,0 +1,28 @@ + + + + +Symbolic Icons + + + + + + + + + + + + + + + + diff --git a/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid-16.svg b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid-16.svg new file mode 100644 index 0000000..45fe52c --- /dev/null +++ b/xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid-16.svg @@ -0,0 +1,24 @@ + + + +Symbolic Icons + + + + + + + + + + + + + + + + From 73f2b44c73549735ed9e7de7457d827d7139f1ba Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 2 Aug 2020 01:30:19 -0500 Subject: [PATCH 13/14] - Added AppIndicator3 system tray app for Linux --- .../GnomeXFCE-Notifier/kintonotify.glade | 36 ---- .../GnomeXFCE-Notifier/kintonotify.py | 102 --------- .../trayapps/appindicator/kintotray.py | 196 ++++++++++++++++++ xkeysnail_service.sh | 10 +- 4 files changed, 204 insertions(+), 140 deletions(-) delete mode 100644 xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade delete mode 100755 xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py create mode 100755 xkeysnail-config/trayapps/appindicator/kintotray.py diff --git a/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade b/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade deleted file mode 100644 index 6c2a28a..0000000 --- a/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.glade +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - True - False - - - True - False - Show pop-up - True - - - - - - True - False - Show/hide window - True - - - - - - True - False - Quit - True - - - - - diff --git a/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py b/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py deleted file mode 100755 index e492907..0000000 --- a/xkeysnail-config/trayapps/GnomeXFCE-Notifier/kintonotify.py +++ /dev/null @@ -1,102 +0,0 @@ -#!/usr/bin/env python3 - -# Based on -# -# gtk-example.py -# (c) Aleksander Alekseev 2016 -# http://eax.me/ -# -# Additions made by Ben Reaves -# 2020 -# http://kinto.sh -# - -import signal -import os -import gi -gi.require_version('Gtk', '3.0') -gi.require_version('Notify', '0.7') -from gi.repository import Gtk -from gi.repository import Notify - -APPID = "kinto" -CURRDIR = os.path.dirname(os.path.abspath(__file__)) -# could be PNG or SVG as well -ICON = os.path.join(CURRDIR, '../icons/kinto-invert.svg') -# ICON = Gtk.Image.new_from_icon_name("kinto-invert", Gtk.IconSize.BUTTON) - -# Cross-platform tray icon implementation -# See: -# * http://ubuntuforums.org/showthread.php?t=1923373#post11902222 -# * https://github.com/syncthing/syncthing-gtk/blob/master/syncthing_gtk/statusicon.py -class TrayIcon: - - def __init__(self, appid, icon, menu): - self.menu = menu - - APPIND_SUPPORT = 1 - try: - from gi.repository import AppIndicator3 - except: - APPIND_SUPPORT = 0 - - if APPIND_SUPPORT == 1: - self.ind = AppIndicator3.Indicator.new( - appid, icon, - AppIndicator3.IndicatorCategory.APPLICATION_STATUS) - self.ind.set_status(AppIndicator3.IndicatorStatus.ACTIVE) - self.ind.set_menu(self.menu) - else: - self.ind = Gtk.StatusIcon() - self.ind.set_from_file(icon) - self.ind.connect('popup-menu', self.onPopupMenu) - - def onPopupMenu(self, icon, button, time): - self.menu.popup(None, None, Gtk.StatusIcon.position_menu, icon, - button, time) - - -class Handler: - - def __init__(self): - self.window_is_hidden = False - - def onShowButtonClicked(self, button): - msg = "Clicked: " + entry.get_text() - dialog = Gtk.MessageDialog(window, 0, Gtk.MessageType.INFO, - Gtk.ButtonsType.OK, msg) - dialog.run() - dialog.destroy() - - def onNotify(self, *args): - Notify.Notification.new("Notification", "Hello!", ICON).show() - - def onShowOrHide(self, *args): - if self.window_is_hidden: - window.show() - else: - window.hide() - - self.window_is_hidden = not self.window_is_hidden - - def onQuit(self, *args): - Notify.uninit() - Gtk.main_quit() - -# Handle pressing Ctr+C properly, ignored by default -signal.signal(signal.SIGINT, signal.SIG_DFL) - -builder = Gtk.Builder() -builder.add_from_file('kintonotify.glade') -builder.connect_signals(Handler()) - -# window = builder.get_object('window1') -# window.set_icon_from_file(ICON) -# window.show_all() - -entry = builder.get_object('entry1') -menu = builder.get_object('menu1') -icon = TrayIcon(APPID, ICON, menu) -Notify.init(APPID) - -Gtk.main() diff --git a/xkeysnail-config/trayapps/appindicator/kintotray.py b/xkeysnail-config/trayapps/appindicator/kintotray.py new file mode 100755 index 0000000..d196e06 --- /dev/null +++ b/xkeysnail-config/trayapps/appindicator/kintotray.py @@ -0,0 +1,196 @@ +#!/usr/bin/env python3 + +import gi + +gi.require_version('Gtk', '3.0') +gi.require_version('AppIndicator3', '0.1') +gi.require_version('Notify', '0.7') + +import signal,subprocess,time,os +from shutil import which +from gi.repository import Gtk +from gi.repository import AppIndicator3 as appindicator +from gi.repository import Notify as notify + +APPINDICATOR_ID = 'Kinto' + +class Indicator(): + + homedir = os.path.expanduser("~") + kconfig = homedir+"/.config/kinto/kinto.py" + + enable_id = 0 + winmac_id = 0 + chkautostart_id = 0 + autostart_bool = False + menu = Gtk.Menu() + checkbox_autostart = Gtk.CheckMenuItem('Autostart') + checkbox_enable = Gtk.CheckMenuItem('Kinto Enabled') + button_config = Gtk.MenuItem('Edit Config') + # Keyboard type set below + button_syskb = Gtk.MenuItem('System Shortcuts') + button_region = Gtk.MenuItem('Change Language') + + def __init__(self): + self.indicator = appindicator.Indicator.new(APPINDICATOR_ID, self.homedir+'/.config/kinto/kinto-invert.svg', appindicator.IndicatorCategory.SYSTEM_SERVICES) + self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE) + self.indicator.set_menu(self.build_menu()) + notify.init(APPINDICATOR_ID) + + def build_menu(self): + + with open(self.kconfig) as configfile: + autostart_line = configfile.read().split('\n')[1] + + # Autostart + if "autostart = true" in autostart_line.casefold(): + autostart_bool = True + + if autostart_bool: + subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) + self.checkbox_autostart.set_active(True) + self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,False) + else: + self.checkbox_autostart.set_active(False) + self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,True) + self.menu.append(self.checkbox_autostart) + + # Kinto Enable + time.sleep(5) + # sudo systemctl is-active --quiet xkeysnail + res = subprocess.Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail']) + res.wait() + + self.checkbox_enable.set_label("Kinto Enabled") + + if res.returncode == 0: + self.checkbox_enable.set_active(True) + self.indicator.set_icon(self.homedir+'/.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(self.homedir+'/.config/kinto/kinto-color.svg') + self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,True) + self.menu.append(self.checkbox_enable) + + # Edit Config + self.button_config.connect('activate',self.setConfig) + self.menu.append(self.button_config) + + # Set Keyboard Type + command = "perl -ne 'print if /(#.*)(# Mac)\n/' ~/.config/kinto/kinto.py | wc -l" + res = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=None, shell=True) + res.wait() + res = res.communicate()[0] + + if res: + self.button_winmac = Gtk.MenuItem('Set Win/Mac KB Type') + self.winmac_id = self.button_winmac.connect('activate',self.setKB,"winmac") + else: + self.button_winmac = Gtk.MenuItem('Set Mac Only KB Type') + self.winmac_id = button_winmac.connect('activate',self.setKB,"mac") + self.menu.append(self.button_winmac) + + # Set System Keyboard Shortcuts + self.button_syskb.connect('activate',self.setSysKB) + self.menu.append(self.button_syskb) + + # Set Language + self.button_region.connect('activate',self.setRegion) + self.menu.append(self.button_region) + + # item_quit = Gtk.MenuItem('Quit') + # item_quit.connect('activate', quit) + # menu.append(item_quit) + self.menu.show_all() + + return self.menu + + def setEnable(self,button,enableKinto): + try: + if enableKinto: + subprocess.Popen(['sudo', 'systemctl','restart','xkeysnail']) + self.checkbox_enable.set_active(True) + self.checkbox_enable.disconnect(self.enable_id) + self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,False) + self.indicator.set_icon(self.homedir+'/.config/kinto/kinto-invert.svg') + + else: + subprocess.Popen(['sudo', 'systemctl','stop','xkeysnail']) + self.checkbox_enable.set_active(False) + self.checkbox_enable.disconnect(self.enable_id) + self.enable_id = self.checkbox_enable.connect('activate',self.setEnable,True) + self.indicator.set_icon(self.homedir+'/.config/kinto/kinto-color.svg') + + except subprocess.CalledProcessError: + subprocess.Popen(['notify-send','Kinto: Error enabling!','-i','budgie-desktop-symbolic']) + + def setAutostart(self,button,autostart): + try: + if autostart == False: + subprocess.Popen(['perl','-pi','-e','s/autostart = true/autostart = false/g',self.homedir+'/.config/kinto/kinto.py']) + self.checkbox_autostart.set_active(False) + self.checkbox_autostart.disconnect(self.chkautostart_id) + self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,True) + else: + subprocess.Popen(['perl','-pi','-e','s/autostart = false/autostart = true/g',self.homedir+'/.config/kinto/kinto.py']) + self.checkbox_autostart.set_active(True) + self.checkbox_autostart.disconnect(self.chkautostart_id) + self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,False) + + except subprocess.CalledProcessError: + subprocess.Popen(['notify-send','Kinto: Error setting autostart!','-i','budgie-desktop-symbolic']) + + def setConfig(self,button): + try: + if os.path.exists('/opt/sublime_text/sublime_text'): + subprocess.Popen(['/opt/sublime_text/sublime_text',self.homedir+'/.config/kinto/kinto.py']) + elif which(gedit) is not None: + subprocess.Popen(['gedit',self.homedir+'/.config/kinto/kinto.py']) + + except subprocess.CalledProcessError: # Notify user about error on running restart commands. + subprocess.Popen(['notify-send','Kinto: Error could not open config file!','-i','budgie-desktop-symbolic']) + + def setKB(self,button,kbtype): + try: + if kbtype == "winmac": + label = "Set Mac KB Type" + connect = "mac" + + setwinmac = ['s/^(\s{3})(\s{1}#)(.*# WinMac\n|.*# WinMac -)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac\n|Mac -)/ $3$7$6$7$8/g'] + + else: + label = "Set Win/Mac KB Type" + connect = "winmac" + + setwinmac = ['s/^(\s{3})(\s{1}#)(.*# Mac\n|.*# Mac -)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac)/ $3$7$6$7$8/g'] + + restart = ['sudo', 'systemctl','restart','xkeysnail'] + cmds = ['perl','-pi','-e']+setwinmac+[self.kconfig] + + subprocess.Popen(cmds) + + cmdsTerm = subprocess.Popen(cmds) + cmdsTerm.wait() + + subprocess.Popen(restart) + + self.button_winmac.set_label(label) + self.button_winmac.disconnect(self.winmac_id) + self.winmac_id = self.button_winmac.connect('activate',self.setKB,connect) + + except subprocess.CalledProcessError: + subprocess.Popen(['notify-send','Kinto: Error Resetting KB Type!','-i','budgie-desktop-symbolic']) + + def setSysKB(self,button): + subprocess.Popen(['gnome-control-center','keyboard']) + + def setRegion(self,button): + subprocess.Popen(['gnome-control-center','region']) + + def quit(source): + Gtk.main_quit() + +Indicator() +signal.signal(signal.SIGINT, signal.SIG_DFL) +Gtk.main() diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index 4b48aad..70679c8 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -277,7 +277,10 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 sudo chmod go-w+rx /usr/local/bin/logoff.sh yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new - # yes | cp -rf ./xkeysnail-config/prexk.sh ~/.config/kinto/prexk.sh + yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.py ~/.config/kinto/kintotray.py + yes | cp -rf ./xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color-16.svg ~/.config/kinto/kinto-color.svg + yes | cp -rf ./xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert-16.svg ~/.config/kinto/kinto-invert.svg + yes | cp -rf ./xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid-16.svg ~/.config/kinto/kinto-solid.svg # yes | cp -rf ./system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh yes | cp -rf ./xkeysnail-config/xkeysnail.service ./xkeysnail-config/xkeysnail.service.new # yes | cp -rf ./xkeysnail-config/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer @@ -296,6 +299,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 sudo chown root:root ./xkeysnail-config/limitedadmins.new sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/autostart/xkeysnail.desktop + sed -i "s#-c \"grep#-c \"python3 {homedir}/.config/kinto/kintotray.py;grep#g" ~/.config/autostart/xkeysnail.desktop sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/autostart/xkeysnail.desktop sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/autostart/xkeysnail.desktop # sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh @@ -377,6 +381,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 # sudo systemctl enable xkeysnail.service # fi sudo systemctl restart xkeysnail + nohup python3 ~/.config/kinto/kintotray.py& >/dev/null 2>&1 echo -e "Adding xhost fix...\n" @@ -419,12 +424,13 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 echo -e "\e[1m\e[32mEnabled\e[0m mutli-language support." fi - trayApp + # trayApp elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then echo "Uninstalling Kinto - xkeysnail (udev)" uninstall removeAppleKB + pkill -f kintotray sudo systemctl stop xkeysnail sudo systemctl disable xkeysnail sudo rm /etc/sudoers.d/limitedadmins From 91b58f01003d45e9df82372e8fa2a4bd47c7ae37 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 3 Aug 2020 18:21:44 -0500 Subject: [PATCH 14/14] - Added system tray for gnome, ubuntu budgie, and mate --- xkeysnail-config/xkeysnail.desktop | 3 +- xkeysnail_service.sh | 51 +++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/xkeysnail-config/xkeysnail.desktop b/xkeysnail-config/xkeysnail.desktop index bd55e6f..6b57886 100644 --- a/xkeysnail-config/xkeysnail.desktop +++ b/xkeysnail-config/xkeysnail.desktop @@ -2,7 +2,8 @@ Name=Kinto_xkey GenericName=Kinto_xkey Comment=Make Linux Type Like it's a Mac -Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && {xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail;sudo /usr/local/bin/logoff.sh $USER $DISPLAY" +Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && {xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail" +# ;sudo /usr/local/bin/logoff.sh $USER $DISPLAY Terminal=false Type=Application X-GNOME-Autostart-enabled=true \ No newline at end of file diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index 80ab549..fcdda56 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -193,12 +193,28 @@ if [ $# -eq 0 ]; then set "$n" fi +# Kinto tray +installtray=false # multi-language rightalt=false # VS code remap vssublime=false if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then + if [[ $dename == "gnome" || $dename == "budgie" || $dename == "mate" ]];then + installtray=true + while true; do + read -rep $'\nWould you like to install the Kinto System Tray (AppInidcator)? (Y/n)\n' yn + case $yn in + [Nn]* ) installtray=false; break;; + * ) break;; + esac + done + if [[ $dename == "gnome" ]]; then + echo "Please install KStatusNotifierItem for AppIndicators to show up." + fi + fi + while true; do read -rep $'\nDo you want multi-language on Right Alt key? (y/N)\naka Left side remaps, right side doesn\'t\n' yn case $yn in @@ -270,10 +286,17 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/autostart/xkeysnail.desktop # yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh - yes | sudo cp -rf xkeysnail-config/root_logoff.sh /usr/local/bin/logoff.sh - sudo chown root:root /usr/local/bin/logoff.sh - sudo chmod u+rwx /usr/local/bin/logoff.sh - sudo chmod go-w+rx /usr/local/bin/logoff.sh + + # *** More testing needing, universal way of killing kinto on user log out? *** + # yes | sudo cp -rf xkeysnail-config/root_logoff.sh /usr/local/bin/logoff.sh + # sudo chown root:root /usr/local/bin/logoff.sh + # sudo chmod u+rwx /usr/local/bin/logoff.sh + # sudo chmod go-w+rx /usr/local/bin/logoff.sh + # *** End universal killing of kinto + if $installtray ; then + yes | sudo cp -rf xkeysnail-config/gnome_logoff.sh ~/.config/kinto/logoff.sh + fi + yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.py ~/.config/kinto/kintotray.py @@ -298,7 +321,10 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 sudo chown root:root ./xkeysnail-config/limitedadmins.new sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/autostart/xkeysnail.desktop - sed -i "s#-c \"grep#-c \"python3 {homedir}/.config/kinto/kintotray.py;grep#g" ~/.config/autostart/xkeysnail.desktop + if $installtray ; then + sed -i "s#-c \"grep#-c \"python3 {homedir}/.config/kinto/kintotray.py;grep#g" ~/.config/autostart/xkeysnail.desktop + sed -i "s#xkeysnail\"#xkeysnail;{homedir}/.config/kinto/logoff.sh\"#g" ~/.config/autostart/xkeysnail.desktop + fi sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/autostart/xkeysnail.desktop sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/autostart/xkeysnail.desktop # sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh @@ -429,15 +455,18 @@ elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then echo "Uninstalling Kinto - xkeysnail (udev)" uninstall removeAppleKB - pkill -f kintotray - sudo systemctl stop xkeysnail - sudo systemctl disable xkeysnail + pkill -f kintotray >/dev/null 2>&1 + sudo systemctl stop xkeysnail >/dev/null 2>&1 + sudo systemctl disable xkeysnail >/dev/null 2>&1 sudo rm /etc/sudoers.d/limitedadmins rm ~/.config/autostart/xkeysnail.desktop rm -rf ~/.config/kinto - sudo rm /etc/systemd/system/xkeysnail.service - sudo rm /etc/systemd/system/graphical.target.wants/xkeysnail.service - sudo rm /usr/lib/systemd/system/xkeysnail.service + sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1 + sudo rm /etc/systemd/system/graphical.target.wants/xkeysnail.service >/dev/null 2>&1 + sudo rm /usr/lib/systemd/system/xkeysnail.service >/dev/null 2>&1 + if [ -f /usr/local/bin/logoff.sh ];then + sudo rm /usr/local/bin/logoff.sh + fi sudo systemctl daemon-reload sudo systemctl --state=not-found --all | grep xkeysnail budgieUninstall