Permalink
Browse files

- Fixed Preferences focus (so first hotkey isn't cleared as soon as w…

…indow is activated)

- Disabled the hotkey loop when AutoHotkey class windows are active, which is necessary for the Preferences GUI to work correctly (not a great solution). Might want to be more selective, depending on whether or not it seems worthwhile to allow replacements in Management or Newkey GUIs.
  • Loading branch information...
1 parent 9c9a5e9 commit 9c6a953e12fb525d56b6620ff3b5d8821325ded1 adam committed Sep 29, 2007
Showing with 7 additions and 5 deletions.
  1. +1 −1 TODO.txt
  2. +2 −1 includes/GUI/preferences_GUI.ahk
  3. +1 −0 includes/functions/MonitorWindows.ahk
  4. +3 −3 texter.ahk
View
@@ -8,7 +8,7 @@ Features/fixes for 0.6 release:
x Fix CD drive error (need new, innocuous SC key that doesn't conflict with anything) -- Dustin's new trigger method fixes this
- Mouse incompatibility with Outlook?
- Need to change import/export format - just readline rather than use .ini - .ini too intense, opens and closes file with each read
- - Set focus on Preferences so On-the-fly shortcut doesn't immediately blank out to "None"
+ x Set focus on Preferences so On-the-fly shortcut doesn't immediately blank out to "None"
- Features:
- Define custom hotkey
@@ -1,7 +1,7 @@
PREFERENCES:
Gui,3: Destroy
Gui,3: +owner2
-Gui,3: Add, Tab,x5 y5 w306 h280,General|Print|Stats ;|Import|Export Add these later
+Gui,3: Add, Tab,x5 y5 w306 h280 vTabs,General|Print|Stats ;|Import|Export Add these later
IniRead,otfhotkey,texter.ini,Hotkey,OntheFly
Gui,3: Add,Text,x10 y40,On-the-Fly shortcut:
Gui,3: Add,Hotkey,xp+10 yp+20 w100 vsotfhotkey, %otfhotkey%
@@ -44,6 +44,7 @@ Gui,3: Add,Text,x25 y100,Hours saved: %time_saved% (assuming 400 cha
;Gui,3: Add,Button,x230 y200 w75 GSETTINGSCANCEL,&Cancel
Gui 2:+Disabled
Gui,3: Show,,Texter Preferences
+GuiControl,3: Focus, Tabs
Return
SETTINGSOK:
@@ -1,5 +1,6 @@
MonitorWindows:
WinGet CurrWinID, ID, A
+WinGetClass, CurrWinClass, A
;Tooltip, CurrWinID= %CurrWinID% ~ PrevWinID= %PrevWinID%
if (CurrWinID <> PrevWinID)
{
View
@@ -39,15 +39,15 @@ SetTimer, MonitorWindows, 500
Loop
{
;wait for a matching hotstring
- if (Disable = 1)
+ if (Disable = 1 || CurrWinClass = "AutoHotkeyGUI")
{
continue
}
if Starting <>
{
Loop
{ ;grab input one character at a time looking for a match
- if (Disable = 1)
+ if (Disable = 1 || CurrWinClass = "AutoHotkeyGUI")
{
break
}
@@ -74,7 +74,7 @@ Loop
}
else
{ ;get a single character of input to look for triggers
- Transform, CtrlC, Chr, 3
+ Transform, CtrlC, Chr, 3 ; used for the Ctrl-C check
Input, UserInput, L1 M, %EndKeys%
;Tooltip, ErrorLevel= %ErrorLevel%, 10, 10
;msgbox %userinput%

0 comments on commit 9c6a953

Please sign in to comment.