From 2147e3c7dd25f14b98905a9a9389cfb7c99f0439 Mon Sep 17 00:00:00 2001 From: dennis Date: Thu, 24 Jul 2008 00:16:58 +0000 Subject: Ein paar Methoden umstrukturiert/verschoben. git-svn-id: https://svn.neo-layout.org@689 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- windows/autohotkey/Build-Update.bat | 2 +- windows/autohotkey/Source/All.ahk | 3 +- windows/autohotkey/Source/Methods-Other.ahk | 352 ---------------------------- windows/autohotkey/neo20.ahk | 63 +++-- windows/autohotkey/neo20.exe | Bin 417327 -> 417325 bytes 5 files changed, 43 insertions(+), 377 deletions(-) diff --git a/windows/autohotkey/Build-Update.bat b/windows/autohotkey/Build-Update.bat index 00fa1a0..458c1ec 100644 --- a/windows/autohotkey/Build-Update.bat +++ b/windows/autohotkey/Build-Update.bat @@ -17,7 +17,7 @@ REM tskill neo20-all-in-one echo Creating a new Driver from the Source code REM The order *is* important! -copy "%scr%\Warning.ahk" + "%scr%\Changelog-and-Todo.ahk" + "%scr%\Global-Part.ahk" + "%scr%\Methods-Layers.ahk" + "%scr%\Keys-Qwert-to-Neo.ahk" + "%scr%\Keys-Neo.ahk" + "%scr%\Methods-Lights.ahk" + "%scr%\Methods-Other.ahk" "%svn%\%fn%.ahk" +copy "%scr%\Warning.ahk" + "%scr%\Changelog-and-Todo.ahk" + "%scr%\Global-Part.ahk" + "%scr%\Methods-Layers.ahk" + "%scr%\Keys-Qwert-to-Neo.ahk" + "%scr%\Keys-Neo.ahk" + "%scr%\Methods-Lights.ahk" + "%scr%\Methods-Other.ahk" + "%scr%\Methods-Unicode.ahk" + "%scr%\Methods-ScreenKeyboard.ahk" "%svn%\%fn%.ahk" REM if exist "%svn%\Compose\Compose-all-in-one.ahk" copy "%svn%\%fn%.ahk" + "%svn%\Compose\Compose-all-in-one.ahk" "%svn%\%fn%.ahk" echo Compiling the new Driver using Autohotkey diff --git a/windows/autohotkey/Source/All.ahk b/windows/autohotkey/Source/All.ahk index b719fac..0594fb3 100644 --- a/windows/autohotkey/Source/All.ahk +++ b/windows/autohotkey/Source/All.ahk @@ -19,6 +19,7 @@ #Include %a_scriptdir%\Keys-Neo.ahk #Include %a_scriptdir%\Methods-Lights.ahk #Include %a_scriptdir%\Methods-Other.ahk -;#Include %a_scriptdir%\Methods-Unicode.ahk +#Include %a_scriptdir%\Methods-Unicode.ahk +#Include %a_scriptdir%\Methods-ScreenKeyboard.ahk ;#Include *i %a_scriptdir%\..\Compose\Compose-all-in-one.ahk diff --git a/windows/autohotkey/Source/Methods-Other.ahk b/windows/autohotkey/Source/Methods-Other.ahk index 9774b72..6fcfdba 100644 --- a/windows/autohotkey/Source/Methods-Other.ahk +++ b/windows/autohotkey/Source/Methods-Other.ahk @@ -128,28 +128,6 @@ IsMod4Pressed() } -/************************* - Alte Methoden -*************************/ - -/* -Unicode(code) -{ - saved_clipboard := ClipboardAll - Transform, Clipboard, Unicode, %code% - sendplay ^v - Clipboard := saved_clipboard -} - -BSUnicode(code) -{ - saved_clipboard := ClipboardAll - Transform, Clipboard, Unicode, %code% - sendplay {bs}^v - Clipboard := saved_clipboard -} -*/ - IsModifierPressed() { if (GetKeyState("LControl","P") or GetKeyState("RControl","P") or GetKeyState("LAlt","P") or GetKeyState("RAltl","P") or GetKeyState("LWin","P") or GetKeyState("RWin","P") or GetKeyState("LShift","P") or GetKeyState("RShift","P") or GetKeyState("AltGr","P") ) @@ -224,335 +202,5 @@ return } -/* - ------------------------------------------------------ - BildschirmTastatur - ------------------------------------------------------ -*/ -guiErstellt = 0 -alwaysOnTop = 1 -aktuellesBild = ebene1.png -SC056 & *F1:: -SC138 & *F1:: -{ - if (zeigeBildschirmTastatur) - goto Switch1 - return -} -SC056 & *F2:: -SC138 & *F2:: -{ - if (zeigeBildschirmTastatur) - goto Switch2 - return -} -SC056 & *F3:: -SC138 & *F3:: -{ - if (zeigeBildschirmTastatur) - goto Switch3 - return -} -SC056 & *F4:: -SC138 & *F4:: -{ - if (zeigeBildschirmTastatur) - goto Switch4 - return -} -SC056 & *F5:: -SC138 & *F5:: -{ - if (zeigeBildschirmTastatur) - goto Switch5 - return -} -SC056 & *F6:: -SC138 & *F6:: -{ - if (zeigeBildschirmTastatur) - goto Switch6 - return -} -SC056 & *F7:: -SC138 & *F7:: -{ - if (zeigeBildschirmTastatur) - goto Show - return -} -SC056 & *F8:: -SC138 & *F8:: -{ - if (zeigeBildschirmTastatur) - goto ToggleAlwaysOnTop - return -} -Switch1: - if (guiErstellt) - { - if (Image == "ebene1.png") - goto Close - else - { - Image = ebene1.png - SetTimer, Refresh - } - } - else - { - Image = ebene1.png - goto Show - } -Return - -Switch2: - if (guiErstellt) - { - if (Image == "ebene2.png") - goto Close - else - { - Image = ebene2.png - SetTimer, Refresh - } - } - else - { - Image = ebene2.png - goto Show - } -Return - -Switch3: - if (guiErstellt) - { - if (Image == "ebene3.png") - goto Close - else - { - Image = ebene3.png - SetTimer, Refresh - } - } - else - { - Image = ebene3.png - goto Show - } -Return - -Switch4: - if (guiErstellt) - { - if (Image == "ebene4.png") - goto Close - else - { - Image = ebene4.png - SetTimer, Refresh - } - } - else - { - Image = ebene4.png - goto Show - } -Return - -Switch5: - if (guiErstellt) - { - if (Image == "ebene5.png") - goto Close - else - { - Image = ebene5.png - SetTimer, Refresh - } - } - else - { - Image = ebene5.png - goto Show - } -Return - -Switch6: - if (guiErstellt) - { - if (Image == "ebene6.png") - goto Close - else - { - Image = ebene6.png - SetTimer, Refresh - } - } - else - { - Image = ebene6.png - goto Show - } -Return - -Show: - if (guiErstellt) - { - goto Close - } - else - { - if (Image = "") - { - Image = ebene1.png - } - yPosition := A_ScreenHeight -270 - Gui, Color, FFFFFF - Gui, Add, Button, xm+5 gSwitch1, F1 - Gui, Add, Text, x+5, kleine Buchstaben - Gui, Add, Button, xm+5 gSwitch2, F2 - Gui, Add, Text, x+5, große Buchstaben - Gui, Add, Button, xm+5 gSwitch3, F3 - Gui, Add, Text, x+5, Satz-/Sonderzeichen - Gui, Add, Button, xm+5 gSwitch4, F4 - Gui, Add, Text, x+5, Zahlen / Steuerung - Gui, Add, Button, xm+5 gSwitch5, F5 - Gui, Add, Text, x+5, Sprachen - Gui, Add, Button, xm+5 gSwitch6, F6 - Gui, Add, Text, x+5, Mathesymbole - Gui, Add, Button, xm+5 gShow, F7 - Gui, Add, Text, x+5, An / - Gui, Add, Text, y+3, Aus - Gui, Add, Button, x+10 y+-30 gShow, F8 - Gui, Add, Text, x+5, OnTop - Gui, Add, Picture,AltSubmit ys w564 h200 vPicture, %Image% - Gui, +AlwaysOnTop - Gui, Show, y%yposition% Autosize - SetTimer, Refresh - guiErstellt = 1 - } -Return - -Close: - guiErstellt = 0 - Gui, Destroy -Return - -Refresh: - If (Image != OldImage) - { - GuiControl, , Picture, %Image% - OldImage := Image - } -Return - -ToggleAlwaysOnTop: - if (alwaysOnTop) - { - Gui, -AlwaysOnTop - alwaysOnTop = 0 - } - else - { - Gui, +AlwaysOnTop - alwaysOnTop = 1 - } -Return - ; Ende der BildschirmTastatur - - -/* - ------------------------------------------------------ - Shift+Pause "pausiert" das Script. - ------------------------------------------------------ -*/ - -+pause:: -Suspend, Permit - goto togglesuspend -return - -; ------------------------------------ - -^SC034::einHandNeo := not(einHandNeo) ; Punkt -^SC033::lernModus := not(lernModus) ; Komma - - - -togglesuspend: - if A_IsSuspended - { - menu, tray, rename, %enable%, %disable% - menu, tray, tip, %name% - if (iconBenutzen) - menu, tray, icon, neo.ico,,1 - suspend , off ; Schaltet Suspend aus -> NEO - } - else - { - menu, tray, rename, %disable%, %enable% - menu, tray, tip, %name% : Deaktiviert - if (iconBenutzen) - menu, tray, icon, neo_disabled.ico,,1 - suspend , on ; Schaltet Suspend ein -> QWERTZ - } - -return - - -help: - Run, %A_WinDir%\hh mk:@MSITStore:autohotkey.chm -return - - -about: - msgbox, 64, %name% – Ergonomische Tastaturbelegung, - ( - %name% - `nDas Neo-Layout ersetzt das übliche deutsche - Tastaturlayout mit der Alternative Neo, - beschrieben auf http://neo-layout.org/. - `nDazu sind keine Administratorrechte nötig. - `nWenn Autohotkey aktiviert ist, werden alle Tastendrucke - abgefangen und statt dessen eine Übersetzung weitergeschickt. - `nDies geschieht transparent für den Anwender, - es muss nichts installiert werden. - `nDie Zeichenübersetzung kann leicht über das Icon im - Systemtray deaktiviert werden. `n - ) -return - - -neo: - run http://neo-layout.org/ -return - -autohotkey: - run http://autohotkey.com/ -return - -open: - ListLines ; shows the Autohotkey window -return - -edit: - edit -return - -reload: - Reload -return - -hide: - menu, tray, noicon -return - -exitprogram: - exitapp -return - - - diff --git a/windows/autohotkey/neo20.ahk b/windows/autohotkey/neo20.ahk index bfa5b8f..45f198e 100644 --- a/windows/autohotkey/neo20.ahk +++ b/windows/autohotkey/neo20.ahk @@ -4791,28 +4791,6 @@ IsMod4Pressed() } -/************************* - Alte Methoden -*************************/ - -/* -Unicode(code) -{ - saved_clipboard := ClipboardAll - Transform, Clipboard, Unicode, %code% - sendplay ^v - Clipboard := saved_clipboard -} - -BSUnicode(code) -{ - saved_clipboard := ClipboardAll - Transform, Clipboard, Unicode, %code% - sendplay {bs}^v - Clipboard := saved_clipboard -} -*/ - IsModifierPressed() { if (GetKeyState("LControl","P") or GetKeyState("RControl","P") or GetKeyState("LAlt","P") or GetKeyState("RAltl","P") or GetKeyState("LWin","P") or GetKeyState("RWin","P") or GetKeyState("LShift","P") or GetKeyState("RShift","P") or GetKeyState("AltGr","P") ) @@ -4887,7 +4865,45 @@ return } -/* + + +/* + ------------------------------------------------------ + Methoden zum Senden von Unicode-Zeichen + ------------------------------------------------------ +*/ + + +/************************************************************ + Alter Weg – Copy/Paste über die Zwischenablage +************************************************************/ + +/* +Unicode(code) +{ + saved_clipboard := ClipboardAll + Transform, Clipboard, Unicode, %code% + sendplay ^v + Clipboard := saved_clipboard +} + +BSUnicode(code) +{ + saved_clipboard := ClipboardAll + Transform, Clipboard, Unicode, %code% + sendplay {bs}^v + Clipboard := saved_clipboard +} +*/ + + +/************************************************************ + Neuer Weg – Benutzung der entsprechenden Win32-API-Methode +************************************************************/ + + + +/* ------------------------------------------------------ BildschirmTastatur ------------------------------------------------------ @@ -5219,4 +5235,5 @@ return +  \ No newline at end of file diff --git a/windows/autohotkey/neo20.exe b/windows/autohotkey/neo20.exe index 7e47359..0c5d57a 100644 Binary files a/windows/autohotkey/neo20.exe and b/windows/autohotkey/neo20.exe differ -- cgit v1.2.3