Neue Bildschirmtastatur: Aktiviert wird diese nur über Mod4+F1, danach folgt sie dem aktuellen Stand der Modifier. Derzeit nicht unterstütz wird das Bild für die toten Tasten (wie soll man das machen?)

git-svn-id: https://svn.neo-layout.org@1218 b9310e46-f624-0410-8ea1-cfbb3a30dc96

2 files changed, 27 insertions, 154 deletions

diff --git a/windows/neo-vars/src/source/levelfunctions.ahk b/windows/neo-vars/src/source/levelfunctions.ahk
index 461e4f7..19d3ab5 100644
--- a/windows/neo-vars/src/source/levelfunctions.ahk
+++ b/windows/neo-vars/src/source/levelfunctions.ahk
@@ -29,6 +29,8 @@ EbeneAktualisieren() {
       Ebene8 := 1

     EbeneNC := EbeneC            ; NC: gleich

   }

+  if (guiErstellt)

+    BSTSwitch(EbeneC)

 }

 

 IsShiftActive() {

diff --git a/windows/neo-vars/src/source/screenkeyboard.ahk b/windows/neo-vars/src/source/screenkeyboard.ahk
index 8a9680f..8258a90 100644
--- a/windows/neo-vars/src/source/screenkeyboard.ahk
+++ b/windows/neo-vars/src/source/screenkeyboard.ahk
@@ -1,164 +1,35 @@
-Switch:

-  if (guiErstellt) 

-  {

-     if (Image = tImage)

-        goto Close

-     else

-     {

-       Image := tImage

-       SetTimer, Refresh

-     }

+BSTSwitch(Eb) {

+  global

+  if (Eb <> EbeneAlt) {

+    GuiControl,Show,Picture%Eb%

+    GuiControl,Hide,Picture%EbeneAlt%

+    EbeneAlt := Eb

   }

-  else 

-  {

-    Image := tImage

-    goto Show    

-  }

-Return

-

-Show:

-  if (guiErstellt) 

-  {

-     goto Close

-  }

-  else

-  {

-    if (Image = "") 

-    {

-      Image := ResourceFolder . "\ebene1.png"

-    }     

+}

+

+BSTToggle() {

+  global

+  if (guiErstellt) {

+    guiErstellt := 0

+    Gui, Destroy

+  } else {

     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 gSwitchDK, F7

-    Gui, Add, Text, x+5, Deadkeys

-    Gui, Add, Button, x+15 y+-13 gShow, F8

-    Gui, Add, Text, x+5, OnTop

-    Gui, Add, Picture,AltSubmit ys w729 h199 vPicture, %Image%

+    Gui, Add, Picture,AltSubmit x0   y0   w729 h199        vPicture1, % ResourceFolder . "\ebene1.png"

+    Gui, Add, Picture,AltSubmit xp+0 yp+0 w729 h199 Hidden vPicture2, % ResourceFolder . "\ebene2.png"

+    Gui, Add, Picture,AltSubmit xp+0 yp+0 w729 h199 Hidden vPicture3, % ResourceFolder . "\ebene3.png"

+    Gui, Add, Picture,AltSubmit xp+0 yp+0 w729 h199 Hidden vPicture4, % ResourceFolder . "\ebene4.png"

+    Gui, Add, Picture,AltSubmit xp+0 yp+0 w729 h199 Hidden vPicture5, % ResourceFolder . "\ebene5.png"

+    Gui, Add, Picture,AltSubmit xp+0 yp+0 w729 h199 Hidden vPicture6, % ResourceFolder . "\ebene6.png"

     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

+    BSTEbeneAlt := 1

+    guiErstellt := 1

+  }

+}

 

 F1::

   if(isMod4Active() && zeigeBildschirmTastatur)

-    goto Switch1

+    BSTToggle()

   else send {blind}{F1}

 return

-

-F2::

-  if(isMod4Active() && zeigeBildschirmTastatur)

-    goto Switch2

-  else send {blind}{F2}

-return

-

-F3::

-  if(isMod4Active() && zeigeBildschirmTastatur)

-    goto Switch3

-  else send {blind}{F3}

-return

-

-F4::

-  if(isMod4Active() && zeigeBildschirmTastatur)

-    goto Switch4

-  else send {blind}{F4}

-return

-

-F5::

-  if(isMod4Active() && zeigeBildschirmTastatur)

-    goto Switch5

-  else send {blind}{F5}

-return

-

-F6::

-  if(isMod4Active() && zeigeBildschirmTastatur)

-    goto Switch6

-  else send {blind}{F6}

-return

-

-F7::

-  if(isMod4Active() && zeigeBildschirmTastatur)

-    goto SwitchDK

-  else send {blind}{F7}

-return

-

-F8::

-  if(isMod4Active() && zeigeBildschirmTastatur)

-    goto ToggleAlwaysOnTop

-  else send {blind}{F8}

-return

-

-Switch1:

-  tImage := ResourceFolder . "\ebene1.png"

-  goto Switch

-Return

-

-Switch2:

-  tImage := ResourceFolder . "\ebene2.png"

-  goto Switch

-Return

-

-Switch3:

-  tImage := ResourceFolder . "\ebene3.png"

-  goto Switch

-Return

-

-Switch4:

-  tImage := ResourceFolder . "\ebene4.png"

-  goto Switch

-Return

-

-Switch5:

-  tImage := ResourceFolder . "\ebene5.png"

-  goto Switch

-Return

-

-Switch6:

-  tImage := ResourceFolder . "\ebene6.png"

-  goto Switch

-Return

-

-SwitchDK:

-  tImage := ResourceFolder . "\deadkeys.png"

-  goto Switch

-Return

-