aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/GuiManager.cpp3
-rw-r--r--gui/ThemeEngine.cpp21
-rw-r--r--gui/ThemeEngine.h1
-rw-r--r--gui/credits.h6
-rw-r--r--gui/options.cpp2
-rw-r--r--gui/themes/default.inc5
-rw-r--r--gui/themes/scummclassic.zipbin58510 -> 73968 bytes
-rw-r--r--gui/themes/scummclassic/clR6x12-iso-8859-5.fccbin0 -> 6403 bytes
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx5
-rw-r--r--gui/themes/scummclassic/fixed5x8-iso-8859-5.fccbin0 -> 3985 bytes
-rw-r--r--gui/themes/scummclassic/helvb12-iso-8859-5.fccbin0 -> 5234 bytes
-rw-r--r--gui/themes/scummmodern.zipbin165851 -> 181317 bytes
-rw-r--r--gui/themes/scummmodern/clR6x12-iso-8859-5.fccbin0 -> 6403 bytes
-rw-r--r--gui/themes/scummmodern/fixed5x8-iso-8859-5.fccbin0 -> 3985 bytes
-rw-r--r--gui/themes/scummmodern/helvb12-iso-8859-5.fccbin0 -> 5234 bytes
15 files changed, 33 insertions, 10 deletions
diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp
index ab370425ab..bbd7718d71 100644
--- a/gui/GuiManager.cpp
+++ b/gui/GuiManager.cpp
@@ -249,6 +249,9 @@ void GuiManager::runLoop() {
redraw();
}
+ _lastMousePosition.x = _lastMousePosition.y = -1;
+ _lastMousePosition.time = 0;
+
Common::EventManager *eventMan = _system->getEventManager();
uint32 lastRedraw = 0;
const uint32 waitTime = 1000 / 45;
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index b491b12065..3a50b2c69c 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1451,6 +1451,20 @@ const Graphics::Font *ThemeEngine::loadFontFromArchive(const Common::String &fil
if (_themeArchive)
stream = _themeArchive->createReadStreamForMember(filename);
if (stream) {
+ font = Graphics::NewFont::loadFont(*stream);
+ delete stream;
+ }
+
+ return font;
+}
+
+const Graphics::Font *ThemeEngine::loadCachedFontFromArchive(const Common::String &filename) {
+ Common::SeekableReadStream *stream = 0;
+ const Graphics::Font *font = 0;
+
+ if (_themeArchive)
+ stream = _themeArchive->createReadStreamForMember(filename);
+ if (stream) {
font = Graphics::NewFont::loadFromCache(*stream);
delete stream;
}
@@ -1464,13 +1478,14 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
Common::File fontFile;
if (!cacheFilename.empty()) {
- if (fontFile.open(cacheFilename))
+ if (fontFile.open(cacheFilename)) {
font = Graphics::NewFont::loadFromCache(fontFile);
+ }
if (font)
return font;
- if ((font = loadFontFromArchive(cacheFilename)))
+ if ((font = loadCachedFontFromArchive(cacheFilename)))
return font;
}
@@ -1485,7 +1500,7 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
if (font) {
if (!cacheFilename.empty()) {
- if (!Graphics::NewFont::cacheFontData(*(const Graphics::NewFont*)font, cacheFilename)) {
+ if (!Graphics::NewFont::cacheFontData(*(const Graphics::NewFont *)font, cacheFilename)) {
warning("Couldn't create cache file for font '%s'", filename.c_str());
}
}
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index e3cdb09b4e..e9ca1a919d 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -542,6 +542,7 @@ protected:
const Graphics::Font *loadFont(const Common::String &filename);
const Graphics::Font *loadFontFromArchive(const Common::String &filename);
+ const Graphics::Font *loadCachedFontFromArchive(const Common::String &filename);
Common::String genCacheFilename(const char *filename);
Common::String genLocalizedFontFilename(const char *filename);
diff --git a/gui/credits.h b/gui/credits.h
index c0e1870226..bd4ecffc9b 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -384,6 +384,12 @@ static const char *credits[] = {
"C1""Russian",
"C0""Eugene Sandulenko",
"",
+"C1""Spanish",
+"C0""Tom\341s Maidagan",
+"",
+"C1""Ukrainian",
+"C0""Lubomyr Lisen",
+"",
"",
"C1""Websites (design)",
"C0""Dob\363 Bal\341zs",
diff --git a/gui/options.cpp b/gui/options.cpp
index d3bda228a7..072b20b393 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1001,7 +1001,7 @@ GlobalOptionsDialog::GlobalOptionsDialog()
#endif // USE_DETECTLANG
_guiLanguagePopUp->appendEntry(_("English"), Common::kTranslationBuiltinId);
_guiLanguagePopUp->appendEntry("", 0);
- Common::TLangArray languages = TransMan.getSupportedLanguages();
+ Common::TLangArray languages = TransMan.getSupportedLanguageNames();
Common::TLangArray::iterator lang = languages.begin();
while (lang != languages.end()) {
_guiLanguagePopUp->appendEntry(lang->name, lang->id);
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index f03b3fc61e..46ac4a1365 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -653,7 +653,6 @@
"width='80' "
"/> "
"</layout> "
-"<space size='4' /> "
"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
"<widget name='subToggleDesc' "
"type='OptionsLabel' "
@@ -673,7 +672,7 @@
"/> "
"</layout> "
"</layout> "
-"<space size='4' /> "
+"<space size='2' /> "
"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
"<widget name='subSubtitleSpeedDesc' "
"type='OptionsLabel' "
@@ -685,7 +684,7 @@
"type='SmallLabel' "
"/> "
"</layout> "
-"<space size='20'/> "
+"<space size='16'/> "
"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
"<widget name='Keys' "
"type='Button' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 299bc41339..2507572e40 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc b/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc
new file mode 100644
index 0000000000..d8e614211d
--- /dev/null
+++ b/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc
Binary files differ
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 622c23439e..65083f4bce 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -709,7 +709,6 @@
width = '80'
/>
</layout>
- <space size = '4' />
<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '1' center = 'true'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
@@ -729,7 +728,7 @@
/>
</layout>
</layout>
- <space size = '4' />
+ <space size = '2' />
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
@@ -741,7 +740,7 @@
type = 'SmallLabel'
/>
</layout>
- <space size = '20'/>
+ <space size = '16'/>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '4'>
<widget name = 'Keys'
type = 'Button'
diff --git a/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc b/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc
new file mode 100644
index 0000000000..e70388dd93
--- /dev/null
+++ b/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc
Binary files differ
diff --git a/gui/themes/scummclassic/helvb12-iso-8859-5.fcc b/gui/themes/scummclassic/helvb12-iso-8859-5.fcc
new file mode 100644
index 0000000000..8ad8f0eb22
--- /dev/null
+++ b/gui/themes/scummclassic/helvb12-iso-8859-5.fcc
Binary files differ
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index cd24d781bb..ea7ecd733c 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc
new file mode 100644
index 0000000000..d8e614211d
--- /dev/null
+++ b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc
Binary files differ
diff --git a/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc
new file mode 100644
index 0000000000..e70388dd93
--- /dev/null
+++ b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc
Binary files differ
diff --git a/gui/themes/scummmodern/helvb12-iso-8859-5.fcc b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc
new file mode 100644
index 0000000000..8ad8f0eb22
--- /dev/null
+++ b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-09 08:41:03 +0000