summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2010-05-03 07:58:06 +0000
committermösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2010-05-03 07:58:06 +0000
commit9876fa7efff9964f1a87c456ad7109fbc81abc7b (patch)
treefe74f7c5c41da749f88c0e9da9ae557dee7b72c2
parent47313f66d4cb084b1d71d39dcc816017f9fd5eb1 (diff)
BSTo entfernt, Always-on-Top jetzt auf M3+F2.
git-svn-id: https://svn.neo-layout.org@2297 b9310e46-f624-0410-8ea1-cfbb3a30dc96
-rw-r--r--windows/neo-vars/src/ebene1.pngbin21607 -> 0 bytes
-rw-r--r--windows/neo-vars/src/ebene1Caps.pngbin22523 -> 0 bytes
-rw-r--r--windows/neo-vars/src/ebene2.pngbin22618 -> 0 bytes
-rw-r--r--windows/neo-vars/src/ebene2Caps.pngbin21720 -> 0 bytes
-rw-r--r--windows/neo-vars/src/ebene3.pngbin20742 -> 0 bytes
-rw-r--r--windows/neo-vars/src/ebene4.pngbin21521 -> 0 bytes
-rw-r--r--windows/neo-vars/src/ebene5.pngbin22458 -> 0 bytes
-rw-r--r--windows/neo-vars/src/ebene6.pngbin22451 -> 0 bytes
-rw-r--r--windows/neo-vars/src/neo20-all.ahk1
-rw-r--r--windows/neo-vars/src/source/levelfunctions.ahk8
-rw-r--r--windows/neo-vars/src/source/screenkeyboard.ahk4
-rw-r--r--windows/neo-vars/src/source/screenkeyboard_old.ahk97
12 files changed, 2 insertions, 108 deletions
diff --git a/windows/neo-vars/src/ebene1.png b/windows/neo-vars/src/ebene1.png
deleted file mode 100644
index 4328650..0000000
--- a/windows/neo-vars/src/ebene1.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/ebene1Caps.png b/windows/neo-vars/src/ebene1Caps.png
deleted file mode 100644
index 345fd9f..0000000
--- a/windows/neo-vars/src/ebene1Caps.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/ebene2.png b/windows/neo-vars/src/ebene2.png
deleted file mode 100644
index 662bbeb..0000000
--- a/windows/neo-vars/src/ebene2.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/ebene2Caps.png b/windows/neo-vars/src/ebene2Caps.png
deleted file mode 100644
index e4084db..0000000
--- a/windows/neo-vars/src/ebene2Caps.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/ebene3.png b/windows/neo-vars/src/ebene3.png
deleted file mode 100644
index 762aaa7..0000000
--- a/windows/neo-vars/src/ebene3.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/ebene4.png b/windows/neo-vars/src/ebene4.png
deleted file mode 100644
index fd40d2a..0000000
--- a/windows/neo-vars/src/ebene4.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/ebene5.png b/windows/neo-vars/src/ebene5.png
deleted file mode 100644
index 496ee03..0000000
--- a/windows/neo-vars/src/ebene5.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/ebene6.png b/windows/neo-vars/src/ebene6.png
deleted file mode 100644
index 7e4d615..0000000
--- a/windows/neo-vars/src/ebene6.png
+++ /dev/null
Binary files differ
diff --git a/windows/neo-vars/src/neo20-all.ahk b/windows/neo-vars/src/neo20-all.ahk
index 6e3423f..bda598a 100644
--- a/windows/neo-vars/src/neo20-all.ahk
+++ b/windows/neo-vars/src/neo20-all.ahk
@@ -28,7 +28,6 @@ SetWorkingDir, %A_ScriptDir%
; Die Bildschirmtastatur
#include source\screenkeyboard.ahk
-#include source\screenkeyboard_old.ahk
; Mitgelieferte Belegungsvarianten
#include source\langstastatur.ahk
diff --git a/windows/neo-vars/src/source/levelfunctions.ahk b/windows/neo-vars/src/source/levelfunctions.ahk
index 0e7a65a..0fe7f83 100644
--- a/windows/neo-vars/src/source/levelfunctions.ahk
+++ b/windows/neo-vars/src/source/levelfunctions.ahk
@@ -20,14 +20,6 @@ NEOEbeneAktualisieren() {
Ebene7 := SubStr("00000000010100000101000000000000",ModPos,1)
Ebene8 := SubStr("00000000000001010000000000000101",ModPos,1)
- if (BSTOguiErstellt) {
- if (striktesMod2Lock)
- BSTOSwitch(EbeneC)
- else if (EbeneNC != EbeneC)
- BSTOSwitch(EbeneNC . "C")
- else
- BSTOSwitch(EbeneNC)
- }
Check_BSTUpdate()
}
diff --git a/windows/neo-vars/src/source/screenkeyboard.ahk b/windows/neo-vars/src/source/screenkeyboard.ahk
index 0af8778..9e7565a 100644
--- a/windows/neo-vars/src/source/screenkeyboard.ahk
+++ b/windows/neo-vars/src/source/screenkeyboard.ahk
@@ -1,6 +1,5 @@
; -*- encoding:utf-8 -*-
-BSTguiErstellt := 0
BSTalwaysOnTop := 1
UnZipLocalFile := ResourceFolder . "\unzip.exe"
@@ -287,7 +286,7 @@ BSTToggleAlwaysOnTop() {
CharProc__BSTA() {
global
; Bildschirmtastatur AlwaysOnTop
- if (BSTguiErstellt)
+ if (useBST)
BSTToggleAlwaysOnTop()
}
@@ -396,6 +395,7 @@ BSTRegister() {
global
CP3F1 := "P__BSTt"
+ CP3F2 := "P__BSTA"
BSTSymbols()
IniRead,useBST,%ini%,Global,useBST,0
diff --git a/windows/neo-vars/src/source/screenkeyboard_old.ahk b/windows/neo-vars/src/source/screenkeyboard_old.ahk
deleted file mode 100644
index f9f7513..0000000
--- a/windows/neo-vars/src/source/screenkeyboard_old.ahk
+++ /dev/null
@@ -1,97 +0,0 @@
-BSTOguiErstellt := 0
-BSTOalwaysOnTop := 1
-BSTOcapsChars := 0
-
-if (FileExist("ResourceFolder")<>false) {
- FileInstall,ebene1.png,%ResourceFolder%\ebene1.png,1
- FileInstall,ebene1Caps.png,%ResourceFolder%\ebene1Caps.png,1
- FileInstall,ebene2.png,%ResourceFolder%\ebene2.png,1
- FileInstall,ebene2Caps.png,%ResourceFolder%\ebene2Caps.png,1
- FileInstall,ebene3.png,%ResourceFolder%\ebene3.png,1
- FileInstall,ebene4.png,%ResourceFolder%\ebene4.png,1
- FileInstall,ebene5.png,%ResourceFolder%\ebene5.png,1
- FileInstall,ebene6.png,%ResourceFolder%\ebene6.png,1
-}
-
-CP3F2 := "P_BSTOt"
-CP3F8 := "P_BSTOA"
-
-BSTOSwitch(Eb) {
- global
- if (Eb <> BSTOEbeneAlt) {
- BSTOeb := Eb
- if (BSTOcapsChars) {
- if (BSTOeb == "1")
- BSTOeb := "1C"
- else if (BSTOeb == "2C")
- BSTOeb := "2"
- }
- GuiControl,Show,Picture%BSTOeb%
- GuiControl,Hide,Picture%BSTOEbeneAlt%
- BSTOEbeneAlt := Eb
- }
-}
-
-BSTOOnClose() {
- global
- if (BSTOguiErstellt) {
- BSTOguiErstellt := 0
- GuiCurrent := ""
- Gui, Destroy
- }
-}
-
-BSTOToggle() {
- global
- if (BSTOguiErstellt) {
- BSTOguiErstellt := 0
- GuiCurrent := ""
- Gui, Destroy
- } else {
- if (GuiCurrent!="")
- %GuiCurrent%OnClose()
-
- SysGet, WorkArea, MonitorWorkArea
- yPosition := WorkAreaBottom - 230
- Gui, Color, FFFFFF
- Gui, Add, Picture,AltSubmit x0 y0 vPicture1, % ResourceFolder . "\ebene1.png"
- Gui, Add, Picture,AltSubmit xp+0 yp+0 Hidden vPicture1C,% ResourceFolder . "\ebene1Caps.png"
- Gui, Add, Picture,AltSubmit xp+0 yp+0 Hidden vPicture2, % ResourceFolder . "\ebene2.png"
- Gui, Add, Picture,AltSubmit xp+0 yp+0 Hidden vPicture2C,% ResourceFolder . "\ebene2Caps.png"
- Gui, Add, Picture,AltSubmit xp+0 yp+0 Hidden vPicture3, % ResourceFolder . "\ebene3.png"
- Gui, Add, Picture,AltSubmit xp+0 yp+0 Hidden vPicture4, % ResourceFolder . "\ebene4.png"
- Gui, Add, Picture,AltSubmit xp+0 yp+0 Hidden vPicture5, % ResourceFolder . "\ebene5.png"
- Gui, Add, Picture,AltSubmit xp+0 yp+0 Hidden vPicture6, % ResourceFolder . "\ebene6.png"
- Gui, +AlwaysOnTop +ToolWindow
- Gui, Show, y%yposition% w776 h200 NoActivate, NEO-Bildschirmtastatur (statisch)
- BSTOEbeneAlt := 1
- BSTOguiErstellt := 1
- BSTOSwitch(EbeneNC)
- BSTOalwaysOnTop := 1
- GuiCurrent := "BSTO"
- }
-}
-
-BSTOToggleAlwaysOnTop() {
- global
- if (BSTOalwaysOnTop) {
- Gui, -AlwaysOnTop
- BSTOalwaysOnTop := 0
- } else {
- Gui, +AlwaysOnTop
- BSTOalwaysOnTop := 1
- }
-}
-
-CharProc_BSTOt() {
- global
- ; Bildschirmtastatur Ein/Aus
- BSTOToggle()
-}
-
-CharProc_BSTOA() {
- global
- ; Bildschirmtastatur AlwaysOnTop
- if (BSTOguiErstellt)
- BSTOToggleAlwaysOnTop()
-}