diff options
author | John Willis | 2009-06-08 14:47:38 +0000 |
---|---|---|
committer | John Willis | 2009-06-08 14:47:38 +0000 |
commit | e78edd8ef6450a61f89a40ae6d8f7e9656a28237 (patch) | |
tree | 2ab7a8cc8c1a347fcbef826beece87cfb34221be /backends/vkeybd | |
parent | 87db37316c6d2cd410592cea278727d700cbc2f5 (diff) | |
download | scummvm-rg350-e78edd8ef6450a61f89a40ae6d8f7e9656a28237.tar.gz scummvm-rg350-e78edd8ef6450a61f89a40ae6d8f7e9656a28237.tar.bz2 scummvm-rg350-e78edd8ef6450a61f89a40ae6d8f7e9656a28237.zip |
Virtual Keyboard: Move vkeybd.zip into packs folder and rename default keyboard pack to vkeybd_default(.zip) with updates to default-events.cpp. Also update vkeybdpack.py to use zlib compression if Python zlib is found. Update GP2X and GP2XWiz bundle files to get new vkeybd_default.zip.
svn-id: r41373
Diffstat (limited to 'backends/vkeybd')
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default.zip | bin | 0 -> 505579 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/lowercase-symbols320x240.bmp (renamed from backends/vkeybd/packs/vkeybd/lowercase-symbols320x240.bmp) | bin | 153654 -> 153654 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/lowercase-symbols640x480.bmp (renamed from backends/vkeybd/packs/vkeybd/lowercase-symbols640x480.bmp) | bin | 612534 -> 612534 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/lowercase320x240.bmp (renamed from backends/vkeybd/packs/vkeybd/lowercase320x240.bmp) | bin | 153654 -> 153654 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/lowercase640x480.bmp (renamed from backends/vkeybd/packs/vkeybd/lowercase640x480.bmp) | bin | 612534 -> 612534 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/uppercase-symbols320x240.bmp (renamed from backends/vkeybd/packs/vkeybd/uppercase-symbols320x240.bmp) | bin | 153654 -> 153654 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/uppercase-symbols640x480.bmp (renamed from backends/vkeybd/packs/vkeybd/uppercase-symbols640x480.bmp) | bin | 612534 -> 612534 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/uppercase320x240.bmp (renamed from backends/vkeybd/packs/vkeybd/uppercase320x240.bmp) | bin | 153654 -> 153654 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/uppercase640x480.bmp (renamed from backends/vkeybd/packs/vkeybd/uppercase640x480.bmp) | bin | 612534 -> 612534 bytes | |||
-rw-r--r-- | backends/vkeybd/packs/vkeybd_default/vkeybd.xml (renamed from backends/vkeybd/packs/vkeybd/vkeybd.xml) | 0 | ||||
-rwxr-xr-x | backends/vkeybd/packs/vkeybdpack.py | 26 | ||||
-rw-r--r-- | backends/vkeybd/vkeybd.zip | bin | 504879 -> 0 bytes |
12 files changed, 8 insertions, 18 deletions
diff --git a/backends/vkeybd/packs/vkeybd_default.zip b/backends/vkeybd/packs/vkeybd_default.zip Binary files differnew file mode 100644 index 0000000000..eb06a173a7 --- /dev/null +++ b/backends/vkeybd/packs/vkeybd_default.zip diff --git a/backends/vkeybd/packs/vkeybd/lowercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols320x240.bmp Binary files differindex 02254aa3c7..02254aa3c7 100644 --- a/backends/vkeybd/packs/vkeybd/lowercase-symbols320x240.bmp +++ b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols320x240.bmp diff --git a/backends/vkeybd/packs/vkeybd/lowercase-symbols640x480.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols640x480.bmp Binary files differindex 98c602acbe..98c602acbe 100644 --- a/backends/vkeybd/packs/vkeybd/lowercase-symbols640x480.bmp +++ b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols640x480.bmp diff --git a/backends/vkeybd/packs/vkeybd/lowercase320x240.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase320x240.bmp Binary files differindex 27a450f2d2..27a450f2d2 100644 --- a/backends/vkeybd/packs/vkeybd/lowercase320x240.bmp +++ b/backends/vkeybd/packs/vkeybd_default/lowercase320x240.bmp diff --git a/backends/vkeybd/packs/vkeybd/lowercase640x480.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase640x480.bmp Binary files differindex 3df2a58b83..3df2a58b83 100644 --- a/backends/vkeybd/packs/vkeybd/lowercase640x480.bmp +++ b/backends/vkeybd/packs/vkeybd_default/lowercase640x480.bmp diff --git a/backends/vkeybd/packs/vkeybd/uppercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols320x240.bmp Binary files differindex 8fd645eb22..8fd645eb22 100644 --- a/backends/vkeybd/packs/vkeybd/uppercase-symbols320x240.bmp +++ b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols320x240.bmp diff --git a/backends/vkeybd/packs/vkeybd/uppercase-symbols640x480.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols640x480.bmp Binary files differindex cbdfbf19e9..cbdfbf19e9 100644 --- a/backends/vkeybd/packs/vkeybd/uppercase-symbols640x480.bmp +++ b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols640x480.bmp diff --git a/backends/vkeybd/packs/vkeybd/uppercase320x240.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase320x240.bmp Binary files differindex 6a1132314a..6a1132314a 100644 --- a/backends/vkeybd/packs/vkeybd/uppercase320x240.bmp +++ b/backends/vkeybd/packs/vkeybd_default/uppercase320x240.bmp diff --git a/backends/vkeybd/packs/vkeybd/uppercase640x480.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase640x480.bmp Binary files differindex e635a3ccf2..e635a3ccf2 100644 --- a/backends/vkeybd/packs/vkeybd/uppercase640x480.bmp +++ b/backends/vkeybd/packs/vkeybd_default/uppercase640x480.bmp diff --git a/backends/vkeybd/packs/vkeybd/vkeybd.xml b/backends/vkeybd/packs/vkeybd_default/vkeybd.xml index aba31b1096..aba31b1096 100644 --- a/backends/vkeybd/packs/vkeybd/vkeybd.xml +++ b/backends/vkeybd/packs/vkeybd_default/vkeybd.xml diff --git a/backends/vkeybd/packs/vkeybdpack.py b/backends/vkeybd/packs/vkeybdpack.py index e7b1c63543..130e4b737b 100755 --- a/backends/vkeybd/packs/vkeybdpack.py +++ b/backends/vkeybd/packs/vkeybdpack.py @@ -4,6 +4,11 @@ import sys import re import os import zipfile +try: + import zlib + compression = zipfile.ZIP_DEFLATED +except: + compression = zipfile.ZIP_STORED PACK_FILE_EXTENSIONS = ('.xml', '.bmp') @@ -14,12 +19,14 @@ def buildPack(packName): zf = zipfile.ZipFile(packName + ".zip", 'w') + zf.compress_type = zipfile.ZIP_DEFLATED + print ("Building '" + packName + "' pack:") os.chdir(packName) for filename in os.listdir('.'): if os.path.isfile(filename) and not filename[0] == '.' and filename.endswith(PACK_FILE_EXTENSIONS): - zf.write(filename, './' + filename) + zf.write(filename, './' + filename, compress_type=compression) print (" Adding file: " + filename) os.chdir('../') @@ -30,24 +37,7 @@ def buildAllPacks(): for f in os.listdir('.'): if os.path.isdir(os.path.join('.', f)) and not f[0] == '.': buildPack(f) - -def parseSTX(pack_file, def_file): - comm = re.compile("<!--(.*?)-->", re.DOTALL) - head = re.compile("<\?(.*?)\?>") - output = "" - for line in pack_file: - output += line.rstrip("\r\n\t ").lstrip() + " \n" - - output = re.sub(comm, "", output) - output = re.sub(head, "", output) - output = output.replace("\t", " ").replace(" ", " ").replace("\"", "'") - output = output.replace(" = ", "=").replace(", ", ",") - - for line in output.splitlines(): - if line and not line.isspace(): - def_file.write("\"" + line + "\"\n") - def printUsage(): print ("===============================================") print ("ScummVM Virtual Keyboard Pack Generation Script") diff --git a/backends/vkeybd/vkeybd.zip b/backends/vkeybd/vkeybd.zip Binary files differdeleted file mode 100644 index a4314e908a..0000000000 --- a/backends/vkeybd/vkeybd.zip +++ /dev/null |