diff options
Diffstat (limited to 'gui')
61 files changed, 2175 insertions, 1123 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index cf16eec238..2cb1635e20 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -34,6 +34,7 @@ #include "graphics/surface.h" #include "graphics/VectorRenderer.h" #include "graphics/fonts/bdf.h" +#include "graphics/fonts/ttf.h" #include "gui/widget.h" #include "gui/ThemeEngine.h" @@ -45,6 +46,7 @@ namespace GUI { const char * const ThemeEngine::kImageLogo = "logo.bmp"; const char * const ThemeEngine::kImageLogoSmall = "logo_small.bmp"; const char * const ThemeEngine::kImageSearch = "search.bmp"; +const char * const ThemeEngine::kImageEraser = "eraser.bmp"; struct TextDrawData { const Graphics::Font *_fontPtr; @@ -260,7 +262,8 @@ void ThemeItemBitmap::drawSelf(bool draw, bool restore) { ThemeEngine::ThemeEngine(Common::String id, GraphicsMode mode) : _system(0), _vectorRenderer(0), _buffering(false), _bytesPerPixel(0), _graphicsMode(kGfxDisabled), - _font(0), _initOk(false), _themeOk(false), _enabled(false), _cursor(0) { + _font(0), _initOk(false), _themeOk(false), _enabled(false), _themeFiles(), + _cursor(0) { _system = g_system; _parser = new ThemeParser(this); @@ -293,6 +296,9 @@ ThemeEngine::ThemeEngine(Common::String id, GraphicsMode mode) : _graphicsMode = mode; _themeArchive = 0; _initOk = false; + + // We prefer files in archive bundles over the common search paths. + _themeFiles.add("default", &SearchMan, 0, false); } ThemeEngine::~ThemeEngine() { @@ -316,7 +322,6 @@ ThemeEngine::~ThemeEngine() { delete _parser; delete _themeEval; delete[] _cursor; - delete _themeArchive; } @@ -405,6 +410,9 @@ bool ThemeEngine::init() { } } } + + if (_themeArchive) + _themeFiles.add("theme_archive", _themeArchive, 1, true); } // Load the theme @@ -550,7 +558,7 @@ bool ThemeEngine::addTextData(const Common::String &drawDataId, TextData textId, return true; } -bool ThemeEngine::addFont(TextData textId, const Common::String &file) { +bool ThemeEngine::addFont(TextData textId, const Common::String &file, const Common::String &scalableFile, const int pointsize) { if (textId == -1) return false; @@ -563,35 +571,26 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) { _texts[textId]->_fontPtr = _font; } else { Common::String localized = FontMan.genLocalizedFontFilename(file); - // Try built-in fonts - _texts[textId]->_fontPtr = FontMan.getFontByName(localized); - - if (!_texts[textId]->_fontPtr) { - // First try to load localized font - _texts[textId]->_fontPtr = loadFont(localized); - - if (_texts[textId]->_fontPtr) - FontMan.assignFontToName(localized, _texts[textId]->_fontPtr); + const Common::String charset +#ifdef USE_TRANSLATION + (TransMan.getCurrentCharset()) +#endif + ; - // Fallback to non-localized font and default translation - else { - // Try built-in fonts - _texts[textId]->_fontPtr = FontMan.getFontByName(file); + // Try localized fonts + _texts[textId]->_fontPtr = loadFont(localized, scalableFile, charset, pointsize, textId == kTextDataDefault); - // Try to load it - if (!_texts[textId]->_fontPtr) { - _texts[textId]->_fontPtr = loadFont(file); + if (!_texts[textId]->_fontPtr) { + // Try standard fonts + _texts[textId]->_fontPtr = loadFont(file, scalableFile, Common::String(), pointsize, textId == kTextDataDefault); - if (!_texts[textId]->_fontPtr) - error("Couldn't load font '%s'", file.c_str()); + if (!_texts[textId]->_fontPtr) + error("Couldn't load font '%s'/'%s'", file.c_str(), scalableFile.c_str()); - FontMan.assignFontToName(file, _texts[textId]->_fontPtr); - } #ifdef USE_TRANSLATION - TransMan.setLanguage("C"); + TransMan.setLanguage("C"); #endif - warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", localized.c_str()); - } + warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", localized.c_str()); } } @@ -622,12 +621,16 @@ bool ThemeEngine::addBitmap(const Common::String &filename) { return true; // If not, try to load the bitmap via the ImageDecoder class. - surf = Graphics::ImageDecoder::loadFile(filename, _overlayFormat); - if (!surf && _themeArchive) { - Common::SeekableReadStream *stream = _themeArchive->createReadStreamForMember(filename); + Common::ArchiveMemberList members; + _themeFiles.listMatchingMembers(members, filename); + for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) { + Common::SeekableReadStream *stream = (*i)->createReadStream(); if (stream) { surf = Graphics::ImageDecoder::loadFile(*stream, _overlayFormat); delete stream; + + if (surf) + break; } } @@ -844,7 +847,7 @@ void ThemeEngine::queueBitmap(const Graphics::Surface *bitmap, const Common::Rec ThemeItemBitmap *q = new ThemeItemBitmap(this, area, bitmap, alpha); if (_buffering) { - _bufferQueue.push_back(q); + _screenQueue.push_back(q); } else { q->drawSelf(true, false); delete q; @@ -903,7 +906,7 @@ void ThemeEngine::drawCheckbox(const Common::Rect &r, const Common::String &str, r2.left = r2.right + checkBoxSize; r2.right = r.right; - queueDDText(getTextData(dd), getTextColor(dd), r2, str, false, false, _widgets[kDDCheckboxDefault]->_textAlignH, _widgets[dd]->_textAlignV); + queueDDText(getTextData(dd), getTextColor(dd), r2, str, true, false, _widgets[kDDCheckboxDefault]->_textAlignH, _widgets[dd]->_textAlignV); } void ThemeEngine::drawRadiobutton(const Common::Rect &r, const Common::String &str, bool checked, WidgetStateInfo state) { @@ -929,7 +932,7 @@ void ThemeEngine::drawRadiobutton(const Common::Rect &r, const Common::String &s r2.left = r2.right + checkBoxSize; r2.right = r.right; - queueDDText(getTextData(dd), getTextColor(dd), r2, str, false, false, _widgets[kDDRadiobuttonDefault]->_textAlignH, _widgets[dd]->_textAlignV); + queueDDText(getTextData(dd), getTextColor(dd), r2, str, true, false, _widgets[kDDRadiobuttonDefault]->_textAlignH, _widgets[dd]->_textAlignV); } void ThemeEngine::drawSlider(const Common::Rect &r, int width, WidgetStateInfo state) { @@ -971,7 +974,7 @@ void ThemeEngine::drawScrollbar(const Common::Rect &r, int sliderY, int sliderHe r2.left += 1; r2.right -= 1; r2.top += sliderY; - r2.bottom = r2.top + sliderHeight - 1; + r2.bottom = r2.top + sliderHeight; r2.top += r.width() / 5; r2.bottom -= r.width() / 5; @@ -1370,6 +1373,10 @@ int ThemeEngine::getCharWidth(byte c, FontStyle font) const { return ready() ? _texts[fontStyleToData(font)]->_fontPtr->getCharWidth(c) : 0; } +int ThemeEngine::getKerningOffset(byte left, byte right, FontStyle font) const { + return ready() ? _texts[fontStyleToData(font)]->_fontPtr->getKerningOffset(left, right) : 0; +} + TextData ThemeEngine::getTextData(DrawData ddId) const { return _widgets[ddId] ? (TextData)_widgets[ddId]->_textDataId : kTextDataNone; } @@ -1390,66 +1397,90 @@ DrawData ThemeEngine::parseDrawDataId(const Common::String &name) const { * External data loading *********************************************************/ -const Graphics::Font *ThemeEngine::loadFontFromArchive(const Common::String &filename) { - Common::SeekableReadStream *stream = 0; - const Graphics::Font *font = 0; +const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name) { +#ifdef USE_FREETYPE2 + name = Common::String::format("%s-%s@%d", filename.c_str(), charset.c_str(), pointsize); - if (_themeArchive) - stream = _themeArchive->createReadStreamForMember(filename); - if (stream) { - font = Graphics::BdfFont::loadFont(*stream); - delete stream; - } + // Try already loaded fonts. + const Graphics::Font *font = FontMan.getFontByName(name); + if (font) + return font; - return font; -} + Common::ArchiveMemberList members; + _themeFiles.listMatchingMembers(members, filename); -const Graphics::Font *ThemeEngine::loadCachedFontFromArchive(const Common::String &filename) { - Common::SeekableReadStream *stream = 0; - const Graphics::Font *font = 0; + for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) { + Common::SeekableReadStream *stream = (*i)->createReadStream(); + if (stream) { + font = Graphics::loadTTFFont(*stream, pointsize, false, +#ifdef USE_TRANSLATION + TransMan.getCharsetMapping() +#else + 0 +#endif + ); + delete stream; - if (_themeArchive) - stream = _themeArchive->createReadStreamForMember(filename); - if (stream) { - font = Graphics::BdfFont::loadFromCache(*stream); - delete stream; + if (font) + return font; + } } - - return font; +#endif + return 0; } -const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) { - const Graphics::Font *font = 0; - Common::String cacheFilename = genCacheFilename(filename); - Common::File fontFile; +const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, Common::String &name) { + name = filename; - if (!cacheFilename.empty()) { - if (fontFile.open(cacheFilename)) { - font = Graphics::BdfFont::loadFromCache(fontFile); - } + // Try already loaded fonts. + const Graphics::Font *font = FontMan.getFontByName(name); + if (font) + return font; - if (font) - return font; + Common::ArchiveMemberList members; + const Common::String cacheFilename(genCacheFilename(filename)); + _themeFiles.listMatchingMembers(members, cacheFilename); + _themeFiles.listMatchingMembers(members, filename); - if ((font = loadCachedFontFromArchive(cacheFilename))) - return font; - } + for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) { + Common::SeekableReadStream *stream = (*i)->createReadStream(); + if (stream) { + if ((*i)->getName().equalsIgnoreCase(cacheFilename)) { + font = Graphics::BdfFont::loadFromCache(*stream); + } else { + font = Graphics::BdfFont::loadFont(*stream); + if (font && !cacheFilename.empty()) { + if (!Graphics::BdfFont::cacheFontData(*(const Graphics::BdfFont *)font, cacheFilename)) + warning("Couldn't create cache file for font '%s'", filename.c_str()); + } + } + delete stream; - // normal open - if (fontFile.open(filename)) { - font = Graphics::BdfFont::loadFont(fontFile); + if (font) + return font; + } } - if (!font) { - font = loadFontFromArchive(filename); - } + return 0; +} +const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, const Common::String &scalableFilename, const Common::String &charset, const int pointsize, const bool makeLocalizedFont) { + Common::String fontName; + + const Graphics::Font *font = 0; + + // Prefer scalable fonts over non-scalable fonts + font = loadScalableFont(scalableFilename, charset, pointsize, fontName); + if (!font) + font = loadFont(filename, fontName); + + // If the font is successfully loaded store it in the font manager. if (font) { - if (!cacheFilename.empty()) { - if (!Graphics::BdfFont::cacheFontData(*(const Graphics::BdfFont *)font, cacheFilename)) { - warning("Couldn't create cache file for font '%s'", filename.c_str()); - } - } + FontMan.assignFontToName(fontName, font); + // If this font should be the new default localized font, we set it up + // for that. + if (makeLocalizedFont) + FontMan.setLocalizedFont(fontName); } return font; diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 5fbea7e301..f041f85ab9 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -35,7 +35,7 @@ #include "graphics/pixelformat.h" -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.3" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.8" class OSystem; @@ -228,6 +228,7 @@ public: static const char *const kImageLogo; ///< ScummVM logo used in the launcher static const char *const kImageLogoSmall; ///< ScummVM logo used in the GMM static const char *const kImageSearch; ///< Search tool image used in the launcher + static const char *const kImageEraser; ///< Clear input image used in the launcher /** * Graphics mode enumeration. @@ -309,6 +310,8 @@ public: int getCharWidth(byte c, FontStyle font = kFontStyleBold) const; + int getKerningOffset(byte left, byte right, FontStyle font = kFontStyleBold) const; + //@} @@ -410,10 +413,12 @@ public: * Interface for the ThemeParser class: Loads a font to use on the GUI from the given * filename. * - * @param fontName Identifier name for the font. - * @param file Name of the font file. + * @param fextId Identifier name for the font. + * @param file Filename of the non-scalable font version. + * @param scalableFile Filename of the scalable version. (Optional) + * @param pointsize Point size for the scalable font. (Optional) */ - bool addFont(TextData textId, const Common::String &file); + bool addFont(TextData textId, const Common::String &file, const Common::String &scalableFile, const int pointsize); /** * Interface for the ThemeParser class: adds a text color value. @@ -535,10 +540,10 @@ protected: */ void unloadTheme(); - const Graphics::Font *loadFont(const Common::String &filename); - const Graphics::Font *loadFontFromArchive(const Common::String &filename); - const Graphics::Font *loadCachedFontFromArchive(const Common::String &filename); + const Graphics::Font *loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name); + const Graphics::Font *loadFont(const Common::String &filename, Common::String &name); Common::String genCacheFilename(const Common::String &filename) const; + const Graphics::Font *loadFont(const Common::String &filename, const Common::String &scalableFilename, const Common::String &charset, const int pointsize, const bool makeLocalizedFont); /** * Actual Dirty Screen handling function. @@ -657,6 +662,7 @@ protected: Common::String _themeId; Common::String _themeFile; Common::Archive *_themeArchive; + Common::SearchSet _themeFiles; bool _useCursor; int _cursorHotspotX, _cursorHotspotY; diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index db45b5a995..9ccdedd564 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -176,8 +176,15 @@ bool ThemeParser::parserCallback_font(ParserNode *node) { return true; } + // Default to a point size of 12. + int pointsize = 12; + if (node->values.contains("point_size")) { + if (sscanf(node->values["point_size"].c_str(), "%d", &pointsize) != 1 || pointsize <= 0) + return parserError(Common::String::format("Font \"%s\" has invalid point size \"%s\"", node->values["id"].c_str(), node->values["point_size"].c_str())); + } + TextData textDataId = parseTextDataId(node->values["id"]); - if (!_theme->addFont(textDataId, node->values["file"])) + if (!_theme->addFont(textDataId, node->values["file"], node->values["scalable_file"], pointsize)) return parserError("Error loading Font in theme engine."); return true; @@ -379,7 +386,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst * theme description format. * @param force Sets if the key is optional or necessary. */ -#define __PARSER_ASSIGN_INT(struct_name, key_name, force) \ +#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 '" + Common::String(key_name) + "'."); \ @@ -398,7 +405,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst * @param key_name Name as STRING of the key identifier as it appears in the * theme description format. */ -#define __PARSER_ASSIGN_RGB(struct_name, key_name) \ +#define PARSER_ASSIGN_RGB(struct_name, key_name) \ if (stepNode->values.contains(key_name)) { \ val = stepNode->values[key_name]; \ if (_palette.contains(val)) { \ @@ -415,16 +422,16 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst drawstep->struct_name.set = true; \ } - __PARSER_ASSIGN_INT(stroke, "stroke", false); - __PARSER_ASSIGN_INT(bevel, "bevel", false); - __PARSER_ASSIGN_INT(shadow, "shadow", false); - __PARSER_ASSIGN_INT(factor, "gradient_factor", false); + PARSER_ASSIGN_INT(stroke, "stroke", false); + PARSER_ASSIGN_INT(bevel, "bevel", false); + PARSER_ASSIGN_INT(shadow, "shadow", false); + PARSER_ASSIGN_INT(factor, "gradient_factor", false); - __PARSER_ASSIGN_RGB(fgColor, "fg_color"); - __PARSER_ASSIGN_RGB(bgColor, "bg_color"); - __PARSER_ASSIGN_RGB(gradColor1, "gradient_start"); - __PARSER_ASSIGN_RGB(gradColor2, "gradient_end"); - __PARSER_ASSIGN_RGB(bevelColor, "bevel_color"); + PARSER_ASSIGN_RGB(fgColor, "fg_color"); + PARSER_ASSIGN_RGB(bgColor, "bg_color"); + PARSER_ASSIGN_RGB(gradColor1, "gradient_start"); + PARSER_ASSIGN_RGB(gradColor2, "gradient_end"); + PARSER_ASSIGN_RGB(bevelColor, "bevel_color"); if (functionSpecific) { assert(stepNode->values.contains("func")); @@ -444,7 +451,7 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst if (stepNode->values.contains("radius") && stepNode->values["radius"] == "auto") { drawstep->radius = 0xFF; } else { - __PARSER_ASSIGN_INT(radius, "radius", true); + PARSER_ASSIGN_INT(radius, "radius", true); } } @@ -544,9 +551,19 @@ bool ThemeParser::parseDrawStep(ParserNode *stepNode, Graphics::DrawStep *drawst else return parserError("'" + stepNode->values["fill"] + "' is not a valid fill mode for a shape."); } + + if (stepNode->values.contains("padding")) { + val = stepNode->values["padding"]; + int pr, pt, pl, pb; + if (parseIntegerKey(val, 4, &pl, &pt, &pr, &pb)) + drawstep->padding.left = pl, + drawstep->padding.top = pt, + drawstep->padding.right = pr, + drawstep->padding.bottom = pb; + } -#undef __PARSER_ASSIGN_INT -#undef __PARSER_ASSIGN_RGB +#undef PARSER_ASSIGN_INT +#undef PARSER_ASSIGN_RGB return true; } diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h index 39a951e007..4b7e88cbf3 100644 --- a/gui/ThemeParser.h +++ b/gui/ThemeParser.h @@ -65,6 +65,8 @@ protected: XML_PROP(id, true) XML_PROP(file, true) XML_PROP(resolution, false) + XML_PROP(scalable_file, false) + XML_PROP(point_size, false) KEY_END() XML_KEY(text_color) @@ -138,6 +140,7 @@ protected: XML_PROP(height, false) XML_PROP(xpos, false) XML_PROP(ypos, false) + XML_PROP(padding, false) XML_PROP(orientation, false) XML_PROP(file, false) KEY_END() diff --git a/gui/about.cpp b/gui/about.cpp index 00dbc5fe0b..03be1f8992 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -54,7 +54,7 @@ enum { static const char *copyright_text[] = { "", -"C0""Copyright (C) 2001-2011 The ScummVM project", +"C0""Copyright (C) 2001-2012 The ScummVM project", "C0""http://www.scummvm.org", "", "C0""ScummVM is the legal property of its developers, whose names are too numerous to list here. Please refer to the COPYRIGHT file distributed with this binary.", diff --git a/gui/browser_osx.mm b/gui/browser_osx.mm index 017b31b9a8..b8aa7c50ee 100644 --- a/gui/browser_osx.mm +++ b/gui/browser_osx.mm @@ -62,11 +62,7 @@ int BrowserDialog::runModal() { NSOpenPanel * panel = [NSOpenPanel openPanel]; [panel setCanChooseDirectories:YES]; if ([panel runModalForTypes:nil] == NSOKButton) { -#ifdef __POWERPC__ - const char *filename = [[panel filename] cString]; -#else - const char *filename = [[panel filename] cStringUsingEncoding:NSUTF8StringEncoding]; -#endif + const char *filename = [[panel filename] UTF8String]; _choice = Common::FSNode(filename); choiceMade = true; } diff --git a/gui/console.cpp b/gui/console.cpp index dc2c5c4f33..49e2fccd98 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -245,6 +245,8 @@ void ConsoleDialog::handleTickle() { } else draw(); } + + _scrollBar->handleTickle(); } void ConsoleDialog::handleMouseWheel(int x, int y, int direction) { diff --git a/gui/credits.h b/gui/credits.h index 3a7e77c146..154f577fba 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -39,6 +39,7 @@ static const char *credits[] = { "C0""Pawel Kolodziejski", "C2""Codecs, iMUSE, Smush, etc.", "C0""Gregory Montoir", +"C2""(retired)", "C0""Eugene Sandulenko", "C2""FT INSANE, MM NES, MM C64, game detection, Herc/CGA", "C0""Ludvig Strigeus", @@ -49,6 +50,7 @@ static const char *credits[] = { "C2""(retired)", "C0""Travis Howell", "C0""Gregory Montoir", +"C2""(retired)", "C0""Eugene Sandulenko", "", "C1""AGI", @@ -81,9 +83,13 @@ static const char *credits[] = { "C2""(retired)", "C0""Pawel Kolodziejski", "C0""Gregory Montoir", +"C2""(retired)", "C0""Kari Salminen", "C0""Eugene Sandulenko", "", +"C1""Composer", +"C0""Alyssa Milburn", +"", "C1""CruisE", "C0""Paul Gilbert", "C0""Vincent Hamm", @@ -101,6 +107,7 @@ static const char *credits[] = { "C0""Torbj\366rn Andersson", "C0""Bertrand Augereau", "C0""Vladimir Menshakov", +"C2""(retired)", "", "C1""Gob", "C0""Torbj\366rn Andersson", @@ -124,6 +131,7 @@ static const char *credits[] = { "C0""Oystein Eftevaag", "C0""Florian Kagerer", "C0""Gregory Montoir", +"C2""(retired)", "C0""Johannes Schickel", "", "C1""Lastexpress", @@ -134,12 +142,6 @@ static const char *credits[] = { "C1""Lure", "C0""Paul Gilbert", "", -"C1""M4", -"C0""Torbj\366rn Andersson", -"C0""Paul Gilbert", -"C0""Benjamin Haisch", -"C0""Filippos Karapetis", -"", "C1""MADE", "C0""Benjamin Haisch", "C0""Filippos Karapetis", @@ -159,10 +161,13 @@ static const char *credits[] = { "C0""David Eriksson", "C2""(retired)", "C0""Gregory Montoir", +"C2""(retired)", "C0""Joost Peters", "", "C1""SAGA", "C0""Torbj\366rn Andersson", +"C0""Daniel Balsom", +"C2""Original engine reimplementation author (retired)", "C0""Filippos Karapetis", "C0""Andrew Kurushin", "C0""Eugene Sandulenko", @@ -214,6 +219,7 @@ static const char *credits[] = { "C0""Robert Megone", "C2""Help with callback rewriting", "C0""Vladimir Menshakov", +"C2""(retired)", "", "C1""Tinsel", "C0""Torbj\366rn Andersson", @@ -231,6 +237,7 @@ static const char *credits[] = { "", "C1""Touch\351", "C0""Gregory Montoir", +"C2""(retired)", "", "C1""TsAGE", "C0""Arnaud Boutonn\351", @@ -238,6 +245,7 @@ static const char *credits[] = { "", "C1""Tucker", "C0""Gregory Montoir", +"C2""(retired)", "", "", "C1""Backend Teams", @@ -491,6 +499,7 @@ static const char *credits[] = { "", "C1""Spanish", "C0""Tom\341s Maidagan", +"C0""Jordi Vilalta Prat", "", "C1""Swedish", "C0""Hampus Flink", @@ -560,6 +569,8 @@ static const char *credits[] = { "C2""Final MI1 CD music support, initial Ogg Vorbis support", "C0""Andr\351 Souza", "C2""SDL-based OpenGL renderer", +"C0""Tom Frost", +"C2""WebOS port contributions", "", "C1""FreeSCI Contributors", "C0""Francois-R Boyer", @@ -642,6 +653,8 @@ static const char *credits[] = { "", "C1""Special thanks to", "", +"C0""Daniel Balsom", +"C2""For the original Reinherit (SAGA) code", "C0""Sander Buskens", "C2""For his work on the initial reversing of Monkey2", "C0""Canadacow", @@ -674,6 +687,8 @@ static const char *credits[] = { "C2""For additional work on the original MT-32 emulator", "C0""James Woodcock", "C2""Soundtrack enhancements", +"C0""Some icons by Yusuke Kamiyamane", +"C0""", "C0""Tony Warriner and everyone at Revolution Software Ltd. for sharing with us the source of some of their brilliant games, allowing us to release Beneath a Steel Sky as freeware... and generally being supportive above and beyond the call of duty.", "C0""", "C0""John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.", diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 3973583d38..26e62dc1d9 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -247,6 +247,12 @@ bool Debugger::parseCommand(const char *inputOrig) { *(int32 *)_dvars[i].variable = atoi(param[1]); DebugPrintf("(int)%s = %d\n", param[0], *(int32 *)_dvars[i].variable); break; + case DVAR_BOOL: + if (Common::parseBool(param[1], *(bool *)_dvars[i].variable)) + DebugPrintf("(bool)%s = %s\n", param[0], *(bool *)_dvars[i].variable ? "true" : "false"); + else + DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\", \"yes\", \"no\"\n"); + break; // Integer Array case DVAR_INTARRAY: { const char *chr = strchr(param[0], '['); @@ -278,6 +284,9 @@ bool Debugger::parseCommand(const char *inputOrig) { case DVAR_INT: DebugPrintf("(int)%s = %d\n", param[0], *(const int32 *)_dvars[i].variable); break; + case DVAR_BOOL: + DebugPrintf("(bool)%s = %s\n", param[0], *(const bool *)_dvars[i].variable ? "true" : "false"); + break; // Integer array case DVAR_INTARRAY: { const char *chr = strchr(param[0], '['); diff --git a/gui/dialog.cpp b/gui/dialog.cpp index 2ec8641257..fd15ba5e09 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -75,7 +75,6 @@ int Dialog::runModal() { } void Dialog::open() { - _result = 0; _visible = true; g_gui.openDialog(this); @@ -335,25 +334,7 @@ void Dialog::removeWidget(Widget *del) { if (del == _dragWidget) _dragWidget = NULL; - Widget *w = _firstWidget; - - if (del == _firstWidget) { - Widget *del_next = del->_next; - del->_next = 0; - _firstWidget = del_next; - return; - } - - w = _firstWidget; - while (w) { - if (w->_next == del) { - Widget *del_next = del->_next; - del->_next = 0; - w->_next = del_next; - return; - } - w = w->_next; - } + GuiObject::removeWidget(del); } } // End of namespace GUI diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index 212d68430c..4fa60bfe07 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -103,30 +103,42 @@ GuiManager::~GuiManager() { void GuiManager::initKeymap() { using namespace Common; - bool tmp; Keymapper *mapper = _system->getEventManager()->getKeymapper(); // Do not try to recreate same keymap over again - if (mapper->getKeymap("gui", tmp) != 0) + if (mapper->getKeymap(kGuiKeymapName) != 0) return; Action *act; - Keymap *guiMap = new Keymap("gui"); + Keymap *guiMap = new Keymap(kGuiKeymapName); - act = new Action(guiMap, "CLOS", _("Close"), kGenericActionType, kStartKeyType); + act = new Action(guiMap, "CLOS", _("Close")); act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0)); act = new Action(guiMap, "CLIK", _("Mouse click")); act->addLeftClickEvent(); - act = new Action(guiMap, "VIRT", _("Display keyboard"), kVirtualKeyboardActionType); - act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0)); +#ifdef ENABLE_VKEYBD + act = new Action(guiMap, "VIRT", _("Display keyboard")); + act->addEvent(EVENT_VIRTUAL_KEYBOARD); +#endif + + act = new Action(guiMap, "REMP", _("Remap keys")); + act->addEvent(EVENT_KEYMAPPER_REMAP); - act = new Action(guiMap, "REMP", _("Remap keys"), kKeyRemapActionType); - act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0)); + act = new Action(guiMap, "FULS", _("Toggle FullScreen")); + act->addKeyEvent(KeyState(KEYCODE_RETURN, ASCII_RETURN, KBD_ALT)); mapper->addGlobalKeymap(guiMap); } + +void GuiManager::pushKeymap() { + _system->getEventManager()->getKeymapper()->pushKeymap(Common::kGuiKeymapName); +} + +void GuiManager::popKeymap() { + _system->getEventManager()->getKeymapper()->popKeymap(Common::kGuiKeymapName); +} #endif bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx, bool forced) { @@ -176,7 +188,7 @@ bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx, } // refresh all dialogs - for (int i = 0; i < _dialogStack.size(); ++i) + for (DialogStack::size_type i = 0; i < _dialogStack.size(); ++i) _dialogStack[i]->reflowLayout(); // We need to redraw immediately. Otherwise @@ -190,7 +202,6 @@ bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx, } void GuiManager::redraw() { - int i; ThemeEngine::ShadingStyle shading; if (_redrawStatus == kRedrawDisabled || _dialogStack.empty()) @@ -211,7 +222,7 @@ void GuiManager::redraw() { _theme->clearAll(); _theme->openDialog(true, ThemeEngine::kShadingNone); - for (i = 0; i < _dialogStack.size() - 1; i++) + for (DialogStack::size_type i = 0; i < _dialogStack.size() - 1; i++) _dialogStack[i]->drawDialog(); _theme->finishBuffering(); @@ -270,19 +281,9 @@ void GuiManager::runLoop() { uint32 lastRedraw = 0; const uint32 waitTime = 1000 / 45; -#ifdef ENABLE_KEYMAPPER - // Due to circular reference with event manager and GUI - // we cannot init keymap on the GUI creation. Thus, let's - // try to do it on every launch, checking whether the - // map is already existing - initKeymap(); - - eventMan->getKeymapper()->pushKeymap("gui"); -#endif - bool tooltipCheck = false; - while (!_dialogStack.empty() && activeDialog == getTopDialog()) { + while (!_dialogStack.empty() && activeDialog == getTopDialog() && !eventMan->shouldQuit()) { redraw(); // Don't "tickle" the dialog until the theme has had a chance @@ -361,8 +362,6 @@ void GuiManager::runLoop() { case Common::EVENT_WHEELDOWN: activeDialog->handleMouseWheel(mouse.x, mouse.y, 1); break; - case Common::EVENT_QUIT: - return; case Common::EVENT_SCREEN_CHANGED: screenChange(); break; @@ -391,9 +390,16 @@ void GuiManager::runLoop() { _system->delayMillis(10); } -#ifdef ENABLE_KEYMAPPER - eventMan->getKeymapper()->popKeymap(); -#endif + // WORKAROUND: When quitting we might not properly close the dialogs on + // the dialog stack, thus we do this here to avoid any problems. + // This is most noticable in bug #3481395 "LAUNCHER: Can't quit from unsupported game dialog". + // It seems that Dialog::runModal never removes the dialog from the dialog + // stack, thus if the dialog does not call Dialog::close to close itself + // it will never be removed. Since we can have multiple run loops being + // called we cannot rely on catching EVENT_QUIT in the event loop above, + // since it would only catch it for the top run loop. + if (eventMan->shouldQuit() && activeDialog == getTopDialog()) + getTopDialog()->close(); if (didSaveState) { _theme->disable(); @@ -405,6 +411,10 @@ void GuiManager::runLoop() { #pragma mark - void GuiManager::saveState() { +#ifdef ENABLE_KEYMAPPER + initKeymap(); + pushKeymap(); +#endif // Backup old cursor _lastClick.x = _lastClick.y = 0; _lastClick.time = 0; @@ -414,6 +424,9 @@ void GuiManager::saveState() { } void GuiManager::restoreState() { +#ifdef ENABLE_KEYMAPPER + popKeymap(); +#endif if (_useStdCursor) { CursorMan.popCursor(); CursorMan.popCursorPalette(); @@ -501,7 +514,7 @@ void GuiManager::screenChange() { _theme->refresh(); // refresh all dialogs - for (int i = 0; i < _dialogStack.size(); ++i) { + for (DialogStack::size_type i = 0; i < _dialogStack.size(); ++i) { _dialogStack[i]->reflowLayout(); } // We need to redraw immediately. Otherwise diff --git a/gui/gui-manager.h b/gui/gui-manager.h index 10f9e6a29f..49542fd001 100644 --- a/gui/gui-manager.h +++ b/gui/gui-manager.h @@ -81,6 +81,7 @@ public: int getFontHeight(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getFontHeight(style); } int getStringWidth(const Common::String &str, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getStringWidth(str, style); } int getCharWidth(byte c, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getCharWidth(c, style); } + int getKerningOffset(byte left, byte right, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold) const { return _theme->getKerningOffset(left, right, font); } /** * Tell the GuiManager to check whether the screen resolution has changed. @@ -126,6 +127,8 @@ protected: byte _cursor[2048]; void initKeymap(); + void pushKeymap(); + void popKeymap(); void saveState(); void restoreState(); diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 8e94c140a4..a3e4925848 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -24,6 +24,7 @@ #include "common/config-manager.h" #include "common/events.h" #include "common/fs.h" +#include "common/gui_options.h" #include "common/util.h" #include "common/system.h" #include "common/translation.h" @@ -71,8 +72,10 @@ enum { kCmdChooseSoundFontCmd = 'chsf', kCmdExtraBrowser = 'PEXT', + kCmdExtraPathClear = 'PEXC', kCmdGameBrowser = 'PGME', - kCmdSaveBrowser = 'PSAV' + kCmdSaveBrowser = 'PSAV', + kCmdSavePathClear = 'PSAC' }; /* @@ -88,7 +91,7 @@ public: protected: bool tryInsertChar(byte c, int pos) { - if (isalnum(c) || c == '-' || c == '_') { + if (Common::isAlnum(c) || c == '-' || c == '_') { _editString.insertChar(c, pos); return true; } @@ -129,6 +132,8 @@ protected: StaticTextWidget *_gamePathWidget; StaticTextWidget *_extraPathWidget; StaticTextWidget *_savePathWidget; + ButtonWidget *_extraPathClearButton; + ButtonWidget *_savePathClearButton; StaticTextWidget *_langPopUpDesc; PopUpWidget *_langPopUp; @@ -245,32 +250,30 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc) // // 5) The MIDI tab // - tab->addTab(_("MIDI")); + if (!_guioptions.contains(GUIO_NOMIDI)) { + tab->addTab(_("MIDI")); - if (g_system->getOverlayWidth() > 320) - _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _("Override global MIDI settings"), 0, kCmdGlobalMIDIOverride); - else - _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _c("Override global MIDI settings", "lowres"), 0, kCmdGlobalMIDIOverride); - - if (_guioptions.contains(GUIO_NOMIDI)) - _globalMIDIOverride->setEnabled(false); + if (g_system->getOverlayWidth() > 320) + _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _("Override global MIDI settings"), 0, kCmdGlobalMIDIOverride); + else + _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _c("Override global MIDI settings", "lowres"), 0, kCmdGlobalMIDIOverride); - addMIDIControls(tab, "GameOptions_MIDI."); + addMIDIControls(tab, "GameOptions_MIDI."); + } // // 6) The MT-32 tab // - tab->addTab(_("MT-32")); - - if (g_system->getOverlayWidth() > 320) - _globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", _("Override global MT-32 settings"), 0, kCmdGlobalMT32Override); - else - _globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", _c("Override global MT-32 settings", "lowres"), 0, kCmdGlobalMT32Override); + if (!_guioptions.contains(GUIO_NOMIDI)) { + tab->addTab(_("MT-32")); - //if (_guioptions.contains(GUIO_NOMIDI)) - // _globalMT32Override->setEnabled(false); + if (g_system->getOverlayWidth() > 320) + _globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", _("Override global MT-32 settings"), 0, kCmdGlobalMT32Override); + else + _globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", _c("Override global MT-32 settings", "lowres"), 0, kCmdGlobalMT32Override); - addMT32Controls(tab, "GameOptions_MT32."); + addMT32Controls(tab, "GameOptions_MT32."); + } // // 7) The Paths tab @@ -297,6 +300,8 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc) new ButtonWidget(tab, "GameOptions_Paths.Extrapath", _c("Extra Path:", "lowres"), _("Specifies path to additional data used the game"), kCmdExtraBrowser); _extraPathWidget = new StaticTextWidget(tab, "GameOptions_Paths.ExtrapathText", extraPath, _("Specifies path to additional data used the game")); + _extraPathClearButton = addClearButton(tab, "GameOptions_Paths.ExtraPathClearButton", kCmdExtraPathClear); + // GUI: Button + Label for the save path if (g_system->getOverlayWidth() > 320) new ButtonWidget(tab, "GameOptions_Paths.Savepath", _("Save Path:"), _("Specifies where your savegames are put"), kCmdSaveBrowser); @@ -304,6 +309,9 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc) new ButtonWidget(tab, "GameOptions_Paths.Savepath", _c("Save Path:", "lowres"), _("Specifies where your savegames are put"), kCmdSaveBrowser); _savePathWidget = new StaticTextWidget(tab, "GameOptions_Paths.SavepathText", savePath, _("Specifies where your savegames are put")); + _savePathClearButton = addClearButton(tab, "GameOptions_Paths.SavePathClearButton", kCmdSavePathClear); + + // Activate the first tab tab->setActiveTab(0); _tabWidget = tab; @@ -350,14 +358,18 @@ void EditGameDialog::open() { ConfMan.hasKey("speech_volume", _domain); _globalVolumeOverride->setState(e); - e = ConfMan.hasKey("soundfont", _domain) || - ConfMan.hasKey("multi_midi", _domain) || - ConfMan.hasKey("midi_gain", _domain); - _globalMIDIOverride->setState(e); + if (!_guioptions.contains(GUIO_NOMIDI)) { + e = ConfMan.hasKey("soundfont", _domain) || + ConfMan.hasKey("multi_midi", _domain) || + ConfMan.hasKey("midi_gain", _domain); + _globalMIDIOverride->setState(e); + } - e = ConfMan.hasKey("native_mt32", _domain) || - ConfMan.hasKey("enable_gs", _domain); - _globalMT32Override->setState(e); + if (!_guioptions.contains(GUIO_NOMIDI)) { + e = ConfMan.hasKey("native_mt32", _domain) || + ConfMan.hasKey("enable_gs", _domain); + _globalMT32Override->setState(e); + } // TODO: game path @@ -403,10 +415,14 @@ void EditGameDialog::close() { String extraPath(_extraPathWidget->getLabel()); if (!extraPath.empty() && (extraPath != _c("None", "path"))) ConfMan.set("extrapath", extraPath, _domain); + else + ConfMan.removeKey("extrapath", _domain); String savePath(_savePathWidget->getLabel()); if (!savePath.empty() && (savePath != _("Default"))) ConfMan.set("savepath", savePath, _domain); + else + ConfMan.removeKey("savepath", _domain); Common::Platform platform = (Common::Platform)_platformPopUp->getSelectedTag(); if (platform < 0) @@ -503,6 +519,14 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat break; } + case kCmdExtraPathClear: + _extraPathWidget->setLabel(_c("None", "path")); + break; + + case kCmdSavePathClear: + _savePathWidget->setLabel(_("Default")); + break; + case kOKCmd: { // Write back changes made to config object String newDomain(_domainWidget->getEditString()); @@ -590,7 +614,7 @@ LauncherDialog::LauncherDialog() _searchDesc = new StaticTextWidget(this, "Launcher.SearchDesc", _("Search:")); _searchWidget = new EditTextWidget(this, "Launcher.Search", _search, 0, kSearchCmd); - _searchClearButton = new ButtonWidget(this, "Launcher.SearchClearButton", "C", _("Clear value"), kSearchClearCmd); + _searchClearButton = addClearButton(this, "Launcher.SearchClearButton", kSearchClearCmd); // Add list with game titles _list = new ListWidget(this, "Launcher.GameList", 0, kListSearchCmd); @@ -1061,7 +1085,7 @@ void LauncherDialog::updateButtons() { void LauncherDialog::reflowLayout() { #ifndef DISABLE_FANCY_THEMES if (g_gui.xmlEval()->getVar("Globals.ShowLauncherLogo") == 1 && g_gui.theme()->supportsImages()) { - StaticTextWidget *ver = (StaticTextWidget*)findWidget("Launcher.Version"); + StaticTextWidget *ver = (StaticTextWidget *)findWidget("Launcher.Version"); if (ver) { ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter)); ver->setLabel(gScummVMVersionDate); @@ -1072,7 +1096,7 @@ void LauncherDialog::reflowLayout() { _logo->useThemeTransparency(true); _logo->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageLogo)); } else { - StaticTextWidget *ver = (StaticTextWidget*)findWidget("Launcher.Version"); + StaticTextWidget *ver = (StaticTextWidget *)findWidget("Launcher.Version"); if (ver) { ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter)); ver->setLabel(gScummVMFullVersion); @@ -1108,6 +1132,11 @@ void LauncherDialog::reflowLayout() { _searchPic = 0; } } + + removeWidget(_searchClearButton); + _searchClearButton->setNext(0); + delete _searchClearButton; + _searchClearButton = addClearButton(this, "Launcher.SearchClearButton", kSearchClearCmd); #endif _w = g_system->getOverlayWidth(); diff --git a/gui/launcher.h b/gui/launcher.h index f27b4df202..fc0484350a 100644 --- a/gui/launcher.h +++ b/gui/launcher.h @@ -31,6 +31,7 @@ class BrowserDialog; class CommandSender; class ListWidget; class ButtonWidget; +class PicButtonWidget; class GraphicsWidget; class StaticTextWidget; class EditTextWidget; diff --git a/gui/object.cpp b/gui/object.cpp index 2ec42df9d7..73c4f74d6c 100644 --- a/gui/object.cpp +++ b/gui/object.cpp @@ -59,4 +59,24 @@ void GuiObject::reflowLayout() { } } +void GuiObject::removeWidget(Widget *del) { + if (del == _firstWidget) { + Widget *del_next = del->next(); + del->setNext(0); + _firstWidget = del_next; + return; + } + + Widget *w = _firstWidget; + while (w) { + if (w->next() == del) { + Widget *del_next = del->next(); + del->setNext(0); + w->setNext(del_next); + return; + } + w = w->next(); + } +} + } // End of namespace GUI diff --git a/gui/object.h b/gui/object.h index 34ff0d47f2..bce3cd7846 100644 --- a/gui/object.h +++ b/gui/object.h @@ -83,6 +83,8 @@ public: virtual void reflowLayout(); + virtual void removeWidget(Widget *widget); + protected: virtual void releaseFocus() = 0; }; diff --git a/gui/options.cpp b/gui/options.cpp index 67204fc343..5085f9cdd9 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -26,9 +26,12 @@ #include "gui/options.h" #include "gui/widgets/popup.h" #include "gui/widgets/tab.h" +#include "gui/ThemeEval.h" #include "common/fs.h" #include "common/config-manager.h" +#include "common/gui_options.h" +#include "common/rendermode.h" #include "common/system.h" #include "common/textconsole.h" #include "common/translation.h" @@ -51,8 +54,11 @@ enum { kChooseSoundFontCmd = 'chsf', kClearSoundFontCmd = 'clsf', kChooseSaveDirCmd = 'chos', + kSavePathClearCmd = 'clsp', kChooseThemeDirCmd = 'chth', + kThemePathClearCmd = 'clth', kChooseExtraDirCmd = 'chex', + kExtraPathClearCmd = 'clex', kChoosePluginsDirCmd = 'chpl', kChooseThemeCmd = 'chtf' }; @@ -75,7 +81,7 @@ static const char *outputRateLabels[] = { _s("<default>"), _s("8 kHz"), _s("11kH static const int outputRateValues[] = { 0, 8000, 11025, 22050, 44100, 48000, -1 }; OptionsDialog::OptionsDialog(const Common::String &domain, int x, int y, int w, int h) - : Dialog(x, y, w, h), _domain(domain), _graphicsTabId(-1), _tabWidget(0) { + : Dialog(x, y, w, h), _domain(domain), _graphicsTabId(-1), _midiTabId(-1), _pathsTabId(-1), _tabWidget(0) { init(); } @@ -141,7 +147,7 @@ void OptionsDialog::init() { _oldTheme = g_gui.theme()->getThemeId(); // Retrieve game GUI options - _guioptions = ""; + _guioptions.clear(); if (ConfMan.hasKey("guioptions", _domain)) { _guioptionsString = ConfMan.get("guioptions", _domain); _guioptions = parseGameGUIOptions(_guioptionsString); @@ -155,7 +161,7 @@ void OptionsDialog::open() { setResult(0); // Retrieve game GUI options - _guioptions = ""; + _guioptions.clear(); if (ConfMan.hasKey("guioptions", _domain)) { _guioptionsString = ConfMan.get("guioptions", _domain); _guioptions = parseGameGUIOptions(_guioptionsString); @@ -187,23 +193,38 @@ void OptionsDialog::open() { int sel = 0; for (int i = 0; p->code; ++p, ++i) { if (renderMode == p->id) - sel = i + 2; + sel = p->id; } - _renderModePopUp->setSelected(sel); + _renderModePopUp->setSelectedTag(sel); } #ifdef SMALL_SCREEN_DEVICE _fullscreenCheckbox->setState(true); _fullscreenCheckbox->setEnabled(false); + _aspectCheckbox->setState(false); _aspectCheckbox->setEnabled(false); #else // !SMALL_SCREEN_DEVICE // Fullscreen setting _fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain)); // Aspect ratio setting - _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain)); + if (_guioptions.contains(GUIO_NOASPECT)) { + _aspectCheckbox->setState(false); + _aspectCheckbox->setEnabled(false); + } else { + _aspectCheckbox->setEnabled(true); + _aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain)); + } #endif // SMALL_SCREEN_DEVICE - _disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain)); + + // EGA undithering setting + if (_guioptions.contains(GUIO_EGAUNDITHER) || _domain == Common::ConfigManager::kApplicationDomain) { + _disableDitheringCheckbox->setEnabled(true); + _disableDitheringCheckbox->setState(ConfMan.getBool("disable_dithering", _domain)); + } else { + _disableDitheringCheckbox->setState(false); + _disableDitheringCheckbox->setEnabled(false); + } } // Audio options @@ -551,6 +572,12 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data // 'true' because if control is disabled then event do not pass setVolumeSettingsState(true); break; + case kSubtitleToggle: + // We update the slider settings here, when there are sliders, to + // disable the speech volume in case we are in subtitle only mode. + if (_musicVolumeSlider) + setVolumeSettingsState(true); + break; case kSubtitleSpeedChanged: _subSpeedLabel->setValue(_subSpeedSlider->getValue()); _subSpeedLabel->draw(); @@ -585,9 +612,15 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) { _renderModePopUp->setEnabled(enabled); #ifndef SMALL_SCREEN_DEVICE _fullscreenCheckbox->setEnabled(enabled); - _aspectCheckbox->setEnabled(enabled); + if (_guioptions.contains(GUIO_NOASPECT)) + _aspectCheckbox->setEnabled(false); + else + _aspectCheckbox->setEnabled(enabled); #endif - _disableDitheringCheckbox->setEnabled(enabled); + if (_guioptions.contains(GUIO_EGAUNDITHER) && enabled) + _disableDitheringCheckbox->setEnabled(true); + else + _disableDitheringCheckbox->setEnabled(false); } void OptionsDialog::setAudioSettingsState(bool enabled) { @@ -595,11 +628,8 @@ void OptionsDialog::setAudioSettingsState(bool enabled) { _midiPopUpDesc->setEnabled(enabled); _midiPopUp->setEnabled(enabled); - Common::String allFlags = MidiDriver::musicType2GUIO((uint32)-1); - char opt[256]; - - strncpy(opt, _guioptions.c_str(), 256); - bool hasMidiDefined = (strtok(opt, allFlags.c_str()) != NULL); + const Common::String allFlags = MidiDriver::musicType2GUIO((uint32)-1); + bool hasMidiDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != NULL); if (_domain != Common::ConfigManager::kApplicationDomain && // global dialog hasMidiDefined && // No flags are specified @@ -669,6 +699,9 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) { _sfxVolumeLabel->setEnabled(ena); ena = enabled && !_muteCheckbox->getState(); + // Disable speech volume slider, when we are in subtitle only mode. + if (_subToggleGroup) + ena = ena && _subToggleGroup->getValue() != kSubtitlesSubs; if (_guioptions.contains(GUIO_NOSPEECH)) ena = false; @@ -717,13 +750,18 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr } // RenderMode popup + const Common::String allFlags = renderType2GUIO((uint32)-1); + bool renderingTypeDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != NULL); + _renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", _("Render mode:"), _("Special dithering modes supported by some games")); _renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup", _("Special dithering modes supported by some games")); _renderModePopUp->appendEntry(_("<default>"), Common::kRenderDefault); _renderModePopUp->appendEntry(""); const Common::RenderModeDescription *rm = Common::g_renderModes; for (; rm->code; ++rm) { - _renderModePopUp->appendEntry(_c(rm->description, context), rm->id); + Common::String renderGuiOption = renderType2GUIO(rm->id); + if ((_domain == Common::ConfigManager::kApplicationDomain) || (_domain != Common::ConfigManager::kApplicationDomain && !renderingTypeDefined) || (_guioptions.contains(renderGuiOption))) + _renderModePopUp->appendEntry(_c(rm->description, context), rm->id); } // Fullscreen checkbox @@ -745,11 +783,8 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref _midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", _("Specifies output sound device or sound card emulator")); // Populate it - Common::String allFlags = MidiDriver::musicType2GUIO((uint32)-1); - char opt[256]; - - strncpy(opt, _guioptions.c_str(), 256); - bool hasMidiDefined = (strtok(opt, allFlags.c_str()) != NULL); + const Common::String allFlags = MidiDriver::musicType2GUIO((uint32)-1); + bool hasMidiDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != NULL); const MusicPlugin::List p = MusicMan.getPlugins(); for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) { @@ -831,7 +866,8 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi else _soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", _c("SoundFont:", "lowres"), _("SoundFont is supported by some audio cards, Fluidsynth and Timidity"), kChooseSoundFontCmd); _soundFont = new StaticTextWidget(boss, prefix + "mcFontPath", _c("None", "soundfont"), _("SoundFont is supported by some audio cards, Fluidsynth and Timidity")); - _soundFontClearButton = new ButtonWidget(boss, prefix + "mcFontClearButton", "C", _("Clear value"), kClearSoundFontCmd); + + _soundFontClearButton = addClearButton(boss, prefix + "mcFontClearButton", kClearSoundFontCmd); // Multi midi setting _multiMidiCheckbox = new CheckboxWidget(boss, prefix + "mcMixedCheckbox", _("Mixed AdLib/MIDI mode"), _("Use both MIDI and AdLib sound generation")); @@ -1004,6 +1040,31 @@ void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String se ConfMan.removeKey(setting, _domain); } +Common::String OptionsDialog::renderType2GUIO(uint32 renderType) { + static const struct { + Common::RenderMode type; + const char *guio; + } renderGUIOMapping[] = { + { Common::kRenderHercG, GUIO_RENDERHERCGREEN }, + { Common::kRenderHercA, GUIO_RENDERHERCAMBER }, + { Common::kRenderCGA, GUIO_RENDERCGA }, + { Common::kRenderEGA, GUIO_RENDEREGA }, + { Common::kRenderVGA, GUIO_RENDERVGA }, + { Common::kRenderAmiga, GUIO_RENDERAMIGA }, + { Common::kRenderFMTowns, GUIO_RENDERFMTOWNS }, + { Common::kRenderPC9821, GUIO_RENDERPC9821 }, + { Common::kRenderPC9801, GUIO_RENDERPC9801 } + }; + Common::String res; + + for (int i = 0; i < ARRAYSIZE(renderGUIOMapping); i++) { + if (renderType == renderGUIOMapping[i].type || renderType == (uint32)-1) + res += renderGUIOMapping[i].guio; + } + + return res; +} + int OptionsDialog::getSubtitleMode(bool subtitles, bool speech_mute) { if (_guioptions.contains(GUIO_NOSUBTITLES)) return kSubtitlesSpeech; // Speech only @@ -1061,7 +1122,7 @@ GlobalOptionsDialog::GlobalOptionsDialog() // // 3) The MIDI tab // - tab->addTab(_("MIDI")); + _midiTabId = tab->addTab(_("MIDI")); addMIDIControls(tab, "GlobalOptions_MIDI."); // @@ -1074,9 +1135,9 @@ GlobalOptionsDialog::GlobalOptionsDialog() // 5) The Paths tab // if (g_system->getOverlayWidth() > 320) - tab->addTab(_("Paths")); + _pathsTabId = tab->addTab(_("Paths")); else - tab->addTab(_c("Paths", "lowres")); + _pathsTabId = tab->addTab(_c("Paths", "lowres")); #if !( defined(__DC__) || defined(__GP32__) ) // These two buttons have to be extra wide, or the text will be @@ -1089,18 +1150,24 @@ GlobalOptionsDialog::GlobalOptionsDialog() new ButtonWidget(tab, "GlobalOptions_Paths.SaveButton", _c("Save Path:", "lowres"), _("Specifies where your savegames are put"), kChooseSaveDirCmd); _savePath = new StaticTextWidget(tab, "GlobalOptions_Paths.SavePath", "/foo/bar", _("Specifies where your savegames are put")); + _savePathClearButton = addClearButton(tab, "GlobalOptions_Paths.SavePathClearButton", kSavePathClearCmd); + if (g_system->getOverlayWidth() > 320) new ButtonWidget(tab, "GlobalOptions_Paths.ThemeButton", _("Theme Path:"), 0, kChooseThemeDirCmd); else new ButtonWidget(tab, "GlobalOptions_Paths.ThemeButton", _c("Theme Path:", "lowres"), 0, kChooseThemeDirCmd); _themePath = new StaticTextWidget(tab, "GlobalOptions_Paths.ThemePath", _c("None", "path")); + _themePathClearButton = addClearButton(tab, "GlobalOptions_Paths.ThemePathClearButton", kThemePathClearCmd); + if (g_system->getOverlayWidth() > 320) new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _("Extra Path:"), _("Specifies path to additional data used by all games or ScummVM"), kChooseExtraDirCmd); else new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _c("Extra Path:", "lowres"), _("Specifies path to additional data used by all games or ScummVM"), kChooseExtraDirCmd); _extraPath = new StaticTextWidget(tab, "GlobalOptions_Paths.ExtraPath", _c("None", "path"), _("Specifies path to additional data used by all games or ScummVM")); + _extraPathClearButton = addClearButton(tab, "GlobalOptions_Paths.ExtraPathClearButton", kExtraPathClearCmd); + #ifdef DYNAMIC_MODULES if (g_system->getOverlayWidth() > 320) new ButtonWidget(tab, "GlobalOptions_Paths.PluginsButton", _("Plugins Path:"), 0, kChoosePluginsDirCmd); @@ -1207,7 +1274,7 @@ void GlobalOptionsDialog::open() { Common::String extraPath(ConfMan.get("extrapath", _domain)); if (savePath.empty() || !ConfMan.hasKey("savepath", _domain)) { - _savePath->setLabel(_c("None", "path")); + _savePath->setLabel(_("Default")); } else { _savePath->setLabel(savePath); } @@ -1251,8 +1318,10 @@ void GlobalOptionsDialog::open() { void GlobalOptionsDialog::close() { if (getResult()) { Common::String savePath(_savePath->getLabel()); - if (!savePath.empty() && (savePath != _c("None", "path"))) + if (!savePath.empty() && (savePath != _("Default"))) ConfMan.set("savepath", savePath, _domain); + else + ConfMan.removeKey("savepath", _domain); Common::String themePath(_themePath->getLabel()); if (!themePath.empty() && (themePath != _c("None", "path"))) @@ -1360,6 +1429,15 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 break; } #endif + case kThemePathClearCmd: + _themePath->setLabel(_c("None", "path")); + break; + case kExtraPathClearCmd: + _extraPath->setLabel(_c("None", "path")); + break; + case kSavePathClearCmd: + _savePath->setLabel(_("Default")); + break; case kChooseSoundFontCmd: { BrowserDialog browser(_("Select SoundFont"), false); if (browser.runModal() > 0) { @@ -1418,4 +1496,39 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 } } +void GlobalOptionsDialog::reflowLayout() { + int activeTab = _tabWidget->getActiveTab(); + + if (_midiTabId != -1) { + _tabWidget->setActiveTab(_midiTabId); + + _tabWidget->removeWidget(_soundFontClearButton); + _soundFontClearButton->setNext(0); + delete _soundFontClearButton; + _soundFontClearButton = addClearButton(_tabWidget, "GlobalOptions_MIDI.mcFontClearButton", kClearSoundFontCmd); + } + + if (_pathsTabId != -1) { + _tabWidget->setActiveTab(_pathsTabId); + + _tabWidget->removeWidget(_savePathClearButton); + _savePathClearButton->setNext(0); + delete _savePathClearButton; + _savePathClearButton = addClearButton(_tabWidget, "GlobalOptions_Paths.SavePathClearButton", kSavePathClearCmd); + + _tabWidget->removeWidget(_themePathClearButton); + _themePathClearButton->setNext(0); + delete _themePathClearButton; + _themePathClearButton = addClearButton(_tabWidget, "GlobalOptions_Paths.ThemePathClearButton", kThemePathClearCmd); + + _tabWidget->removeWidget(_extraPathClearButton); + _extraPathClearButton->setNext(0); + delete _extraPathClearButton; + _extraPathClearButton = addClearButton(_tabWidget, "GlobalOptions_Paths.ExtraPathClearButton", kExtraPathClearCmd); + } + + _tabWidget->setActiveTab(activeTab); + OptionsDialog::reflowLayout(); +} + } // End of namespace GUI diff --git a/gui/options.h b/gui/options.h index c6b1d328c1..83c9d60d59 100644 --- a/gui/options.h +++ b/gui/options.h @@ -85,8 +85,12 @@ protected: bool loadMusicDeviceSetting(PopUpWidget *popup, Common::String setting, MusicType preferredType = MT_AUTO); void saveMusicDeviceSetting(PopUpWidget *popup, Common::String setting); + Common::String renderType2GUIO(uint32 renderType); + TabWidget *_tabWidget; int _graphicsTabId; + int _midiTabId; + int _pathsTabId; private: // @@ -191,13 +195,18 @@ public: void close(); void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); + virtual void reflowLayout(); + protected: #ifdef SMALL_SCREEN_DEVICE KeysDialog *_keysDialog; #endif StaticTextWidget *_savePath; + ButtonWidget *_savePathClearButton; StaticTextWidget *_themePath; + ButtonWidget *_themePathClearButton; StaticTextWidget *_extraPath; + ButtonWidget *_extraPathClearButton; #ifdef DYNAMIC_MODULES StaticTextWidget *_pluginsPath; #endif diff --git a/gui/saveload.cpp b/gui/saveload.cpp index ae950a21fb..3dc9961906 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -92,7 +92,7 @@ int SaveLoadChooser::runModalWithPluginAndTarget(const EnginePlugin *plugin, con _thumbnailSupport = _metaInfoSupport && (*_plugin)->hasFeature(MetaEngine::kSavesSupportThumbnail); _saveDateSupport = _metaInfoSupport && (*_plugin)->hasFeature(MetaEngine::kSavesSupportCreationDate); _playTimeSupport = _metaInfoSupport && (*_plugin)->hasFeature(MetaEngine::kSavesSupportPlayTime); - _resultString = ""; + _resultString.clear(); reflowLayout(); updateSaveList(); diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 2716e6ca72..bd28c2e85d 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -1,47 +1,644 @@ "<?xml version = '1.0'?>" -"<layout_info resolution='y>399'> " +"<render_info> " +"<palette> " +"<color name='black' " +"rgb='0,0,0' " +"/> " +"<color name='lightgrey' " +"rgb='104,104,104' " +"/> " +"<color name='darkgrey' " +"rgb='64,64,64' " +"/> " +"<color name='green' " +"rgb='32,160,32' " +"/> " +"<color name='green2' " +"rgb='0,255,0' " +"/> " +"</palette> " +"<fonts> " +"<font id='text_default' " +"file='helvb12.bdf' " +"/> " +"<font resolution='y<400' " +"id='text_default' " +"file='clR6x12.bdf' " +"/> " +"<font id='text_button' " +"file='helvb12.bdf' " +"/> " +"<font resolution='y<400' " +"id='text_button' " +"file='clR6x12.bdf' " +"/> " +"<font id='text_normal' " +"file='helvb12.bdf' " +"/> " +"<font resolution='y<400' " +"id='text_normal' " +"file='clR6x12.bdf' " +"/> " +"<font id='tooltip_normal' " +"file='fixed5x8.bdf' " +"/> " +"<text_color id='color_normal' " +"color='green' " +"/> " +"<text_color id='color_normal_inverted' " +"color='black' " +"/> " +"<text_color id='color_normal_hover' " +"color='green2' " +"/> " +"<text_color id='color_normal_disabled' " +"color='lightgrey' " +"/> " +"<text_color id='color_alternative' " +"color='lightgrey' " +"/> " +"<text_color id='color_alternative_inverted' " +"color='255,255,255' " +"/> " +"<text_color id='color_alternative_hover' " +"color='176,176,176' " +"/> " +"<text_color id='color_alternative_disabled' " +"color='darkgrey' " +"/> " +"<text_color id='color_button' " +"color='green' " +"/> " +"<text_color id='color_button_hover' " +"color='green2' " +"/> " +"<text_color id='color_button_disabled' " +"color='lightgrey' " +"/> " +"</fonts> " +"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> " +"<drawdata id='text_selection' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='lightgrey' " +"/> " +"</drawdata> " +"<drawdata id='text_selection_focus' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='green' " +"/> " +"</drawdata> " +"<drawdata id='mainmenu_bg' cache='false'> " +"<drawstep func='fill' " +"fill='foreground' " +"fg_color='black' " +"/> " +"</drawdata> " +"<drawdata id='special_bg' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"/> " +"</drawdata> " +"<drawdata id='tooltip_bg' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='foreground' " +"fg_color='black' " +"/> " +"</drawdata> " +"<drawdata id='separator' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"height='2' " +"ypos='center' " +"fg_color='lightgrey' " +"/> " +"</drawdata> " +"<drawdata id='scrollbar_base' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"/> " +"</drawdata> " +"<drawdata id='scrollbar_handle_hover' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='green2' " +"/> " +"</drawdata> " +"<drawdata id='scrollbar_handle_idle' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='green' " +"/> " +"</drawdata> " +"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='10' " +"xpos='right' " +"ypos='center' " +"padding='0,0,3,0' " +"orientation='top' " +"/> " +"</drawdata> " +"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='5' " +"height='5' " +"xpos='right' " +"ypos='center' " +"padding='0,0,2,0' " +"orientation='top' " +"/> " +"</drawdata> " +"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='10' " +"xpos='right' " +"ypos='center' " +"padding='0,0,3,0' " +"orientation='top' " +"/> " +"</drawdata> " +"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='5' " +"height='5' " +"xpos='right' " +"ypos='center' " +"padding='0,0,2,0' " +"orientation='top' " +"/> " +"</drawdata> " +"<drawdata id='tab_active' cache='false'> " +"<text font='text_default' " +"text_color='color_normal_hover' " +"vertical_align='center' " +"horizontal_align='center' " +"/> " +"<drawstep func='tab' " +"bevel='2' " +"radius='0' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='tab_inactive' cache='false'> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='center' " +"horizontal_align='center' " +"/> " +"<drawstep func='tab' " +"bevel='2' " +"radius='0' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='tab_background' cache='false'> " +"</drawdata> " +"<drawdata id='widget_slider' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='slider_disabled' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='lightgrey' " +"/> " +"</drawdata> " +"<drawdata id='slider_full' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='green' " +"/> " +"</drawdata> " +"<drawdata id='slider_hover' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='green2' " +"/> " +"</drawdata> " +"<drawdata id='widget_small' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='popup_idle' cache='false' resolution='y>399'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='5' " +"xpos='right' " +"ypos='10' " +"padding='0,0,7,0' " +"orientation='bottom' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='5' " +"xpos='right' " +"ypos='4' " +"padding='0,0,7,0' " +"orientation='top' " +"/> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"</drawdata> " +"<drawdata id='popup_idle' cache='false' resolution='y<400'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='7' " +"height='4' " +"xpos='right' " +"ypos='9' " +"padding='0,0,3,0' " +"orientation='bottom' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='7' " +"height='4' " +"xpos='right' " +"ypos='4' " +"padding='0,0,3,0' " +"orientation='top' " +"/> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"</drawdata> " +"<drawdata id='popup_disabled' cache='false' resolution='y>399'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='5' " +"xpos='right' " +"ypos='10' " +"padding='0,0,7,0' " +"orientation='bottom' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='5' " +"xpos='right' " +"ypos='4' " +"padding='0,0,7,0' " +"orientation='top' " +"/> " +"<text font='text_default' " +"text_color='color_normal_disabled' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"</drawdata> " +"<drawdata id='popup_disabled' cache='false' resolution='y<400'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='7' " +"height='4' " +"xpos='right' " +"ypos='9' " +"padding='0,0,3,0' " +"orientation='bottom' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='7' " +"height='4' " +"xpos='right' " +"ypos='4' " +"padding='0,0,3,0' " +"orientation='top' " +"/> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"</drawdata> " +"<drawdata id='popup_hover' cache='false' resolution='y>399'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='5' " +"xpos='right' " +"ypos='10' " +"padding='0,0,7,0' " +"orientation='bottom' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='10' " +"height='5' " +"xpos='right' " +"ypos='4' " +"padding='0,0,7,0' " +"orientation='top' " +"/> " +"<text font='text_default' " +"text_color='color_normal_hover' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"</drawdata> " +"<drawdata id='popup_hover' cache='false' resolution='y<400'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='7' " +"height='4' " +"xpos='right' " +"ypos='9' " +"padding='0,0,3,0' " +"orientation='bottom' " +"/> " +"<drawstep func='triangle' " +"fg_color='green' " +"fill='foreground' " +"width='7' " +"height='4' " +"xpos='right' " +"ypos='4' " +"padding='0,0,3,0' " +"orientation='top' " +"/> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"</drawdata> " +"<drawdata id='widget_textedit' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='plain_bg' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"/> " +"</drawdata> " +"<drawdata id='caret' cache='false'> " +"<drawstep func='square' " +"fill='foreground' " +"fg_color='lightgrey' " +"/> " +"</drawdata> " +"<drawdata id='default_bg' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"/> " +"</drawdata> " +"<drawdata id='button_idle' cache='false'> " +"<text font='text_button' " +"text_color='color_button' " +"vertical_align='center' " +"horizontal_align='center' " +"/> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='button_hover' cache='false'> " +"<text font='text_button' " +"text_color='color_button_hover' " +"vertical_align='center' " +"horizontal_align='center' " +"/> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='button_disabled' cache='false'> " +"<text font='text_button' " +"text_color='color_button_disabled' " +"vertical_align='center' " +"horizontal_align='center' " +"/> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='checkbox_disabled' cache='false'> " +"<text font='text_default' " +"text_color='color_normal_disabled' " +"vertical_align='top' " +"horizontal_align='left' " +"/> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='checkbox_selected' cache='false'> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='top' " +"horizontal_align='left' " +"/> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"<drawstep func='cross' " +"fill='foreground' " +"stroke='2' " +"fg_color='green' " +"/> " +"</drawdata> " +"<drawdata id='checkbox_default' cache='false'> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='top' " +"horizontal_align='left' " +"/> " +"<drawstep func='bevelsq' " +"bevel='2' " +"fill='none' " +"/> " +"</drawdata> " +"<drawdata id='radiobutton_default' cache='false'> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"<drawstep func='circle' " +"width='7' " +"height='7' " +"radius='7' " +"fill='background' " +"bg_color='darkgrey' " +"xpos='0' " +"ypos='0' " +"/> " +"</drawdata> " +"<drawdata id='radiobutton_selected' cache='false'> " +"<text font='text_default' " +"text_color='color_normal' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"<drawstep func='circle' " +"width='7' " +"height='7' " +"radius='7' " +"fg_color='darkgrey' " +"fill='none' " +"xpos='0' " +"ypos='0' " +"/> " +"<drawstep func='circle' " +"width='7' " +"height='7' " +"radius='5' " +"fg_color='green' " +"fill='foreground' " +"xpos='2' " +"ypos='2' " +"/> " +"</drawdata> " +"<drawdata id='radiobutton_disabled' cache='false'> " +"<text font='text_default' " +"text_color='color_normal_disabled' " +"vertical_align='center' " +"horizontal_align='left' " +"/> " +"<drawstep func='circle' " +"width='7' " +"height='7' " +"radius='7' " +"bg_color='lightgrey' " +"fill='background' " +"xpos='0' " +"ypos='0' " +"/> " +"</drawdata> " +"<drawdata id='widget_default' cache='false'> " +"<drawstep func='bevelsq' " +"bevel='2' " +"/> " +"</drawdata> " +"<drawdata id='widget_small' cache='false'> " +"<drawstep func='square' " +"stroke='0' " +"/> " +"</drawdata> " +"</render_info> " +"<layout_info resolution='y<400'> " "<globals> " -"<def var='Line.Height' value='16' /> " -"<def var='Font.Height' value='16' /> " -"<def var='About.OuterBorder' value='80'/> " -"<def var='Layout.Spacing' value='8' /> " +"<def var='Line.Height' value='12' /> " +"<def var='Font.Height' value='10' /> " +"<def var='About.OuterBorder' value='10'/> " +"<def var='Layout.Spacing' value='8'/> " "<def var='ShowLauncherLogo' value='0'/> " "<def var='ShowGlobalMenuLogo' value='0'/> " "<def var='ShowSearchPic' value='0'/> " -"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/> " -"<def var='KeyMapper.Spacing' value='10'/> " -"<def var='KeyMapper.LabelWidth' value='100'/> " -"<def var='KeyMapper.ButtonWidth' value='80'/> " -"<def var='Tooltip.MaxWidth' value='200'/> " -"<def var='Tooltip.XDelta' value='16'/> " -"<def var='Tooltip.YDelta' value='16'/> " +"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> " +"<def var='KeyMapper.Spacing' value='5'/> " +"<def var='KeyMapper.LabelWidth' value='80'/> " +"<def var='KeyMapper.ButtonWidth' value='60'/> " +"<def var='Tooltip.MaxWidth' value='70'/> " +"<def var='Tooltip.XDelta' value='8'/> " +"<def var='Tooltip.YDelta' value='8'/> " +"<widget name='Button' " +"size='72,16' " +"/> " +"<widget name='Slider' " +"size='85,12' " +"/> " "<widget name='OptionsLabel' " "size='110,Globals.Line.Height' " "textalign='right' " "/> " "<widget name='SmallLabel' " -"size='24,Globals.Line.Height' " -"/> " -"<widget name='ShortOptionsLabel' " -"size='60,Globals.Line.Height' " -"/> " -"<widget name='Button' " -"size='108,24' " -"/> " -"<widget name='Slider' " -"size='128,18' " +"size='18,Globals.Line.Height' " "/> " "<widget name='PopUp' " -"size='-1,19' " +"size='-1,15' " "/> " "<widget name='Checkbox' " -"size='-1,14' " +"size='-1,Globals.Line.Height' " "/> " "<widget name='Radiobutton' " "size='-1,Globals.Line.Height' " "/> " "<widget name='ListWidget' " -"padding='5,0,8,0' " +"padding='5,0,0,0' " "/> " "<widget name='PopUpWidget' " "padding='7,5,0,0' " @@ -53,28 +650,28 @@ "padding='7,5,5,5' " "/> " "<widget name='Scrollbar' " -"size='15,0' " +"size='9,0' " "/> " "<widget name='TabWidget.Tab' " -"size='75,27' " -"padding='0,0,8,0' " +"size='45,16' " +"padding='0,0,2,0' " "/> " "<widget name='TabWidget.Body' " -"padding='0,0,0,0' " +"padding='0,0,0,-8' " "/> " "<widget name='TabWidget.NavButton' " -"size='15,18' " -"padding='0,3,4,0' " +"size='32,18' " +"padding='0,0,1,0' " "/> " "</globals> " "<dialog name='Launcher' overlays='screen'> " -"<layout type='vertical' center='true' padding='16,16,8,8'> " +"<layout type='vertical' center='true' padding='6,6,2,2'> " "<widget name='Version' " "height='Globals.Line.Height' " "/> " -"<layout type='horizontal' spacing='5' padding='10,0,0,0'> " +"<layout type='horizontal' spacing='5' padding='0,0,0,0'> " "<widget name='SearchDesc' " -"width='60' " +"width='50' " "height='Globals.Line.Height' " "textalign='right' " "/> " @@ -89,39 +686,38 @@ "<space /> " "</layout> " "<widget name='GameList'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " "<widget name='LoadGameButton' " -"height='20' " +"height='12' " "/> " "<widget name='AddGameButton' " -"height='20' " +"height='12' " "/> " "<widget name='EditGameButton' " -"height='20' " +"height='12' " "/> " "<widget name='RemoveGameButton' " -"height='20' " +"height='12' " "/> " "</layout> " -"<space size='4'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " "<widget name='QuitButton' " -"height='20' " +"height='12' " "/> " "<widget name='AboutButton' " -"height='20' " +"height='12' " "/> " "<widget name='OptionsButton' " -"height='20' " +"height='12' " "/> " "<widget name='StartButton' " -"height='20' " +"height='12' " "/> " "</layout> " "</layout> " "</dialog> " -"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8'> " +"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> " +"<layout type='vertical' padding='8,8,0,4'> " "<widget name='Headline' " "height='Globals.Line.Height' " "/> " @@ -129,7 +725,7 @@ "height='Globals.Line.Height' " "/> " "<widget name='List'/> " -"<layout type='horizontal' padding='0,0,16,0'> " +"<layout type='horizontal' padding='0,0,8,0'> " "<widget name='Up' " "type='Button' " "/> " @@ -143,10 +739,10 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> " +"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> " "<layout type='vertical' padding='0,0,0,0'> " "<widget name='TabWidget'/> " -"<layout type='horizontal' padding='16,16,16,16'> " +"<layout type='horizontal' padding='8,8,8,8'> " "<space/> " "<widget name='Cancel' " "type='Button' " @@ -159,7 +755,7 @@ "</dialog> " "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='grModePopupDesc' " "type='OptionsLabel' " "/> " @@ -167,7 +763,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='grRenderPopupDesc' " "type='OptionsLabel' " "/> " @@ -188,7 +784,7 @@ "</dialog> " "<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='auMidiPopupDesc' " "type='OptionsLabel' " "/> " @@ -196,7 +792,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='auOPLPopupDesc' " "type='OptionsLabel' " "/> " @@ -204,7 +800,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='auSampleRatePopupDesc' " "type='OptionsLabel' " "/> " @@ -212,7 +808,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " "/> " @@ -226,7 +822,7 @@ "type='Radiobutton' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " "/> " @@ -240,9 +836,8 @@ "</layout> " "</dialog> " "<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='horizontal' padding='16,16,16,16' spacing='8'> " -"<layout type='vertical' padding='0,0,0,0' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcMusicText' " "type='OptionsLabel' " "/> " @@ -253,7 +848,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSfxText' " "type='OptionsLabel' " "/> " @@ -264,7 +859,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSpeechText' " "type='OptionsLabel' " "/> " @@ -275,8 +870,8 @@ "type='SmallLabel' " "/> " "</layout> " -"</layout> " -"<layout type='vertical' padding='24,0,24,0' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<space size='110' /> " "<widget name='vcMuteCheckbox' " "type='Checkbox' " "/> " @@ -285,7 +880,7 @@ "</dialog> " "<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='auPrefGmPopupDesc' " "type='OptionsLabel' " "/> " @@ -293,7 +888,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " "<widget name='mcFontButton' " "type='Button' " "/> " @@ -308,7 +903,7 @@ "<widget name='mcMixedCheckbox' " "type='Checkbox' " "/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='mcMidiGainText' " "type='OptionsLabel' " "/> " @@ -324,7 +919,7 @@ "</dialog> " "<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='auPrefMt32PopupDesc' " "type='OptionsLabel' " "/> " @@ -342,29 +937,41 @@ "</dialog> " "<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " "<widget name='SaveButton' " "type='Button' " "/> " "<widget name='SavePath' " "height='Globals.Line.Height' " "/> " +"<widget name='SavePathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " "<widget name='ThemeButton' " "type='Button' " "/> " "<widget name='ThemePath' " "height='Globals.Line.Height' " "/> " +"<widget name='ThemePathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " "<widget name='ExtraButton' " "type='Button' " "/> " "<widget name='ExtraPath' " "height='Globals.Line.Height' " "/> " +"<widget name='ExtraPathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " "<layout type='horizontal' padding='0,0,0,0' spacing='16'> " "<widget name='PluginsButton' " @@ -378,7 +985,7 @@ "</dialog> " "<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " "<widget name='ThemeButton' " "type='Button' " "/> " @@ -386,25 +993,31 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='RendererPopupDesc' " -"type='OptionsLabel' " +"width='80' " +"height='Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='RendererPopup' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='AutosavePeriodPopupDesc' " -"type='OptionsLabel' " +"width='80' " +"height='Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='AutosavePeriodPopup' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='GuiLanguagePopupDesc' " -"type='OptionsLabel' " +"width='80' " +"height='Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='GuiLanguagePopup' " "type='PopUp' " @@ -439,10 +1052,10 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'> " +"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> " "<layout type='vertical' padding='0,0,0,0' spacing='16'> " "<widget name='TabWidget'/> " -"<layout type='horizontal' padding='16,16,16,4'> " +"<layout type='horizontal' padding='8,8,8,8'> " "<space/> " "<widget name='Cancel' " "type='Button' " @@ -454,7 +1067,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='vertical' padding='8,8,8,8' spacing='6'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -462,7 +1075,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='vertical' padding='8,8,8,8' spacing='6'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -470,7 +1083,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='vertical' padding='8,8,8,8' spacing='6'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -478,7 +1091,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='vertical' padding='8,8,8,8' spacing='6'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -486,7 +1099,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"<layout type='vertical' padding='8,8,8,8' spacing='6'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -494,34 +1107,43 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " -"<layout type='vertical' padding='16,16,16,16'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='vertical' padding='8,8,8,8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='Id' " -"type='OptionsLabel' " +"width='35' " +"height='Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='Domain' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='Name' " -"type='OptionsLabel' " +"width='35' " +"height='Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='Desc' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<space size='8'/> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='LangPopupDesc' " -"type='OptionsLabel' " +"width='60' " +"height='Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='LangPopup' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='PlatformPopupDesc' " -"type='OptionsLabel' " +"width='60' " +"height='Globals.Line.Height' " +"textalign='right' " "/> " "<widget name='PlatformPopup' " "type='PopUp' " @@ -530,24 +1152,32 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " -"<layout type='vertical' padding='16,16,16,16'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='vertical' padding='8,8,8,8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " "<widget name='Savepath' " "type='Button' " "/> " "<widget name='SavepathText' " "height='Globals.Line.Height' " "/> " +"<widget name='SavePathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " "<widget name='Extrapath' " "type='Button' " "/> " "<widget name='ExtrapathText' " "height='Globals.Line.Height' " "/> " +"<widget name='ExtraPathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " "<widget name='Gamepath' " "type='Button' " "/> " @@ -558,57 +1188,55 @@ "</layout> " "</dialog> " "<dialog name='GlobalMenu' overlays='screen_center'> " -"<layout type='vertical' padding='16,16,16,16' center='true'> " +"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> " "<widget name='Title' " -"width='210' " -"height='Globals.Line.Height' " +"width='160' " +"height='4' " "/> " "<widget name='Version' " -"width='210' " -"height='Globals.Line.Height' " -"/> " -"<widget name='Resume' " -"width='150' " -"height='Globals.Button.Height' " +"width='160' " +"height='4' " "/> " -"<space size='10'/> " +"<space size='1'/> " "<widget name='Load' " -"width='150' " -"height='Globals.Button.Height' " +"width='120' " +"height='12' " "/> " "<widget name='Save' " -"width='150' " -"height='Globals.Button.Height' " +"width='120' " +"height='12' " "/> " -"<space size='10'/> " +"<space size='1'/> " "<widget name='Options' " -"width='150' " -"height='Globals.Button.Height' " +"width='120' " +"height='12' " "/> " "<widget name='Help' " -"width='150' " -"height='Globals.Button.Height' " +"width='120' " +"height='12' " "/> " "<widget name='About' " -"width='150' " -"height='Globals.Button.Height' " +"width='120' " +"height='12' " +"/> " +"<space size='1'/> " +"<widget name='Resume' " +"width='120' " +"height='12' " "/> " -"<space size='10'/> " "<widget name='RTL' " -"width='150' " -"height='Globals.Button.Height' " +"width='120' " +"height='12' " "/> " "<widget name='Quit' " -"width='150' " -"height='Globals.Button.Height' " +"width='120' " +"height='12' " "/> " "</layout> " "</dialog> " "<dialog name='GlobalConfig' overlays='screen_center'> " "<layout type='vertical' padding='8,8,8,8'> " -"<layout type='horizontal' padding='0,0,0,0'> " -"<layout type='vertical' padding='0,0,0,0' center='true'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcMusicText' " "type='OptionsLabel' " "/> " @@ -619,7 +1247,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSfxText' " "type='OptionsLabel' " "/> " @@ -630,7 +1258,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='vcSpeechText' " "type='OptionsLabel' " "/> " @@ -641,33 +1269,34 @@ "type='SmallLabel' " "/> " "</layout> " -"</layout> " -"<layout type='vertical' padding='24,24,24,24' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<space size='110' /> " "<widget name='vcMuteCheckbox' " "type='Checkbox' " -"width='80' " +"width='80' " "/> " "</layout> " -"</layout> " -"<space size='8' /> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " "/> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subToggleSpeechOnly' " "type='Radiobutton' " -"width='100' " +"width='90' " "/> " "<widget name='subToggleSubOnly' " "type='Radiobutton' " -"width='100' " +"width='90' " "/> " "<widget name='subToggleSubBoth' " "type='Radiobutton' " -"width='100' " +"width='90' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"</layout> " +"<space size='2' /> " +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " "/> " @@ -678,8 +1307,8 @@ "type='SmallLabel' " "/> " "</layout> " -"<space size='60'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"<space size='16'/> " +"<layout type='horizontal' padding='0,0,0,0' spacing='4'> " "<widget name='Keys' " "type='Button' " "/> " @@ -694,23 +1323,15 @@ "</layout> " "</dialog> " "<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> " -"<layout type='vertical' padding='8,8,8,32' center='true'> " -"<widget name='Title' " -"height='Globals.Line.Height' " -"/> " -"<layout type='horizontal' padding='0,0,0,16' spacing='16'> " +"<layout type='vertical' padding='8,8,8,8' center='true'> " +"<widget name='Title' height='Globals.Line.Height'/> " "<widget name='List' /> " -"<widget name='Thumbnail' " -"width='180' " -"height='200' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,16,0'> " "<space/> " "<widget name='Delete' " "type='Button' " "/> " -"<space size='32'/> " +"<space size='16'/> " "<widget name='Cancel' " "type='Button' " "/> " @@ -720,16 +1341,16 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name='ScummHelp' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"<dialog name='ScummHelp' overlays='screen'> " +"<layout type='vertical' padding='8,8,8,8'> " "<widget name='Title' " -"width='320' " +"width='180' " "height='Globals.Line.Height' " "/> " "<widget name='HelpText' " -"height='200' " +"height='140' " "/> " -"<layout type='horizontal' padding='0,0,16,0'> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='Prev' " "type='Button' " "/> " @@ -743,21 +1364,41 @@ "</layout> " "</layout> " "</dialog> " +"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> " +"<layout type='vertical' padding='8,8,8,8' center='true'> " +"<widget name='Description1' " +"width='280' " +"height='Globals.Line.Height' " +"/> " +"<widget name='Description2' " +"height='Globals.Line.Height' " +"/> " +"<widget name='Standard' " +"type='Button' " +"/> " +"<widget name='Practice' " +"type='Button' " +"/> " +"<widget name='Expert' " +"type='Button' " +"/> " +"</layout> " +"</dialog> " "<dialog name='MassAdd' overlays='screen_center' shading='dim'> " -"<layout type='vertical' padding='8,8,32,8' center='true'> " +"<layout type='vertical' padding='4,4,16,4' center='true'> " "<widget name='DirProgressText' " -"width='480' " +"width='280' " "height='Globals.Line.Height' " "/> " "<widget name='GameProgressText' " -"width='480' " +"width='280' " "height='Globals.Line.Height' " "/> " "<widget name='GameList' " -"width='480' " -"height='250' " +"width='280' " +"height='100' " "/> " -"<layout type='horizontal' padding='8,8,8,8'> " +"<layout type='horizontal' padding='4,4,4,4'> " "<widget name='Ok' " "type='Button' " "/> " @@ -768,20 +1409,20 @@ "</layout> " "</dialog> " "<dialog name='KeyMapper' overlays='screen_center' shading='dim'> " -"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> " +"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> " "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='PopupDesc' " "type='OptionsLabel' " "/> " "<widget name='Popup' " "type='PopUp' " -"width='400' " +"width='150' " "height='Globals.Line.Height' " "/> " "</layout> " "<widget name='KeymapArea' " -"width='600' " -"height='280' " +"width='300' " +"height='120' " "/> " "<widget name='Close' " "type='Button' " @@ -789,46 +1430,49 @@ "</layout> " "</dialog> " "</layout_info> " -"<layout_info resolution='y<400'> " +"<layout_info resolution='y>399'> " "<globals> " -"<def var='Line.Height' value='12' /> " -"<def var='Font.Height' value='10' /> " -"<def var='About.OuterBorder' value='10'/> " -"<def var='Layout.Spacing' value='8'/> " +"<def var='Line.Height' value='16' /> " +"<def var='Font.Height' value='16' /> " +"<def var='About.OuterBorder' value='80'/> " +"<def var='Layout.Spacing' value='8' /> " "<def var='ShowLauncherLogo' value='0'/> " "<def var='ShowGlobalMenuLogo' value='0'/> " "<def var='ShowSearchPic' value='0'/> " -"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> " -"<def var='KeyMapper.Spacing' value='5'/> " -"<def var='KeyMapper.LabelWidth' value='80'/> " -"<def var='KeyMapper.ButtonWidth' value='60'/> " -"<def var='Tooltip.MaxWidth' value='70'/> " -"<def var='Tooltip.XDelta' value='8'/> " -"<def var='Tooltip.YDelta' value='8'/> " -"<widget name='Button' " -"size='72,16' " -"/> " -"<widget name='Slider' " -"size='85,12' " -"/> " +"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/> " +"<def var='KeyMapper.Spacing' value='10'/> " +"<def var='KeyMapper.LabelWidth' value='100'/> " +"<def var='KeyMapper.ButtonWidth' value='80'/> " +"<def var='Tooltip.MaxWidth' value='200'/> " +"<def var='Tooltip.XDelta' value='16'/> " +"<def var='Tooltip.YDelta' value='16'/> " "<widget name='OptionsLabel' " "size='110,Globals.Line.Height' " "textalign='right' " "/> " "<widget name='SmallLabel' " -"size='18,Globals.Line.Height' " +"size='24,Globals.Line.Height' " +"/> " +"<widget name='ShortOptionsLabel' " +"size='60,Globals.Line.Height' " +"/> " +"<widget name='Button' " +"size='108,24' " +"/> " +"<widget name='Slider' " +"size='128,18' " "/> " "<widget name='PopUp' " -"size='-1,15' " +"size='-1,19' " "/> " "<widget name='Checkbox' " -"size='-1,Globals.Line.Height' " +"size='-1,14' " "/> " "<widget name='Radiobutton' " "size='-1,Globals.Line.Height' " "/> " "<widget name='ListWidget' " -"padding='5,0,0,0' " +"padding='5,0,8,0' " "/> " "<widget name='PopUpWidget' " "padding='7,5,0,0' " @@ -840,28 +1484,28 @@ "padding='7,5,5,5' " "/> " "<widget name='Scrollbar' " -"size='9,0' " +"size='15,0' " "/> " "<widget name='TabWidget.Tab' " -"size='45,16' " -"padding='0,0,2,0' " +"size='75,27' " +"padding='0,0,8,0' " "/> " "<widget name='TabWidget.Body' " -"padding='0,0,0,-8' " +"padding='0,0,0,0' " "/> " "<widget name='TabWidget.NavButton' " -"size='32,18' " -"padding='0,0,1,0' " +"size='15,18' " +"padding='0,3,4,0' " "/> " "</globals> " "<dialog name='Launcher' overlays='screen'> " -"<layout type='vertical' center='true' padding='6,6,2,2'> " +"<layout type='vertical' center='true' padding='16,16,8,8'> " "<widget name='Version' " "height='Globals.Line.Height' " "/> " -"<layout type='horizontal' spacing='5' padding='0,0,0,0'> " +"<layout type='horizontal' spacing='5' padding='10,0,0,0'> " "<widget name='SearchDesc' " -"width='50' " +"width='60' " "height='Globals.Line.Height' " "textalign='right' " "/> " @@ -876,38 +1520,39 @@ "<space /> " "</layout> " "<widget name='GameList'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='LoadGameButton' " -"height='12' " +"height='20' " "/> " "<widget name='AddGameButton' " -"height='12' " +"height='20' " "/> " "<widget name='EditGameButton' " -"height='12' " +"height='20' " "/> " "<widget name='RemoveGameButton' " -"height='12' " +"height='20' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"<space size='4'/> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='QuitButton' " -"height='12' " +"height='20' " "/> " "<widget name='AboutButton' " -"height='12' " +"height='20' " "/> " "<widget name='OptionsButton' " -"height='12' " +"height='20' " "/> " "<widget name='StartButton' " -"height='12' " +"height='20' " "/> " "</layout> " "</layout> " "</dialog> " -"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> " -"<layout type='vertical' padding='8,8,0,4'> " +"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'> " +"<layout type='vertical' padding='8,8,8,8'> " "<widget name='Headline' " "height='Globals.Line.Height' " "/> " @@ -915,7 +1560,7 @@ "height='Globals.Line.Height' " "/> " "<widget name='List'/> " -"<layout type='horizontal' padding='0,0,8,0'> " +"<layout type='horizontal' padding='0,0,16,0'> " "<widget name='Up' " "type='Button' " "/> " @@ -929,10 +1574,10 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> " +"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> " "<layout type='vertical' padding='0,0,0,0'> " "<widget name='TabWidget'/> " -"<layout type='horizontal' padding='8,8,8,8'> " +"<layout type='horizontal' padding='16,16,16,16'> " "<space/> " "<widget name='Cancel' " "type='Button' " @@ -945,7 +1590,7 @@ "</dialog> " "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='grModePopupDesc' " "type='OptionsLabel' " "/> " @@ -953,7 +1598,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='grRenderPopupDesc' " "type='OptionsLabel' " "/> " @@ -974,7 +1619,7 @@ "</dialog> " "<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='auMidiPopupDesc' " "type='OptionsLabel' " "/> " @@ -982,7 +1627,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='auOPLPopupDesc' " "type='OptionsLabel' " "/> " @@ -990,7 +1635,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='auSampleRatePopupDesc' " "type='OptionsLabel' " "/> " @@ -998,7 +1643,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " "/> " @@ -1012,7 +1657,7 @@ "type='Radiobutton' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " "/> " @@ -1026,8 +1671,9 @@ "</layout> " "</dialog> " "<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='16,16,16,16' spacing='8'> " +"<layout type='vertical' padding='0,0,0,0' spacing='8'> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='vcMusicText' " "type='OptionsLabel' " "/> " @@ -1038,7 +1684,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='vcSfxText' " "type='OptionsLabel' " "/> " @@ -1049,7 +1695,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='vcSpeechText' " "type='OptionsLabel' " "/> " @@ -1060,8 +1706,8 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " -"<space size='110' /> " +"</layout> " +"<layout type='vertical' padding='24,0,24,0' center='true'> " "<widget name='vcMuteCheckbox' " "type='Checkbox' " "/> " @@ -1070,7 +1716,7 @@ "</dialog> " "<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='auPrefGmPopupDesc' " "type='OptionsLabel' " "/> " @@ -1078,7 +1724,7 @@ "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='mcFontButton' " "type='Button' " "/> " @@ -1093,7 +1739,7 @@ "<widget name='mcMixedCheckbox' " "type='Checkbox' " "/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='mcMidiGainText' " "type='OptionsLabel' " "/> " @@ -1109,7 +1755,7 @@ "</dialog> " "<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='auPrefMt32PopupDesc' " "type='OptionsLabel' " "/> " @@ -1127,29 +1773,41 @@ "</dialog> " "<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='SaveButton' " "type='Button' " "/> " "<widget name='SavePath' " "height='Globals.Line.Height' " "/> " +"<widget name='SavePathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='ThemeButton' " "type='Button' " "/> " "<widget name='ThemePath' " "height='Globals.Line.Height' " "/> " +"<widget name='ThemePathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='ExtraButton' " "type='Button' " "/> " "<widget name='ExtraPath' " "height='Globals.Line.Height' " "/> " +"<widget name='ExtraPathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " "<layout type='horizontal' padding='0,0,0,0' spacing='16'> " "<widget name='PluginsButton' " @@ -1163,7 +1821,7 @@ "</dialog> " "<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> " "<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='ThemeButton' " "type='Button' " "/> " @@ -1171,31 +1829,25 @@ "height='Globals.Line.Height' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='RendererPopupDesc' " -"width='80' " -"height='Globals.Line.Height' " -"textalign='right' " +"type='OptionsLabel' " "/> " "<widget name='RendererPopup' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='AutosavePeriodPopupDesc' " -"width='80' " -"height='Globals.Line.Height' " -"textalign='right' " +"type='OptionsLabel' " "/> " "<widget name='AutosavePeriodPopup' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='GuiLanguagePopupDesc' " -"width='80' " -"height='Globals.Line.Height' " -"textalign='right' " +"type='OptionsLabel' " "/> " "<widget name='GuiLanguagePopup' " "type='PopUp' " @@ -1230,10 +1882,10 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> " +"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'> " "<layout type='vertical' padding='0,0,0,0' spacing='16'> " "<widget name='TabWidget'/> " -"<layout type='horizontal' padding='8,8,8,8'> " +"<layout type='horizontal' padding='16,16,16,4'> " "<space/> " "<widget name='Cancel' " "type='Button' " @@ -1245,7 +1897,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"<layout type='vertical' padding='16,16,16,16' spacing='8'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -1253,7 +1905,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"<layout type='vertical' padding='16,16,16,16' spacing='8'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -1261,7 +1913,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"<layout type='vertical' padding='16,16,16,16' spacing='8'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -1269,7 +1921,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"<layout type='vertical' padding='16,16,16,16' spacing='8'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -1277,7 +1929,7 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"<layout type='vertical' padding='16,16,16,16' spacing='8'> " "<widget name='EnableTabCheckbox' " "type='Checkbox' " "/> " @@ -1285,43 +1937,34 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='vertical' padding='16,16,16,16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Id' " -"width='35' " -"height='Globals.Line.Height' " -"textalign='right' " +"type='OptionsLabel' " "/> " "<widget name='Domain' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Name' " -"width='35' " -"height='Globals.Line.Height' " -"textalign='right' " +"type='OptionsLabel' " "/> " "<widget name='Desc' " "type='PopUp' " "/> " "</layout> " -"<space size='8'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='LangPopupDesc' " -"width='60' " -"height='Globals.Line.Height' " -"textalign='right' " +"type='OptionsLabel' " "/> " "<widget name='LangPopup' " "type='PopUp' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='PlatformPopupDesc' " -"width='60' " -"height='Globals.Line.Height' " -"textalign='right' " +"type='OptionsLabel' " "/> " "<widget name='PlatformPopup' " "type='PopUp' " @@ -1330,24 +1973,32 @@ "</layout> " "</dialog> " "<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"<layout type='vertical' padding='16,16,16,16'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Savepath' " "type='Button' " "/> " "<widget name='SavepathText' " "height='Globals.Line.Height' " "/> " +"<widget name='SavePathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Extrapath' " "type='Button' " "/> " "<widget name='ExtrapathText' " "height='Globals.Line.Height' " "/> " +"<widget name='ExtraPathClearButton' " +"height='Globals.Line.Height' " +"width='Globals.Line.Height' " +"/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='Gamepath' " "type='Button' " "/> " @@ -1358,55 +2009,57 @@ "</layout> " "</dialog> " "<dialog name='GlobalMenu' overlays='screen_center'> " -"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> " +"<layout type='vertical' padding='16,16,16,16' center='true'> " "<widget name='Title' " -"width='160' " -"height='4' " +"width='210' " +"height='Globals.Line.Height' " "/> " "<widget name='Version' " -"width='160' " -"height='4' " +"width='210' " +"height='Globals.Line.Height' " "/> " -"<space size='1'/> " +"<widget name='Resume' " +"width='150' " +"height='Globals.Button.Height' " +"/> " +"<space size='10'/> " "<widget name='Load' " -"width='120' " -"height='12' " +"width='150' " +"height='Globals.Button.Height' " "/> " "<widget name='Save' " -"width='120' " -"height='12' " +"width='150' " +"height='Globals.Button.Height' " "/> " -"<space size='1'/> " +"<space size='10'/> " "<widget name='Options' " -"width='120' " -"height='12' " +"width='150' " +"height='Globals.Button.Height' " "/> " "<widget name='Help' " -"width='120' " -"height='12' " +"width='150' " +"height='Globals.Button.Height' " "/> " "<widget name='About' " -"width='120' " -"height='12' " -"/> " -"<space size='1'/> " -"<widget name='Resume' " -"width='120' " -"height='12' " +"width='150' " +"height='Globals.Button.Height' " "/> " +"<space size='10'/> " "<widget name='RTL' " -"width='120' " -"height='12' " +"width='150' " +"height='Globals.Button.Height' " "/> " "<widget name='Quit' " -"width='120' " -"height='12' " +"width='150' " +"height='Globals.Button.Height' " "/> " "</layout> " "</dialog> " "<dialog name='GlobalConfig' overlays='screen_center'> " "<layout type='vertical' padding='8,8,8,8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='vertical' padding='0,0,0,0' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " "<widget name='vcMusicText' " "type='OptionsLabel' " "/> " @@ -1417,7 +2070,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " "<widget name='vcSfxText' " "type='OptionsLabel' " "/> " @@ -1428,7 +2081,7 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " "<widget name='vcSpeechText' " "type='OptionsLabel' " "/> " @@ -1439,34 +2092,33 @@ "type='SmallLabel' " "/> " "</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " -"<space size='110' /> " +"</layout> " +"<layout type='vertical' padding='24,24,24,24' center='true'> " "<widget name='vcMuteCheckbox' " "type='Checkbox' " -"width='80' " +"width='80' " "/> " "</layout> " -"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> " +"</layout> " +"<space size='8' /> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subToggleDesc' " "type='OptionsLabel' " "/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " "<widget name='subToggleSpeechOnly' " "type='Radiobutton' " -"width='90' " +"width='100' " "/> " "<widget name='subToggleSubOnly' " "type='Radiobutton' " -"width='90' " +"width='100' " "/> " "<widget name='subToggleSubBoth' " "type='Radiobutton' " -"width='90' " +"width='100' " "/> " "</layout> " -"</layout> " -"<space size='2' /> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " "/> " @@ -1477,8 +2129,8 @@ "type='SmallLabel' " "/> " "</layout> " -"<space size='16'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='4'> " +"<space size='60'/> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " "<widget name='Keys' " "type='Button' " "/> " @@ -1493,15 +2145,23 @@ "</layout> " "</dialog> " "<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " -"<widget name='Title' height='Globals.Line.Height'/> " +"<layout type='vertical' padding='8,8,8,32' center='true'> " +"<widget name='Title' " +"height='Globals.Line.Height' " +"/> " +"<layout type='horizontal' padding='0,0,0,16' spacing='16'> " "<widget name='List' /> " -"<layout type='horizontal' padding='0,0,16,0'> " +"<widget name='Thumbnail' " +"width='180' " +"height='200' " +"/> " +"</layout> " +"<layout type='horizontal' padding='0,0,0,0'> " "<space/> " "<widget name='Delete' " "type='Button' " "/> " -"<space size='16'/> " +"<space size='32'/> " "<widget name='Cancel' " "type='Button' " "/> " @@ -1511,16 +2171,16 @@ "</layout> " "</layout> " "</dialog> " -"<dialog name='ScummHelp' overlays='screen'> " -"<layout type='vertical' padding='8,8,8,8'> " +"<dialog name='ScummHelp' overlays='screen_center'> " +"<layout type='vertical' padding='8,8,8,8' center='true'> " "<widget name='Title' " -"width='180' " +"width='320' " "height='Globals.Line.Height' " "/> " "<widget name='HelpText' " -"height='140' " +"height='200' " "/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"<layout type='horizontal' padding='0,0,16,0'> " "<widget name='Prev' " "type='Button' " "/> " @@ -1534,21 +2194,41 @@ "</layout> " "</layout> " "</dialog> " +"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> " +"<layout type='vertical' padding='8,8,8,8' center='true'> " +"<widget name='Description1' " +"width='320' " +"height='Globals.Line.Height' " +"/> " +"<widget name='Description2' " +"height='Globals.Line.Height' " +"/> " +"<widget name='Standard' " +"type='Button' " +"/> " +"<widget name='Practice' " +"type='Button' " +"/> " +"<widget name='Expert' " +"type='Button' " +"/> " +"</layout> " +"</dialog> " "<dialog name='MassAdd' overlays='screen_center' shading='dim'> " -"<layout type='vertical' padding='4,4,16,4' center='true'> " +"<layout type='vertical' padding='8,8,32,8' center='true'> " "<widget name='DirProgressText' " -"width='280' " +"width='480' " "height='Globals.Line.Height' " "/> " "<widget name='GameProgressText' " -"width='280' " +"width='480' " "height='Globals.Line.Height' " "/> " "<widget name='GameList' " -"width='280' " -"height='100' " +"width='480' " +"height='250' " "/> " -"<layout type='horizontal' padding='4,4,4,4'> " +"<layout type='horizontal' padding='8,8,8,8'> " "<widget name='Ok' " "type='Button' " "/> " @@ -1559,20 +2239,20 @@ "</layout> " "</dialog> " "<dialog name='KeyMapper' overlays='screen_center' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> " +"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> " "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " "<widget name='PopupDesc' " "type='OptionsLabel' " "/> " "<widget name='Popup' " "type='PopUp' " -"width='150' " +"width='400' " "height='Globals.Line.Height' " "/> " "</layout> " "<widget name='KeymapArea' " -"width='300' " -"height='120' " +"width='600' " +"height='280' " "/> " "<widget name='Close' " "type='Button' " @@ -1580,443 +2260,3 @@ "</layout> " "</dialog> " "</layout_info> " -"<render_info> " -"<palette> " -"<color name='black' " -"rgb='0,0,0' " -"/> " -"<color name='lightgrey' " -"rgb='104,104,104' " -"/> " -"<color name='darkgrey' " -"rgb='64,64,64' " -"/> " -"<color name='green' " -"rgb='32,160,32' " -"/> " -"<color name='green2' " -"rgb='0,255,0' " -"/> " -"</palette> " -"<fonts> " -"<font id='text_default' " -"file='helvb12.bdf' " -"/> " -"<font resolution='y<400' " -"id='text_default' " -"file='clR6x12.bdf' " -"/> " -"<font id='text_button' " -"file='helvb12.bdf' " -"/> " -"<font resolution='y<400' " -"id='text_button' " -"file='clR6x12.bdf' " -"/> " -"<font id='text_normal' " -"file='helvb12.bdf' " -"/> " -"<font resolution='y<400' " -"id='text_normal' " -"file='clR6x12.bdf' " -"/> " -"<font id='tooltip_normal' " -"file='fixed5x8.bdf' " -"/> " -"<text_color id='color_normal' " -"color='green' " -"/> " -"<text_color id='color_normal_inverted' " -"color='black' " -"/> " -"<text_color id='color_normal_hover' " -"color='green2' " -"/> " -"<text_color id='color_normal_disabled' " -"color='lightgrey' " -"/> " -"<text_color id='color_alternative' " -"color='lightgrey' " -"/> " -"<text_color id='color_alternative_inverted' " -"color='255,255,255' " -"/> " -"<text_color id='color_alternative_hover' " -"color='176,176,176' " -"/> " -"<text_color id='color_alternative_disabled' " -"color='darkgrey' " -"/> " -"<text_color id='color_button' " -"color='green' " -"/> " -"<text_color id='color_button_hover' " -"color='green2' " -"/> " -"<text_color id='color_button_disabled' " -"color='lightgrey' " -"/> " -"</fonts> " -"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> " -"<drawdata id='text_selection' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='lightgrey' " -"/> " -"</drawdata> " -"<drawdata id='text_selection_focus' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='green' " -"/> " -"</drawdata> " -"<drawdata id='mainmenu_bg' cache='false'> " -"<drawstep func='fill' " -"fill='foreground' " -"fg_color='black' " -"/> " -"</drawdata> " -"<drawdata id='special_bg' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='tooltip_bg' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='foreground' " -"fg_color='black' " -"/> " -"</drawdata> " -"<drawdata id='separator' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"height='2' " -"ypos='center' " -"fg_color='lightgrey' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_base' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_handle_hover' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='green2' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_handle_idle' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='green' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_button_idle' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"<drawstep func='triangle' " -"fg_color='green' " -"fill='foreground' " -"width='auto' " -"height='auto' " -"xpos='center' " -"ypos='center' " -"orientation='top' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_button_hover' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"<drawstep func='triangle' " -"fg_color='green2' " -"fill='foreground' " -"width='auto' " -"height='auto' " -"xpos='center' " -"ypos='center' " -"orientation='top' " -"/> " -"</drawdata> " -"<drawdata id='tab_active' cache='false'> " -"<text font='text_default' " -"text_color='color_normal_hover' " -"vertical_align='center' " -"horizontal_align='center' " -"/> " -"<drawstep func='tab' " -"bevel='2' " -"radius='0' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='tab_inactive' cache='false'> " -"<text font='text_default' " -"text_color='color_normal' " -"vertical_align='center' " -"horizontal_align='center' " -"/> " -"<drawstep func='tab' " -"bevel='2' " -"radius='0' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='tab_background' cache='false'> " -"</drawdata> " -"<drawdata id='widget_slider' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='slider_disabled' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='lightgrey' " -"/> " -"</drawdata> " -"<drawdata id='slider_full' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='green' " -"/> " -"</drawdata> " -"<drawdata id='slider_hover' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='green2' " -"/> " -"</drawdata> " -"<drawdata id='widget_small' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='popup_idle' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"<drawstep func='triangle' " -"fg_color='green' " -"fill='foreground' " -"width='height' " -"height='auto' " -"xpos='right' " -"ypos='center' " -"orientation='bottom' " -"/> " -"<text font='text_default' " -"text_color='color_normal' " -"vertical_align='center' " -"horizontal_align='left' " -"/> " -"</drawdata> " -"<drawdata id='popup_disabled' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"<drawstep func='triangle' " -"fg_color='lightgrey' " -"fill='foreground' " -"width='height' " -"height='auto' " -"xpos='right' " -"ypos='center' " -"orientation='bottom' " -"/> " -"<text font='text_default' " -"text_color='color_normal_disabled' " -"vertical_align='center' " -"horizontal_align='left' " -"/> " -"</drawdata> " -"<drawdata id='popup_hover' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"<drawstep func='triangle' " -"fg_color='green2' " -"fill='foreground' " -"width='height' " -"height='auto' " -"xpos='right' " -"ypos='center' " -"orientation='bottom' " -"/> " -"<text font='text_default' " -"text_color='color_normal_hover' " -"vertical_align='center' " -"horizontal_align='left' " -"/> " -"</drawdata> " -"<drawdata id='widget_textedit' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='plain_bg' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='caret' cache='false'> " -"<drawstep func='square' " -"fill='foreground' " -"fg_color='lightgrey' " -"/> " -"</drawdata> " -"<drawdata id='default_bg' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='button_idle' cache='false'> " -"<text font='text_button' " -"text_color='color_button' " -"vertical_align='center' " -"horizontal_align='center' " -"/> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='button_hover' cache='false'> " -"<text font='text_button' " -"text_color='color_button_hover' " -"vertical_align='center' " -"horizontal_align='center' " -"/> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='button_disabled' cache='false'> " -"<text font='text_button' " -"text_color='color_button_disabled' " -"vertical_align='center' " -"horizontal_align='center' " -"/> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='checkbox_disabled' cache='false'> " -"<text font='text_default' " -"text_color='color_normal_disabled' " -"vertical_align='top' " -"horizontal_align='left' " -"/> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='checkbox_selected' cache='false'> " -"<text font='text_default' " -"text_color='color_normal' " -"vertical_align='top' " -"horizontal_align='left' " -"/> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"<drawstep func='cross' " -"fill='foreground' " -"stroke='2' " -"fg_color='green' " -"/> " -"</drawdata> " -"<drawdata id='checkbox_default' cache='false'> " -"<text font='text_default' " -"text_color='color_normal' " -"vertical_align='top' " -"horizontal_align='left' " -"/> " -"<drawstep func='bevelsq' " -"bevel='2' " -"fill='none' " -"/> " -"</drawdata> " -"<drawdata id='radiobutton_default' cache='false'> " -"<text font='text_default' " -"text_color='color_normal' " -"vertical_align='center' " -"horizontal_align='left' " -"/> " -"<drawstep func='circle' " -"width='7' " -"height='7' " -"radius='7' " -"fill='background' " -"bg_color='darkgrey' " -"xpos='0' " -"ypos='0' " -"/> " -"</drawdata> " -"<drawdata id='radiobutton_selected' cache='false'> " -"<text font='text_default' " -"text_color='color_normal' " -"vertical_align='center' " -"horizontal_align='left' " -"/> " -"<drawstep func='circle' " -"width='7' " -"height='7' " -"radius='7' " -"fg_color='darkgrey' " -"fill='none' " -"xpos='0' " -"ypos='0' " -"/> " -"<drawstep func='circle' " -"width='7' " -"height='7' " -"radius='5' " -"fg_color='green' " -"fill='foreground' " -"xpos='2' " -"ypos='2' " -"/> " -"</drawdata> " -"<drawdata id='radiobutton_disabled' cache='false'> " -"<text font='text_default' " -"text_color='color_normal_disabled' " -"vertical_align='center' " -"horizontal_align='left' " -"/> " -"<drawstep func='circle' " -"width='7' " -"height='7' " -"radius='7' " -"bg_color='lightgrey' " -"fill='background' " -"xpos='0' " -"ypos='0' " -"/> " -"</drawdata> " -"<drawdata id='widget_default' cache='false'> " -"<drawstep func='bevelsq' " -"bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='widget_small' cache='false'> " -"<drawstep func='square' " -"stroke='0' " -"/> " -"</drawdata> " -"</render_info> " diff --git a/gui/themes/fonts/FreeMonoBold.ttf b/gui/themes/fonts/FreeMonoBold.ttf Binary files differnew file mode 100644 index 0000000000..3bce6129ae --- /dev/null +++ b/gui/themes/fonts/FreeMonoBold.ttf diff --git a/gui/themes/fonts/FreeSans.ttf b/gui/themes/fonts/FreeSans.ttf Binary files differnew file mode 100644 index 0000000000..9db958532c --- /dev/null +++ b/gui/themes/fonts/FreeSans.ttf diff --git a/gui/themes/fonts/FreeSansBold.ttf b/gui/themes/fonts/FreeSansBold.ttf Binary files differnew file mode 100644 index 0000000000..63644e7437 --- /dev/null +++ b/gui/themes/fonts/FreeSansBold.ttf diff --git a/gui/themes/fonts/README b/gui/themes/fonts/README index 594bfc3ea4..b36d89889c 100644 --- a/gui/themes/fonts/README +++ b/gui/themes/fonts/README @@ -1,3 +1,5 @@ These are fonts used in ScummVM. Most of them come from Xorg. +The GNU FreeFont files are distributed under the license in COPYING.FREEFONT. + Also other potentially usable fonts are stored here as well. diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 4dbedd4f14..d4cfd0cba3 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC index 17e934d5ef..f3904cbb6d 100644 --- a/gui/themes/scummclassic/THEMERC +++ b/gui/themes/scummclassic/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.3:ScummVM Classic Theme:No Author] +[SCUMMVM_STX0.8.8:ScummVM Classic Theme:No Author] diff --git a/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc b/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc Binary files differindex 042bc5b24d..4d225ddc23 100644 --- a/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc +++ b/gui/themes/scummclassic/clR6x12-iso-8859-2.fcc diff --git a/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc b/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc Binary files differindex d8e614211d..37d4615ea0 100644 --- a/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc +++ b/gui/themes/scummclassic/clR6x12-iso-8859-5.fcc diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx index c0fcc9f083..f07499ce79 100644 --- a/gui/themes/scummclassic/classic_gfx.stx +++ b/gui/themes/scummclassic/classic_gfx.stx @@ -176,7 +176,7 @@ /> </drawdata> - <drawdata id = 'scrollbar_button_idle' cache = 'false'> + <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>399'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' @@ -184,26 +184,62 @@ <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' - width = 'auto' - height = 'auto' - xpos = 'center' + width = '10' + height = '10' + xpos = 'right' + ypos = 'center' + padding = '0,0,3,0' + orientation = 'top' + /> + </drawdata> + + <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'> + <drawstep func = 'bevelsq' + bevel = '2' + fill = 'none' + /> + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '5' + height = '5' + xpos = 'right' ypos = 'center' + padding = '0,0,2,0' orientation = 'top' /> </drawdata> - <drawdata id = 'scrollbar_button_hover' cache = 'false'> + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' /> <drawstep func = 'triangle' - fg_color = 'green2' + fg_color = 'green' + fill = 'foreground' + width = '10' + height = '10' + xpos = 'right' + ypos = 'center' + padding = '0,0,3,0' + orientation = 'top' + /> + </drawdata> + + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'> + <drawstep func = 'bevelsq' + bevel = '2' + fill = 'none' + /> + <drawstep func = 'triangle' + fg_color = 'green' fill = 'foreground' - width = 'auto' - height = 'auto' - xpos = 'center' + width = '5' + height = '5' + xpos = 'right' ypos = 'center' + padding = '0,0,2,0' orientation = 'top' /> </drawdata> @@ -272,20 +308,70 @@ /> </drawdata> - <drawdata id = 'popup_idle' cache = 'false'> + <!--popup_idle HERE --> + <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>399'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' /> + <drawstep func = 'triangle' fg_color = 'green' fill = 'foreground' - width = 'height' - height = 'auto' + width = '10' + height = '5' xpos = 'right' - ypos = 'center' + ypos = '10' + padding = '0, 0, 7, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 7, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> + + <drawdata id = 'popup_idle' cache = 'false' resolution = 'y<400'> + <drawstep func = 'bevelsq' + bevel = '2' + fill = 'none' + /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '7' + height = '4' + xpos = 'right' + ypos = '9' + padding = '0, 0, 3, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -293,47 +379,141 @@ /> </drawdata> - <drawdata id = 'popup_disabled' cache = 'false'> + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>399'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' /> <drawstep func = 'triangle' - fg_color = 'lightgrey' + fg_color = 'green' fill = 'foreground' - width = 'height' - height = 'auto' + width = '10' + height = '5' xpos = 'right' - ypos = 'center' + ypos = '10' + padding = '0, 0, 7, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 7, 0' + orientation = 'top' + /> <text font = 'text_default' text_color = 'color_normal_disabled' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> + + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'> + <drawstep func = 'bevelsq' + bevel = '2' + fill = 'none' + /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '7' + height = '4' + xpos = 'right' + ypos = '9' + padding = '0, 0, 3, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> - <drawdata id = 'popup_hover' cache = 'false'> + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>399'> <drawstep func = 'bevelsq' bevel = '2' fill = 'none' /> <drawstep func = 'triangle' - fg_color = 'green2' + fg_color = 'green' fill = 'foreground' - width = 'height' - height = 'auto' + width = '10' + height = '5' xpos = 'right' - ypos = 'center' + ypos = '10' + padding = '0, 0, 7, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 7, 0' + orientation = 'top' + /> <text font = 'text_default' text_color = 'color_normal_hover' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> + + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'> + <drawstep func = 'bevelsq' + bevel = '2' + fill = 'none' + /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '7' + height = '4' + xpos = 'right' + ypos = '9' + padding = '0, 0, 3, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + fg_color = 'green' + fill = 'foreground' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> <drawdata id = 'widget_textedit' cache = 'false'> <drawstep func = 'bevelsq' diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index 4b42b4f36d..9da42635a7 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -388,6 +388,10 @@ <widget name = 'SavePath' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ThemeButton' @@ -396,6 +400,10 @@ <widget name = 'ThemePath' height = 'Globals.Line.Height' /> + <widget name = 'ThemePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ExtraButton' @@ -404,6 +412,10 @@ <widget name = 'ExtraPath' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> <widget name = 'PluginsButton' @@ -587,6 +599,10 @@ <widget name = 'SavepathText' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Extrapath' @@ -595,6 +611,10 @@ <widget name = 'ExtrapathText' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'Gamepath' @@ -798,6 +818,27 @@ </layout> </dialog> + <dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Description1' + width = '320' + height = 'Globals.Line.Height' + /> + <widget name = 'Description2' + height = 'Globals.Line.Height' + /> + <widget name = 'Standard' + type = 'Button' + /> + <widget name = 'Practice' + type = 'Button' + /> + <widget name = 'Expert' + type = 'Button' + /> + </layout> + </dialog> + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> <widget name = 'DirProgressText' diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 4db6cc4bfc..dc528a4c00 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -385,6 +385,10 @@ <widget name = 'SavePath' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> <widget name = 'ThemeButton' @@ -393,6 +397,10 @@ <widget name = 'ThemePath' height = 'Globals.Line.Height' /> + <widget name = 'ThemePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> <widget name = 'ExtraButton' @@ -401,6 +409,10 @@ <widget name = 'ExtraPath' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> <widget name = 'PluginsButton' @@ -599,6 +611,10 @@ <widget name = 'SavepathText' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Extrapath' @@ -607,6 +623,10 @@ <widget name = 'ExtrapathText' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Gamepath' @@ -800,6 +820,27 @@ </layout> </dialog> + <dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Description1' + width = '280' + height = 'Globals.Line.Height' + /> + <widget name = 'Description2' + height = 'Globals.Line.Height' + /> + <widget name = 'Standard' + type = 'Button' + /> + <widget name = 'Practice' + type = 'Button' + /> + <widget name = 'Expert' + type = 'Button' + /> + </layout> + </dialog> + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> <layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'> <widget name = 'DirProgressText' diff --git a/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc b/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc Binary files differindex 73bb5fff2d..37da61be00 100644 --- a/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc +++ b/gui/themes/scummclassic/fixed5x8-iso-8859-2.fcc diff --git a/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc b/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc Binary files differindex e70388dd93..ee32a2041b 100644 --- a/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc +++ b/gui/themes/scummclassic/fixed5x8-iso-8859-5.fcc diff --git a/gui/themes/scummclassic/helvb12-iso-8859-2.fcc b/gui/themes/scummclassic/helvb12-iso-8859-2.fcc Binary files differindex 2117b6b9e6..540d8c4f4c 100644 --- a/gui/themes/scummclassic/helvb12-iso-8859-2.fcc +++ b/gui/themes/scummclassic/helvb12-iso-8859-2.fcc diff --git a/gui/themes/scummclassic/helvb12-iso-8859-5.fcc b/gui/themes/scummclassic/helvb12-iso-8859-5.fcc Binary files differindex 8ad8f0eb22..90df2b0df4 100644 --- a/gui/themes/scummclassic/helvb12-iso-8859-5.fcc +++ b/gui/themes/scummclassic/helvb12-iso-8859-5.fcc diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 1e44442933..fc4c89cbcc 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/FreeMonoBold.ttf b/gui/themes/scummmodern/FreeMonoBold.ttf Binary files differnew file mode 100644 index 0000000000..3bce6129ae --- /dev/null +++ b/gui/themes/scummmodern/FreeMonoBold.ttf diff --git a/gui/themes/scummmodern/FreeSans.ttf b/gui/themes/scummmodern/FreeSans.ttf Binary files differnew file mode 100644 index 0000000000..9db958532c --- /dev/null +++ b/gui/themes/scummmodern/FreeSans.ttf diff --git a/gui/themes/scummmodern/FreeSansBold.ttf b/gui/themes/scummmodern/FreeSansBold.ttf Binary files differnew file mode 100644 index 0000000000..63644e7437 --- /dev/null +++ b/gui/themes/scummmodern/FreeSansBold.ttf diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC index f947a5685a..32bd36241e 100644 --- a/gui/themes/scummmodern/THEMERC +++ b/gui/themes/scummmodern/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.3:ScummVM Modern Theme:No Author] +[SCUMMVM_STX0.8.8:ScummVM Modern Theme:No Author] diff --git a/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc b/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc Binary files differindex 042bc5b24d..4d225ddc23 100644 --- a/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc +++ b/gui/themes/scummmodern/clR6x12-iso-8859-2.fcc diff --git a/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc Binary files differindex d8e614211d..37d4615ea0 100644 --- a/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc +++ b/gui/themes/scummmodern/clR6x12-iso-8859-5.fcc diff --git a/gui/themes/scummmodern/eraser.bmp b/gui/themes/scummmodern/eraser.bmp Binary files differnew file mode 100644 index 0000000000..b927a6384f --- /dev/null +++ b/gui/themes/scummmodern/eraser.bmp diff --git a/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc b/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc Binary files differindex 73bb5fff2d..37da61be00 100644 --- a/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc +++ b/gui/themes/scummmodern/fixed5x8-iso-8859-2.fcc diff --git a/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc Binary files differindex e70388dd93..ee32a2041b 100644 --- a/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc +++ b/gui/themes/scummmodern/fixed5x8-iso-8859-5.fcc diff --git a/gui/themes/scummmodern/helvb12-iso-8859-1.fcc b/gui/themes/scummmodern/helvb12-iso-8859-1.fcc Binary files differindex 651a25934a..18af0bf870 100644 --- a/gui/themes/scummmodern/helvb12-iso-8859-1.fcc +++ b/gui/themes/scummmodern/helvb12-iso-8859-1.fcc diff --git a/gui/themes/scummmodern/helvb12-iso-8859-2.fcc b/gui/themes/scummmodern/helvb12-iso-8859-2.fcc Binary files differindex 2117b6b9e6..540d8c4f4c 100644 --- a/gui/themes/scummmodern/helvb12-iso-8859-2.fcc +++ b/gui/themes/scummmodern/helvb12-iso-8859-2.fcc diff --git a/gui/themes/scummmodern/helvb12-iso-8859-5.fcc b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc Binary files differindex 8ad8f0eb22..90df2b0df4 100644 --- a/gui/themes/scummmodern/helvb12-iso-8859-5.fcc +++ b/gui/themes/scummmodern/helvb12-iso-8859-5.fcc diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx index 80177054f4..5f7cc69acd 100644 --- a/gui/themes/scummmodern/scummmodern_gfx.stx +++ b/gui/themes/scummmodern/scummmodern_gfx.stx @@ -99,32 +99,44 @@ <bitmap filename = 'radiobutton_empty.bmp'/> <bitmap filename = 'logo_small.bmp'/> <bitmap filename = 'search.bmp'/> + <bitmap filename = 'eraser.bmp'/> </bitmaps> <fonts> <font id = 'text_default' file = 'helvb12.bdf' + scalable_file = 'FreeSansBold.ttf' /> <font resolution = 'y<400' id = 'text_default' file = 'clR6x12.bdf' + scalable_file = 'FreeSans.ttf' + point_size = '11' /> <font id = 'text_button' file = 'helvb12.bdf' + scalable_file = 'FreeSansBold.ttf' /> <font resolution = 'y<400' id = 'text_button' file = 'clR6x12.bdf' + scalable_file = 'FreeSans.ttf' + point_size = '11' /> <font id = 'text_normal' file = 'helvb12.bdf' + scalable_file = 'FreeSans.ttf' /> <font resolution = 'y<400' id = 'text_normal' file = 'clR6x12.bdf' + scalable_file = 'FreeSans.ttf' + point_size = '11' /> <font id = 'tooltip_normal' file = 'fixed5x8.bdf' + scalable_file = 'FreeMonoBold.ttf' + point_size = '8' /> <text_color id = 'color_normal' @@ -259,7 +271,7 @@ </drawdata> <!-- Buttons at the top and bottom of the scrollbar --> - <drawdata id = 'scrollbar_button_idle' cache = 'false'> + <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' radius = '10' fill = 'none' @@ -269,15 +281,35 @@ <drawstep func = 'triangle' fg_color = 'shadowcolor' fill = 'foreground' - width = 'auto' - height = 'auto' - xpos = 'center' + width = '10' + height = '10' + xpos = 'right' ypos = 'center' + padding = '0,0,2,0' orientation = 'top' /> </drawdata> - <drawdata id = 'scrollbar_button_hover' cache = 'false'> + <drawdata id = 'scrollbar_button_idle' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '10' + fill = 'none' + fg_color = 'darkgray' + stroke = '1' + /> + <drawstep func = 'triangle' + fg_color = 'shadowcolor' + fill = 'foreground' + width = '5' + height = '5' + xpos = 'right' + ypos = 'center' + padding = '0,0,1,0' + orientation = 'top' + /> + </drawdata> + + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' radius = '10' fill = 'gradient' @@ -291,10 +323,30 @@ <drawstep func = 'triangle' fg_color = 'shadowcolor' fill = 'foreground' - width = 'auto' - height = 'auto' - xpos = 'center' + width = '10' + height = '10' + xpos = 'right' + ypos = 'center' + padding = '0,0,2,0' + orientation = 'top' + /> + </drawdata> + + <drawdata id = 'scrollbar_button_hover' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '10' + fill = 'none' + fg_color = 'darkgray' + stroke = '1' + /> + <drawstep func = 'triangle' + fg_color = 'shadowcolor' + fill = 'foreground' + width = '5' + height = '5' + xpos = 'right' ypos = 'center' + padding = '0,0,2,0' orientation = 'top' /> </drawdata> @@ -346,7 +398,7 @@ <!-- Background of the slider widget --> <drawdata id = 'widget_slider' cache = 'false'> <drawstep func = 'roundedsq' - stroke = '0' + stroke = '1' radius = '5' fill = 'foreground' fg_color = 'paleyellow' @@ -392,7 +444,7 @@ </drawdata> <!-- Idle popup --> - <drawdata id = 'popup_idle' cache = 'false'> + <drawdata id = 'popup_idle' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' radius = '5' stroke = '1' @@ -401,15 +453,68 @@ bg_color = 'xtrabrightred' shadow = '2' /> + <drawstep func = 'triangle' bg_color = 'shadowcolor' fill = 'background' - width = 'height' - height = 'auto' + width = '10' + height = '5' xpos = 'right' - ypos = 'center' + ypos = '10' + padding = '0, 0, 6, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 6, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> + + <drawdata id = 'popup_idle' cache = 'false' resolution ='y<400'> + <drawstep func = 'roundedsq' + radius = '5' + stroke = '1' + fg_color = 'lightgray2' + fill = 'background' + bg_color = 'xtrabrightred' + shadow = '2' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '9' + padding = '0, 0, 3, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + <text font = 'text_default' text_color = 'color_normal' vertical_align = 'center' @@ -418,31 +523,86 @@ </drawdata> <!-- Disabled popup --> - <drawdata id = 'popup_disabled' cache = 'false'> + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' + stroke = '1' + fg_color = 'lightgray' radius = '5' - fill = 'foreground' - fg_color = 'darkgray' + fill = 'gradient' + gradient_start = 'blandyellow' + gradient_end = 'xtrabrightred' + shadow = '0' + /> + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '10' + padding = '0, 0, 6, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 6, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal_hover' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> + + <drawdata id = 'popup_disabled' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '5' + stroke = '1' + fg_color = 'lightgray2' + fill = 'background' + bg_color = 'xtrabrightred' shadow = '2' /> + <drawstep func = 'triangle' - fg_color = 'shadowcolor' - fill = 'foreground' - width = 'height' - height = 'auto' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' xpos = 'right' - ypos = 'center' + ypos = '9' + padding = '0, 0, 3, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + <text font = 'text_default' - text_color = 'color_normal_disabled' + text_color = 'color_normal' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> <!-- Hovered popup --> - <drawdata id = 'popup_hover' cache = 'false'> + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y>399'> <drawstep func = 'roundedsq' stroke = '1' fg_color = 'lightgray' @@ -453,20 +613,72 @@ shadow = '0' /> <drawstep func = 'triangle' - fg_color = 'shadowcolor' - fill = 'foreground' - width = 'height' - height = 'auto' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' xpos = 'right' - ypos = 'center' + ypos = '10' + padding = '0, 0, 6, 0' orientation = 'bottom' /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '10' + height = '5' + xpos = 'right' + ypos = '4' + padding = '0, 0, 6, 0' + orientation = 'top' + /> + <text font = 'text_default' text_color = 'color_normal_hover' vertical_align = 'center' horizontal_align = 'left' /> </drawdata> + + <drawdata id = 'popup_hover' cache = 'false' resolution = 'y<400'> + <drawstep func = 'roundedsq' + radius = '5' + stroke = '1' + fg_color = 'lightgray2' + fill = 'background' + bg_color = 'xtrabrightred' + shadow = '2' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '9' + padding = '0, 0, 3, 0' + orientation = 'bottom' + /> + + <drawstep func = 'triangle' + bg_color = 'shadowcolor' + fill = 'background' + width = '7' + height = '4' + xpos = 'right' + ypos = '4' + padding = '0, 0, 3, 0' + orientation = 'top' + /> + + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + </drawdata> <!-- Background of the textedit widget --> <drawdata id = 'widget_textedit' cache = 'false'> @@ -475,6 +687,7 @@ radius = '5' fg_color = 'paleyellow' shadow = '0' + stroke = '1' bevel = '1' bevel_color = 'shadowcolor' /> diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index e77284e5ac..69ad9c79fa 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -403,6 +403,10 @@ <widget name = 'SavePath' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ThemeButton' @@ -411,6 +415,10 @@ <widget name = 'ThemePath' height = 'Globals.Line.Height' /> + <widget name = 'ThemePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'ExtraButton' @@ -419,6 +427,10 @@ <widget name = 'ExtraPath' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> <widget name = 'PluginsButton' @@ -602,6 +614,10 @@ <widget name = 'SavepathText' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Extrapath' @@ -610,6 +626,10 @@ <widget name = 'ExtrapathText' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Gamepath' @@ -813,6 +833,27 @@ </layout> </dialog> + <dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Description1' + width = '320' + height = 'Globals.Line.Height' + /> + <widget name = 'Description2' + height = 'Globals.Line.Height' + /> + <widget name = 'Standard' + type = 'Button' + /> + <widget name = 'Practice' + type = 'Button' + /> + <widget name = 'Expert' + type = 'Button' + /> + </layout> + </dialog> + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> <widget name = 'DirProgressText' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index e95fa2d584..0bfd16c1d9 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -383,6 +383,10 @@ <widget name = 'SavePath' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'ThemeButton' @@ -391,6 +395,10 @@ <widget name = 'ThemePath' height = 'Globals.Line.Height' /> + <widget name = 'ThemePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'ExtraButton' @@ -399,6 +407,10 @@ <widget name = 'ExtraPath' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'PluginsButton' @@ -597,6 +609,10 @@ <widget name = 'SavepathText' height = 'Globals.Line.Height' /> + <widget name = 'SavePathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Extrapath' @@ -605,6 +621,10 @@ <widget name = 'ExtrapathText' height = 'Globals.Line.Height' /> + <widget name = 'ExtraPathClearButton' + height = 'Globals.Line.Height' + width = 'Globals.Line.Height' + /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> <widget name = 'Gamepath' @@ -799,6 +819,27 @@ </layout> </dialog> + <dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'> + <layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> + <widget name = 'Description1' + width = '280' + height = 'Globals.Line.Height' + /> + <widget name = 'Description2' + height = 'Globals.Line.Height' + /> + <widget name = 'Standard' + type = 'Button' + /> + <widget name = 'Practice' + type = 'Button' + /> + <widget name = 'Expert' + type = 'Button' + /> + </layout> + </dialog> + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> <layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'> <widget name = 'DirProgressText' diff --git a/gui/themes/scummmodern/search.bmp b/gui/themes/scummmodern/search.bmp Binary files differindex fa963f8f16..0d2b098445 100644 --- a/gui/themes/scummmodern/search.bmp +++ b/gui/themes/scummmodern/search.bmp diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py index e4e9549265..4c55fd79de 100755 --- a/gui/themes/scummtheme.py +++ b/gui/themes/scummtheme.py @@ -5,7 +5,7 @@ import re import os import zipfile -THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc') +THEME_FILE_EXTENSIONS = ('.stx', '.bmp', '.fcc', '.ttf') def buildTheme(themeName): if not os.path.isdir(themeName) or not os.path.isfile(os.path.join(themeName, "THEMERC")): diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat Binary files differindex 770f76ddf1..65ca204393 100644 --- a/gui/themes/translations.dat +++ b/gui/themes/translations.dat diff --git a/gui/widget.cpp b/gui/widget.cpp index c4d288eb11..0e2fd248b1 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -23,6 +23,7 @@ #include "common/system.h" #include "common/rect.h" #include "common/textconsole.h" +#include "common/translation.h" #include "graphics/pixelformat.h" #include "gui/widget.h" #include "gui/gui-manager.h" @@ -244,16 +245,16 @@ void StaticTextWidget::setValue(int value) { } void StaticTextWidget::setLabel(const Common::String &label) { - if (_label != label) { - _label = label; + if (_label != label) { + _label = label; - // when changing the label, add the CLEARBG flag - // so the widget is completely redrawn, otherwise - // the new text is drawn on top of the old one. - setFlags(WIDGET_CLEARBG); - draw(); - clearFlags(WIDGET_CLEARBG); - } + // when changing the label, add the CLEARBG flag + // so the widget is completely redrawn, otherwise + // the new text is drawn on top of the old one. + setFlags(WIDGET_CLEARBG); + draw(); + clearFlags(WIDGET_CLEARBG); + } } void StaticTextWidget::setAlign(Graphics::TextAlign align) { @@ -302,19 +303,40 @@ void ButtonWidget::setLabel(const Common::String &label) { StaticTextWidget::setLabel(cleanupHotkey(label)); } +ButtonWidget *addClearButton(GuiObject *boss, const Common::String &name, uint32 cmd, int x, int y, int w, int h) { + ButtonWidget *button; + +#ifndef DISABLE_FANCY_THEMES + if (g_gui.xmlEval()->getVar("Globals.ShowSearchPic") == 1 && g_gui.theme()->supportsImages()) { + if (!name.empty()) + button = new PicButtonWidget(boss, name, _("Clear value"), cmd); + else + button = new PicButtonWidget(boss, x, y, w, h, _("Clear value"), cmd); + ((PicButtonWidget *)button)->useThemeTransparency(true); + ((PicButtonWidget *)button)->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEraser)); + } else +#endif + if (!name.empty()) + button = new ButtonWidget(boss, name, "C", _("Clear value"), cmd); + else + button = new ButtonWidget(boss, x, y, w, h, "C", _("Clear value"), cmd); + + return button; +} + #pragma mark - PicButtonWidget::PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const char *tooltip, uint32 cmd, uint8 hotkey) - : Widget(boss, x, y, w, h, tooltip), CommandSender(boss), - _cmd(cmd), _hotkey(hotkey), _gfx(), _alpha(256), _transparency(false) { + : ButtonWidget(boss, x, y, w, h, "", tooltip, cmd, hotkey), + _gfx(), _alpha(256), _transparency(false) { setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG); _type = kButtonWidget; } PicButtonWidget::PicButtonWidget(GuiObject *boss, const Common::String &name, const char *tooltip, uint32 cmd, uint8 hotkey) - : Widget(boss, name, tooltip), CommandSender(boss), - _cmd(cmd), _gfx(), _alpha(256), _transparency(false) { + : ButtonWidget(boss, name, "", tooltip, cmd, hotkey), + _alpha(256), _transparency(false) { setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG); _type = kButtonWidget; } @@ -323,11 +345,6 @@ PicButtonWidget::~PicButtonWidget() { _gfx.free(); } -void PicButtonWidget::handleMouseUp(int x, int y, int button, int clickCount) { - if (isEnabled() && x >= 0 && x < _w && y >= 0 && y < _h) - sendCommand(_cmd, 0); -} - void PicButtonWidget::setGfx(const Graphics::Surface *gfx) { _gfx.free(); diff --git a/gui/widget.h b/gui/widget.h index acd575a90b..789fc09231 100644 --- a/gui/widget.h +++ b/gui/widget.h @@ -197,28 +197,17 @@ protected: }; /* PicButtonWidget */ -class PicButtonWidget : public Widget, public CommandSender { - friend class Dialog; // Needed for the hotkey handling -protected: - uint32 _cmd; - uint8 _hotkey; +class PicButtonWidget : public ButtonWidget { public: PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const char *tooltip = 0, uint32 cmd = 0, uint8 hotkey = 0); PicButtonWidget(GuiObject *boss, const Common::String &name, const char *tooltip = 0, uint32 cmd = 0, uint8 hotkey = 0); ~PicButtonWidget(); - void setCmd(uint32 cmd) { _cmd = cmd; } - uint32 getCmd() const { return _cmd; } - void setGfx(const Graphics::Surface *gfx); void useAlpha(int alpha) { _alpha = alpha; } void useThemeTransparency(bool enable) { _transparency = enable; } - void handleMouseUp(int x, int y, int button, int clickCount); - void handleMouseEntered(int button) { setFlags(WIDGET_HILITED); draw(); } - void handleMouseLeft(int button) { clearFlags(WIDGET_HILITED); draw(); } - protected: void drawWidget(); @@ -365,6 +354,8 @@ protected: void drawWidget(); }; +ButtonWidget *addClearButton(GuiObject *boss, const Common::String &name, uint32 cmd, int x=0, int y=0, int w=0, int h=0); + } // End of namespace GUI #endif diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp index 4a0ee54828..6fae9346b2 100644 --- a/gui/widgets/editable.cpp +++ b/gui/widgets/editable.cpp @@ -238,8 +238,13 @@ void EditableWidget::defaultKeyDownHandler(Common::KeyState &state, bool &dirty, int EditableWidget::getCaretOffset() const { int caretpos = 0; - for (int i = 0; i < _caretPos; i++) - caretpos += g_gui.getCharWidth(_editString[i], _font); + + uint last = 0; + for (int i = 0; i < _caretPos; ++i) { + const uint cur = _editString[i]; + caretpos += g_gui.getCharWidth(cur, _font) + g_gui.getKerningOffset(last, cur, _font); + last = cur; + } caretpos -= _editScrollOffset; @@ -270,6 +275,8 @@ void EditableWidget::drawCaret(bool erase) { if ((uint)_caretPos < _editString.size()) { GUI::EditableWidget::String chr(_editString[_caretPos]); int chrWidth = g_gui.getCharWidth(_editString[_caretPos], _font); + const uint last = (_caretPos > 0) ? _editString[_caretPos - 1] : 0; + x += g_gui.getKerningOffset(last, _editString[_caretPos], _font); g_gui.theme()->drawText(Common::Rect(x, y, x + chrWidth, y + editRect.height() - 2), chr, _state, Graphics::kTextAlignLeft, _inversion, 0, false, _font); } } diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp index d4a4407ee0..4b266e8194 100644 --- a/gui/widgets/edittext.cpp +++ b/gui/widgets/edittext.cpp @@ -26,13 +26,14 @@ namespace GUI { - EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, const char *tooltip, uint32 cmd, uint32 finishCmd) +EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, const char *tooltip, uint32 cmd, uint32 finishCmd) : EditableWidget(boss, x, y - 1, w, h + 2, tooltip, cmd) { setFlags(WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE); _type = kEditTextWidget; _finishCmd = finishCmd; setEditString(text); + setFontStyle(ThemeEngine::kFontStyleNormal); } EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String &text, const char *tooltip, uint32 cmd, uint32 finishCmd) @@ -42,6 +43,7 @@ EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String _finishCmd = finishCmd; setEditString(text); + setFontStyle(ThemeEngine::kFontStyleNormal); } void EditTextWidget::setEditString(const String &str) { @@ -67,10 +69,13 @@ void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount) { int width = 0; uint i; + uint last = 0; for (i = 0; i < _editString.size(); ++i) { - width += g_gui.theme()->getCharWidth(_editString[i], _font); + const uint cur = _editString[i]; + width += g_gui.getCharWidth(cur, _font) + g_gui.getKerningOffset(last, cur, _font); if (width >= x) break; + last = cur; } if (setCaretPos(i)) draw(); diff --git a/gui/widgets/list.cpp b/gui/widgets/list.cpp index 2a0d4afff0..13784ddf7f 100644 --- a/gui/widgets/list.cpp +++ b/gui/widgets/list.cpp @@ -220,6 +220,7 @@ void ListWidget::scrollBarRecalc() { void ListWidget::handleTickle() { if (_editMode) EditableWidget::handleTickle(); + _scrollBar->handleTickle(); } void ListWidget::handleMouseDown(int x, int y, int button, int clickCount) { diff --git a/gui/widgets/scrollbar.cpp b/gui/widgets/scrollbar.cpp index e0dbcec59c..c7c17bc908 100644 --- a/gui/widgets/scrollbar.cpp +++ b/gui/widgets/scrollbar.cpp @@ -45,28 +45,8 @@ ScrollBarWidget::ScrollBarWidget(GuiObject *boss, int x, int y, int w, int h) _numEntries = 0; _entriesPerPage = 0; _currentPos = 0; -} - -static void upArrowRepeater(void *ref) { - ScrollBarWidget *sb = (ScrollBarWidget *)ref; - int old_pos = sb->_currentPos; - - sb->_currentPos -= 3; - sb->checkBounds(old_pos); - - g_system->getTimerManager()->removeTimerProc(&upArrowRepeater); - g_system->getTimerManager()->installTimerProc(&upArrowRepeater, 1000000/10, ref, "guiScrollBarUp"); -} - -static void downArrowRepeater(void *ref) { - ScrollBarWidget *sb = (ScrollBarWidget *)ref; - int old_pos = sb->_currentPos; - sb->_currentPos += 3; - sb->checkBounds(old_pos); - - g_system->getTimerManager()->removeTimerProc(&downArrowRepeater); - g_system->getTimerManager()->installTimerProc(&downArrowRepeater, 1000000/10, ref, "guiScrollBarDown"); + _repeatTimer = 0; } void ScrollBarWidget::handleMouseDown(int x, int y, int button, int clickCount) { @@ -79,13 +59,13 @@ void ScrollBarWidget::handleMouseDown(int x, int y, int button, int clickCount) if (y <= UP_DOWN_BOX_HEIGHT) { // Up arrow _currentPos--; + _repeatTimer = g_system->getMillis() + kRepeatInitialDelay; _draggingPart = kUpArrowPart; - g_system->getTimerManager()->installTimerProc(&upArrowRepeater, 1000000/2, this, "guiScrollBarUp"); } else if (y >= _h - UP_DOWN_BOX_HEIGHT) { // Down arrow _currentPos++; + _repeatTimer = g_system->getMillis() + kRepeatInitialDelay; _draggingPart = kDownArrowPart; - g_system->getTimerManager()->installTimerProc(&downArrowRepeater, 1000000/2, this, "guiScrollBarDown"); } else if (y < _sliderPos) { _currentPos -= _entriesPerPage - 1; } else if (y >= _sliderPos + _sliderHeight) { @@ -101,9 +81,7 @@ void ScrollBarWidget::handleMouseDown(int x, int y, int button, int clickCount) void ScrollBarWidget::handleMouseUp(int x, int y, int button, int clickCount) { _draggingPart = kNoPart; - - g_system->getTimerManager()->removeTimerProc(&upArrowRepeater); - g_system->getTimerManager()->removeTimerProc(&downArrowRepeater); + _repeatTimer = 0; } void ScrollBarWidget::handleMouseWheel(int x, int y, int direction) { @@ -160,23 +138,21 @@ void ScrollBarWidget::handleMouseMoved(int x, int y, int button) { } void ScrollBarWidget::handleTickle() { -/* - // FIXME/TODO - this code is supposed to allow for "click-repeat" (like key repeat), - // i.e. if you click on one of the arrows and keep clicked, it will scroll - // continuously. However, just like key repeat, this requires two delays: - // First an "initial" delay that has to pass before repeating starts (otherwise - // it is near to impossible to achieve single clicks). Secondly, a repeat delay - // that determines how often per second a click is simulated. - int old_pos = _currentPos; + if (_repeatTimer) { + const uint32 curTime = g_system->getMillis(); + if (curTime >= _repeatTimer) { + const int old_pos = _currentPos; - if (_draggingPart == kUpArrowPart) - _currentPos--; - else if (_draggingPart == kDownArrowPart) - _currentPos++; + if (_part == kUpArrowPart) + _currentPos -= 3; + else if (_part == kDownArrowPart) + _currentPos += 3; - // Make sure that _currentPos is still inside the bounds - checkBounds(old_pos); -*/ + checkBounds(old_pos); + + _repeatTimer = curTime + kRepeatDelay; + } + } } void ScrollBarWidget::checkBounds(int old_pos) { diff --git a/gui/widgets/scrollbar.h b/gui/widgets/scrollbar.h index 3b248ce8a4..1c9f371cbc 100644 --- a/gui/widgets/scrollbar.h +++ b/gui/widgets/scrollbar.h @@ -49,6 +49,12 @@ protected: Part _draggingPart; int _sliderDeltaMouseDownPos; + enum { + kRepeatInitialDelay = 500, + kRepeatDelay = 100 + }; + uint32 _repeatTimer; + public: int _numEntries; int _entriesPerPage; |
