diff --git a/TODO.txt b/TODO.txt index d051209..b8b8e71 100644 --- a/TODO.txt +++ b/TODO.txt @@ -11,9 +11,9 @@ Features/fixes for 0.6 release: x Set focus on Preferences so On-the-fly shortcut doesn't immediately blank out to "None" - Features: - - Define custom hotkey + - Define custom hotkey or implement "no trigger" replacements - Integrate AHK autocorrect script - (Unless Dustin's new trigger method works, consider compiling autocorrect to .exe, storing it in resources, hiding from systray, and running separately when enabled, killing when disabled. The script doesn't play nice with the SC77 special char trigger) + - Can select bundle when creating new on-the-fly hotstring x Disable via global hotkey? Features/fixes for 0.5 release: diff --git a/includes/GUI/management_GUI.ahk b/includes/GUI/management_GUI.ahk index 4fd6011..8d3d716 100644 --- a/includes/GUI/management_GUI.ahk +++ b/includes/GUI/management_GUI.ahk @@ -22,16 +22,19 @@ GoSub,GetFileList Bundles = Loop,bundles\*,2 { - Bundles = %Bundles%|%A_LoopFileName% thisBundle = %A_LoopFileName% + if (thisBundle != "Autocorrect") + { + Bundles = %Bundles%|%A_LoopFileName% ; Loop,bundles\%A_LoopFileName%\replacements\*.txt ; { ; thisReplacement:=Dehexify(A_LoopFileName) ; thisBundle = %thisBundle%%thisReplacement%| ; } - StringReplace, thisBundle, thisBundle, .txt,,All - StringReplace, thisBundle, thisBundle, %A_LoopFileName%,, - %A_LoopFileName% = %thisBundle% + StringReplace, thisBundle, thisBundle, .txt,,All + StringReplace, thisBundle, thisBundle, %A_LoopFileName%,, + %A_LoopFileName% = %thisBundle% + } } StringReplace, FileList, FileList, .txt,,All StringTrimLeft,Bundles,Bundles,1 @@ -48,9 +51,10 @@ Gui,2: Add, DropDownList, Section ys vTextOrScript, Text||Script Gui,2: Font, s12, Arial Gui,2: Add, Edit, r12 W460 xs vFullText Gui,2: Add, Text, xs,Trigger: -Gui,2: Add, Checkbox, vEnterCbox yp xp+65, Enter -Gui,2: Add, Checkbox, vTabCbox yp xp+65, Tab -Gui,2: Add, Checkbox, vSpaceCbox yp xp+60, Space +Gui,2: Add, Checkbox, gDisableChecks vEnterCbox yp xp+65, Enter +Gui,2: Add, Checkbox, gDisableChecks vTabCbox yp xp+65, Tab +Gui,2: Add, Checkbox, gDisableChecks vSpaceCbox yp xp+60, Space +Gui,2: Add, Checkbox, gDisableChecks vNoTrigCbox yp xp+80, Instant Gui,2: Font, s8, Arial Gui,2: Add,Button, w80 GPButtonSave xs+375 yp, &Save IniRead,bundleCheck,texter.ini,Bundles,Default @@ -58,9 +62,11 @@ Gui,2: Add, Checkbox, Checked%bundleCheck% vbundleCheck gToggleBundle xs+400 yp+ Gui,2: Add, Button, w80 Default GPButtonOK xs+290 yp+30,&OK Gui,2: Add, Button, w80 xp+90 GPButtonCancel, &Cancel Gui,2: Show, , Texter Management +GuiControl,2: Focus, Choice Hotkey,IfWinActive, Texter Management Hotkey,!p,Preferences -Hotkey,delete,Delete +;Hotkey,delete,Delete +Hotkey,^s,PButtonSave Hotkey,IfWinActive return @@ -112,7 +118,7 @@ Gosub,BuildActive return ADD: -EnableTriggers(false) +;EnableTriggers(false) GoSub,Newkey IfWinExist,Add new hotstring... { @@ -122,7 +128,7 @@ IfWinExist,Add new hotstring... GoSub,ListBundle StringReplace, CurrentBundle, CurrentBundle,|%RString%|,|%RString%|| GuiControl,,Choice,|%CurrentBundle% -EnableTriggers(true) +;EnableTriggers(true) GoSub,ShowString return @@ -165,6 +171,7 @@ else FileRead,enter,%ReadFrom%bank\enter.csv FileRead,tab,%ReadFrom%bank\tab.csv FileRead,space,%ReadFrom%bank\space.csv +FileRead,notrig,%ReadFrom%bank\notrig.csv if ActiveChoice in %enter% { @@ -184,6 +191,12 @@ if ActiveChoice in %space% } else GuiControl,,SpaceCbox,0 +if ActiveChoice in %notrig% +{ + GuiControl,,NoTrigCbox,1 +} +else + GuiControl,,NoTrigCbox,0 FileRead, Text, %ReadFrom%replacements\%ActiveChoice%.txt IfInString,Text,::scr:: { @@ -205,7 +218,7 @@ If Choice <> SaveToDir = Bundles\%CurrentBundle%\ else SaveToDir = - PSaveSuccessful := SaveHotstring(Choice, FullText, IsScript, SaveToDir, SpaceCbox, TabCbox, EnterCbox) + PSaveSuccessful := SaveHotstring(Choice, FullText, IsScript, SaveToDir, SpaceCbox, TabCbox, EnterCbox, NoTrigCbox) } else { diff --git a/includes/GUI/newkey_GUI.ahk b/includes/GUI/newkey_GUI.ahk index 8fd5de2..31d5891 100644 --- a/includes/GUI/newkey_GUI.ahk +++ b/includes/GUI/newkey_GUI.ahk @@ -1,7 +1,27 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Implementation and GUI for on-the-fly creation ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; NEWKEY: +Bundles= +Loop,bundles\*,2 +{ + thisBundle = %A_LoopFileName% + if (thisBundle != "Autocorrect") + { + Bundles = %Bundles%%A_LoopFileName%| + StringReplace, thisBundle, thisBundle, .txt,,All + StringReplace, thisBundle, thisBundle, %A_LoopFileName%,, + %A_LoopFileName% = %thisBundle% + } +} if A_GuiControl = + ;;;; MAYBE CHANGE THIS TO IfWinExist,Texter Management +{ GuiControlGet,CurrentBundle,,BundleTabs + StringReplace,Bundles,Bundles,%CurrentBundle%,$ + StringSplit,Bundles,Bundles,$ +; MsgBox,%Bundles1% %Bundles2% +; msgbox %currentbundle% +; msgbox,%bundles2% + Bundles = %Bundles1%%CurrentBundle%|%Bundles2% +} else CurrentBundle = if (CurrentBundle != "") and (CurrentBundle != "Default") @@ -12,20 +32,24 @@ Gui,1: Destroy IniRead,EnterBox,texter.ini,Triggers,Enter IniRead,TabBox,texter.ini,Triggers,Tab IniRead,SpaceBox,texter.ini,Triggers,Space +IniRead,NoTrigBox,texter.ini,Triggers,NoTrig Gui,1: font, s12, Arial Gui,1: +owner2 +AlwaysOnTop -SysMenu +ToolWindow ;suppresses taskbar button, always on top, removes minimize/close Gui,1: Add, Text,x10 y20, Hotstring: Gui,1: Add, Edit, x13 y45 r1 W65 vRString, Gui,1: Add, Edit, x100 y45 r4 W395 vFullText, Enter your replacement text here... Gui,1: Add, Text,x115,Trigger: -Gui,1: Add, Checkbox, vEnterCbox yp x175 Checked%EnterBox%, Enter -Gui,1: Add, Checkbox, vTabCbox yp x242 Checked%TabBox%, Tab -Gui,1: Add, Checkbox, vSpaceCbox yp x305 Checked%SpaceBox%, Space +Gui,1: Add, Checkbox, gDisableChecks vEnterCbox yp x175 Checked%EnterBox%, Enter +Gui,1: Add, Checkbox, gDisableChecks vTabCbox yp x242 Checked%TabBox%, Tab +Gui,1: Add, Checkbox, gDisableChecks vSpaceCbox yp x305 Checked%SpaceBox%, Space +Gui,1: Add, Checkbox, gDisableChecks vNoTrigCbox yp x388 Checked%NoTrigBox%, Instant Gui,1: font, s8, Arial Gui,1: Add, Button,w80 x320 default,&OK Gui,1: Add, Button,w80 xp+90 GButtonCancel,&Cancel Gui,1: font, s12, Arial -Gui,1: Add,DropDownList,x100 y15 vTextOrScript, Text||Script +Gui,1: Add,DropDownList,x100 y15 w100 vTextOrScript, Text||Script +Gui,1: Add, Text,x315 y19, Bundle: +Gui,1: Add,DropDownList,x370 y15 w125 vBundle,Default||%Bundles% Gui,1: Add,Picture,x0 y105,%TexterPNG% Gui 2:+Disabled Gui,1: Show, W500 H200,Add new hotstring... @@ -41,14 +65,15 @@ ButtonOK: Gui,1: Submit, NoHide Gui 1:+OwnDialogs hexRString:=hexify(RString) +if (Bundle != "") and (Bundle != "Default") + AddToDir = Bundles\%Bundle%\ IfExist, %A_ScriptDir%\%AddToDir%replacements\%hexRString%.txt { MsgBox,262144,Hotstring already exists, A replacement with the text %RString% already exists. Would you like to try again? return } IsScript := (TextOrScript == "Script") - -if SaveHotstring(RString, FullText, IsScript, AddToDir, SpaceCbox, TabCbox, EnterCbox) +if SaveHotstring(RString, FullText, IsScript, AddToDir, SpaceCbox, TabCbox, EnterCbox, NoTrigCbox) { Gui 2:-Disabled Gui,1: Submit diff --git a/includes/GUI/preferences_GUI.ahk b/includes/GUI/preferences_GUI.ahk index 4fecbc0..7f3423f 100644 --- a/includes/GUI/preferences_GUI.ahk +++ b/includes/GUI/preferences_GUI.ahk @@ -45,6 +45,9 @@ Gui,3: Add,Text,x25 y100,Hours saved: %time_saved% (assuming 400 cha Gui 2:+Disabled Gui,3: Show,,Texter Preferences GuiControl,3: Focus, Tabs +Disable=1 +WinWaitClose, Texter Preferences +Disable= Return SETTINGSOK: diff --git a/includes/functions/InsSpecKeys.ahk b/includes/functions/InsSpecKeys.ahk index 5642ac7..c5e12f5 100644 --- a/includes/functions/InsSpecKeys.ahk +++ b/includes/functions/InsSpecKeys.ahk @@ -1,4 +1,4 @@ -#IfWinActive,Texter Management +#IfWinActive, ahk_class AutoHotkeyGUI Ins & LWin:: Ins & Rwin:: SendRaw,# diff --git a/includes/functions/addtobank.ahk b/includes/functions/addtobank.ahk index 8448692..463d87b 100644 --- a/includes/functions/addtobank.ahk +++ b/includes/functions/addtobank.ahk @@ -2,6 +2,10 @@ AddToBank(HotString, Bundle, Trigger) { ;HotString:=Dehexify(HotString) BankFile = %Bundle%bank\%trigger%.csv + IfNotExist %BankFile% + { + FileAppend,, %BankFile% + } FileRead, Bank, %BankFile% if HotString not in %Bank% { diff --git a/includes/functions/buildactive.ahk b/includes/functions/buildactive.ahk index ac62963..9f96969 100644 --- a/includes/functions/buildactive.ahk +++ b/includes/functions/buildactive.ahk @@ -1,7 +1,5 @@ BuildActive: activeBundles = -FileDelete,Active\replacements\* -FileDelete,Active\bank\* Loop,bundles\*,2 { IniRead,activeCheck,texter.ini,Bundles,%A_LoopFileName% @@ -11,35 +9,49 @@ Loop,bundles\*,2 IniRead,activeCheck,texter.ini,Bundles,Default if activeCheck = 1 activeBundles = %activeBundles%Default -Loop,Parse,activeBundles,CSV +if skipfirst <> { -; MsgBox,%A_LoopField% - if A_LoopField = Default + FileDelete,Active\replacements\* + FileDelete,Active\bank\* + Loop,Parse,activeBundles,CSV { - FileCopy,replacements\*.txt,Active\replacements - FileRead,tab,bank\tab.csv - FileAppend,%tab%,Active\bank\tab.csv - FileRead,space,bank\space.csv - FileAppend,%space%,Active\bank\space.csv - FileRead,enter,bank\enter.csv - FileAppend,%enter%,Active\bank\enter.csv + if A_LoopField = Default + { + FileCopy,replacements\*.txt,Active\replacements + FileRead,tab,bank\tab.csv + FileAppend,%tab%,Active\bank\tab.csv + FileRead,space,bank\space.csv + FileAppend,%space%,Active\bank\space.csv + FileRead,enter,bank\enter.csv + FileAppend,%enter%,Active\bank\enter.csv + FileRead,notrig,bank\notrig.csv + FileAppend,%notrig%,Active\bank\notrig.csv + } +; else if A_LoopField = Autocorrect +; { +; +; } + else + { + FileCopy,Bundles\%A_LoopField%\replacements\*.txt,active\replacements + FileRead,tab,Bundles\%A_LoopField%\bank\tab.csv + FileAppend,%tab%,active\bank\tab.csv + FileRead,space,Bundles\%A_LoopField%\bank\space.csv + FileAppend,%space%,active\bank\space.csv + FileRead,enter,Bundles\%A_LoopField%\bank\enter.csv + FileAppend,%enter%,active\bank\enter.csv + FileRead,notrig,Bundles\%A_LoopField%\bank\notrig.csv + FileAppend,%notrig%,active\bank\notrig.csv + } + ; IfExist active\replacements\wc.txt + ; MsgBox,%A_LoopFileName% put me here } - else - { - FileCopy,Bundles\%A_LoopField%\replacements\*.txt,active\replacements - FileRead,tab,Bundles\%A_LoopField%\bank\tab.csv - FileAppend,%tab%,active\bank\tab.csv - FileRead,space,Bundles\%A_LoopField%\bank\space.csv - FileAppend,%space%,active\bank\space.csv - FileRead,enter,Bundles\%A_LoopField%\bank\enter.csv - FileAppend,%enter%,active\bank\enter.csv - } -; IfExist active\replacements\wc.txt -; MsgBox,%A_LoopFileName% put me here } +skipfirst=1 FileRead, EnterKeys, %A_WorkingDir%\Active\bank\enter.csv FileRead, TabKeys, %A_WorkingDir%\Active\bank\tab.csv FileRead, SpaceKeys, %A_WorkingDir%\Active\bank\space.csv +FileRead, NoTrigKeys, %A_WorkingDir%\Active\bank\notrig.csv ActiveList = HotStrings= | ; added this variable for Dustin's new trigger method... need to sometime check and see if ActiveList is necessary Loop, Active\replacements\*.txt @@ -49,5 +61,4 @@ Loop, Active\replacements\*.txt HotStrings = %HotStrings%%This_HotString%| } StringReplace, ActiveList, ActiveList, .txt,,All - return \ No newline at end of file diff --git a/includes/functions/bundles.ahk b/includes/functions/bundles.ahk index ca0a8af..0f6f5ec 100644 --- a/includes/functions/bundles.ahk +++ b/includes/functions/bundles.ahk @@ -145,6 +145,7 @@ if ErrorLevel = 0 Gui,8: Add, Checkbox, vEnterCbox x30, Enter Gui,8: Add, Checkbox, vTabCbox yp xp+65, Tab Gui,8: Add, Checkbox, vSpaceCbox yp xp+60, Space + Gui,8: Add, Checkbox, vNoTrigCbox yp xp+60, Instant Gui,8: Add,Button, x180 Default w80 GCreateBank,&OK Gui, 8: Show,,Set default triggers } @@ -159,6 +160,8 @@ if TabCbox = 1 FileAppend,%bundleCollection%,bundles\%BundleName%\bank\tab.csv if SpaceCbox = 1 FileAppend,%bundleCollection%,bundles\%BundleName%\bank\space.csv +if NoTrigCbox = 1 + FileAppend,%bundleCollection%,bundles\%BundleName%\bank\notrig.csv MsgBox,4,Enable %BundleName% bundle?,Would you like to enable the %BundleName% bundle? IfMsgBox,Yes { diff --git a/includes/functions/printablelist.ahk b/includes/functions/printablelist.ahk index e95b765..91dbfe6 100644 --- a/includes/functions/printablelist.ahk +++ b/includes/functions/printablelist.ahk @@ -11,12 +11,15 @@ Loop, replacements\*.txt FileRead, entertrig, bank\enter.csv FileRead, tabtrig, bank\tab.csv FileRead, spacetrig, bank\space.csv + FileRead, notrig, bank\notrig.csv If hs in %entertrig% trig = Enter If hs in %tabtrig% trig = %trig% Tab If hs in %spacetrig% trig = %trig% Space + If hs in %notrig% + trig = %trig% Instant StringReplace, rp, rp, <,<,All StringReplace, rp, rp, >,>,All hs := DeHexify(hs) @@ -36,12 +39,15 @@ Loop,bundles\*,2 FileRead, entertrig, bundles\%thisBundle%\bank\enter.csv FileRead, tabtrig, bundles\%thisBundle%\bank\tab.csv FileRead, spacetrig, bundles\%thisBundle%\bank\space.csv + FileRead, notrig, bundles\%thisBundle%\bank\notrig.csv If hs in %entertrig% trig = Enter If hs in %tabtrig% trig = %trig% Tab If hs in %spacetrig% trig = %trig% Space + If hs in %notrig% + trig = %trig% Instant StringReplace, rp, rp, <,<,All StringReplace, rp, rp, >,>,All hs := DeHexify(hs) diff --git a/includes/functions/savehotstring.ahk b/includes/functions/savehotstring.ahk index 230199e..6b1c2a4 100644 --- a/includes/functions/savehotstring.ahk +++ b/includes/functions/savehotstring.ahk @@ -1,16 +1,18 @@ -SaveHotstring(HotString, Replacement, IsScript, Bundle, SpaceIsTrigger, TabIsTrigger, EnterIsTrigger) +SaveHotstring(HotString, Replacement, IsScript, Bundle, SpaceIsTrigger, TabIsTrigger, EnterIsTrigger, NoTrigger) { global EnterCSV global TabCSV global SpaceCSV +global NoTrigCSV global EnterKeys global TabKeys global SpaceKeys +global NoTrigKeys HotString:=Hexify(HotString) successful := false - if (!EnterIsTrigger AND !TabIsTrigger AND !SpaceIsTrigger) + if (!EnterIsTrigger AND !TabIsTrigger AND !SpaceIsTrigger AND !NoTrigger) { - MsgBox,262144,Choose a trigger,You need to choose a trigger in order to save a hotstring replacement. + MsgBox,262144,Choose a trigger,You need to choose a trigger method in order to save a hotstring replacement. } else if (HotString <> "" AND Replacement <> "") { @@ -23,6 +25,7 @@ global SpaceKeys IniWrite,%SpaceIsTrigger%,texter.ini,Triggers,Space IniWrite,%TabIsTrigger%,texter.ini,Triggers,Tab IniWrite,%EnterIsTrigger%,texter.ini,Triggers,Enter + IniWrite,%NoTrigger%,texter.ini,Triggers,NoTrig FileDelete, %A_ScriptDir%\%Bundle%replacements\%HotString%.txt FileAppend,%Replacement%,%A_ScriptDir%\%Bundle%replacements\%HotString%.txt @@ -51,6 +54,14 @@ global SpaceKeys { DelFromBank(HotString, Bundle, "space") } + if NoTrigger + { + AddToBank(HotString, Bundle, "notrig") + } + else + { + DelFromBank(HotString, Bundle, "notrig") + } } GoSub,BuildActive return successful diff --git a/texter.ahk b/texter.ahk index 7f1f1d5..6cc0118 100644 --- a/texter.ahk +++ b/texter.ahk @@ -31,11 +31,12 @@ Gosub,BuildActive FileRead, EnterKeys, %EnterCSV% FileRead, TabKeys, %TabCSV% FileRead, SpaceKeys, %SpaceCSV% +FileRead, NoTrigKeys, %NoTrigCSV% ;Gosub,GetFileList ;Goto Start -WinGet PrevWinID, ID, A -SetTimer, MonitorWindows, 500 - +; WinGet PrevWinID, ID, A +; SetTimer, MonitorWindows, 500 +Starting=1 Loop { ;wait for a matching hotstring @@ -51,7 +52,7 @@ Loop { break } - Input, UserInput, L1 V, %EndKeys% + Input, UserInput, L1 V M, %EndKeys% ;Tooltip, Input received, 10, 10 if (SubStr(ErrorLevel, 1, 6) = "EndKey") { ;any end key resets the search for a match @@ -68,9 +69,10 @@ Loop } } ; end of inside loop } - if PossibleMatch in %NoTrigger% - { ;matched in triggerless list - Match := PossibleMatch + PossHexMatch := Hexify(PossibleMatch) + if PossHexMatch in %NoTrigKeys% + { ;matched in triggerless list + Match := PossHexMatch } else { ;get a single character of input to look for triggers @@ -78,18 +80,16 @@ Loop Input, UserInput, L1 M, %EndKeys% ;Tooltip, ErrorLevel= %ErrorLevel%, 10, 10 ;msgbox %userinput% - if (SubStr(ErrorLevel, 1, 6) = "EndKey") - { ;trigger found AltState := GetKeyState("Alt", "P") CtrlState := GetKeyState("Ctrl", "P") ShiftState := GetKeyState("Shift", "P") LWinState := GetKeyState("LWin", "P") RWinState := GetKeyState("RWin", "P") WinState := LWinState || RWinState + Modifier= if (AltState || CtrlState || ShiftState || WinState) { PossibleMatch= - Modifier= if AltState { Modifier = ! @@ -107,21 +107,12 @@ Loop Modifier = %Modifier%# } } + if (SubStr(ErrorLevel, 1, 6) = "EndKey") + { ;trigger found Trigger := SubStr(ErrorLevel, 8) if (Trigger = "Backspace") { ; trim possmatch so trigger still works if miskeyed - if AltState - { - Send, !{BS} - } - else if CtrlState - { - Send, ^{BS} - } - else - { - Send, {BS} - } + Send %Modifier%{BS} StringTrimRight, PossibleMatch, PossibleMatch, 1 continue } @@ -155,15 +146,17 @@ Loop Send, {Alt Up} break } - PossibleMatch= - Starting=1 } + PossibleMatch= + Starting=1 } } else if (AltState || CtrlState || ShiftState || WinState) { ;msgbox not alone: %modifier% Send, %Modifier%`{%Trigger%`} + PossibleMatch= + Starting=1 } else { @@ -186,9 +179,26 @@ Loop } else { - if UserInput = %CtrlC% ; this doesn't seem like the best fix, but Ctrl-C was not working correctly w/out - { ; all other modifiers + letters seem to be working fine - SendInput, ^c + if (AltState && Modifier=) + { + Send, {Alt Down}%UserInput% + AltState := GetKeyState("Alt", "P") + Loop + { + if AltState + { + AltState := GetKeyState("Alt", "P") + } + else + { + Send, {Alt Up} + break + } + } + } + else if Modifier <> + { + SendInput,%Modifier%%UserInput% } ;msgbox sending %userinput% else @@ -196,6 +206,7 @@ Loop PossibleMatch=%PossibleMatch%%UserInput% SendRaw, %UserInput% ; SendRaw ensures special characters like #, !, {}, etc. are interpreted and sent correctly Starting= + Modifier= } } } @@ -208,7 +219,7 @@ EXECUTE: WinGetActiveTitle,thisWindow ; this variable ensures that the active Window is receiving the text, activated before send ;; below added b/c SendMode Play appears not to be supported in Vista ;EnableTriggers(false) -if (A_OSVersion = "WIN_VISTA") or (Synergy = 1) ;;; need to implement this in the preferences - should work, though +if (A_OSVersion = "WIN_VISTA") or (Synergy = 1) SendMode Input else SendMode Play ; Set an option in Preferences to enable for use with Synergy - Use SendMode Input to work with Synergy @@ -366,10 +377,11 @@ Send,{SC77} Return ASSIGNVARS: -Version = 0.5 +Version = 0.6 EnterCSV = %A_ScriptDir%\Active\bank\enter.csv TabCSV = %A_ScriptDir%\Active\bank\tab.csv SpaceCSV = %A_ScriptDir%\Active\bank\space.csv +NoTrigCSV = %A_ScriptDir%\Active\bank\notrig.csv ReplaceWAV = %A_ScriptDir%\resources\replace.wav TexterPNG = %A_ScriptDir%\resources\texter.png TexterICO = %A_ScriptDir%\resources\texter.ico @@ -410,6 +422,7 @@ SpaceBox := GetValFromIni("Triggers","Space",0) ExSound := GetValFromIni("Preferences","ExSound",1) Synergy := GetValFromIni("Preferences","Synergy",0) AutoCorrect := GetValFromIni("Preferences","AutoCorrect",1) +Default := GetValFromIni("Bundles","Default",1) @@ -447,6 +460,8 @@ if disablehotkey <> #Include includes\GUI\preferences_GUI.ahk ; Preferences GUI and accept/cancel threads #Include includes\GUI\management_GUI.ahk ; Implementation of the hotstring management GUI #Include includes\GUI\textprompt_GUI.ahk ; GUI that prompts for text when %p operator is included +#Include includes\GUI\disablechecks.ahk ; Keeps instant exclusive from tab, enter, and space keys (greys out others) + ; Functions #Include includes\functions\disable.ahk ; Disable/enable Texter... need to check if this is still in use (not sure it is) @@ -467,7 +482,7 @@ if disablehotkey <> #Include includes\functions\InsSpecKeys.ahk ; Insert special characters in Texter script mode by pressing insert and then the special key #Include includes\functions\MonitorWindows.ahk ; monitors active window and clears input when window switches - #Include includes\functions\autocorrect.ahk ; Spelling autocorrect--may implement in 0.6 +;#Include includes\functions\autocorrect.ahk ; Spelling autocorrect--may implement in 0.6 ; #Include includes\functions\autoclose.ahk ; Automatically closes bracketed puntuation, like parentheticals - not currently implemented EXIT: