diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/ThemeEngine.cpp | 23 | ||||
| -rw-r--r-- | gui/ThemeEngine.h | 9 | ||||
| -rw-r--r-- | gui/about.cpp | 7 | ||||
| -rw-r--r-- | gui/credits.h | 9 | ||||
| -rw-r--r-- | gui/object.cpp | 2 | ||||
| -rw-r--r-- | gui/object.h | 7 | ||||
| -rw-r--r-- | gui/themes/default.inc | 2892 | ||||
| -rw-r--r-- | gui/themes/scummclassic.zip | bin | 110000 -> 113348 bytes | |||
| -rw-r--r-- | gui/themes/scummmodern.zip | bin | 1485763 -> 1489429 bytes | |||
| -rw-r--r-- | gui/themes/scummmodern/scummmodern_gfx.stx | 42 | ||||
| -rwxr-xr-x | gui/themes/scummtheme.py | 17 | ||||
| -rw-r--r-- | gui/widgets/editable.cpp | 2 | ||||
| -rw-r--r-- | gui/widgets/edittext.cpp | 8 |
13 files changed, 1531 insertions, 1487 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 561c0244a2..688654d208 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -122,15 +122,16 @@ protected: class ThemeItemTextData : public ThemeItem { public: - ThemeItemTextData(ThemeEngine *engine, const TextDrawData *data, const TextColorData *color, const Common::Rect &area, const Common::String &text, - Graphics::TextAlign alignH, GUI::ThemeEngine::TextAlignVertical alignV, + ThemeItemTextData(ThemeEngine *engine, const TextDrawData *data, const TextColorData *color, const Common::Rect &area, const Common::Rect &textDrawableArea, + const Common::String &text, Graphics::TextAlign alignH, GUI::ThemeEngine::TextAlignVertical alignV, bool ellipsis, bool restoreBg, int deltaX) : ThemeItem(engine, area), _data(data), _color(color), _text(text), _alignH(alignH), _alignV(alignV), - _ellipsis(ellipsis), _restoreBg(restoreBg), _deltax(deltaX) {} + _ellipsis(ellipsis), _restoreBg(restoreBg), _deltax(deltaX), _textDrawableArea(textDrawableArea) {} void drawSelf(bool draw, bool restore); protected: + Common::Rect _textDrawableArea; const TextDrawData *_data; const TextColorData *_color; Common::String _text; @@ -246,7 +247,7 @@ void ThemeItemTextData::drawSelf(bool draw, bool restore) { if (draw) { _engine->renderer()->setFgColor(_color->r, _color->g, _color->b); - _engine->renderer()->drawString(_data->_fontPtr, _text, _area, _alignH, _alignV, _deltax, _ellipsis); + _engine->renderer()->drawString(_data->_fontPtr, _text, _area, _alignH, _alignV, _deltax, _ellipsis, _textDrawableArea); } _engine->addDirtyRect(_area); @@ -521,6 +522,12 @@ void ThemeEngine::setGraphicsMode(GraphicsMode mode) { delete _vectorRenderer; _vectorRenderer = Graphics::createRenderer(mode); _vectorRenderer->setSurface(&_screen); + + // Since we reinitialized our screen surfaces we know nothing has been + // drawn so far. Sometimes we still end up with dirty screen bits in the + // list. Clearing it avoids invalid overlay writes when the backend + // resizes the overlay. + _dirtyScreen.clear(); } void WidgetDrawData::calcBackgroundOffset() { @@ -836,7 +843,7 @@ void ThemeEngine::queueDD(DrawData type, const Common::Rect &r, uint32 dynamic, } void ThemeEngine::queueDDText(TextData type, TextColor color, const Common::Rect &r, const Common::String &text, bool restoreBg, - bool ellipsis, Graphics::TextAlign alignH, TextAlignVertical alignV, int deltax) { + bool ellipsis, Graphics::TextAlign alignH, TextAlignVertical alignV, int deltax, const Common::Rect &drawableTextArea) { if (_texts[type] == 0) return; @@ -844,7 +851,7 @@ void ThemeEngine::queueDDText(TextData type, TextColor color, const Common::Rect Common::Rect area = r; area.clip(_screen.w, _screen.h); - ThemeItemTextData *q = new ThemeItemTextData(this, _texts[type], _textColors[color], area, text, alignH, alignV, ellipsis, restoreBg, deltax); + ThemeItemTextData *q = new ThemeItemTextData(this, _texts[type], _textColors[color], area, drawableTextArea, text, alignH, alignV, ellipsis, restoreBg, deltax); if (_buffering) { _screenQueue.push_back(q); @@ -1115,7 +1122,7 @@ void ThemeEngine::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, co } } -void ThemeEngine::drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, Graphics::TextAlign align, TextInversionState inverted, int deltax, bool useEllipsis, FontStyle font, FontColor color, bool restore) { +void ThemeEngine::drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, Graphics::TextAlign align, TextInversionState inverted, int deltax, bool useEllipsis, FontStyle font, FontColor color, bool restore, const Common::Rect &drawableTextArea) { if (!ready()) return; @@ -1185,7 +1192,7 @@ void ThemeEngine::drawText(const Common::Rect &r, const Common::String &str, Wid break; } - queueDDText(textId, colorId, r, str, restore, useEllipsis, align, kTextAlignVCenter, deltax); + queueDDText(textId, colorId, r, str, restore, useEllipsis, align, kTextAlignVCenter, deltax, drawableTextArea); } void ThemeEngine::drawChar(const Common::Rect &r, byte ch, const Graphics::Font *font, WidgetStateInfo state, FontColor color) { diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index c0e47a19e6..4dffb13e71 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -29,6 +29,7 @@ #include "common/hashmap.h" #include "common/list.h" #include "common/str.h" +#include "common/rect.h" #include "graphics/surface.h" #include "graphics/font.h" @@ -39,10 +40,6 @@ class OSystem; -namespace Common { -struct Rect; -} - namespace Graphics { struct DrawStep; class VectorRenderer; @@ -376,7 +373,7 @@ public: void drawDialogBackground(const Common::Rect &r, DialogBackground type, WidgetStateInfo state = kStateEnabled); - void drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state = kStateEnabled, Graphics::TextAlign align = Graphics::kTextAlignCenter, TextInversionState inverted = kTextInversionNone, int deltax = 0, bool useEllipsis = true, FontStyle font = kFontStyleBold, FontColor color = kFontColorNormal, bool restore = true); + void drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state = kStateEnabled, Graphics::TextAlign align = Graphics::kTextAlignCenter, TextInversionState inverted = kTextInversionNone, int deltax = 0, bool useEllipsis = true, FontStyle font = kFontStyleBold, FontColor color = kFontColorNormal, bool restore = true, const Common::Rect &drawableTextArea = Common::Rect(0, 0, 0, 0)); void drawChar(const Common::Rect &r, byte ch, const Graphics::Font *font, WidgetStateInfo state = kStateEnabled, FontColor color = kFontColorNormal); @@ -588,7 +585,7 @@ protected: */ void queueDD(DrawData type, const Common::Rect &r, uint32 dynamic = 0, bool restore = false); void queueDDText(TextData type, TextColor color, const Common::Rect &r, const Common::String &text, bool restoreBg, - bool elipsis, Graphics::TextAlign alignH = Graphics::kTextAlignLeft, TextAlignVertical alignV = kTextAlignVTop, int deltax = 0); + bool elipsis, Graphics::TextAlign alignH = Graphics::kTextAlignLeft, TextAlignVertical alignV = kTextAlignVTop, int deltax = 0, const Common::Rect &drawableTextArea = Common::Rect(0, 0, 0, 0)); void queueBitmap(const Graphics::Surface *bitmap, const Common::Rect &r, bool alpha); /** diff --git a/gui/about.cpp b/gui/about.cpp index 20145886c6..3bb1934e28 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -180,9 +180,10 @@ void AboutDialog::close() { } void AboutDialog::drawDialog() { -// g_gui.theme()->setDrawArea(Common::Rect(_x, _y, _x+_w, _y+_h)); Dialog::drawDialog(); + setTextDrawableArea(Common::Rect(_x, _y, _x + _w, _y + _h)); + // Draw text // TODO: Add a "fade" effect for the top/bottom text lines // TODO: Maybe prerender all of the text into another surface, @@ -239,8 +240,8 @@ void AboutDialog::drawDialog() { while (*str && *str == ' ') str++; - if (*str && y > _y && y + g_gui.theme()->getFontHeight() < _y + _h) - g_gui.theme()->drawText(Common::Rect(_x + _xOff, y, _x + _w - _xOff, y + g_gui.theme()->getFontHeight()), str, state, align, ThemeEngine::kTextInversionNone, 0, false); + if (*str) + g_gui.theme()->drawText(Common::Rect(_x + _xOff, y, _x + _w - _xOff, y + g_gui.theme()->getFontHeight()), str, state, align, ThemeEngine::kTextInversionNone, 0, false, ThemeEngine::kFontStyleBold, ThemeEngine::kFontColorNormal, true, _textDrawableArea); y += _lineHeight; } } diff --git a/gui/credits.h b/gui/credits.h index 70f79ac9a5..3a4d7769f6 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -170,6 +170,15 @@ static const char *credits[] = { "C0""Eugene Sandulenko", "C0""David Turner", "", +"C1""Mortevielle", +"A0""Arnaud Boutonne", +"C0""Arnaud Boutonn\351", +"C0""Paul Gilbert", +"", +"C1""Neverhood", +"C0""Benjamin Haisch", +"C0""Filippos Karapetis", +"", "C1""Parallaction", "C0""peres", "", diff --git a/gui/object.cpp b/gui/object.cpp index 73c4f74d6c..189a286ead 100644 --- a/gui/object.cpp +++ b/gui/object.cpp @@ -29,7 +29,7 @@ namespace GUI { GuiObject::GuiObject(const Common::String &name) - : _x(-1000), _y(-1000), _w(0), _h(0), _name(name), _firstWidget(0) { + : _x(-1000), _y(-1000), _w(0), _h(0), _name(name), _firstWidget(0), _textDrawableArea(Common::Rect(0, 0, 0, 0)) { reflowLayout(); } diff --git a/gui/object.h b/gui/object.h index bce3cd7846..dac3341b5a 100644 --- a/gui/object.h +++ b/gui/object.h @@ -24,6 +24,7 @@ #include "common/scummsys.h" #include "common/str.h" +#include "common/rect.h" namespace GUI { @@ -59,6 +60,8 @@ class Widget; class GuiObject : public CommandReceiver { friend class Widget; protected: + Common::Rect _textDrawableArea; + int16 _x, _y; uint16 _w, _h; const Common::String _name; @@ -66,10 +69,12 @@ protected: Widget *_firstWidget; public: - GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _firstWidget(0) { } + GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _firstWidget(0), _textDrawableArea(Common::Rect(0, 0, 0, 0)) { } GuiObject(const Common::String &name); ~GuiObject(); + virtual void setTextDrawableArea(const Common::Rect &r) { _textDrawableArea = r; } + virtual int16 getAbsX() const { return _x; } virtual int16 getAbsY() const { return _y; } virtual int16 getChildX() const { return getAbsX(); } diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 1b6ae3ec27..352cc86852 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -1,142 +1,142 @@ "<?xml version = '1.0'?>" -"<render_info> " -"<palette> " +"<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> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</drawdata>" +"<drawdata id='text_selection_focus' cache='false'>" "<drawstep func='square' " "fill='foreground' " "fg_color='green' " -"/> " -"</drawdata> " -"<drawdata id='mainmenu_bg' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='mainmenu_bg' cache='false'>" "<drawstep func='fill' " "fill='foreground' " "fg_color='black' " -"/> " -"</drawdata> " -"<drawdata id='special_bg' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='special_bg' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='tooltip_bg' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='tooltip_bg' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " "fill='foreground' " "fg_color='black' " -"/> " -"</drawdata> " -"<drawdata id='separator' cache='false'> " +"/>" +"</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'> " +"/>" +"</drawdata>" +"<drawdata id='scrollbar_base' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_handle_hover' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='scrollbar_handle_hover' cache='false'>" "<drawstep func='square' " "fill='foreground' " "fg_color='green2' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_handle_idle' cache='false'> " +"/>" +"</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'> " +"/>" +"</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' " @@ -146,13 +146,13 @@ "ypos='center' " "padding='0,0,3,0' " "orientation='top' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'> " +"/>" +"</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' " @@ -162,13 +162,13 @@ "ypos='center' " "padding='0,0,2,0' " "orientation='top' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'> " +"/>" +"</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' " @@ -178,13 +178,13 @@ "ypos='center' " "padding='0,0,3,0' " "orientation='top' " -"/> " -"</drawdata> " -"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'> " +"/>" +"</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' " @@ -194,69 +194,69 @@ "ypos='center' " "padding='0,0,2,0' " "orientation='top' " -"/> " -"</drawdata> " -"<drawdata id='tab_active' cache='false'> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</drawdata>" +"<drawdata id='slider_disabled' cache='false'>" "<drawstep func='square' " "fill='foreground' " "fg_color='lightgrey' " -"/> " -"</drawdata> " -"<drawdata id='slider_full' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='slider_full' cache='false'>" "<drawstep func='square' " "fill='foreground' " "fg_color='green' " -"/> " -"</drawdata> " -"<drawdata id='slider_hover' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='slider_hover' cache='false'>" "<drawstep func='square' " "fill='foreground' " "fg_color='green2' " -"/> " -"</drawdata> " -"<drawdata id='widget_small' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='widget_small' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " "fill='none' " -"/> " -"</drawdata> " -"<drawdata id='popup_idle' cache='false' resolution='y>399'> " +"/>" +"</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' " @@ -266,7 +266,7 @@ "ypos='10' " "padding='0,0,7,0' " "orientation='bottom' " -"/> " +"/>" "<drawstep func='triangle' " "fg_color='green' " "fill='foreground' " @@ -276,18 +276,18 @@ "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'> " +"/>" +"</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' " @@ -297,7 +297,7 @@ "ypos='9' " "padding='0,0,3,0' " "orientation='bottom' " -"/> " +"/>" "<drawstep func='triangle' " "fg_color='green' " "fill='foreground' " @@ -307,18 +307,18 @@ "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'> " +"/>" +"</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' " @@ -328,7 +328,7 @@ "ypos='10' " "padding='0,0,7,0' " "orientation='bottom' " -"/> " +"/>" "<drawstep func='triangle' " "fg_color='green' " "fill='foreground' " @@ -338,18 +338,18 @@ "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'> " +"/>" +"</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' " @@ -359,7 +359,7 @@ "ypos='9' " "padding='0,0,3,0' " "orientation='bottom' " -"/> " +"/>" "<drawstep func='triangle' " "fg_color='green' " "fill='foreground' " @@ -369,18 +369,18 @@ "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'> " +"/>" +"</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' " @@ -390,7 +390,7 @@ "ypos='10' " "padding='0,0,7,0' " "orientation='bottom' " -"/> " +"/>" "<drawstep func='triangle' " "fg_color='green' " "fill='foreground' " @@ -400,18 +400,18 @@ "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'> " +"/>" +"</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' " @@ -421,7 +421,7 @@ "ypos='9' " "padding='0,0,3,0' " "orientation='bottom' " -"/> " +"/>" "<drawstep func='triangle' " "fg_color='green' " "fill='foreground' " @@ -431,123 +431,123 @@ "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'> " +"/>" +"</drawdata>" +"<drawdata id='widget_textedit' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " "fill='none' " -"/> " -"</drawdata> " -"<drawdata id='plain_bg' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='plain_bg' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='caret' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='caret' cache='false'>" "<drawstep func='square' " "fill='foreground' " "fg_color='lightgrey' " -"/> " -"</drawdata> " -"<drawdata id='default_bg' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='default_bg' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='button_pressed' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='button_pressed' cache='false'>" "<text font='text_button' " "text_color='color_alternative_inverted' " "vertical_align='center' " "horizontal_align='center' " -"/> " +"/>" "<drawstep func='square' " "fill='foreground' " "fg_color='green' " -"/> " -"</drawdata> " -"<drawdata id='button_idle' cache='false'> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</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'> " +"/>" +"</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' " @@ -556,14 +556,14 @@ "bg_color='darkgrey' " "xpos='0' " "ypos='0' " -"/> " -"</drawdata> " -"<drawdata id='radiobutton_selected' cache='false'> " +"/>" +"</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' " @@ -572,7 +572,7 @@ "fill='none' " "xpos='0' " "ypos='0' " -"/> " +"/>" "<drawstep func='circle' " "width='7' " "height='7' " @@ -581,14 +581,14 @@ "fill='foreground' " "xpos='2' " "ypos='2' " -"/> " -"</drawdata> " -"<drawdata id='radiobutton_disabled' cache='false'> " +"/>" +"</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' " @@ -597,2510 +597,2510 @@ "fill='background' " "xpos='0' " "ypos='0' " -"/> " -"</drawdata> " -"<drawdata id='widget_default' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='widget_default' cache='false'>" "<drawstep func='bevelsq' " "bevel='2' " -"/> " -"</drawdata> " -"<drawdata id='widget_small' cache='false'> " +"/>" +"</drawdata>" +"<drawdata id='widget_small' cache='false'>" "<drawstep func='square' " "stroke='0' " -"/> " -"</drawdata> " -"</render_info> " -"<layout_info resolution='y>399'> " -"<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='ShowLauncherLogo' value='0'/> " -"<def var='ShowGlobalMenuLogo' value='0'/> " -"<def var='ShowSearchPic' value='0'/> " -"<def var='ShowChooserPics' value='0'/> " -"<def var='ShowChooserPageDisplay' value='1'/> " -"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/> " -"<def var='RecorderDialog.ExtInfo.Visible' value='1'/> " -"<def var='OnScreenDialog.ShowPics' value='0'/> " -"<def var='KeyMapper.Spacing' value='10'/> " -"<def var='KeyMapper.LabelWidth' value='100'/> " -"<def var='KeyMapper.ButtonWidth' value='80'/> " -"<def var='Tooltip.MaxWidth' value='200'/> " +"/>" +"</drawdata>" +"</render_info>" +"<layout_info resolution='y>399'>" +"<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='ShowLauncherLogo' value='0'/>" +"<def var='ShowGlobalMenuLogo' value='0'/>" +"<def var='ShowSearchPic' value='0'/>" +"<def var='ShowChooserPics' value='0'/>" +"<def var='ShowChooserPageDisplay' value='1'/>" +"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/>" +"<def var='RecorderDialog.ExtInfo.Visible' value='1'/>" +"<def var='OnScreenDialog.ShowPics' value='0'/>" +"<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='Predictive.Button.Width' value='60' /> " +"<def var='Tooltip.YDelta' value='16'/>" +"<def var='Predictive.Button.Width' value='60' />" "<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' " -"/> " +"/>" "<widget name='PopUp' " "size='-1,19' " -"/> " +"/>" "<widget name='Checkbox' " "size='-1,14' " -"/> " +"/>" "<widget name='Radiobutton' " "size='-1,Globals.Line.Height' " -"/> " +"/>" "<widget name='ListWidget' " "padding='5,0,8,0' " -"/> " +"/>" "<widget name='PopUpWidget' " "padding='7,5,0,0' " -"/> " +"/>" "<widget name='EditTextWidget' " "padding='5,5,0,0' " -"/> " +"/>" "<widget name='Console' " "padding='7,5,5,5' " -"/> " +"/>" "<widget name='Scrollbar' " "size='15,0' " -"/> " +"/>" "<widget name='TabWidget.Tab' " "size='75,27' " "padding='0,0,8,0' " -"/> " +"/>" "<widget name='TabWidget.Body' " "padding='0,0,0,0' " -"/> " +"/>" "<widget name='TabWidget.NavButton' " "size='15,18' " "padding='0,3,4,0' " -"/> " +"/>" "<widget name='EditRecordLabel' " "size='60,25' " -"/> " +"/>" "<widget name='EditRecord' " "size='240,25' " -"/> " -"</globals> " -"<dialog name='Launcher' overlays='screen'> " -"<layout type='vertical' center='true' padding='16,16,8,8'> " +"/>" +"</globals>" +"<dialog name='Launcher' overlays='screen'>" +"<layout type='vertical' center='true' padding='16,16,8,8'>" "<widget name='Version' " "height='Globals.Line.Height' " "textalign='center' " -"/> " -"<layout type='horizontal' spacing='5' padding='10,0,0,0'> " +"/>" +"<layout type='horizontal' spacing='5' padding='10,0,0,0'>" "<widget name='SearchDesc' " "width='60' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='Search' " "width='150' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='SearchClearButton' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " -"<space /> " -"</layout> " -"<widget name='GameList'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"/>" +"<space />" +"</layout>" +"<widget name='GameList'/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10'>" "<widget name='LoadGameButton' " "height='20' " -"/> " +"/>" "<widget name='AddGameButton' " "height='20' " -"/> " +"/>" "<widget name='EditGameButton' " "height='20' " -"/> " +"/>" "<widget name='RemoveGameButton' " "height='20' " -"/> " -"</layout> " -"<space size='4'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"/>" +"</layout>" +"<space size='4'/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10'>" "<widget name='QuitButton' " "height='20' " -"/> " +"/>" "<widget name='AboutButton' " "height='20' " -"/> " +"/>" "<widget name='OptionsButton' " "height='20' " -"/> " +"/>" "<widget name='StartButton' " "height='20' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'>" +"<layout type='vertical' padding='8,8,8,8'>" "<widget name='Headline' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='Path' " "height='Globals.Line.Height' " -"/> " -"<widget name='List'/> " -"<layout type='vertical' padding='0,0,16,0'> " +"/>" +"<widget name='List'/>" +"<layout type='vertical' padding='0,0,16,0'>" "<widget name='Hidden' " "type='Checkbox' " -"/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='Up' " "type='Button' " -"/> " -"<space/> " +"/>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Choose' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> " -"<layout type='vertical' padding='0,0,0,0'> " -"<widget name='TabWidget'/> " -"<layout type='horizontal' padding='16,16,16,16'> " -"<space/> " +"/>" +"</layout>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'>" +"<layout type='vertical' padding='0,0,0,0'>" +"<widget name='TabWidget'/>" +"<layout type='horizontal' padding='16,16,16,16'>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</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>" +"</layout>" +"</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'>" "<widget name='grModePopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='grModePopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='grRenderPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='grRenderPopup' " "type='PopUp' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='grAspectCheckbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='grFullscreenCheckbox' " "type='Checkbox' " -"/> " -"</layout> " -"</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>" +"</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'>" "<widget name='auMidiPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auMidiPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='auOPLPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auOPLPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='auSampleRatePopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auSampleRatePopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10'>" "<widget name='subToggleDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='subToggleSpeechOnly' " "type='Radiobutton' " -"/> " +"/>" "<widget name='subToggleSubOnly' " "type='Radiobutton' " -"/> " +"/>" "<widget name='subToggleSubBoth' " "type='Radiobutton' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10'>" "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='subSubtitleSpeedSlider' " "type='Slider' " -"/> " +"/>" "<widget name='subSubtitleSpeedLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"</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>" +"</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'>" "<widget name='vcMusicText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcMusicSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcMusicLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='vcSfxText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSfxSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSfxLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='vcSpeechText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSpeechSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSpeechLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"</layout> " -"<layout type='vertical' padding='24,0,24,0' center='true'> " +"/>" +"</layout>" +"</layout>" +"<layout type='vertical' padding='24,0,24,0' center='true'>" "<widget name='vcMuteCheckbox' " "type='Checkbox' " -"/> " -"</layout> " -"</layout> " -"</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>" +"</layout>" +"</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'>" "<widget name='auPrefGmPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auPrefGmPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='mcFontButton' " "type='Button' " -"/> " +"/>" "<widget name='mcFontPath' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='mcFontClearButton' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='mcMixedCheckbox' " "type='Checkbox' " -"/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='mcMidiGainText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='mcMidiGainSlider' " "type='Slider' " -"/> " +"/>" "<widget name='mcMidiGainLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='mcFluidSynthSettings' " "width='200' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"</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>" +"</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'>" "<widget name='auPrefMt32PopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auPrefMt32Popup' " "type='PopUp' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='mcMt32Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='mcGSCheckbox' " "type='Checkbox' " -"/> " -"</layout> " -"</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>" +"</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'>" "<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>" +"<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='10' center='true'> " +"/>" +"</layout>" +"<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'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='16'>" "<widget name='PluginsButton' " "type='Button' " -"/> " +"/>" "<widget name='PluginsPath' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"</layout> " -"</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>" +"</layout>" +"</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'>" "<widget name='ThemeButton' " "type='Button' " -"/> " +"/>" "<widget name='CurTheme' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='RendererPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='RendererPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='AutosavePeriodPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='AutosavePeriodPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='GuiLanguagePopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='GuiLanguagePopup' " "type='PopUp' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='KeysButton' " "type='Button' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>" +"<layout type='vertical' padding='8,8,8,8' center='true'>" "<widget name='Action' " "height='Globals.Line.Height' " -"/> " -"<widget name='List'/> " +"/>" +"<widget name='List'/>" "<widget name='Mapping' " "height='Globals.Line.Height' " -"/> " -"<space size='Globals.Line.Height'/> " -"<layout type='horizontal'> " +"/>" +"<space size='Globals.Line.Height'/>" +"<layout type='horizontal'>" "<widget name='Map' " "type='Button' " -"/> " -"<space/> " +"/>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<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='16,16,16,4'> " -"<space/> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<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='16,16,16,4'>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_Graphics' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"/>" +"<import layout='Dialog.GlobalOptions_Graphics' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_Audio' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"/>" +"<import layout='Dialog.GlobalOptions_Audio' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_MIDI' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"/>" +"<import layout='Dialog.GlobalOptions_MIDI' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_MT32' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"/>" +"<import layout='Dialog.GlobalOptions_MT32' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_Volume' /> " -"</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'> " +"/>" +"<import layout='Dialog.GlobalOptions_Volume' />" +"</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'>" "<widget name='Id' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='Domain' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='Name' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='Desc' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='LangPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='LangPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='PlatformPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='PlatformPopup' " "type='PopUp' " -"/> " -"</layout> " -"</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>" +"</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'>" "<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>" +"<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='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='Gamepath' " "type='Button' " -"/> " +"/>" "<widget name='GamepathText' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " -"<layout type='vertical' padding='16,16,16,16'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'>" +"<layout type='vertical' padding='16,16,16,16'>" "<widget name='customOption1Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption2Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption3Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption4Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption5Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption6Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption7Checkbox' " "type='Checkbox' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='GlobalMenu' overlays='screen_center'> " -"<layout type='vertical' padding='16,16,16,16' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='GlobalMenu' overlays='screen_center'>" +"<layout type='vertical' padding='16,16,16,16' center='true'>" "<widget name='Title' " "width='210' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='Version' " "width='210' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='Resume' " "width='150' " "height='Globals.Button.Height' " -"/> " -"<space size='10'/> " +"/>" +"<space size='10'/>" "<widget name='Load' " "width='150' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Save' " "width='150' " "height='Globals.Button.Height' " -"/> " -"<space size='10'/> " +"/>" +"<space size='10'/>" "<widget name='Options' " "width='150' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Help' " "width='150' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='About' " "width='150' " "height='Globals.Button.Height' " -"/> " -"<space size='10'/> " +"/>" +"<space size='10'/>" "<widget name='RTL' " "width='150' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Quit' " "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'> " -"<layout type='vertical' padding='0,0,0,0' center='true'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"/>" +"</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'>" "<widget name='vcMusicText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcMusicSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcMusicLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='8'>" "<widget name='vcSfxText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSfxSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSfxLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='8'>" "<widget name='vcSpeechText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSpeechSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSpeechLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"</layout> " -"<layout type='vertical' padding='24,24,24,24' center='true'> " +"/>" +"</layout>" +"</layout>" +"<layout type='vertical' padding='24,24,24,24' center='true'>" "<widget name='vcMuteCheckbox' " "type='Checkbox' " "width='80' " -"/> " -"</layout> " -"</layout> " -"<space size='8' /> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"/>" +"</layout>" +"</layout>" +"<space size='8' />" +"<layout type='horizontal' padding='0,0,0,0' spacing='10'>" "<widget name='subToggleDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='subToggleSpeechOnly' " "type='Radiobutton' " "width='100' " -"/> " +"/>" "<widget name='subToggleSubOnly' " "type='Radiobutton' " "width='100' " -"/> " +"/>" "<widget name='subToggleSubBoth' " "type='Radiobutton' " "width='100' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10'>" "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='subSubtitleSpeedSlider' " "type='Slider' " -"/> " +"/>" "<widget name='subSubtitleSpeedLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<space size='60'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10'> " +"/>" +"</layout>" +"<space size='60'/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10'>" "<widget name='Keys' " "type='Button' " -"/> " -"<space size='Globals.Button.Width' /> " +"/>" +"<space size='Globals.Button.Width' />" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'> " -"<layout type='vertical' padding='0,0,0,0'> " -"<widget name='TabWidget'/> " -"<layout type='horizontal' padding='16,16,16,16'> " -"<space/> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>" +"<layout type='vertical' padding='0,0,0,0'>" +"<widget name='TabWidget'/>" +"<layout type='horizontal' padding='16,16,16,16'>" +"<space/>" "<widget name='ResetSettings' " "type='Button' " -"/> " +"/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='VoiceCountText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='VoiceCountSlider' " "type='Slider' " -"/> " +"/>" "<widget name='VoiceCountLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='LevelText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='LevelSlider' " "type='Slider' " -"/> " +"/>" "<widget name='LevelLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='SpeedText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='SpeedSlider' " "type='Slider' " -"/> " +"/>" "<widget name='SpeedLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='DepthText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='DepthSlider' " "type='Slider' " -"/> " +"/>" "<widget name='DepthLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='WaveFormTypeText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='WaveFormType' " "type='PopUp' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='RoomSizeText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='RoomSizeSlider' " "type='Slider' " -"/> " +"/>" "<widget name='RoomSizeLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='DampingText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='DampingSlider' " "type='Slider' " -"/> " +"/>" "<widget name='DampingLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='WidthText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='WidthSlider' " "type='Slider' " -"/> " +"/>" "<widget name='WidthLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='LevelText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='LevelSlider' " "type='Slider' " -"/> " +"/>" "<widget name='LevelLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='8'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='8'>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='InterpolationText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='Interpolation' " "type='PopUp' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> " -"<layout type='vertical' padding='8,8,8,32' center='true'> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'>" +"<layout type='vertical' padding='8,8,8,32' center='true'>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='Title' " "height='Globals.Line.Height' " -"/> " -"<space/> " +"/>" +"<space/>" "<widget name='PageDisplay' " "width='200' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,16' spacing='16'> " -"<widget name='List' /> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,16' spacing='16'>" +"<widget name='List' />" "<widget name='Thumbnail' " "width='180' " "height='200' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='ListSwitch' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " +"/>" "<widget name='GridSwitch' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " -"<space/> " +"/>" +"<space/>" "<widget name='Delete' " "type='Button' " -"/> " -"<space size='32'/> " +"/>" +"<space size='32'/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Choose' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='SavenameDialog' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='SavenameDialog' overlays='screen_center'>" +"<layout type='vertical' padding='8,8,8,8'>" "<widget name='DescriptionText' " "width='320' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='Description' " "height='19' " -"/> " -"<layout type='horizontal' padding='0,0,16,0'> " +"/>" +"<layout type='horizontal' padding='0,0,16,0'>" "<widget name='Cancel' " "type='Button' " -"/> " -"<space size='96'/> " +"/>" +"<space size='96'/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'> " -"<layout type='vertical' padding='8,8,8,32' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='RecorderDialog' 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'> " -"<widget name='List' /> " -"<layout type='vertical' padding='0,0,0,0'> " +"/>" +"<layout type='horizontal' padding='0,0,0,16' spacing='16'>" +"<widget name='List' />" +"<layout type='vertical' padding='0,0,0,0'>" "<widget name='Thumbnail' " "width='180' " "height='170' " -"/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='NextScreenShotButton' " "width='25' " "height='25' " -"/> " +"/>" "<widget name='currentScreenshot' " "width='125' " "height='25' " "textalign='center' " -"/> " +"/>" "<widget name='PreviousScreenShotButton' " "width='25' " "height='25' " -"/> " -"</layout> " -"<widget name='Author' height='Globals.Line.Height' /> " -"<widget name='Notes' height='Globals.Line.Height' /> " -"</layout> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"</layout>" +"<widget name='Author' height='Globals.Line.Height' />" +"<widget name='Notes' height='Globals.Line.Height' />" +"</layout>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='Delete' " "type='Button' " -"/> " -"<space size='16'/> " +"/>" +"<space size='16'/>" "<widget name='Cancel' " "type='Button' " -"/> " -"<space size='16'/> " +"/>" +"<space size='16'/>" "<widget name='Edit' " "type='Button' " -"/> " +"/>" "<widget name='Record' " "type='Button' " -"/> " +"/>" "<widget name='Playback' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='OnScreenDialog' overlays='screen_center'> " -"<layout type='horizontal' spacing='5' padding='5,3,5,3' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='OnScreenDialog' overlays='screen_center'>" +"<layout type='horizontal' spacing='5' padding='5,3,5,3' center='true'>" "<widget name='StopButton' " "width='32' " "height='32' " -"/> " +"/>" "<widget name='EditButton' " "width='32' " "height='32' " -"/> " +"/>" "<widget name='SwitchModeButton' " "width='32' " "height='32' " -"/> " +"/>" "<widget name='FastReplayButton' " "width='32' " "height='32' " -"/> " +"/>" "<widget name='TimeLabel' " "width='50' " "height='30' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='EditRecordDialog' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='EditRecordDialog' overlays='screen_center'>" +"<layout type='vertical' padding='8,8,8,8' center='true'>" "<widget name='Title' " "width='320' " "height='Globals.Line.Height' " -"/> " -"<layout type='horizontal' spacing='5' padding='0,0,0,10'> " +"/>" +"<layout type='horizontal' spacing='5' padding='0,0,0,10'>" "<widget name='AuthorLabel' " "type='EditRecordLabel' " -"/> " +"/>" "<widget name='AuthorEdit' " "type='EditRecord' " -"/> " -"</layout> " -"<layout type='horizontal' spacing='5' padding='0,0,0,10'> " +"/>" +"</layout>" +"<layout type='horizontal' spacing='5' padding='0,0,0,10'>" "<widget name='NameLabel' " "type='EditRecordLabel' " -"/> " +"/>" "<widget name='NameEdit' " "type='EditRecord' " -"/> " -"</layout> " -"<layout type='horizontal' spacing='5' padding='0,0,0,10'> " +"/>" +"</layout>" +"<layout type='horizontal' spacing='5' padding='0,0,0,10'>" "<widget name='NotesLabel' " "type='EditRecordLabel' " -"/> " +"/>" "<widget name='NotesEdit' " "type='EditRecord' " -"/> " -"</layout> " -"<layout type='horizontal' spacing='5' padding='0,0,0,10'> " +"/>" +"</layout>" +"<layout type='horizontal' spacing='5' padding='0,0,0,10'>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='OK' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='ScummHelp' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='ScummHelp' overlays='screen_center'>" +"<layout type='vertical' padding='8,8,8,8' center='true'>" "<widget name='Title' " "width='320' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='HelpText' " "height='200' " -"/> " -"<layout type='horizontal' padding='0,0,16,0'> " +"/>" +"<layout type='horizontal' padding='0,0,16,0'>" "<widget name='Prev' " "type='Button' " -"/> " +"/>" "<widget name='Next' " "type='Button' " -"/> " -"<space size='32'/> " +"/>" +"<space size='32'/>" "<widget name='Close' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"/>" +"</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='8,8,32,8' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='MassAdd' overlays='screen_center' shading='dim'>" +"<layout type='vertical' padding='8,8,32,8' center='true'>" "<widget name='DirProgressText' " "width='480' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='GameProgressText' " "width='480' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='GameList' " "width='480' " "height='250' " -"/> " -"<layout type='horizontal' padding='8,8,8,8'> " +"/>" +"<layout type='horizontal' padding='8,8,8,8'>" "<widget name='Ok' " "type='Button' " -"/> " +"/>" "<widget name='Cancel' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> " -"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='KeyMapper' overlays='screen_center' shading='dim'>" +"<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='400' " "height='Globals.Line.Height' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='KeymapArea' " "width='600' " "height='280' " -"/> " +"/>" "<widget name='Close' " "type='Button' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='Predictive' overlays='screen_center'> " -"<layout type='vertical' padding='5,5,5,5' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='Predictive' overlays='screen_center'>" +"<layout type='vertical' padding='5,5,5,5' center='true'>" "<widget name='Headline' " "height='Globals.Line.Height' " "width='210' " "textalign='center' " -"/> " -"<layout type='horizontal' padding='5,5,5,5'> " +"/>" +"<layout type='horizontal' padding='5,5,5,5'>" "<widget name='Word' " "width='190' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Delete' " "width='20' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"<space size='5' /> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<space size='5' />" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Button1' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Button2' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Button3' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Button4' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Button5' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Button6' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Button7' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Button8' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Button9' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Pre' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Button0' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Next' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"<space size='5' /> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<space size='5' />" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Add' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " -"<space size='22'/> " +"/>" +"<space size='22'/>" "<widget name='Cancel' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='OK' " "width='Globals.Predictive.Button.Width' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"</layout_info> " -"<layout_info resolution='y<400'> " -"<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='ShowLauncherLogo' value='0'/> " -"<def var='ShowGlobalMenuLogo' value='0'/> " -"<def var='ShowSearchPic' value='0'/> " -"<def var='ShowChooserPics' value='0'/> " -"<def var='ShowChooserPageDisplay' value='0'/> " -"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> " -"<def var='RecorderDialog.ExtInfo.Visible' value='0'/> " -"<def var='OnScreenDialog.ShowPics' 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'/> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"</layout_info>" +"<layout_info resolution='y<400'>" +"<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='ShowLauncherLogo' value='0'/>" +"<def var='ShowGlobalMenuLogo' value='0'/>" +"<def var='ShowSearchPic' value='0'/>" +"<def var='ShowChooserPics' value='0'/>" +"<def var='ShowChooserPageDisplay' value='0'/>" +"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/>" +"<def var='RecorderDialog.ExtInfo.Visible' value='0'/>" +"<def var='OnScreenDialog.ShowPics' 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'/> " -"<def var='Predictive.Button.Width' value='45' /> " -"<def var='Predictive.Button.Height' value='15' /> " +"<def var='Tooltip.YDelta' value='8'/>" +"<def var='Predictive.Button.Width' value='45' />" +"<def var='Predictive.Button.Height' value='15' />" "<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='18,Globals.Line.Height' " -"/> " +"/>" "<widget name='PopUp' " "size='-1,15' " -"/> " +"/>" "<widget name='Checkbox' " "size='-1,Globals.Line.Height' " -"/> " +"/>" "<widget name='Radiobutton' " "size='-1,Globals.Line.Height' " -"/> " +"/>" "<widget name='ListWidget' " "padding='5,0,0,0' " -"/> " +"/>" "<widget name='PopUpWidget' " "padding='7,5,0,0' " -"/> " +"/>" "<widget name='EditTextWidget' " "padding='5,5,0,0' " -"/> " +"/>" "<widget name='Console' " "padding='7,5,5,5' " -"/> " +"/>" "<widget name='Scrollbar' " "size='9,0' " -"/> " +"/>" "<widget name='TabWidget.Tab' " "size='45,16' " "padding='0,0,2,0' " -"/> " +"/>" "<widget name='TabWidget.Body' " "padding='0,0,0,-8' " -"/> " +"/>" "<widget name='TabWidget.NavButton' " "size='32,18' " "padding='0,0,1,0' " -"/> " +"/>" "<widget name='EditRecordLabel' " "size='60,Globals.Line.Height' " -"/> " +"/>" "<widget name='EditRecord' " "size='120,15' " -"/> " -"</globals> " -"<dialog name='Launcher' overlays='screen'> " -"<layout type='vertical' center='true' padding='6,6,2,2'> " +"/>" +"</globals>" +"<dialog name='Launcher' overlays='screen'>" +"<layout type='vertical' center='true' padding='6,6,2,2'>" "<widget name='Version' " "height='Globals.Line.Height' " "textalign='center' " -"/> " -"<layout type='horizontal' spacing='5' padding='0,0,0,0'> " +"/>" +"<layout type='horizontal' spacing='5' padding='0,0,0,0'>" "<widget name='SearchDesc' " "width='50' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='Search' " "width='150' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='SearchClearButton' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " -"<space /> " -"</layout> " -"<widget name='GameList'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"/>" +"<space />" +"</layout>" +"<widget name='GameList'/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='8'>" "<widget name='LoadGameButton' " "height='12' " -"/> " +"/>" "<widget name='AddGameButton' " "height='12' " -"/> " +"/>" "<widget name='EditGameButton' " "height='12' " -"/> " +"/>" "<widget name='RemoveGameButton' " "height='12' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='8'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='8'>" "<widget name='QuitButton' " "height='12' " -"/> " +"/>" "<widget name='AboutButton' " "height='12' " -"/> " +"/>" "<widget name='OptionsButton' " "height='12' " -"/> " +"/>" "<widget name='StartButton' " "height='12' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> " -"<layout type='vertical' padding='8,8,0,4'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='Browser' overlays='screen' inset='8' shading='dim'>" +"<layout type='vertical' padding='8,8,0,4'>" "<widget name='Headline' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='Path' " "height='Globals.Line.Height' " -"/> " -"<widget name='List'/> " -"<layout type='vertical' padding='0,0,8,0'> " +"/>" +"<widget name='List'/>" +"<layout type='vertical' padding='0,0,8,0'>" "<widget name='Hidden' " "type='Checkbox' " -"/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='Up' " "type='Button' " -"/> " -"<space/> " +"/>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Choose' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> " -"<layout type='vertical' padding='0,0,0,0'> " -"<widget name='TabWidget'/> " -"<layout type='horizontal' padding='8,8,8,8'> " -"<space/> " +"/>" +"</layout>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'>" +"<layout type='vertical' padding='0,0,0,0'>" +"<widget name='TabWidget'/>" +"<layout type='horizontal' padding='8,8,8,8'>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</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>" +"</layout>" +"</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'>" "<widget name='grModePopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='grModePopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='grRenderPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='grRenderPopup' " "type='PopUp' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='grAspectCheckbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='grFullscreenCheckbox' " "type='Checkbox' " -"/> " -"</layout> " -"</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>" +"</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'>" "<widget name='auMidiPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auMidiPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='auOPLPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auOPLPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='auSampleRatePopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auSampleRatePopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'>" "<widget name='subToggleDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='subToggleSpeechOnly' " "type='Radiobutton' " -"/> " +"/>" "<widget name='subToggleSubOnly' " "type='Radiobutton' " -"/> " +"/>" "<widget name='subToggleSubBoth' " "type='Radiobutton' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='subSubtitleSpeedSlider' " "type='Slider' " -"/> " +"/>" "<widget name='subSubtitleSpeedLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"</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>" +"</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'>" "<widget name='vcMusicText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcMusicSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcMusicLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='vcSfxText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSfxSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSfxLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='vcSpeechText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSpeechSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSpeechLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " -"<space size='110' /> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" +"<space size='110' />" "<widget name='vcMuteCheckbox' " "type='Checkbox' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='16,16,16,16' spacing='6'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='16,16,16,16' spacing='6'>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='auPrefGmPopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auPrefGmPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'>" "<widget name='mcFontButton' " "type='Button' " -"/> " +"/>" "<widget name='mcFontPath' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='mcFontClearButton' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " -"</layout> " +"/>" +"</layout>" "<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' spacing='6' center='true'>" "<widget name='mcMidiGainText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='mcMidiGainSlider' " "type='Slider' " -"/> " +"/>" "<widget name='mcMidiGainLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='mcFluidSynthSettings' " "width='150' " "height='Globals.Button.Height' " -"/> " -"</layout> " -"</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>" +"</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'>" "<widget name='auPrefMt32PopupDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='auPrefMt32Popup' " "type='PopUp' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='mcMt32Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='mcGSCheckbox' " "type='Checkbox' " -"/> " -"</layout> " -"</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>" +"</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'>" "<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>" +"<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='16'> " +"/>" +"</layout>" +"<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'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='16'>" "<widget name='PluginsButton' " "type='Button' " -"/> " +"/>" "<widget name='PluginsPath' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"</layout> " -"</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>" +"</layout>" +"</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'>" "<widget name='ThemeButton' " "type='Button' " -"/> " +"/>" "<widget name='CurTheme' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='RendererPopupDesc' " "width='80' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='RendererPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='AutosavePeriodPopupDesc' " "width='80' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='AutosavePeriodPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='GuiLanguagePopupDesc' " "width='80' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='GuiLanguagePopup' " "type='PopUp' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='KeysButton' " "type='Button' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>" +"<layout type='vertical' padding='8,8,8,8' center='true'>" "<widget name='Action' " "height='Globals.Line.Height' " -"/> " -"<widget name='List'/> " +"/>" +"<widget name='List'/>" "<widget name='Mapping' " "height='Globals.Line.Height' " -"/> " -"<space size='Globals.Line.Height'/> " -"<layout type='horizontal'> " +"/>" +"<space size='Globals.Line.Height'/>" +"<layout type='horizontal'>" "<widget name='Map' " "type='Button' " -"/> " -"<space/> " +"/>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<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='8,8,8,8'> " -"<space/> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<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='8,8,8,8'>" +"<space/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_Graphics' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"/>" +"<import layout='Dialog.GlobalOptions_Graphics' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_Audio' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"/>" +"<import layout='Dialog.GlobalOptions_Audio' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_MIDI' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"/>" +"<import layout='Dialog.GlobalOptions_MIDI' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_MT32' /> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"/>" +"<import layout='Dialog.GlobalOptions_MT32' />" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<import layout='Dialog.GlobalOptions_Volume' /> " -"</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'> " +"/>" +"<import layout='Dialog.GlobalOptions_Volume' />" +"</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'>" "<widget name='Id' " "width='35' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='Domain' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='Name' " "width='35' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='Desc' " "type='PopUp' " -"/> " -"</layout> " -"<space size='8'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<space size='8'/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='LangPopupDesc' " "width='60' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='LangPopup' " "type='PopUp' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='PlatformPopupDesc' " "width='60' " "height='Globals.Line.Height' " "textalign='right' " -"/> " +"/>" "<widget name='PlatformPopup' " "type='PopUp' " -"/> " -"</layout> " -"</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>" +"</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'>" "<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>" +"<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='16' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'>" "<widget name='Gamepath' " "type='Button' " -"/> " +"/>" "<widget name='GamepathText' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'>" +"<layout type='vertical' padding='8,8,8,8'>" "<widget name='customOption1Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption2Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption3Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption4Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption5Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption6Checkbox' " "type='Checkbox' " -"/> " +"/>" "<widget name='customOption7Checkbox' " "type='Checkbox' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='GlobalMenu' overlays='screen_center'> " -"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='GlobalMenu' overlays='screen_center'>" +"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'>" "<widget name='Title' " "width='160' " "height='4' " -"/> " +"/>" "<widget name='Version' " "width='160' " "height='4' " -"/> " -"<space size='1'/> " +"/>" +"<space size='1'/>" "<widget name='Load' " "width='120' " "height='12' " -"/> " +"/>" "<widget name='Save' " "width='120' " "height='12' " -"/> " -"<space size='1'/> " +"/>" +"<space size='1'/>" "<widget name='Options' " "width='120' " "height='12' " -"/> " +"/>" "<widget name='Help' " "width='120' " "height='12' " -"/> " +"/>" "<widget name='About' " "width='120' " "height='12' " -"/> " -"<space size='1'/> " +"/>" +"<space size='1'/>" "<widget name='Resume' " "width='120' " "height='12' " -"/> " +"/>" "<widget name='RTL' " "width='120' " "height='12' " -"/> " +"/>" "<widget name='Quit' " "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' spacing='6' center='true'> " +"/>" +"</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'>" "<widget name='vcMusicText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcMusicSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcMusicLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='vcSfxText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSfxSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSfxLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='vcSpeechText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='vcSpeechSlider' " "type='Slider' " -"/> " +"/>" "<widget name='vcSpeechLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " -"<space size='110' /> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" +"<space size='110' />" "<widget name='vcMuteCheckbox' " "type='Checkbox' " "width='80' " -"/> " -"</layout> " -"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> " +"/>" +"</layout>" +"<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'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='subToggleSpeechOnly' " "type='Radiobutton' " "width='90' " -"/> " +"/>" "<widget name='subToggleSubOnly' " "type='Radiobutton' " "width='90' " -"/> " +"/>" "<widget name='subToggleSubBoth' " "type='Radiobutton' " "width='90' " -"/> " -"</layout> " -"</layout> " -"<space size='2' /> " -"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> " +"/>" +"</layout>" +"</layout>" +"<space size='2' />" +"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>" "<widget name='subSubtitleSpeedDesc' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='subSubtitleSpeedSlider' " "type='Slider' " -"/> " +"/>" "<widget name='subSubtitleSpeedLabel' " "type='SmallLabel' " -"/> " -"</layout> " -"<space size='16'/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='4'> " +"/>" +"</layout>" +"<space size='16'/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='4'>" "<widget name='Keys' " "type='Button' " -"/> " -"<space size='Globals.Button.Width' /> " +"/>" +"<space size='Globals.Button.Width' />" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'> " -"<layout type='vertical' padding='0,0,0,0'> " -"<widget name='TabWidget'/> " -"<layout type='horizontal' padding='8,8,8,8'> " -"<space/> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>" +"<layout type='vertical' padding='0,0,0,0'>" +"<widget name='TabWidget'/>" +"<layout type='horizontal' padding='8,8,8,8'>" +"<space/>" "<widget name='ResetSettings' " "type='Button' " -"/> " +"/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='VoiceCountText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='VoiceCountSlider' " "type='Slider' " -"/> " +"/>" "<widget name='VoiceCountLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='LevelText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='LevelSlider' " "type='Slider' " -"/> " +"/>" "<widget name='LevelLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='SpeedText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='SpeedSlider' " "type='Slider' " -"/> " +"/>" "<widget name='SpeedLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='DepthText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='DepthSlider' " "type='Slider' " -"/> " +"/>" "<widget name='DepthLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='WaveFormTypeText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='WaveFormType' " "type='PopUp' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" "<widget name='EnableTabCheckbox' " "type='Checkbox' " -"/> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='RoomSizeText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='RoomSizeSlider' " "type='Slider' " -"/> " +"/>" "<widget name='RoomSizeLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='DampingText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='DampingSlider' " "type='Slider' " -"/> " +"/>" "<widget name='DampingLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='WidthText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='WidthSlider' " "type='Slider' " -"/> " +"/>" "<widget name='WidthLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='LevelText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='LevelSlider' " "type='Slider' " -"/> " +"/>" "<widget name='LevelLabel' " "width='32' " "height='Globals.Line.Height' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'> " -"<layout type='vertical' padding='8,8,8,8' spacing='6'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'>" +"<layout type='vertical' padding='8,8,8,8' spacing='6'>" +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>" "<widget name='InterpolationText' " "type='OptionsLabel' " -"/> " +"/>" "<widget name='Interpolation' " "type='PopUp' " -"/> " -"</layout> " -"</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'/> " -"<widget name='List' /> " -"<layout type='horizontal' padding='0,0,16,0'> " +"/>" +"</layout>" +"</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'/>" +"<widget name='List' />" +"<layout type='horizontal' padding='0,0,16,0'>" "<widget name='ListSwitch' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " +"/>" "<widget name='GridSwitch' " "height='Globals.Line.Height' " "width='Globals.Line.Height' " -"/> " -"<space/> " +"/>" +"<space/>" "<widget name='Delete' " "type='Button' " -"/> " -"<space size='16'/> " +"/>" +"<space size='16'/>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Choose' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='SavenameDialog' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='SavenameDialog' overlays='screen_center'>" +"<layout type='vertical' padding='8,8,8,8'>" "<widget name='DescriptionText' " "width='180' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='Description' " "height='19' " -"/> " -"<layout type='horizontal' padding='0,0,16,0'> " +"/>" +"<layout type='horizontal' padding='0,0,16,0'>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Ok' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'> " -"<layout type='vertical' padding='8,8,8,4' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'>" +"<layout type='vertical' padding='8,8,8,4' center='true'>" "<widget name='Title' " "height='Globals.Line.Height' " -"/> " -"<widget name='List' /> " -"<layout type='horizontal' padding='0,0,0,0' spacing='2'> " +"/>" +"<widget name='List' />" +"<layout type='horizontal' padding='0,0,0,0' spacing='2'>" "<widget name='Edit' " "type='Button' " -"/> " -"<space /> " +"/>" +"<space />" "<widget name='Record' " "type='Button' " -"/> " -"</layout> " -"<layout type='horizontal' padding='0,0,0,0' spacing='2'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='0,0,0,0' spacing='2'>" "<widget name='Delete' " "type='Button' " -"/> " -"<space /> " +"/>" +"<space />" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='Playback' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='OnScreenDialog' overlays='screen_center'> " -"<layout type='horizontal' spacing='5' padding='3,2,3,2' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='OnScreenDialog' overlays='screen_center'>" +"<layout type='horizontal' spacing='5' padding='3,2,3,2' center='true'>" "<widget name='StopButton' " "width='16' " "height='16' " -"/> " +"/>" "<widget name='EditButton' " "width='16' " "height='16' " -"/> " +"/>" "<widget name='SwitchModeButton' " "width='16' " "height='16' " -"/> " +"/>" "<widget name='FastReplayButton' " "width='16' " "height='16' " -"/> " +"/>" "<widget name='TimeLabel' " "width='50' " "height='16' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='EditRecordDialog' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='EditRecordDialog' overlays='screen_center'>" +"<layout type='vertical' padding='8,8,8,8' center='true'>" "<widget name='Title' " "height='Globals.Line.Height' " -"/> " -"<layout type='horizontal' spacing='5' padding='0,0,0,10'> " +"/>" +"<layout type='horizontal' spacing='5' padding='0,0,0,10'>" "<widget name='AuthorLabel' " "type='EditRecordLabel' " -"/> " +"/>" "<widget name='AuthorEdit' " "type='EditRecord' " -"/> " -"</layout> " -"<layout type='horizontal' spacing='5' padding='0,0,0,10'> " +"/>" +"</layout>" +"<layout type='horizontal' spacing='5' padding='0,0,0,10'>" "<widget name='NameLabel' " "type='EditRecordLabel' " -"/> " +"/>" "<widget name='NameEdit' " "type='EditRecord' " -"/> " -"</layout> " -"<layout type='horizontal' spacing='5' padding='0,0,0,10'> " +"/>" +"</layout>" +"<layout type='horizontal' spacing='5' padding='0,0,0,10'>" "<widget name='NotesLabel' " "type='EditRecordLabel' " -"/> " +"/>" "<widget name='NotesEdit' " "type='EditRecord' " -"/> " -"</layout> " -"<layout type='horizontal' spacing='5' padding='0,0,0,0'> " +"/>" +"</layout>" +"<layout type='horizontal' spacing='5' padding='0,0,0,0'>" "<widget name='Cancel' " "type='Button' " -"/> " +"/>" "<widget name='OK' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='ScummHelp' overlays='screen'> " -"<layout type='vertical' padding='8,8,8,8'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='ScummHelp' overlays='screen'>" +"<layout type='vertical' padding='8,8,8,8'>" "<widget name='Title' " "width='180' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='HelpText' " "height='140' " -"/> " -"<layout type='horizontal' padding='0,0,0,0'> " +"/>" +"<layout type='horizontal' padding='0,0,0,0'>" "<widget name='Prev' " "type='Button' " -"/> " +"/>" "<widget name='Next' " "type='Button' " -"/> " -"<space size='32'/> " +"/>" +"<space size='32'/>" "<widget name='Close' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> " -"<layout type='vertical' padding='8,8,8,8' center='true'> " +"/>" +"</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='4,4,16,4' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='MassAdd' overlays='screen_center' shading='dim'>" +"<layout type='vertical' padding='4,4,16,4' center='true'>" "<widget name='DirProgressText' " "width='280' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='GameProgressText' " "width='280' " "height='Globals.Line.Height' " -"/> " +"/>" "<widget name='GameList' " "width='280' " "height='100' " -"/> " -"<layout type='horizontal' padding='4,4,4,4'> " +"/>" +"<layout type='horizontal' padding='4,4,4,4'>" "<widget name='Ok' " "type='Button' " -"/> " +"/>" "<widget name='Cancel' " "type='Button' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> " -"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> " -"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"<dialog name='KeyMapper' overlays='screen_center' shading='dim'>" +"<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='150' " "height='Globals.Line.Height' " -"/> " -"</layout> " +"/>" +"</layout>" "<widget name='KeymapArea' " "width='300' " "height='120' " -"/> " +"/>" "<widget name='Close' " "type='Button' " -"/> " -"</layout> " -"</dialog> " -"<dialog name='Predictive' overlays='screen_center'> " -"<layout type='vertical' padding='1,1,1,1' center='true'> " +"/>" +"</layout>" +"</dialog>" +"<dialog name='Predictive' overlays='screen_center'>" +"<layout type='vertical' padding='1,1,1,1' center='true'>" "<widget name='Headline' " "height='Globals.Line.Height' " "width='150' " "textalign='center' " -"/> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Word' " "width='120' " "height='Globals.Button.Height' " -"/> " +"/>" "<widget name='Delete' " "width='20' " "height='Globals.Predictive.Button.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Button1' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Button2' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Button3' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Button4' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Button5' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Button6' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='3,3,3,3'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='3,3,3,3'>" "<widget name='Button7' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Button8' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Button9' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " -"</layout> " -"<layout type='horizontal' padding='3,3,3,0'> " +"/>" +"</layout>" +"<layout type='horizontal' padding='3,3,3,0'>" "<widget name='Pre' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Button0' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Next' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " -"</layout> " -"<space size='3' /> " -"<layout type='horizontal' padding='3,3,0,3'> " +"/>" +"</layout>" +"<space size='3' />" +"<layout type='horizontal' padding='3,3,0,3'>" "<widget name='Add' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='Cancel' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " +"/>" "<widget name='OK' " "width='Globals.Predictive.Button.Width' " "height='Globals.Predictive.Button.Height' " -"/> " -"</layout> " -"</layout> " -"</dialog> " -"</layout_info> " +"/>" +"</layout>" +"</layout>" +"</dialog>" +"</layout_info>" diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 4154c6c33a..1085aa64a4 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 0f10003e94..e40e8b1e26 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx index 1b3bcea0d6..3a1ec5a5f0 100644 --- a/gui/themes/scummmodern/scummmodern_gfx.stx +++ b/gui/themes/scummmodern/scummmodern_gfx.stx @@ -38,6 +38,14 @@ rgb = '203, 126, 107' /> + <color name = 'brightredborder' + rgb = '238, 213, 207' + /> + + <color name = 'darkredborder' + rgb = '30, 7, 1' + /> + <!-- Disabled button/slider --> <color name = 'darkeneddarkred' rgb = '120, 28, 0' @@ -73,7 +81,7 @@ rgb = '255, 255, 255' /> <color name = 'shadowcolor' - rgb = '63, 60, 17' + rgb = '105, 101, 86' /> <color name = 'darkgray' rgb = '176, 168, 144' @@ -170,6 +178,10 @@ color = '128, 128, 128' /> + <text_color id = 'color_button_hover' + color = 'white' + /> + <text_color id = 'color_alternative_inverted' color = 'white' /> @@ -186,10 +198,6 @@ color = 'white' /> - <text_color id = 'color_button_hover' - color = '255, 214, 84' - /> - <text_color id = 'color_button_disabled' color = '192, 192, 192' /> @@ -232,7 +240,7 @@ stroke = '0' gradient_start = 'darkorange' gradient_end = 'brightorange' - shadow = '3' + shadow = '7' gradient_factor = '3' /> </drawdata> @@ -466,7 +474,7 @@ fg_color = 'lightgray2' fill = 'background' bg_color = 'xtrabrightred' - shadow = '2' + shadow = '1' /> <drawstep func = 'triangle' @@ -505,7 +513,7 @@ fg_color = 'lightgray2' fill = 'background' bg_color = 'xtrabrightred' - shadow = '2' + shadow = '1' /> <drawstep func = 'triangle' @@ -663,7 +671,7 @@ fg_color = 'lightgray2' fill = 'background' bg_color = 'xtrabrightred' - shadow = '2' + shadow = '1' /> <drawstep func = 'triangle' @@ -716,7 +724,7 @@ gradient_start = 'blandyellow' gradient_end = 'xtrabrightred' fill = 'gradient' - shadow = '3' + shadow = '7' /> </drawdata> @@ -737,7 +745,7 @@ gradient_start = 'blandyellow' gradient_end = 'xtrabrightred' gradient_factor = '4' - shadow = '3' + shadow = '7' /> </drawdata> @@ -783,18 +791,18 @@ stroke = '1' fill = 'gradient' shadow = '0' - fg_color = 'shadowcolor' + fg_color = 'darkredborder' gradient_start = 'brightred' gradient_end = 'darkred' bevel = '1' - bevel_color = '237, 169, 72' + bevel_color = 'brightredborder' /> </drawdata> <!-- Hovered button --> <drawdata id = 'button_hover' cache = 'false'> <text font = 'text_button' - text_color = 'color_button_hover' + text_color = 'color_button' vertical_align = 'center' horizontal_align = 'center' /> @@ -803,11 +811,11 @@ stroke = '1' fill = 'gradient' shadow = '0' - fg_color = 'shadowcolor' + fg_color = 'darkredborder' gradient_start = 'brightpink' gradient_end = 'darkpink' bevel = '1' - bevel_color = 'xtrabrightred' + bevel_color = 'brightredborder' /> </drawdata> @@ -915,7 +923,7 @@ gradient_factor = '6' fill = 'gradient' bg_color = 'xtrabrightred' - shadow = '3' + shadow = '7' /> </drawdata> diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py index 4c55fd79de..524e91468e 100755 --- a/gui/themes/scummtheme.py +++ b/gui/themes/scummtheme.py @@ -37,9 +37,13 @@ def parseSTX(theme_file, def_file): comm = re.compile("<!--(.*?)-->", re.DOTALL) head = re.compile("<\?(.*?)\?>") + strlitcount = 0 output = "" for line in theme_file: - output += line.rstrip("\r\n\t ").lstrip() + " \n" + output += line.rstrip("\r\n\t ").lstrip() + if not output.endswith('>'): + output += ' ' + output += "\n" output = re.sub(comm, "", output) output = re.sub(head, "", output) @@ -48,7 +52,9 @@ def parseSTX(theme_file, def_file): for line in output.splitlines(): if line and not line.isspace(): + strlitcount += len(line) def_file.write("\"" + line + "\"\n") + return strlitcount def buildDefTheme(themeName): def_file = open("default.inc", "w") @@ -57,16 +63,23 @@ def buildDefTheme(themeName): print ("Cannot open default theme dir.") def_file.write(""" "<?xml version = '1.0'?>"\n""") + strlitcount = 24 for filename in os.listdir(themeName): filename = os.path.join(themeName, filename) if os.path.isfile(filename) and filename.endswith(".stx"): theme_file = open(filename, "r") - parseSTX(theme_file, def_file) + strlitcount += parseSTX(theme_file, def_file) theme_file.close() def_file.close() + if strlitcount > 65535: + print("WARNING: default.inc string literal is of length %d which exceeds the" % strlitcount) + print(" maximum length of 65536 that C++ compilers are required to support.") + print(" It is likely that bugs will occur dependent on compiler behaviour.") + print(" To avoid this, reduce the size of the theme.") + def printUsage(): print ("===============================") print ("ScummVM Theme Generation Script") diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp index 6fae9346b2..667850d6cc 100644 --- a/gui/widgets/editable.cpp +++ b/gui/widgets/editable.cpp @@ -277,7 +277,7 @@ void EditableWidget::drawCaret(bool erase) { 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); + g_gui.theme()->drawText(Common::Rect(x, y, x + chrWidth, y + editRect.height() - 2), chr, _state, Graphics::kTextAlignLeft, _inversion, 0, false, _font, ThemeEngine::kFontColorNormal, true, _textDrawableArea); } } diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp index 3677f02e47..52527effd8 100644 --- a/gui/widgets/edittext.cpp +++ b/gui/widgets/edittext.cpp @@ -93,11 +93,15 @@ void EditTextWidget::drawWidget() { // Draw the text adjustOffset(); - g_gui.theme()->drawText(Common::Rect(_x+2+ _leftPadding,_y+2, _x+_leftPadding+getEditRect().width()+2, _y+_h-2), _editString, _state, Graphics::kTextAlignLeft, ThemeEngine::kTextInversionNone, -_editScrollOffset, false, _font); + + const Common::Rect &r = Common::Rect(_x + 2 + _leftPadding, _y + 2, _x + _leftPadding + getEditRect().width() + 8, _y + _h); + setTextDrawableArea(r); + + g_gui.theme()->drawText(Common::Rect(_x + 2 + _leftPadding, _y + 2, _x + _leftPadding + getEditRect().width() + 2, _y + _h), _editString, _state, Graphics::kTextAlignLeft, ThemeEngine::kTextInversionNone, -_editScrollOffset, false, _font, ThemeEngine::kFontColorNormal, true, _textDrawableArea); } Common::Rect EditTextWidget::getEditRect() const { - Common::Rect r(2 + _leftPadding, 2, _w - 2 - _leftPadding - _rightPadding, _h-1); + Common::Rect r(2 + _leftPadding, 2, _w - 2 - _leftPadding - _rightPadding, _h - 1); return r; } |