thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: sync with scummvm

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-06-09 11:17:15 +02:00
parent 0c962164d4
commit 7329a5d164
126 changed files with 2443 additions and 1679 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gui/ThemeParser.cpp
View file

@ -232,7 +232,7 @@ bool ThemeParser::parserCallback_bitmap(ParserNode *node) {
}
if (!_theme->addBitmap(node->values["filename"]))
return parserError("Error loading Bitmap file '%s'", node->values["filename"].c_str());
return parserError("Error loading Bitmap file '" + node->values["filename"] + "'");
return true;
}
@ -252,7 +252,7 @@ bool ThemeParser::parserCallback_text(ParserNode *node) {
TextColor textColorId = parseTextColorId(node->values["text_color"]);
if (!_theme->addTextData(id, textDataId, textColorId, alignH, alignV))
return parserError("Error adding Text Data for '%s'.", id.c_str());
return parserError("Error adding Text Data for '" + id + "'.");
return true;
}
@ -279,13 +279,13 @@ bool ThemeParser::parserCallback_color(ParserNode *node) {
Common::String name = node->values["name"];
if (_palette.contains(name))
return parserError("Color '%s' has already been defined.", name.c_str());
return parserError("Color '" + name + "' has already been defined.");
int red, green, blue;
if (parseIntegerKey(node->values["rgb"], 3, &red, &green, &blue) == false ||
red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255)
return parserError("Error parsing RGB values for palette color '%s'", name.c_str());\
return parserError("Error parsing RGB values for palette color '" + name + "'");
_palette[name].r = red;
_palette[name].g = green;
@ -332,7 +332,7 @@ bool ThemeParser::parserCallback_drawstep(ParserNode *node) {
drawstep->drawingCall = getDrawingFunctionCallback(functionName);
if (drawstep->drawingCall == 0)
return parserError("%s is not a valid drawing function name", functionName.c_str());
return parserError(functionName + " is not a valid drawing function name");
if (!parseDrawStep(node, drawstep, true))
return false;
@ -385,11 +385,11 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst
#define __PARSER_ASSIGN_INT(struct_name, key_name, force) \
if (stepNode->values.contains(key_name)) { \
if (!parseIntegerKey(stepNode->values[key_name], 1, &x)) \
return parserError("Error parsing key value for '%s'.", key_name); \
return parserError("Error parsing key value for '" + Common::String(key_name) + "'."); \
\
drawstep->struct_name = x; \
} else if (force) { \
return parserError("Missing necessary key '%s'.", key_name); \
return parserError("Missing necessary key '" + Common::String(key_name) + "'."); \
}
/**
@ -410,7 +410,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst
blue = _palette[val].b; \
} else if (parseIntegerKey(val, 3, &red, &green, &blue) == false || \
red < 0 || red > 255 || green < 0 || green > 255 || blue < 0 || blue > 255) \
return parserError("Error parsing color struct '%s'", val.c_str());\
return parserError("Error parsing color struct '" + val + "'");\
\
drawstep->struct_name.r = red; \
drawstep->struct_name.g = green; \
@ -466,7 +466,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst
else if (val == "right")
drawstep->extraData = Graphics::VectorRenderer::kTriangleRight;
else
return parserError("'%s' is not a valid value for triangle orientation.", val.c_str());
return parserError("'" + val + "' is not a valid value for triangle orientation.");
}
}
@ -545,7 +545,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst
else if (val == "gradient")
drawstep->fillMode = Graphics::VectorRenderer::kFillGradient;
else
return parserError("'%s' is not a valid fill mode for a shape.", stepNode->values["fill"].c_str());
return parserError("'" + stepNode->values["fill"] + "' is not a valid fill mode for a shape.");
}
#undef __PARSER_ASSIGN_INT
@ -567,7 +567,7 @@ bool ThemeParser::parserCallback_def(ParserNode *node) {
value = _theme->getEvaluator()->getVar(node->values["value"]);
else if (!parseIntegerKey(node->values["value"], 1, &value))
return parserError("Invalid definition for '%s'.", var.c_str());
return parserError("Invalid definition for '" + var + "'.");
_theme->getEvaluator()->setVar(var, value);
return true;
@ -585,7 +585,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) {
var = "Globals." + node->values["name"] + ".";
if (!parseCommonLayoutProps(node, var))
return parserError("Error parsing Layout properties of '%s'.", var.c_str());
return parserError("Error parsing Layout properties of '" + var + "'.");
} else {
// FIXME: Shouldn't we distinguish the name/id and the label of a widget?
@ -606,7 +606,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) {
width = _theme->getEvaluator()->getVar(node->values["width"]);
else if (!parseIntegerKey(node->values["width"], 1, &width))
return parserError("Corrupted width value in key for %s", var.c_str());
return parserError("Corrupted width value in key for " + var);
}
if (node->values.contains("height")) {
@ -614,7 +614,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) {
height = _theme->getEvaluator()->getVar(node->values["height"]);
else if (!parseIntegerKey(node->values["height"], 1, &height))
return parserError("Corrupted height value in key for %s", var.c_str());
return parserError("Corrupted height value in key for " + var);
}
Graphics::TextAlign alignH = Graphics::kTextAlignLeft;