General improvements

Remove unreliable RDP reload
Alter timers
Casing and whitespace changes
Move unused borders script

2 files changed, 9 insertions, 135 deletions

diff --git a/ahk-assistant.ahk b/ahk-assistant.ahk
index ea41846..e9d3b7d 100644
--- a/ahk-assistant.ahk
+++ b/ahk-assistant.ahk
@@ -7,13 +7,12 @@
 #NoEnv
 #SingleInstance,Force
 SetTimer, changeReload, 1000
-SetTimer, remoteReload, 1000
 CoordMode,Mouse
 SetWorkingDir %A_MyDocuments%\..\
 ProgramFilesX86 := A_ProgramFiles . (A_PtrSize=8 ? " (x86)" : "") ; pfx86 variable from http://www.autohotkey.com/board/topic/79160-a-programfiles-for-programs-in-windows-7-x86-directory/
-SetWinDelay,1
-SetKeyDelay,1
-SetControlDelay,1
+SetWinDelay,0
+SetKeyDelay,0
+SetControlDelay,0
 SetCapsLockState, AlwaysOff
 SetScrollLockState, AlwaysOff
 SetNumLockState, AlwaysOn
@@ -48,8 +47,8 @@ SetNumLockState, AlwaysOn
 ^!Space::toggleAudioDevice()
 RAlt & j::ShiftAltTab
 RAlt & k::AltTab
-Ralt & PgUp::Send {WheelUp}
-Ralt & PgDn::Send {WheelDown}
+RAlt & PgUp::Send {WheelUp}
+RAlt & PgDn::Send {WheelDown}
 SC029::Send, 0 ; Backtick send zeroes
 +SC029::Send, `` ; S-Backtick send backticks
 ^SC029::Send, `¬ ; C-Backtick send negations
@@ -149,8 +148,9 @@ Insert::appendClipboard()
 :c*?:(ai)::ä
 :c*?:(Oi)::Ö
 :c*?:(oi)::ö
-; norwegian
+; norwegian/danish
 :c*?:(AE)::Æ
+:c*?:(Ae)::Æ
 :c*?:(ae)::æ
 :c*?:(O/)::Ø
 :c*?:(o/)::ø
@@ -362,7 +362,7 @@ Insert::appendClipboard()
   ^b::Send ^v ; replace bookmarks with paste
   #o::Send, ^c{F6}^v{Enter} ; copy selected uri and open in current tab
   #+o::Send, ^c^t^v{Enter} ; copy selected uri and open in new tab
-  ^+o::Send, !t {sleep 25} o ; C-S-o options
+  ^+o::Send, !t{sleep 25}o ; C-S-o options
   F1:: ; overflow
   F2::tabSplit() ; split current tab from window and tile, kinda flakey and in need of improvement
   F7:: ; overflow
@@ -401,7 +401,7 @@ Insert::appendClipboard()
 #IfWinActive
 
 
-changeReload: ; auto-reload on change
+changeReload: ; auto-reload script on source change
   {
     FileGetAttrib, FileAttribs, %A_ScriptFullPath%
     IfInString, FileAttribs, A
@@ -414,12 +414,3 @@ changeReload: ; auto-reload on change
       }
     Return
   }
-
-remoteReload: ; reload script when rdp window is detected to allow sending to 
-IfWinActive, ahk_class TscShellContainerClass
-{
-    WinWaitNotActive, ahk_class TscShellContainerClass,,3600
-}
-WinWaitActive, ahk_class TscShellContainerClass,,3600
-Reload
-return
diff --git a/borders.ahk b/borders.ahk
deleted file mode 100644
index a603798..0000000
--- a/borders.ahk
+++ /dev/null
@@ -1,117 +0,0 @@
-
-;doesn't work via include, must run standalone
-
-GoSub, HookWindow
-
-HookWindow:
-    ; New Window Hook
-    Gui +LastFound
-    hWnd := WinExist()
-
-    DllCall( "RegisterShellHookWindow", UInt,hWnd )
-    MsgNum := DllCall( "RegisterWindowMessage", Str,"SHELLHOOK" )
-    OnMessage( MsgNum, "ShellMessage" )
-
-    ShellMessage(wParam,lParam) {
-        If (wParam = 1) ;  HSHELL_WINDOWCREATED := 1
-        {
-            Sleep, 10
-            AdjustWindow(lParam)
-        }
-    }
-Return
-
-AdjustWindow(id)
-{
-    WinId := id
-    WinTitle := id = "A" ? "A" : "ahk_id " . id
-
-    ; This is to check if the window is shown in the alt-tab menu, you don't want to do it on every single frame
-    WinGet, WinExStyle, ExStyle, %WinTitle%
-    If (WinExStyle & 0x80)
-    {
-        Return
-    }
-
-    WinGetClass, WinClass, %WinTitle%
-    WinGet, WinProcess, ProcessName, %WinTitle%
-
-    If WinClass In % "CabinetWClass"
-    If WinProcess In % "explorer.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinClass In % "ShImgVw:CPreviewWnd" ;windows xp image viewer
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinClass In % "MMCMainFrame" ;windows xp mmc panes
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinClass In % "MozillaWindowClass" ;firefox
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinClass In % "#32770" ;windows xp date/time picker, amongst many other things
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "Photoshop.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "sumatrapdf.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "mintty.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "7zFM.exe" ;7zip
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "msaccess.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "excel.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "Notepad2.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "outlook.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "winword.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinClass In % "Qt5QWindowIcon" ;owncloud client
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinProcess In % "charmap.exe"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-    If WinClass In % "mpv"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-   If WinClass In % "AutoHotkeyGUI"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-   If WinClass In % "RegEdit_RegEdit"
-    {
-        WinSet, Style, -0xC00000, %WinTitle%
-    }
-
-}
\ No newline at end of file