aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/ThemeParser.cpp22
-rw-r--r--gui/credits.h12
-rw-r--r--gui/options.cpp10
-rw-r--r--gui/themes/translations.datbin212190 -> 220518 bytes
4 files changed, 22 insertions, 22 deletions
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 5b1faa4075..db45b5a995 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -352,11 +352,8 @@ bool ThemeParser::parserCallback_drawdata(ParserNode *node) {
}
if (node->values.contains("cache")) {
- if (node->values["cache"] == "true")
- cached = true;
- else if (node->values["cache"] == "false")
- cached = false;
- else return parserError("'Parsed' value must be either true or false.");
+ if (!Common::parseBool(node->values["cache"], cached))
+ return parserError("'Parsed' value must be either true or false.");
}
if (_theme->addDrawData(node->values["id"], cached) == false)
@@ -595,9 +592,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) {
bool enabled = true;
if (node->values.contains("enabled")) {
- if (node->values["enabled"] == "false")
- enabled = false;
- else if (node->values["enabled"] != "true")
+ if (!Common::parseBool(node->values["enabled"], enabled))
return parserError("Invalid value for Widget enabling (expecting true/false)");
}
@@ -641,9 +636,7 @@ bool ThemeParser::parserCallback_dialog(ParserNode *node) {
}
if (node->values.contains("enabled")) {
- if (node->values["enabled"] == "false")
- enabled = false;
- else if (node->values["enabled"] != "true")
+ if (!Common::parseBool(node->values["enabled"], enabled))
return parserError("Invalid value for Dialog enabling (expecting true/false)");
}
@@ -677,16 +670,19 @@ bool ThemeParser::parserCallback_import(ParserNode *node) {
bool ThemeParser::parserCallback_layout(ParserNode *node) {
int spacing = -1;
+ bool center = false;
if (node->values.contains("spacing")) {
if (!parseIntegerKey(node->values["spacing"], 1, &spacing))
return false;
}
+ Common::parseBool(node->values["center"], center);
+
if (node->values["type"] == "vertical")
- _theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutVertical, spacing, node->values["center"] == "true");
+ _theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutVertical, spacing, center);
else if (node->values["type"] == "horizontal")
- _theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutHorizontal, spacing, node->values["center"] == "true");
+ _theme->getEvaluator()->addLayout(GUI::ThemeLayout::kLayoutHorizontal, spacing, center);
else
return parserError("Invalid layout type. Only 'horizontal' and 'vertical' layouts allowed.");
diff --git a/gui/credits.h b/gui/credits.h
index ba679c433c..5bc6d56ff4 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -3,13 +3,13 @@ static const char *credits[] = {
"C1""ScummVM Team",
"",
"C1""Project Leaders",
-"C0""Max Horn",
"C0""Eugene Sandulenko",
"",
"C1""Retired Project Leaders",
"C0""James Brown",
"C0""Vincent Hamm",
"C2""ScummVM co-founder, Original Cruise/CinE author",
+"C0""Max Horn",
"C0""Ludvig Strigeus",
"C2""Original ScummVM and SimonVM author",
"",
@@ -23,6 +23,7 @@ static const char *credits[] = {
"C0""Vincent Hamm",
"C2""(retired)",
"C0""Max Horn",
+"C2""(retired)",
"C0""Travis Howell",
"C2""(retired)",
"C0""Pawel Kolodziejski",
@@ -156,6 +157,7 @@ static const char *credits[] = {
"C0""Greg Frieger",
"C0""Paul Gilbert",
"C0""Max Horn",
+"C2""(retired)",
"C0""Filippos Karapetis",
"C0""Martin Kiewitz",
"C0""Walter van Niftrik",
@@ -189,6 +191,7 @@ static const char *credits[] = {
"C0""Eugene Sandulenko",
"C0""Filippos Karapetis",
"C0""Max Horn",
+"C2""(retired)",
"C0""Paul Gilbert",
"C0""Torbj\366rn Andersson",
"",
@@ -204,6 +207,7 @@ static const char *credits[] = {
"C0""Paul Gilbert",
"C0""Sven Hesse",
"C0""Max Horn",
+"C2""(retired)",
"C0""Filippos Karapetis",
"C0""Joost Peters",
"",
@@ -268,6 +272,7 @@ static const char *credits[] = {
"",
"C1""SDL (Win/Linux/OS X/etc.)",
"C0""Max Horn",
+"C2""(retired)",
"C0""Eugene Sandulenko",
"C2""Asm routines, GFX layers",
"",
@@ -285,7 +290,7 @@ static const char *credits[] = {
"C1""Other subsystems",
"C1""Infrastructure",
"C0""Max Horn",
-"C2""Backend & Engine APIs, file API, sound mixer, audiostreams, data structures, etc.",
+"C2""Backend & Engine APIs, file API, sound mixer, audiostreams, data structures, etc. (retired)",
"C0""Eugene Sandulenko",
"C0""Johannes Schickel",
"",
@@ -320,8 +325,6 @@ static const char *credits[] = {
"C2""Wiki maintainer",
"C0""Andre Heider",
"C2""Buildbot maintainer",
-"C0""Max Horn",
-"C2""Forum, IRC channel and Mailing list maintainer",
"C0""Joost Peters",
"C2""Doxygen Project Documentation maintainer",
"C0""Jordi Vilalta Prat",
@@ -390,6 +393,7 @@ static const char *credits[] = {
"",
"C1""Mac OS X",
"C0""Max Horn",
+"C2""(retired)",
"C0""Oystein Eftevaag",
"",
"C1""Mandriva",
diff --git a/gui/options.cpp b/gui/options.cpp
index b0b9fe6c90..3cc2eea6b9 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -343,12 +343,12 @@ void OptionsDialog::close() {
ConfMan.removeKey("render_mode", _domain);
}
}
-
+
// Setup graphics again if needed
if (_domain == Common::ConfigManager::kApplicationDomain && graphicsModeChanged) {
g_system->beginGFXTransaction();
g_system->setGraphicsMode(ConfMan.get("gfx_mode", _domain).c_str());
-
+
if (ConfMan.hasKey("aspect_ratio"))
g_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio", _domain));
if (ConfMan.hasKey("fullscreen"))
@@ -383,7 +383,7 @@ void OptionsDialog::close() {
message += "\n";
message += _("the video mode could not be changed.");
}
-
+
if (gfxError & OSystem::kTransactionAspectRatioFailed) {
ConfMan.setBool("aspect_ratio", g_system->getFeatureState(OSystem::kFeatureAspectRatioCorrection), _domain);
message += "\n";
@@ -808,7 +808,7 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
_gmDevicePopUp->appendEntry(d->getCompleteName(), d->getHandle());
} else if (d->getMusicDriverId() == "auto") {
_gmDevicePopUp->appendEntry(_("Use first available device"), d->getHandle());
- }
+ }
}
}
@@ -855,7 +855,7 @@ void OptionsDialog::addMT32Controls(GuiObject *boss, const Common::String &prefi
// Make sure the null device is the first one in the list to avoid undesired
// auto detection for users who don't have a saved setting yet.
for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) {
- MusicDevices i = (**m)->getDevices();
+ MusicDevices i = (**m)->getDevices();
for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) {
if (d->getMusicDriverId() == "null")
_mt32DevicePopUp->appendEntry(_("Don't use Roland MT-32 music"), d->getHandle());
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 9e5c0465d9..83155bba1b 100644
--- a/gui/themes/translations.dat
+++ b/gui/themes/translations.dat
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 01:01:34 +0000