From 5d175bb1682fb1cfe473431761f07fcd046b84d0 Mon Sep 17 00:00:00 2001
From: mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Fri, 19 Feb 2010 08:55:07 +0000
Subject: 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.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: https://svn.neo-layout.org@2168 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
windows/neo-vars/src/source/screenkeyboard_new.ahk | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'windows/neo-vars/src')
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
}
--
cgit v1.2.3