[Scummvm-git-logs] scummvm master -> 7c92832db9a45aef1ddd521aa1e2fe248452f743
dwatteau
noreply at scummvm.org
Fri Oct 7 10:45:47 UTC 2022
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
eacd30cceb VKEYBD: Use compresslevel=9 if available in vkeybdpack.py
4be173fc49 VKEYBD: Repair the apostrophe key in the virtual keyboard
7c92832db9 VKEYBD: Fix euro symbol description in keycodeDescTable
Commit: eacd30cceb9dcf75f5ceb391659a4b7c8f424546
https://github.com/scummvm/scummvm/commit/eacd30cceb9dcf75f5ceb391659a4b7c8f424546
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-07T12:45:40+02:00
Commit Message:
VKEYBD: Use compresslevel=9 if available in vkeybdpack.py
So that the .zip files don't get too big.
Changed paths:
backends/vkeybd/packs/vkeybdpack.py
diff --git a/backends/vkeybd/packs/vkeybdpack.py b/backends/vkeybd/packs/vkeybdpack.py
index b0cd4c45e99..c2609792026 100755
--- a/backends/vkeybd/packs/vkeybdpack.py
+++ b/backends/vkeybd/packs/vkeybdpack.py
@@ -17,7 +17,10 @@ def buildPack(packName):
print ("Invalid pack name: " + packName)
return
- zf = zipfile.ZipFile(packName + ".zip", 'w')
+ try:
+ zf = zipfile.ZipFile(packName + ".zip", 'w', compresslevel=9)
+ except TypeError:
+ zf = zipfile.ZipFile(packName + ".zip", 'w')
zf.compress_type = zipfile.ZIP_DEFLATED
Commit: 4be173fc49a34f96ea4ea36a253f39cafce8e455
https://github.com/scummvm/scummvm/commit/4be173fc49a34f96ea4ea36a253f39cafce8e455
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-07T12:45:40+02:00
Commit Message:
VKEYBD: Repair the apostrophe key in the virtual keyboard
The `target` and `name` attributes for this key didn't use the same
character, so they never matched and the key had no effect.
Changed paths:
backends/vkeybd/packs/vkeybd_default.zip
backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
backends/vkeybd/packs/vkeybd_small.zip
backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
diff --git a/backends/vkeybd/packs/vkeybd_default.zip b/backends/vkeybd/packs/vkeybd_default.zip
index 960e9431523..b1b25540bf8 100644
Binary files a/backends/vkeybd/packs/vkeybd_default.zip and b/backends/vkeybd/packs/vkeybd_default.zip differ
diff --git a/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml b/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
index 85a27c71ca0..033a27ca3a1 100644
--- a/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
+++ b/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
@@ -73,7 +73,7 @@
<area shape="rect" coords="264,67,282,86" target="]" />
<area shape="rect" coords="284,68,309,86" target="#" />
<area shape="rect" coords="231,88,249,106" target=";" />
- <area shape="rect" coords="251,89,269,107" target="’" />
+ <area shape="rect" coords="251,89,269,107" target="'" />
<area shape="rect" coords="202,110,219,128" target="," />
<area shape="rect" coords="223,110,241,128" target="." />
<area shape="rect" coords="243,110,261,128" target="/" />
@@ -151,7 +151,7 @@
<area shape="rect" coords="529,135,565,173" target="]" />
<area shape="rect" coords="569,136,620,172" target="#" />
<area shape="rect" coords="462,177,498,214" target=";" />
- <area shape="rect" coords="503,178,539,214" target="’" />
+ <area shape="rect" coords="503,178,539,214" target="'" />
<area shape="rect" coords="405,220,440,256" target="," />
<area shape="rect" coords="447,220,483,256" target="." />
<area shape="rect" coords="487,220,524,256" target="/" />
@@ -307,7 +307,7 @@
<area shape="rect" coords="264,67,282,86" target="]" />
<area shape="rect" coords="284,68,309,86" target="#" />
<area shape="rect" coords="231,88,249,106" target=";" />
- <area shape="rect" coords="251,89,269,107" target="’" />
+ <area shape="rect" coords="251,89,269,107" target="'" />
<area shape="rect" coords="202,110,219,128" target="," />
<area shape="rect" coords="223,110,241,128" target="." />
<area shape="rect" coords="243,110,261,128" target="/" />
@@ -385,7 +385,7 @@
<area shape="rect" coords="529,135,565,173" target="]" />
<area shape="rect" coords="569,136,620,172" target="#" />
<area shape="rect" coords="462,177,498,214" target=";" />
- <area shape="rect" coords="503,178,539,214" target="’" />
+ <area shape="rect" coords="503,178,539,214" target="'" />
<area shape="rect" coords="405,220,440,256" target="," />
<area shape="rect" coords="447,220,483,256" target="." />
<area shape="rect" coords="487,220,524,256" target="/" />
diff --git a/backends/vkeybd/packs/vkeybd_small.zip b/backends/vkeybd/packs/vkeybd_small.zip
index d1c7fc75e57..930ff711f88 100644
Binary files a/backends/vkeybd/packs/vkeybd_small.zip and b/backends/vkeybd/packs/vkeybd_small.zip differ
diff --git a/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml b/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
index 20e91fe2fc8..5a62e9af38b 100644
--- a/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
+++ b/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
@@ -73,7 +73,7 @@
<area shape="rect" coords="264,67,282,86" target="]" />
<area shape="rect" coords="284,68,309,86" target="#" />
<area shape="rect" coords="231,88,249,106" target=";" />
- <area shape="rect" coords="251,89,269,107" target="’" />
+ <area shape="rect" coords="251,89,269,107" target="'" />
<area shape="rect" coords="202,110,219,128" target="," />
<area shape="rect" coords="223,110,241,128" target="." />
<area shape="rect" coords="243,110,261,128" target="/" />
@@ -229,7 +229,7 @@
<area shape="rect" coords="264,67,282,86" target="]" />
<area shape="rect" coords="284,68,309,86" target="#" />
<area shape="rect" coords="231,88,249,106" target=";" />
- <area shape="rect" coords="251,89,269,107" target="’" />
+ <area shape="rect" coords="251,89,269,107" target="'" />
<area shape="rect" coords="202,110,219,128" target="," />
<area shape="rect" coords="223,110,241,128" target="." />
<area shape="rect" coords="243,110,261,128" target="/" />
Commit: 7c92832db9a45aef1ddd521aa1e2fe248452f743
https://github.com/scummvm/scummvm/commit/7c92832db9a45aef1ddd521aa1e2fe248452f743
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-07T12:45:40+02:00
Commit Message:
VKEYBD: Fix euro symbol description in keycodeDescTable
This was encoded in Windows-1252 and it triggered a
-Winvalid-source-encoding warning. Just use ASCII, as for the other
descriptions.
Changed paths:
backends/vkeybd/keycode-descriptions.h
diff --git a/backends/vkeybd/keycode-descriptions.h b/backends/vkeybd/keycode-descriptions.h
index e3c1dfccced..23b0494b15a 100644
--- a/backends/vkeybd/keycode-descriptions.h
+++ b/backends/vkeybd/keycode-descriptions.h
@@ -325,7 +325,7 @@ static const char *keycodeDescTable[] = {
"Break",
"Menu",
"Power",
- "€",
+ "Euro",
"Undo"
};
static const int keycodeDescTableSize = 322;
More information about the Scummvm-git-logs
mailing list