Switch to Windows 7

5 files changed, 30 insertions, 57 deletions

diff --git a/tt.windowselect.ahk b/!tt.windowselect.ahk
index 0914004..0914004 100644
--- a/tt.windowselect.ahk
+++ b/!tt.windowselect.ahk
diff --git a/scripts.ahk b/scripts.ahk
index 45d4cbe..f022e7b 100644
--- a/scripts.ahk
+++ b/scripts.ahk
@@ -67,7 +67,7 @@ return
 
 ^F12 Up::
 Sleep, 600
-Run, %A_WinDir%\system32\ssstars.scr /s ; start screen saver
+Run, %A_WinDir%\system32\Mystify.scr /s ; start screen saver
 return
 
 ; Library ---------------------------------------------------------------------
diff --git a/tt.jump.ahk b/tt.jump.ahk
index 35b6022..31fe3f7 100644
--- a/tt.jump.ahk
+++ b/tt.jump.ahk
@@ -3,10 +3,11 @@
 JumpPaths := { s: env("Sync")
 			       , w: env("Sync") "\Projekt\john.ankarstrom.se\htdocs"
 			       , g: env("Sync") "\Projekt\git"
-			       , e: env("Personal")
-			       , d: env("Personal") "\Downloads"
-			       , m: env("Personal") "\MP3"
-			       , p: env("Personal") "\My Pictures" }
+			       , u: env("UserProfile")
+			       , e: env("UserProfile") "\Documents"
+			       , d: env("UserProfile") "\Downloads"
+			       , m: env("UserProfile") "\Music"
+			       , p: env("UserProfile") "\Pictures" }
 
 ;; -> body
 
diff --git a/tt.programs.explorer.ahk b/tt.programs.explorer.ahk
index 0d31034..db07380 100644
--- a/tt.programs.explorer.ahk
+++ b/tt.programs.explorer.ahk
@@ -50,12 +50,7 @@ WinWait, ahk_class ConsoleWindowClass
 SendInput, % "cd " path "{Return}"
 return
 
-; Create new folder/file
-
-^+n::
-FileCreateDir, % ExplorerPath() "\New Folder"
-SendInput, {F5}New Folder{F2}
-return
+; Create new file
 
 ^!n::
 FileAppend,, % ExplorerPath() "\New Text Document.txt"
@@ -129,35 +124,24 @@ Loop, % win
 	PostMessage, 0x111, 41504,,, % "ahk_id " win%A_Index% ; refresh
 return
 
-; Sort and display options
-
-^q::ExplorerFolderView("name")
-^w::ExplorerFolderView("modified")
-^e::ExplorerFolderView("type")
-^t::ExplorerFolderView("created")
-^g::ExplorerFolderView("groups")
-^s::ExplorerFolderView("tiles")
-^d::ExplorerFolderView("icons")
-^+d::ExplorerFolderView("thumbnails")
-^f::ExplorerFolderView("details")
-^+f::ExplorerFolderView("list")
-
-^!q::ExplorerFolderView("name", true)
-^!w::ExplorerFolderView("modified", true)
-^!e::ExplorerFolderView("type", true)
-^!t::ExplorerFolderView("created", true)
-^!g::ExplorerFolderView("groups", true)
-^!s::ExplorerFolderView("tiles", true)
-^!d::ExplorerFolderView("icons", true)
-^!+d::ExplorerFolderView("thumbnails", true)
-^!f::ExplorerFolderView("details", true)
-^!+f::ExplorerFolderView("list", true)
+; Sort and display options (Windows XP)
+
+;^q::ExplorerFolderView("name")
+;^w::ExplorerFolderView("modified")
+;^e::ExplorerFolderView("type")
+;^t::ExplorerFolderView("created")
+;^g::ExplorerFolderView("groups")
+;^s::ExplorerFolderView("tiles")
+;^d::ExplorerFolderView("icons")
+;^+d::ExplorerFolderView("thumbnails")
+;^f::ExplorerFolderView("details")
+;^+f::ExplorerFolderView("list")
 
 #IfWinActive
 
 ;; -> library
 
-ExplorerFolderView(view, children := false)
+ExplorerFolderView(view)
 {
 	if (view = "name")
 		n := {m: 30210, d: -1}
@@ -180,20 +164,8 @@ ExplorerFolderView(view, children := false)
 	else if (view = "list")
 		n := {m: 28715, d: 3}
 	
-	PostMessage, 0x111, % n.m, 0,, A ; change current folder
+	PostMessage, 0x111, % n.m, 0,, A
 	return
-	if (not children or m.d = -1)
-		return
-	
-	old := A_BatchLines
-	SetBatchLines, -1
-	
-	Loop, Files, % ExplorerPath() "\*", D
-	{
-		MsgBox, % A_LoopFileFullPath
-	}
-	
-	SetBatchLines, % old
 }
 
 ;; Git hotkeys ----------------------------------------------------------------
@@ -231,6 +203,7 @@ basename(s)
 !c::Run, % "cmd /c cd "qp()" & git commit & pause"
 !+c::Run, % "cmd /c cd "qp()" & git commit --amend & pause"
 !^c::Run, % "cmd /c cd "qp()" & git commit -a & pause"
+!^+c::Run, % "cmd /c cd "qp()" & git commit -a --amend & pause"
 !p::Run, % "cmd /c cd "qp()" & git push & pause"
 !s::Run, % "cmd /c cd "qp()" & git status & pause"
 
diff --git a/tt.volume.ahk b/tt.volume.ahk
index e01be7d..5946469 100644
--- a/tt.volume.ahk
+++ b/tt.volume.ahk
@@ -13,15 +13,14 @@ RAlt & F5::SetVolume(GetKeyState("Shift") ? -2 : -1)
 
 SetVolume(n)
 {
-	SoundGet, w, WAVE
-	SoundSet, 15
-	w := round(w) + n
-	if (w > 100)
-		w := 100
-	if (w < 0)
-		w := 0
-	SoundSet, %w%, WAVE
-	OSD(w)
+	SoundGet, s
+	s := round(s) + n
+	if (s > 100)
+		s := 100
+	if (s < 0)
+		s := 0
+	SoundSet, %s%
+	OSD(s)
 }
 
 /*