- Improved Windows UX, Added System Tray, Kinto icon assets

This commit is contained in:
Ben Reaves
2020-06-12 01:18:40 -05:00
parent 046eaa05cd
commit 329e821440
11 changed files with 274 additions and 675 deletions

View File

@@ -1,42 +1,51 @@
; Cmd Tab For App Switching
; LWin & Tab::AltTab
; RWin & Tab::AltTab
#SingleInstance force
#NoEnv
#Persistent
; New AltTab and CtrlTab fix
*tab::
{
if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P") = false) {
Send {LAlt up}{LCtrl down}{tab}
KeyWait, tab
} else if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P")) {
Send {LAlt up}{LShift down}{LCtrl down}{tab}
KeyWait, tab
} else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P") = false) {
Send {LAlt down}{tab}
KeyWait, tab
} else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) {
Send {LShift down}{LAlt down}{tab}
KeyWait, tab
} else {
send {tab}
}
return
I_Icon = %A_ScriptDir%\assets\kinto-white.ico
IfExist, %I_Icon%
Menu, Tray, Icon, %I_Icon%
; Set Tray menu
; Menu, Tray, Standard
Menu, Tray, NoStandard ; to remove default menu
Menu, Tray, Add, Set Windows Keyboard, winkb
Menu, Tray, Add, Set Apple Keyboard, mackb
Menu, Tray, Add, Suspend Kinto, tray_suspend
Menu, Tray, Add, Returns to Desktop, min
Menu, Tray, Add
Menu, Tray, Add, Close, Exit
Menu, Tray, Click, 1
Menu, Tray, Tip, Kinto
winkb(){
Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat win, %A_ScriptDir%
}
; Basic Remap
;
; Primary::LCtrl
; Secondary::LAlt
; Tertiary::LWin
mackb(){
Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat mac, %A_ScriptDir%
}
$LCtrl::LWin
$LWin::LCtrl
; Hack to disable start menu on winkey
$LCtrl up::Send {Ctrl down}{LWin up}{Ctrl up}
min(){
; Refocus last active Window
Send {LAlt down}{tab}{LAlt up}
}
; temporary hack to ensure keys don't get stuck
; impacts Alt-Tab fix
$LWin up::Send {LAlt up}{LCtrl up}
tray_suspend(){
suspend toggle
if (a_isSuspended = 1){
menu, tray, check , Suspend Kinto
}
else{
menu, tray, unCheck, Suspend Kinto
}
; Refocus last active Window
Send {LAlt down}{tab}{LAlt up}
}
Exit() {
ExitApp
}
SetTitleMatchMode, 2
@@ -47,6 +56,7 @@ GroupAdd, terminals, ahk_exe powershell.exe
GroupAdd, terminals, ahk_exe WindowsTerminal.exe
GroupAdd, terminals, ahk_exe Hyper.exe
GroupAdd, terminals, ahk_exe Cmd.exe
GroupAdd, terminals, ahk_exe Terminus.exe
GroupAdd, terminals, Fluent Terminal ahk_class ApplicationFrameWindow
GroupAdd, posix, ahk_exe ubuntu.exe
@@ -54,6 +64,7 @@ GroupAdd, posix, ahk_exe ConEmu.exe
GroupAdd, posix, ahk_exe ConEmu64.exe
GroupAdd, posix, ahk_exe Hyper.exe
GroupAdd, posix, ahk_exe mintty.exe
GroupAdd, terminals, ahk_exe Terminus.exe
GroupAdd, posix, Fluent Terminal ahk_class ApplicationFrameWindow
GroupAdd, ConEmu, ahk_exe ConEmu.exe
@@ -67,7 +78,79 @@ GroupAdd, editors, ahk_exe Code.exe
GroupAdd, vscode, ahk_exe VSCodium.exe
GroupAdd, vscode, ahk_exe Code.exe
; Close Apps
GroupAdd, vstudio, ahk_exe devenv.exe
; New AltTab and CtrlTab fix
*tab::
{
; Tertiary
if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P") = false) {
; Secondary
; Send {LCtrl down}{Secondary up}{tab}
; Send {LCtrl down}{LWin up}{tab} ; WinModifiers
; Send {LCtrl down}{LAlt up}{tab} ; MacModifiers
KeyWait, tab
; Tertiary
} else if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P")) {
; Secondary
; Send {LCtrl down}{Secondary up}{LShift down}{tab}
; Send {LCtrl down}{LWin up}{LShift down}{tab} ; WinModifiers
; Send {LCtrl down}{LAlt up}{LShift down}{tab} ; MacModifiers
KeyWait, tab
; Primary
; } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P") = false) { ; WinModifiers
; } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P") = false) { ; MacModifiers
Send {LAlt down}{tab}
KeyWait, tab
; Primary
; } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P")) { ; WinModifiers
; } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) { ; MacModifiers
Send {LAlt down}{LShift down}{tab}
KeyWait, tab
; Secondary
; } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) = false { ; WinModifiers
; } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P") = false) { ; MacModifiers
return
; Secondary
; } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) { ; WinModifiers
; } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P")) { ; MacModifiers
return
} else {
send {Blind}{tab}
}
return
}
tab::Send {tab}
+tab::Send {Shift down}{tab}{Shift up}
; Basic Remap
;
; Primary::LCtrl
; Secondary::LAlt
; Tertiary::LWin
; $LAlt::LCtrl ; WinModifiers
; $RAlt::RCtrl ; WinModifiers
; $LWin::LAlt ; WinModifiers
; $LCtrl::LWin ; WinModifiers
; $LWin::LCtrl ; MacModifiers
; $RWin::RCtrl ; MacModifiers
; $LCtrl::LWin ; MacModifiers
; Hack to disable start menu on winkey
; Static
$LCtrl up::Send {Ctrl down}{LWin up}{Ctrl up}
; temporary hack to ensure keys don't get stuck
; impacts Alt-Tab fix
; Primary
; $LAlt up::Send {LWin up}{LAlt up}{LCtrl up} ; WinModifiers
; $LWin up::Send {LWin up}{LAlt up}{LCtrl up} ; MacModifiers
; Close Apps
^q::Send !{F4}
; Emoji Panel
@@ -97,134 +180,112 @@ $^+Right::Send +{End}
; Cmd+Space Alternative
^Space::Send ^{Esc}
; ^Space::run AppName
; ; Ctrl Tab for In-App Tab Switching
; ; https://autohotkey.com/board/topic/72433-controltab/
; #if GetKeyState("LWin")
; *Tab::
; if(!GetKeyState("LControl"))
; Send {LControl Down}
; Send {Tab}
; SetTimer, WaitForWinUp, 10
; ToolTip trigger
; return
; WaitForWinUp:
; if(!GetKeyState("LWin", "P"))
; {
; Send {LControl Up}
; SetTimer, WaitForWinUp, Off
; }
; return
; ; Sublime Text Remaps for VS Code
; #IfWinActive ahk_group vscode ; ST2CODE
; ; Remap Ctrl+Shift to behave like macOS Sublimetext
; ; Will extend cursor to multiple lines
; #+Up::send ^!{Up} ; ST2CODE
; #+Down::send ^!{Down} ; ST2CODE
; ; Remap Ctrl+Cmd+G to select all matches
; #^g::send ^+{L} ; ST2CODE
; #If ; ST2CODE
#IfWinActive ahk_group vscode ; ST2CODE
; Remap Ctrl+Shift to behave like macOS Sublimetext
; Will extend cursor to multiple lines
#+Up::send ^!{Up} ; ST2CODE
#+Down::send ^!{Down} ; ST2CODE
; Remap Ctrl+Cmd+G to select all matches
#^g::send ^+{L} ; ST2CODE
#If ; ST2CODE
#IfWinActive ahk_exe sublime_text.exe
; Remap Ctrl+Shift to behave like macOS Sublimetext
; Will extend cursor to multiple lines
#+Up::send {shift up}^!{Up}
#+Down::send {shift up}^!{Down}
; Remap Ctrl+Shift to behave like macOS Sublimetext
; Will extend cursor to multiple lines
#+Up::send {shift up}^!{Up}
#+Down::send {shift up}^!{Down}
; Remap Ctrl+Cmd+G to select all matches
#^g::send !{F3}
; Remap Ctrl+Cmd+G to select all matches
#^g::send !{F3}
#If
; #IfWinActive ahk_group terminals
; ; Copy
; ^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up}
; #c::Send {LCtrl down}c{LCtrl Up}
; ; Paste
; $^v::
; If not WinActive("ahk_group ConEmu") && not WinActive("ahk_exe cmd.exe"){
; Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up}
; }
; else{
; Send ^v
; }
; return
; #If
#IfWinActive ahk_group terminals
; Copy
^c::
SetKeyDelay -1
Send {Blind}{LShift down}{c DownTemp}
return
; #IfWinActive ahk_group posix
; ; Open/Close Tab for those that support it
; $^t::
; If not WinActive("ahk_group ConEmu"){
; Send {LCtrl down}{LShift down}t{LCtrl Up}{LShift Up}
; }
; else{
; Send ^t
; }
; return
^c up::
SetKeyDelay -1
Send {Blind}{c Up}{LShift Up}
return
; $^w::
; If not WinActive("ahk_group ConEmu"){
; Send {LCtrl down}{LShift down}w{LCtrl Up}{LShift Up}
; }
; else{
; Send ^w
; }
; return
; Sigints - interrupt
$#c::Send {Ctrl down}c{Ctrl up}
; ; End of Line
; #e::Send {LCtrl down}e{LCtrl Up}
; ^e::return
; ; Beginning of Line
; #a::Send {LCtrl down}a{LCtrl Up}
; ^a::return
; ;^l::Send clear{Enter}
; ;#l::return
; ; Clear Terminal and Scroll Buffer
; ^k::Send clear && printf '\e[3J'{Enter}
; ; Nano editor shortcuts
; #k::Send {LCtrl down}k{LCtrl Up}
; #x::Send {LCtrl down}x{LCtrl Up}
; #o::Send {LCtrl down}o{LCtrl Up}
; #r::Send {LCtrl down}r{LCtrl Up}
; #w::Send {LCtrl down}w{LCtrl Up}
; #\::Send {LCtrl down}\{LCtrl Up}
; #u::Send {LCtrl down}u{LCtrl Up}
; #j::Send {LCtrl down}j{LCtrl Up}
; #t::Send {LCtrl down}t{LCtrl Up}
; #_::Send {LCtrl down}_{LCtrl Up}
; #z::Send {LCtrl down}z{LCtrl Up}
; #If
; Paste
^v::
If WinActive("ahk_group posix"){
Send {Blind}{Shift down}v{Shift up}
}
else{
Send {Blind}v
}
return
#If
; ; #IfWinActive ahk_group ConEmu
; ; ; Paste
; ; $^v::Send {Shift down}{Insert}{Shift Up}
; ; #v::Send {LCtrl down}v{LCtrl Up}
; ; #If
#IfWinActive ahk_group posix
; Open/Close Tab for those that support it
$^t::
If not WinActive("ahk_group ConEmu"){
Send {LCtrl down}{LShift down}t{LCtrl Up}{LShift Up}
}
else{
Send ^t
}
return
; #IfWinActive ahk_exe mintty.exe
; ; Copy
; $^c::Send {Control down}{Insert}{Control Up}
; #c::Send {LCtrl down}c{LCtrl Up}
; ; Paste
; $^v::Send {Shift down}{Insert}{Shift Up}
; #v::Send {LCtrl down}v{LCtrl Up}
; #If
$^w::
If not WinActive("ahk_group ConEmu"){
Send {LCtrl down}{LShift down}w{LCtrl Up}{LShift Up}
}
else{
Send ^w
}
return
; ;Disable win + l key locking (This line must come before any hotkey assignments in the .ahk file)
; End of Line
^e::
SetKeyDelay -1
Send {Blind}{e DownTemp}
return
; ; Admin privileges required
; ; Sets Workstation Lock to not occur on Win+L
; ; RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 1
^e up::
SetKeyDelay -1
Send {Blind}{e Up}
return
; ; Re-enables Workstation lock on Ctrl+Cmd+Q
; ; Need to Remove Quick Assist and reboot
; ; Remove-WindowsCapability -online -name App.Support.QuickAssist~~~~0.0.1.0
; #^q::
; ; re-enable locking workstation, then lock it
; ; RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 0
; ; DllCall("LockWorkStation")
; ; Reload script to relock Workstation Lock
; ; Reload
; ;return
; Beginning of Line
^a::
SetKeyDelay -1
Send {Blind}{a DownTemp}
return
^a up::
SetKeyDelay -1
Send {Blind}{a Up}
return
^l::Send clear{Enter}
; #l::return
; Clear Terminal and Scroll Buffer
^k::Send clear && printf '\e[3J'{Enter}
; Nano editor shortcuts
#g::Send {LCtrl down}g{LCtrl Up}
#k::Send {LCtrl down}k{LCtrl Up}
#x::Send {LCtrl down}x{LCtrl Up}
#o::Send {LCtrl down}o{LCtrl Up}
#r::Send {LCtrl down}r{LCtrl Up}
#w::Send {LCtrl down}w{LCtrl Up}
#\::Send {LCtrl down}\{LCtrl Up}
#u::Send {LCtrl down}u{LCtrl Up}
#j::Send {LCtrl down}j{LCtrl Up}
#t::Send {LCtrl down}t{LCtrl Up}
#_::Send {LCtrl down}_{LCtrl Up}
#z::Send {LCtrl down}z{LCtrl Up}
#y::Send {LCtrl down}y{LCtrl Up}
#v::Send {LCtrl down}v{LCtrl Up}
#If