Merge pull request #255 from rbreaves/alpha

- Added xfce system tray support

windows/kinto.ahk

@@ -118,6 +118,11 @@ GroupAdd, editors, ahk_exe Code.exe
 GroupAdd, browsers, ahk_exe chrome.exe
 GroupAdd, browsers, ahk_exe opera.exe
 GroupAdd, browsers, ahk_exe firefox.exe
+
+; Disable Key Remapping for Virtual Machines
+; Disable for Remote desktop solutions too
+GroupAdd, virtm, ahk_exe VirtualBoxVM.exe
+
 ; Disabled Edge for now - no ability to close all instances
 ; GroupAdd, browsers, Microsoft Edge ahk_class ApplicationFrameWindow
 
@@ -129,6 +134,8 @@ GroupAdd, vstudio, ahk_exe devenv.exe
 GroupAdd, intellij, ahk_exe idea.exe
 GroupAdd, intellij, ahk_exe idea64.exe
 
+#IfWinNotActive ahk_group virtm
+
     ; New AltTab and CtrlTab fix
     *tab:: 
     {
@@ -511,3 +518,4 @@ $^+Right::Send +{End}
         #y::Send {LCtrl down}y{LCtrl Up}
         #v::Send {LCtrl down}v{LCtrl Up}
     #If
+#If

xkeysnail-config/trayapps/appindicator/kintotray.py

@@ -18,6 +18,7 @@ class Indicator():
 
     homedir = os.path.expanduser("~")
     kconfig = homedir+"/.config/kinto/kinto.py"
+    ostype = os.environ.get('XDG_CURRENT_DESKTOP')
 
     enable_id = 0
     winmac_id = 0
@@ -183,9 +184,15 @@ class Indicator():
             subprocess.Popen(['notify-send','Kinto: Error Resetting KB Type!','-i','budgie-desktop-symbolic'])
 
     def setSysKB(self,button):
+        if self.ostype == "XFCE":
+            subprocess.Popen(['xfce4-keyboard-settings'])
+        else:
             subprocess.Popen(['gnome-control-center','keyboard'])
 
     def setRegion(self,button):
+        if self.ostype == "XFCE":
+            subprocess.Popen(['gnome-language-selector'])
+        else:
             subprocess.Popen(['gnome-control-center','region'])
 
     def quit(source):

xkeysnail-config/xkeysnail.service

@@ -5,6 +5,7 @@ Description=xkeysnail
 Type=simple
 KillMode=process
 ExecStart=/usr/bin/sudo /bin/bash -c '/usr/bin/xhost +SI:localuser:root && {homedir}/.config/kinto/killdups.sh && /usr/local/bin/xkeysnail --quiet --watch {homedir}/.config/kinto/kinto.py'
+ExecStop=/usr/bin/sudo pkill -f xkeysnail
 Restart=on-failure
 RestartSec=3
 Environment=DISPLAY={displayid}

xkeysnail_service.sh

@@ -201,7 +201,7 @@ rightalt=false
 vssublime=false
 
 if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
-	if [[ $dename == "gnome" || $dename == "budgie" || $dename == "mate" ]];then
+	if [[ $dename == "gnome" || $dename == "budgie" || $dename == "mate" || $dename == "xfce" ]];then
 		installtray=true
 		while true; do
 		read -rep $'\nWould you like to install the Kinto System Tray (AppInidcator)? (Y/n)\n' yn