General cleanup, see details

- SciTE title bar no longer displays the full file path
- Support for IronAHK and HKML scripts has been removed
- Attach debugger command can now be used even if the current document
  is not an AHK script
- Minor Toolbar stability fix
- Removal of unused functions
- More COMization
- Fix minor auto-updater bug

README.md

@@ -13,7 +13,7 @@ SciTE4AutoHotkey is a SciTE-based AutoHotkey script editor. It offers:
 * AutoIndent
 * AutoHotkey help integration
 * Abbreviations
-* AutoHotkey_L debugging support
+* Debugging support
 * Tools for AutoHotkey scripting
 * A toolbar that enables easy access to the tools
 * Some AutoHotkey scripting facilities
@@ -30,9 +30,8 @@ In order to do so, follow the instructions in the *scipatches* folder. When done
 
 Afterwards, download the current portable build in order to get some files from it:
 
-* SciTE_beta5/tools/GenDocs/hha.dll and hha.exe -> source/tools/GenDocs/
-* SciTE_beta5/tools/Rebranded/\*.\* -> source/tools/Rebranded/
+* SciTE/tools/Rebranded/\*.\* -> source/tools/Rebranded/
 
 You must also build the [documentation](https://github.com/fincs/SciTE4AHK-Docs) and place it in the source folder.
 
-The latest AutoHotkey_L Unicode binary (v1.1.08.00 at the time of writing) also needs to be placed in the source folder.
+The latest AutoHotkey Unicode binary (v1.1.09.00 at the time of writing) also needs to be placed in the source folder.

SciTEDirectory.properties

@@ -1,5 +1,5 @@
 
 # Git GUI command - please note that it only affects this project!
 command.name.7.*=Git GUI
-command.subsystem.7.*=0
+command.subsystem.7.*=2
 command.7.*=cmd /c cd "$(SciteDirectoryHome)" && git gui

source/License.txt

@@ -1,7 +1,7 @@
 License for Scintilla and SciTE
 ===============================
 
-Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+Copyright 1998-2012 by Neil Hodgson <neilh@scintilla.org>
 
 All Rights Reserved
 
@@ -23,7 +23,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 License for the toolbar, debugger & setting files
 =================================================
 
-Copyright 2007-2011 by fincs (@ autohotkey.com forum)
+Copyright 2007-2012 by fincs (@ autohotkey.com forum)
 
 This program is free software. It comes without any warranty, to
 the extent permitted by applicable law. You can redistribute it and/or

source/SciTEGlobal.properties

@@ -53,7 +53,7 @@ load.on.activate=1
 reload.preserves.undo=1
 check.if.already.open=1
 save.all.for.build=0
-title.full.path=1
+title.full.path=0
 title.show.buffers=1
 save.recent=1
 save.session=1

source/ahk.properties

@@ -8,21 +8,16 @@
 
 # AutoHotkey path
 AutoHotkeyDir=$(SciteDefaultHome)\..
-IronAHKDir=$(AutoHotkeyDir)\IronAHK
 LocalAHK=$(SciteDefaultHome)\InternalAHK.exe
 
 # Script file extensions
 ahk.file.extension=*.ahk
-ia.file.extension=*.ia
 ahkscriptlet.file.extension=*.scriptlet
-hkml.file.extension=*.hkml
 
 # General settings
-file.patterns.ahk=$(ahk.file.extension);$(ia.file.extension);$(ahkscriptlet.file.extension);$(hkml.file.extension)
+file.patterns.ahk=$(ahk.file.extension);$(ahkscriptlet.file.extension)
 filter.ahk=\
 AutoHotkey scripts (*.ahk)|$(ahk.file.extension)|\
-IronAHK scripts (*.ia)|$(ia.file.extension)|\
-HKML documents (*.hkml)|$(hkml.file.extension)|\
 AHK scriptlets (*.scriptlet)|$(ahkscriptlet.file.extension)|
 lexer.$(file.patterns.ahk)=ahk1
 braces.ahk1.style=5

source/platforms.properties

@@ -62,7 +62,7 @@ command.shortcut.1.$(file.patterns.ahk)=Ctrl+Shift+F5
 command.subsystem.1.$(file.patterns.ahk)=2
 
 ; Debugger attaching command
-command.name.2.$(file.patterns.ahk)=Debug a currently running script...
-command.2.$(file.patterns.ahk)="$(LocalAHK)" /ErrorStdOut "$(SciteDefaultHome)\debugger\SciTEDebug.ahk" /attach
-command.shortcut.2.$(file.patterns.ahk)=Ctrl+Shift+F7
-command.subsystem.2.$(file.patterns.ahk)=2
+command.name.2.*=Debug a currently running script...
+command.2.*="$(LocalAHK)" /ErrorStdOut "$(SciteDefaultHome)\debugger\SciTEDebug.ahk" /attach
+command.shortcut.2.*=Ctrl+Shift+F7
+command.subsystem.2.*=2

source/toolbar/Toolbar.ahk

@@ -290,9 +290,12 @@ var2 = %2%
 if (var1 != "/NoAutorun" && var2 != "/NoAutorun")
 	Run, "%A_AhkPath%" "%SciTEDir%\Autorun.ahk"
 
+; Safety SciTE window existance timer
+SetTimer, check4scite, 1000
+
 if FirstTime
 {
-	Director_Send("open:" CEscape(SciTEDir "\TestSuite.ahk"))
+	CoI_OpenFile("", SciTEDir "\TestSuite.ahk")
 	MsgBox, 64, SciTE4AutoHotkey, Welcome to SciTE4AutoHotkey!
 	Run, "%A_AhkPath%" "%SciTEDir%\tools\PropEdit.ahk"
 }
@@ -301,7 +304,7 @@ return
 ; Toolbar event handler
 OnToolbar(hToolbar, pEvent, pTxt, pPos, pId)
 {
-	Global
+	global
 	Critical
 
 	if pEvent = click

source/tools/PropEdit.ahk

@@ -185,23 +185,3 @@ GetItem(ByRef list, id, delim="|")
 		if (A_Index = id)
 			return A_LoopField
 }
-
-Util_Is64bitWindows()
-{
-	DllCall("IsWow64Process", "ptr", DllCall("GetCurrentProcess", "ptr"), "uint*", retval)
-	if ErrorLevel
-		return 0
-	else
-		return retval
-}
-
-Util_Is64bitProcess(pid)
-{
-	if !Util_Is64bitWindows()
-		return 0
-
-	proc := DllCall("OpenProcess", "uint", 0x0400, "uint", 0, "uint", pid, "ptr")
-	DllCall("IsWow64Process", "ptr", proc, "uint*", retval)
-	DllCall("CloseHandle", "ptr", proc)
-	return retval ? 0 : 1
-}

source/tools/SUtility.ahk

@@ -52,7 +52,7 @@ if 1 = /insert
 		Press OK to edit the toolbar properties file.
 		)
 		IfMsgBox, Yes
