summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2010-02-19 08:55:07 +0000
committermösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2010-02-19 08:55:07 +0000
commit5d175bb1682fb1cfe473431761f07fcd046b84d0 (patch)
treed28fd90f08a47ac876b341b555bc2aa7750e3259
parentcb6ead2e643f0aa4ad4ed6d01d22530d558c19bc (diff)
Font-Zip-Datei und unzip.exe werden jetzt in den temporären Ordner geladen, die eigentliche Font-Datei bleibt im Applikationsordner.
Die Font-Resource wird jetzt nach Verwendung des Fonts sauber entladen. git-svn-id: https://svn.neo-layout.org@2168 b9310e46-f624-0410-8ea1-cfbb3a30dc96
-rw-r--r--windows/neo-vars/src/source/screenkeyboard_new.ahk10
1 files changed, 6 insertions, 4 deletions
diff --git a/windows/neo-vars/src/source/screenkeyboard_new.ahk b/windows/neo-vars/src/source/screenkeyboard_new.ahk
index 2687fb3..ab3a85b 100644
--- a/windows/neo-vars/src/source/screenkeyboard_new.ahk
+++ b/windows/neo-vars/src/source/screenkeyboard_new.ahk
@@ -5,7 +5,7 @@ BSTNalwaysOnTop := 1
CP3F2 := "P_BSTNt"
-UnZipLocalFile := ApplicationFolder . "\unzip.exe"
+UnZipLocalFile := ResourceFolder . "\unzip.exe"
UnZipSourceLink := "http://stahlworks.com/dev/unzip.exe"
UniFontVersion := "2.30"
@@ -13,11 +13,12 @@ UniFontFilename := "DejaVuSans-Bold.ttf"
UniFontName := "DejaVu Sans"
UniFontZipFilename := "dejavu-fonts-ttf-" . UniFontVersion . ".zip"
-UniFontZipLocalFile := ApplicationFolder . "\" . UniFontZipFilename
+UniFontZipLocalFile := ResourceFolder . "\" . UniFontZipFilename
UniFontZipSourceLink := "http://downloads.sourceforge.net/project/dejavu/dejavu/" . UniFontVersion . "/" . UniFontZipFilename
-UniFontLocalFile := ApplicationFolder . "/" . UniFontFilename
+UniFontLocalFilePath := ApplicationFolder
+UniFontLocalFile := UniFontLocalFilePath . "/" . UniFontFilename
UniFontZipFontPath := "dejavu-fonts-ttf-" . UniFontVersion . "/ttf/" . UniFontFilename
BSTNUpdate() {
@@ -92,6 +93,7 @@ BSTNToggle() {
if (BSTNguiErstellt) {
BSTNguiErstellt := 0
Gui, Destroy
+ DllCall( "GDI32.DLL\RemoveFontResourceEx", Str, UniFontLocalFile ,UInt,(FR_PRIVATE:=0x10), Int,0)
} else {
if (FileExist(ResourceFolder)!="") {
FileInstall,ebene0.png,%ResourceFolder%\ebene0.png,1
@@ -112,7 +114,7 @@ BSTNToggle() {
}
Progress,80,Entpacken des Archivs ...
- RunWait,% """" . UnZipLocalFile . """ -j """ . UniFontZipLocalFile . """ """ . UniFontZipFontPath . """",%ApplicationFolder%,Hide
+ RunWait,% """" . UnZipLocalFile . """ -j """ . UniFontZipLocalFile . """ """ . UniFontZipFontPath . """",%UniFontLocalFilePath%,Hide
Progress,OFF
}