marcel/kinto
1
0
Fork 0
mirror of https://github.com/rbreaves/kinto.git synced 2025-08-03 01:26:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #314 from rbreaves/dev

Browse Source 
- xkeysnail install check, updated Windows icons & force modifier key release
This commit is contained in:
Ben Reaves
2020-11-11 20:20:11 -06:00
committed by GitHub
parent b29ec9d936 ef6dc65a20
commit c71714e0c2
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
windows/kinto.ahk
View File

@@ -24,7 +24,7 @@ AHK_NOTIFYICON(wParam, lParam)
} }
; End Enable Left clicks ; End Enable Left clicks
; I_Icon = %A_ScriptDir%\assets\kinto-white.ico ; MacModifiers ; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico ; MacModifiers
; IfExist, %I_Icon% ; MacModifiers ; IfExist, %I_Icon% ; MacModifiers
; Menu, Tray, Icon, %I_Icon%,, 1 ; MacModifiers ; Menu, Tray, Icon, %I_Icon%,, 1 ; MacModifiers
; Menu, Tray, Tip, Mac - Kinto ; MacModifiers ; Menu, Tray, Tip, Mac - Kinto ; MacModifiers
@@ -97,8 +97,9 @@ Send {LAlt down}{tab}{LAlt up}
tray_suspend(){ tray_suspend(){
suspend toggle suspend toggle
if (a_isSuspended = 1){ if (a_isSuspended = 1){
Gosub ReleaseModifiers
menu, tray, check , Suspend Kinto menu, tray, check , Suspend Kinto
I_Icon = %A_ScriptDir%\assets\kinto-color-invert.ico I_Icon = %A_ScriptDir%\assets\kinto-white.ico
Menu, Tray, Icon, %I_Icon%,, 1 Menu, Tray, Icon, %I_Icon%,, 1
Menu, Tray, Tip, Suspended - Kinto Menu, Tray, Tip, Suspended - Kinto
IfWinExist, detectUSB.ahk IfWinExist, detectUSB.ahk
@@ -106,7 +107,7 @@ tray_suspend(){
} }
else{ else{
menu, tray, unCheck, Suspend Kinto menu, tray, unCheck, Suspend Kinto
; I_Icon = %A_ScriptDir%\assets\kinto-white.ico ; MacModifiers ; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico ; MacModifiers
; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico ; WinModifiers/CB/IBM ; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico ; WinModifiers/CB/IBM
Menu, Tray, Icon, %I_Icon%,,1 Menu, Tray, Icon, %I_Icon%,,1
Run, %A_ScriptDir%\detectUSB.ahk Run, %A_ScriptDir%\detectUSB.ahk
@@ -116,6 +117,7 @@ tray_suspend(){
} }
Exit() { Exit() {
Gosub ReleaseModifiers
IfWinExist, detectUSB.ahk IfWinExist, detectUSB.ahk
WinClose WinClose
@@ -619,4 +621,15 @@ GroupAdd, intellij, ahk_exe idea64.exe
!y::Send {LCtrl down}y{LCtrl Up} ; CB/IBM !y::Send {LCtrl down}y{LCtrl Up} ; CB/IBM
!v::Send {LCtrl down}v{LCtrl Up} ; CB/IBM !v::Send {LCtrl down}v{LCtrl Up} ; CB/IBM
#If #If
#If #If
ReleaseModifiers:
Send {RCtrl up}
Send {LCtrl up}
Send {RAlt up}
Send {LAlt up}
Send {RWin up}
Send {LWin up}
Send {RShift up}
Send {LShift up}
return

7
xkeysnail_service.sh
View File

@@ -476,6 +476,13 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
fi fi
sudo pip3 install --upgrade . sudo pip3 install --upgrade .
cd .. cd ..
which xkeysnail
if [ $? -eq 1 ]; then
echo -e "\nKinto install has \e[1m\033[0;91mfailed\e[0m.\n"
echo -e "cd into ./xkeysnail"
echo -e "Run 'sudo pip3 install --upgrade .' to debug issue"
exit 0
fi
sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/xkeysnail.service.new sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/xkeysnail.service.new
sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/limitedadmins.new sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/limitedadmins.new
sudo mv ./xkeysnail-config/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service" sudo mv ./xkeysnail-config/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"