Merge branch 'master' into demo

- Corrected Suspend error, duplicate code issue

README.md

@@ -61,7 +61,7 @@ I'd say 90+% of the time no, but every OS has their default conventions that som
 
 ## What does Kinto require?
 
-- Python (initial install only)
+- Python
 - systemd
 - x11
 - IBus*
@@ -77,9 +77,9 @@ Wayland support is planned, but not ready yet.
 
 ### Kinto for Windows 10 Requirements
 
-- WSL Ubuntu edition
+- [Git for Windows](https://git-scm.com/download/win)
 - Powershell - run as Administrator
-- Python3
+- [Python3](https://www.python.org/downloads/windows/)
 
 Other programs that will be installed when you run ./setup.py
 - Chocolatey
@@ -95,7 +95,7 @@ Users can now hotswap between Apple and Windows based keyboards without having t
 <img src="https://user-images.githubusercontent.com/10969616/84471501-10a51380-ac4b-11ea-9e0e-c19a7ebfad6d.png" width="50%">
 
 
-## How to install
+## How to install (Linux)
 
 1. clone this repo
 ```
@@ -120,6 +120,21 @@ To Uninstall Kinto
 ./setup.py
 ```
 
+## How to Install (Windows)
+
+Video Tutorial: [How to Install Kinto.sh on Windows 10](https://youtu.be/sRk8A8krz40)
+
+Install
+```
+python setup.py
+```
+
+To Uninstall Kinto
+
+```
+python setup.py
+```
+
 ## Shortcut Creation (Xkeysnail)
 
 **GUI Keys**

setup.py

@@ -37,18 +37,18 @@ def windows_setup():
 		print("This install will fail if you are not running with elevated privileges")
 		os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"')
 		os.system('refreshenv')
-		print("\nWill now install Ubuntu Terminal Theme as default...")
+		print("\nWill now install Ubuntu Termimnal Theme as default...")
 		os.system("regedit " + path + "\\windows\\theme_ubuntu.reg")
+		os.system('robocopy '+ path + '\\assets "%userprofile%\\.kinto\\assets" /E')
 		if(stvscode):
 			os.system('perl -pi -e "s/(; )(.*)(; ST2CODE)/$2$3/g" ./windows/kinto-new.ahk')
-		os.system('copy /Y ' + path + '\\windows\\kinto-start.vbs "%userprofile%\\.kinto\\kinto-start.vbs"')
+		os.system('copy /Y ' + path + '\\windows\\kinto-start.vbs "%userprofile%\\.kinto\\kinto-start.vbs')
 		os.system('copy /Y ' + path + '\\windows\\usb.vbs "%userprofile%\\.kinto\\usb.vbs"')
-		os.system('copy /Y ' + path + '\\windows\\usb.vbs "%userprofile%\\.kinto\\detectUSB.vbs"')
+		os.system('copy /Y ' + path + '\\windows\\detectUSB.ahk "%userprofile%\\.kinto\\detectUSB.ahk"')
 		os.system('mklink "%userprofile%\\Start Menu\\Programs\\Startup\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
-		os.system('cp '+ path + '\\windows\\NoShell.vbs "%userprofile%\\.kinto\\NoShell.vbs"')
-		os.system('cp '+ path + '\\windows\\toggle_kb.bat "%userprofile%\\.kinto\\toggle_kb.bat"')
-		os.system('cp '+ path + '\\windows\\kinto-new.ahk "%userprofile%\\.kinto\\kinto.ahk"')
-		os.system('robocopy '+ path + '\\assets "%userprofile%\\.kinto\\assets" /E')
+		os.system('copy /Y '+ path + '\\windows\\NoShell.vbs "%userprofile%\\.kinto\\NoShell.vbs"')
+		os.system('copy /Y '+ path + '\\windows\\toggle_kb.bat "%userprofile%\\.kinto\\toggle_kb.bat"')
+		os.system('copy /Y '+ path + '\\windows\\kinto-new.ahk "%userprofile%\\.kinto\\kinto.ahk"')
 		os.system("del /f .\\windows\\kinto-new.ahk")
 		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
 		os.system("%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs")

windows/kinto.ahk

@@ -5,6 +5,8 @@
 DetectHiddenWindows, On
 Run, %A_ScriptDir%\detectUSB.ahk
 
+Run, C:\Users\%A_UserName%\.keypressosd\KeypressOSD_kinto.ahk
+
 ; I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
 ; IfExist, %I_Icon%                                       ; MacModifiers
 ; Menu, Tray, Icon, %I_Icon%,, 1                          ; MacModifiers
@@ -48,6 +50,9 @@ tray_suspend(){
         Menu, Tray, Tip, Suspended - Kinto
         IfWinExist, detectUSB.ahk
             WinClose
+        IfWinExist, KeypressOSD_kinto.ahk
+            WinClose
+        Run, C:\Users\%A_UserName%\.keypressosd\KeypressOSD.ahk
     }
     else{
         menu, tray, unCheck, Suspend Kinto
@@ -55,6 +60,9 @@ tray_suspend(){
 ;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; WinModifiers
         Menu, Tray, Icon, %I_Icon%,,1
         Run, %A_ScriptDir%\detectUSB.ahk
+        IfWinExist, KeypressOSD.ahk
+            WinClose
+        Run, C:\Users\%A_UserName%\.keypressosd\KeypressOSD_kinto.ahk
     }
     ; Refocus last active Window
     Send {LAlt down}{tab}{LAlt up}
@@ -63,48 +71,14 @@ tray_suspend(){
 Exit() {
     IfWinExist, detectUSB.ahk
         WinClose
-
+    IfWinExist, KeypressOSD.ahk
+        WinClose, C:\Users\%A_UserName%\.keypressosd\KeypressOSD.ahk ahk_class AutoHotkey
+    IfWinExist, KeypressOSD_kinto.ahk
+        WinClose, C:\Users\%A_UserName%\.keypressosd\KeypressOSD_kinto.ahk ahk_class AutoHotkey
+            
     ExitApp
 }
 
-OnMessage(0x219, "notify_change")
-return
-
-lastkb = ""
-
-DllCall("AllocConsole")
-WinHide % "ahk_id " DllCall("GetConsoleWindow", "ptr")
-
-notify_change(wParam, lParam, msg, hwnd) 
-{
-    global lastkb
-    ; kbtype = % ComObjCreate("WScript.Shell").Exec("cscript /nologo usb.vbs").StdOut.ReadAll()
-    DetectHiddenWindows On
-    Run %ComSpec%,, Hide, pid
-    WinWait ahk_pid %pid%
-    DllCall("AttachConsole", "UInt", pid)
-    WshShell := ComObjCreate("Wscript.Shell")
-    exec := WshShell.Exec("cscript /nologo usb.vbs")
-    kbtype := exec.StdOut.ReadAll()
-    DllCall("FreeConsole")
-    Process Close, %pid%
-    if lastkb != %kbtype%
-    {
-
-        if InStr(kbtype, "Apple")
-        {
-            ; MsgBox, Apple
-            Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat mac, %A_ScriptDir%
-        }
-        else{
-            ; MsgBox, Windows
-            Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat win, %A_ScriptDir%
-        }
-        ; MsgBox % kbtype
-    }
-    lastkb = %kbtype%
-}
-
 SetTitleMatchMode, 2
 
 GroupAdd, terminals, ahk_exe ubuntu.exe