-			Run, "%A_ScriptDir%\..\SciTE.exe" "%LocalSciTEPath%\UserToolbar.properties"
+			scite.OpenFile(LocalSciTEPath "\UserToolbar.properties")
 		ExitApp
 	}
 	FileRead, text2insert, %sdir%\%2%.scriptlet
@@ -165,14 +165,7 @@ if selected =
 	return
 
 FileAppend, `n=Scriptlet: %selected%|`%LOCALAHK`% tools\SUtility.ahk /insert "%selected%"||`%ICONRES`%`,12, %LocalSciTEPath%\UserToolbar.properties
-scite := GetSciTEInstance()
-if !scite
-{
-	MsgBox, 16, Scriptlet Utility, SciTE COM object not found!
-	ExitApp
-}
 scite.Message(0x1000+2)
-scite := ""
 return
 
 InsertBut:
@@ -181,14 +174,7 @@ InsertDirect:
 if text2insert =
 	return
 WinActivate, ahk_id %scitehwnd%
-scite := GetSciTEInstance()
-if !scite
-{
-	MsgBox, 16, Scriptlet Utility, Undefined error: the toolbar is not running?
-	ExitApp
-}
 scite.InsertText(text2insert)
-scite := ""
 return
 
 SaveBut:

source/tools/SciTEDiag.ahk

@@ -13,7 +13,7 @@ SetWorkingDir, %A_ScriptDir%
 oSciTE := ComObjActive("SciTE4AHK.Application")
 SciTEDir := oSciTE.SciTEDir
 A_AhkBin := oSciTE.ResolveProp("AutoHotkey")
-SplitPath, A_AhkBin,, A_AhkDir
+A_AhkDir := oSciTE.ResolveProp("AutoHotkeyDir")
 
 MsgBox, 36, SciTE Diagnostics Utility,
 (
@@ -30,8 +30,6 @@ Continue?
 IfMsgBox, No
 	ExitApp
 
-
-
 diagtext := "SciTE Diagnostic Info`n=====================`n`nSciTE dir: " SciTEDir
 . "`nAutoHotkey build: " GetAhkVer(A_AhkBin) "`nCurrent platform: " oSciTE.ActivePlatform "`n`n"
 

source/tools/updater/SciTEUpdate.ahk

@@ -61,7 +61,7 @@ try
 }
 
 FileRead, curVer, ..\..\$VER
-if (curVer != latestVer)
+if (curVer < latestVer)
 {
 	MsgBox, 36, SciTE4AutoHotkey Updater,
 	(LTrim