From af289bdb03d7f0a5e8f01c03e462f230835e0077 Mon Sep 17 00:00:00 2001
From: Vicent Marti <tanoku@users.sourceforge.net>
Date: Thu, 16 Jul 2009 17:29:31 +0000
Subject: [PATCH] Fixed bug 2820514 ("Help dialog causes crash")

svn-id: r42537
---
 engines/scumm/dialogs.cpp                     |   16 +-
 engines/scumm/dialogs.h                       |    1 +
 graphics/VectorRendererSpec.cpp               |   12 +-
 gui/themes/default.inc                        | 2170 ++++++++---------
 gui/themes/scummclassic.zip                   |  Bin 52802 -> 53307 bytes
 gui/themes/scummclassic/classic_layout.stx    |   20 +-
 .../scummclassic/classic_layout_lowres.stx    |    2 +-
 gui/themes/scummmodern.zip                    |  Bin 157460 -> 157995 bytes
 .../scummmodern/scummmodern_layout_lowres.stx |    6 +-
 9 files changed, 1116 insertions(+), 1111 deletions(-)

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 9fb107f9fcc..54ade5b7ca9 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -641,6 +641,8 @@ HelpDialog::HelpDialog(const GameSettings &game)
 	new GUI::ButtonWidget(this, "ScummHelp.Close", "Close", kCloseCmd, 'C');
 	_prevButton->clearFlags(WIDGET_ENABLED);
 
+    _numLines = HELP_NUM_LINES;
+
 	// Dummy entries
 	for (int i = 0; i < HELP_NUM_LINES; i++) {
 		_key[i] = new StaticTextWidget(this, 0, 0, 10, 10, "", Graphics::kTextAlignRight);
@@ -658,15 +660,20 @@ void HelpDialog::reflowLayout() {
 
 	g_gui.xmlEval()->getWidgetData("ScummHelp.HelpText", x, y, w, h);
 
+    /* Make sure than we don't have more lines than what we can fit
+     * on the space that the layout reserves for text */
+    _numLines = MIN(HELP_NUM_LINES, (int)(h / lineHeight));
+
+
 	int keyW = w * 20 / 100;
 	int dscX = x + keyW + 32;
 	int dscW = w * 80 / 100;
 
 	int xoff = (_w >> 1) - (w >> 1);
 
-	for (int i = 0; i < HELP_NUM_LINES; i++) {
-		_key[i]->resize(xoff + x, y + lineHeight * i, keyW, lineHeight + 2);
-		_dsc[i]->resize(xoff + dscX, y + lineHeight * i, dscW, lineHeight + 2);
+	for (int i = 0; i < _numLines; i++) {
+		_key[i]->resize(xoff + x, y + lineHeight * i, keyW, lineHeight);
+		_dsc[i]->resize(xoff + dscX, y + lineHeight * i, dscW, lineHeight);
 	}
 
 	displayKeyBindings();
@@ -675,6 +682,7 @@ void HelpDialog::reflowLayout() {
 void HelpDialog::displayKeyBindings() {
 
 	String titleStr, *keyStr, *dscStr;
+    int i;
 
 #ifndef __DS__
 	ScummHelp::updateStrings(_game.id, _game.version, _game.platform, _page, titleStr, keyStr, dscStr);
@@ -684,7 +692,7 @@ void HelpDialog::displayKeyBindings() {
 #endif
 
 	_title->setLabel(titleStr);
-	for (int i = 0; i < HELP_NUM_LINES; i++) {
+	for (i = 0; i < _numLines; i++) {
 		_key[i]->setLabel(keyStr[i]);
 		_dsc[i]->setLabel(dscStr[i]);
 	}
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 290b3450dc4..996ff0e7a75 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -124,6 +124,7 @@ protected:
 
 	int _page;
 	int _numPages;
+    int _numLines;
 
 	const GameSettings _game;
 
diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index 4a7a301faf0..b68f4822d86 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -596,8 +596,6 @@ drawSquare(int x, int y, int w, int h) {
 template<typename PixelType>
 void VectorRendererSpec<PixelType>::
 drawRoundedSquare(int x, int y, int r, int w, int h) {
-	x++; y++; w--; h--;
-
 	if (x + w > Base::_activeSurface->w || y + h > Base::_activeSurface->h ||
 		w <= 0 || h <= 0 || x < 0 || y < 0 || r <= 0)
 		return;
@@ -606,8 +604,8 @@ drawRoundedSquare(int x, int y, int r, int w, int h) {
 		r = MIN(w /2, h / 2);
 
 	if (Base::_fillMode != kFillDisabled && Base::_shadowOffset
-		&& x + w + Base::_shadowOffset < Base::_activeSurface->w
-		&& y + h + Base::_shadowOffset < Base::_activeSurface->h) {
+		&& x + w + Base::_shadowOffset + 1 < Base::_activeSurface->w
+		&& y + h + Base::_shadowOffset + 1 < Base::_activeSurface->h) {
 		drawRoundedSquareShadow(x, y, r, w, h, Base::_shadowOffset);
 	}
 
@@ -922,13 +920,11 @@ drawBevelSquareAlg(int x, int y, int w, int h, int bevel, PixelType top_color, P
 
 	int i, j;
 
-#if 0
 	x = MAX(x - bevel, 0);
 	y = MAX(y - bevel, 0);
 
-	w = w + (bevel * 2);
-	h = h + (bevel * 2);
-#endif
+	w = MIN(w + (bevel * 2), (int)_activeSurface->w);
+	h = MIN(h + (bevel * 2), (int)_activeSurface->h);
 
 	PixelType *ptr_left = (PixelType *)_activeSurface->getBasePtr(x, y);
 
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index b7db2a6b62a..0331c90fbb9 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,4 +1,1088 @@
  "<?xml version = '1.0'?>"
+"<layout_info resolution='-320xY,-256x240'> "
+"<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='ScummSaveLoad.ExtInfo.Visible' value='1'/> "
+"<def var='KeyMapper.Spacing' value='10'/> "
+"<def var='KeyMapper.LabelWidth' value='100'/> "
+"<def var='KeyMapper.ButtonWidth' value='80'/> "
+"<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='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.NavButton' "
+"size='15,18' "
+"padding='0,3,4,0' "
+"/> "
+"</globals> "
+"<dialog name='Launcher' overlays='screen'> "
+"<layout type='vertical' center='true' padding='16,16,8,8'> "
+"<widget name='Version' "
+"height='Globals.Line.Height' "
+"/> "
+"<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'> "
+"<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'> "
+"<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'> "
+"<widget name='Headline' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Path' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Up' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Choose' "
+"type='Button' "
+"/> "
+"</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'> "
+"<widget name='grModePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grModePopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
+"/> "
+"</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'> "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auMidiPopup' "
+"type='PopUp' "
+"/> "
+"</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'> "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auSampleRatePopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='subToggleButton' "
+"width='150' "
+"height='Globals.Slider.Height' "
+"/> "
+"</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'> "
+"<widget name='vcMusicText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
+"/> "
+"</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'> "
+"<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'> "
+"<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'> "
+"<widget name='mcFontButton' "
+"type='Button' "
+"/> "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
+"/> "
+"<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> "
+"</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' "
+"/> "
+"</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' "
+"/> "
+"</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' "
+"/> "
+"</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'> "
+"<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'> "
+"<widget name='RendererPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='RendererPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
+"/> "
+"</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'> "
+"<widget name='Action' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='List'/> "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
+"/> "
+"<space size='Globals.Line.Height'/> "
+"<layout type='horizontal'> "
+"<widget name='Map' "
+"type='Button' "
+"/> "
+"<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/> "
+"<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'> "
+"<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'> "
+"<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'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
+"/> "
+"<import layout='Dialog.GlobalOptions_MIDI' /> "
+"</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'> "
+"<widget name='Id' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='Domain' "
+"type='PopUp' "
+"/> "
+"</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'> "
+"<widget name='LangPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='LangPopup' "
+"type='PopUp' "
+"/> "
+"</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'> "
+"<widget name='Savepath' "
+"type='Button' "
+"/> "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
+"/> "
+"</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' "
+"/> "
+"</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='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'/> "
+"<widget name='Load' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<widget name='Save' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<space size='10'/> "
+"<widget name='Options' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<widget name='About' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<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='ScummMain' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<widget name='Resume' "
+"type='Button' "
+"/> "
+"<space size='15'/> "
+"<widget name='Load' "
+"type='Button' "
+"/> "
+"<widget name='Save' "
+"type='Button' "
+"/> "
+"<space size='15'/> "
+"<widget name='Options' "
+"type='Button' "
+"/> "
+"<widget name='Help' "
+"type='Button' "
+"/> "
+"<widget name='About' "
+"type='Button' "
+"/> "
+"<space size='15'/> "
+"<widget name='Quit' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='ScummConfig' 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'> "
+"<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'> "
+"<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'> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"width='80'  "
+"/> "
+"</layout> "
+"</layout> "
+"<space size='8' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='subToggleButton' "
+"width='158' "
+"height='Globals.Slider.Height' "
+"/> "
+"</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'> "
+"<widget name='Keys' "
+"type='Button' "
+"/> "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='ScummSaveLoad' 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' /> "
+"<widget name='Thumbnail' "
+"width='180' "
+"height='200' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<space/> "
+"<widget name='Delete' "
+"type='Button' "
+"/> "
+"<space size='32'/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Choose' "
+"type='Button' "
+"/> "
+"</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'> "
+"<widget name='Prev' "
+"type='Button' "
+"/> "
+"<widget name='Next' "
+"type='Button' "
+"/> "
+"<space size='32'/> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' center='true'> "
+"<widget name='DirProgressText' "
+"width='250' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='GameProgressText' "
+"width='250' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='GameList' "
+"width='480' "
+"height='250' "
+"/> "
+"<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'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='400' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<widget name='KeymapArea' "
+"width='600' "
+"height='280' "
+"/> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"</layout_info> "
+"<render_info> "
+"<palette> "
+"<color name='black' "
+"rgb='0,0,0' "
+"/> "
+"<color name='lightgrey' "
+"rgb='104,104,104' "
+"/> "
+"<color name='darkgrey' "
+"rgb='64,64,64' "
+"/> "
+"<color name='green' "
+"rgb='32,160,32' "
+"/> "
+"<color name='green2' "
+"rgb='0,255,0' "
+"/> "
+"</palette> "
+"<fonts> "
+"<font id='text_default' "
+"file='default' "
+"color='green' "
+"/> "
+"<font id='text_hover' "
+"file='default' "
+"color='green2' "
+"/> "
+"<font id='text_disabled' "
+"file='default' "
+"color='lightgrey' "
+"/> "
+"<font id='text_inverted' "
+"file='default' "
+"color='black' "
+"/> "
+"<font id='text_button' "
+"file='default' "
+"color='green' "
+"/> "
+"<font id='text_button_hover' "
+"file='default' "
+"color='green2' "
+"/> "
+"<font id='text_normal' "
+"file='default' "
+"color='green' "
+"/> "
+"</fonts> "
+"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> "
+"<drawdata id='text_selection' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id='text_selection_focus' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
+"/> "
+"</drawdata> "
+"<drawdata id='mainmenu_bg' cache='false'> "
+"<drawstep func='fill' "
+"fill='foreground' "
+"fg_color='black' "
+"/> "
+"</drawdata> "
+"<drawdata id='special_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='separator' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"height='2' "
+"ypos='center' "
+"fg_color='lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_base' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_idle' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_button_idle' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='auto' "
+"height='auto' "
+"xpos='center' "
+"ypos='center' "
+"orientation='top' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_button_hover' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green2' "
+"fill='foreground' "
+"width='auto' "
+"height='auto' "
+"xpos='center' "
+"ypos='center' "
+"orientation='top' "
+"/> "
+"</drawdata> "
+"<drawdata id='tab_active' cache='false'> "
+"<text font='text_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='tab_inactive' cache='false'> "
+"<text font='text_default' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='tab_background' cache='false'> "
+"</drawdata> "
+"<drawdata id='widget_slider' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='slider_disabled' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id='slider_full' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
+"/> "
+"</drawdata> "
+"<drawdata id='slider_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_idle' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
+"/> "
+"<text font='text_default' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_disabled' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='lightgrey' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
+"/> "
+"<text font='text_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_hover' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green2' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
+"/> "
+"<text font='text_hover' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_textedit' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='plain_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='caret' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id='default_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='button_idle' cache='false'> "
+"<text font='text_button' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='button_hover' cache='false'> "
+"<text font='text_button_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='button_disabled' cache='false'> "
+"<text font='text_disabled' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='checkbox_disabled' cache='false'> "
+"<text font='text_disabled' "
+"vertical_align='top' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='checkbox_selected' cache='false'> "
+"<text font='text_default' "
+"vertical_align='top' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='cross' "
+"fill='foreground' "
+"stroke='2' "
+"fg_color='green' "
+"/> "
+"</drawdata> "
+"<drawdata id='checkbox_default' cache='false'> "
+"<text font='text_default' "
+"vertical_align='top' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_default' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"/> "
+"</drawdata> "
+"</render_info> "
 "<layout_info resolution='320xY,256x240,Xx272'> "
 "<globals> "
 "<def var='Line.Height' value='12' /> "
@@ -688,7 +1772,7 @@
 "</layout> "
 "</dialog> "
 "<dialog name='ScummHelp' overlays='screen'> "
-"<layout type='vertical' padding='8,8,0,0'> "
+"<layout type='vertical' padding='8,8,8,8'> "
 "<widget name='Title' "
 "width='180' "
 "height='Globals.Line.Height' "
@@ -756,1087 +1840,3 @@
 "</layout> "
 "</dialog> "
 "</layout_info> "
-"<render_info> "
-"<palette> "
-"<color name='black' "
-"rgb='0,0,0' "
-"/> "
-"<color name='lightgrey' "
-"rgb='104,104,104' "
-"/> "
-"<color name='darkgrey' "
-"rgb='64,64,64' "
-"/> "
-"<color name='green' "
-"rgb='32,160,32' "
-"/> "
-"<color name='green2' "
-"rgb='0,255,0' "
-"/> "
-"</palette> "
-"<fonts> "
-"<font id='text_default' "
-"file='default' "
-"color='green' "
-"/> "
-"<font id='text_hover' "
-"file='default' "
-"color='green2' "
-"/> "
-"<font id='text_disabled' "
-"file='default' "
-"color='lightgrey' "
-"/> "
-"<font id='text_inverted' "
-"file='default' "
-"color='black' "
-"/> "
-"<font id='text_button' "
-"file='default' "
-"color='green' "
-"/> "
-"<font id='text_button_hover' "
-"file='default' "
-"color='green2' "
-"/> "
-"<font id='text_normal' "
-"file='default' "
-"color='green' "
-"/> "
-"</fonts> "
-"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> "
-"<drawdata id='text_selection' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='text_selection_focus' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='mainmenu_bg' cache='false'> "
-"<drawstep func='fill' "
-"fill='foreground' "
-"fg_color='black' "
-"/> "
-"</drawdata> "
-"<drawdata id='special_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='separator' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"height='2' "
-"ypos='center' "
-"fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_base' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_idle' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_idle' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='auto' "
-"height='auto' "
-"xpos='center' "
-"ypos='center' "
-"orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green2' "
-"fill='foreground' "
-"width='auto' "
-"height='auto' "
-"xpos='center' "
-"ypos='center' "
-"orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_active' cache='false'> "
-"<text font='text_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
-"/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_inactive' cache='false'> "
-"<text font='text_default' "
-"vertical_align='center' "
-"horizontal_align='center' "
-"/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_background' cache='false'> "
-"</drawdata> "
-"<drawdata id='widget_slider' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='slider_disabled' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='slider_full' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='slider_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
-"/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='height' "
-"height='auto' "
-"xpos='right' "
-"ypos='center' "
-"orientation='bottom' "
-"/> "
-"<text font='text_default' "
-"vertical_align='center' "
-"horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='lightgrey' "
-"fill='foreground' "
-"width='height' "
-"height='auto' "
-"xpos='right' "
-"ypos='center' "
-"orientation='bottom' "
-"/> "
-"<text font='text_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='triangle' "
-"fg_color='green2' "
-"fill='foreground' "
-"width='height' "
-"height='auto' "
-"xpos='right' "
-"ypos='center' "
-"orientation='bottom' "
-"/> "
-"<text font='text_hover' "
-"vertical_align='center' "
-"horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='widget_textedit' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='plain_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='caret' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='default_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='button_idle' cache='false'> "
-"<text font='text_button' "
-"vertical_align='center' "
-"horizontal_align='center' "
-"/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='button_hover' cache='false'> "
-"<text font='text_button_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
-"/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='button_disabled' cache='false'> "
-"<text font='text_disabled' "
-"vertical_align='center' "
-"horizontal_align='center' "
-"/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='checkbox_disabled' cache='false'> "
-"<text font='text_disabled' "
-"vertical_align='top' "
-"horizontal_align='left' "
-"/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='checkbox_selected' cache='false'> "
-"<text font='text_default' "
-"vertical_align='top' "
-"horizontal_align='left' "
-"/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='cross' "
-"fill='foreground' "
-"stroke='2' "
-"fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='checkbox_default' cache='false'> "
-"<text font='text_default' "
-"vertical_align='top' "
-"horizontal_align='left' "
-"/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='widget_default' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/> "
-"</drawdata> "
-"</render_info> "
-"<layout_info resolution='-320xY,-256x240'> "
-"<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='ScummSaveLoad.ExtInfo.Visible' value='1'/> "
-"<def var='KeyMapper.Spacing' value='10'/> "
-"<def var='KeyMapper.LabelWidth' value='100'/> "
-"<def var='KeyMapper.ButtonWidth' value='80'/> "
-"<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='112,28' "
-"/> "
-"<widget name='Slider' "
-"size='128,18' "
-"/> "
-"<widget name='PopUp' "
-"size='-1,19' "
-"/> "
-"<widget name='Checkbox' "
-"size='-1,14' "
-"/> "
-"<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.NavButton' "
-"size='15,18' "
-"padding='0,3,4,0' "
-"/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='16,16,8,8'> "
-"<widget name='Version' "
-"height='Globals.Line.Height' "
-"/> "
-"<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'> "
-"<widget name='LoadGameButton' "
-"height='24' "
-"/> "
-"<widget name='AddGameButton' "
-"height='24' "
-"/> "
-"<widget name='EditGameButton' "
-"height='24' "
-"/> "
-"<widget name='RemoveGameButton' "
-"height='24' "
-"/> "
-"</layout> "
-"<space size='4'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='QuitButton' "
-"height='24' "
-"/> "
-"<widget name='AboutButton' "
-"height='24' "
-"/> "
-"<widget name='OptionsButton' "
-"height='24' "
-"/> "
-"<widget name='StartButton' "
-"height='24' "
-"/> "
-"</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='horizontal' padding='0,0,16,0'> "
-"<widget name='Up' "
-"type='Button' "
-"/> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Choose' "
-"type='Button' "
-"/> "
-"</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'> "
-"<widget name='grModePopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grModePopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
-"/> "
-"</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'> "
-"<widget name='auMidiPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auMidiPopup' "
-"type='PopUp' "
-"/> "
-"</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'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auSampleRatePopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='subToggleButton' "
-"width='150' "
-"height='Globals.Slider.Height' "
-"/> "
-"</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'> "
-"<widget name='vcMusicText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
-"/> "
-"</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'> "
-"<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'> "
-"<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'> "
-"<widget name='mcFontButton' "
-"type='Button' "
-"/> "
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
-"/> "
-"<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> "
-"</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' "
-"/> "
-"</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' "
-"/> "
-"</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' "
-"/> "
-"</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'> "
-"<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'> "
-"<widget name='RendererPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='RendererPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='AutosavePeriodPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
-"/> "
-"</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'> "
-"<widget name='Action' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
-"<widget name='Mapping' "
-"height='Globals.Line.Height' "
-"/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
-"<widget name='Map' "
-"type='Button' "
-"/> "
-"<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/> "
-"<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'> "
-"<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'> "
-"<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'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</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'> "
-"<widget name='Id' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='Domain' "
-"type='PopUp' "
-"/> "
-"</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'> "
-"<widget name='LangPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='LangPopup' "
-"type='PopUp' "
-"/> "
-"</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'> "
-"<widget name='Savepath' "
-"type='Button' "
-"/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
-"/> "
-"</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' "
-"/> "
-"</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='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'/> "
-"<widget name='Load' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<widget name='Save' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
-"<widget name='Options' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<widget name='About' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<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='ScummMain' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<widget name='Resume' "
-"type='Button' "
-"/> "
-"<space size='15'/> "
-"<widget name='Load' "
-"type='Button' "
-"/> "
-"<widget name='Save' "
-"type='Button' "
-"/> "
-"<space size='15'/> "
-"<widget name='Options' "
-"type='Button' "
-"/> "
-"<widget name='Help' "
-"type='Button' "
-"/> "
-"<widget name='About' "
-"type='Button' "
-"/> "
-"<space size='15'/> "
-"<widget name='Quit' "
-"type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummConfig' 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'> "
-"<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'> "
-"<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'> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"width='80'  "
-"/> "
-"</layout> "
-"</layout> "
-"<space size='8' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='subToggleButton' "
-"width='158' "
-"height='Globals.Slider.Height' "
-"/> "
-"</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'> "
-"<widget name='Keys' "
-"type='Button' "
-"/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummSaveLoad' 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' /> "
-"<widget name='Thumbnail' "
-"width='180' "
-"height='200' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<space/> "
-"<widget name='Delete' "
-"type='Button' "
-"/> "
-"<space size='32'/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Choose' "
-"type='Button' "
-"/> "
-"</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='220' "
-"/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Prev' "
-"type='Button' "
-"/> "
-"<widget name='Next' "
-"type='Button' "
-"/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' center='true'> "
-"<widget name='DirProgressText' "
-"width='250' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='GameProgressText' "
-"width='250' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='GameList' "
-"width='480' "
-"height='250' "
-"/> "
-"<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'> "
-"<widget name='PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='Popup' "
-"type='PopUp' "
-"width='400' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<widget name='KeymapArea' "
-"width='600' "
-"height='280' "
-"/> "
-"<widget name='Close' "
-"type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"</layout_info> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 7c21b78a3fe8450b7fafd036733bc61ae2a27c8b..ce21ea54870f720a79fa20223965f14d3d234e22 100644
GIT binary patch
delta 951
zcmX>!hk5q`X5IjAW)=|!5MavuFp)QyuYCFkE34aC>#D;T7^=fIyOqCWuD4RiC@Co@
zw$j%xPA<*OEz8v_F3Zy^&Mz%WPEE@%N>A0xOD)kaF3T&*&o6<gfzu^LrFq%<>7|+a
zB^jx?sl^b9<ebFf;>=`yC>@`ZSeaj1qE}o}p`gO0psS$bnPQ~?k<>?#H8C<ZvQ#iK
zFtF4$FxNFSQ!q5NGB&p|Hj7dyNzBX7E>+lUUfs&fW?-SCU}Q4+Acy4U+jTXp%m(TT
zlMlAaPLAM}XEHLFET|+qc^a=GjCqY$8N{3@B{ezAf^V`@Yb_&0&D~acC`+nMk<nnX
zVzb=js5Uu9gUN=04x4wj&2*UjF34o^0RgtnJ;ztFiXjE3l`yZdNw*>cL$~5)gRp1x
z3CHxb3ao*c9G|WYl`=6hH8etmps9kPg_VJ+m9cr0LQZ~BN=AN3zQSg?C@EP!<=G#s
zHm^DUz$T1=!6s~D-Us^l0g@KtbMniJQj1Z214|RIB!R5R#L&bH<}Wi{Ln8$P3o8Qy
zD<iWgh2qpQg~{gCDx14lRJ|wvaFm*SZj0#Vd;T_Tyo^jD%<vpA+3Bp2AZiw1U=W(z
zdRE>5<c<Ju6xB!(%)r18&P5Qgq>(Xv^6j&-fv5q<z#xgDXlDfj18Vw5@=ky^D;r2P
Q3j+(oPX-1Co%0~Q098pe%m4rY

delta 409
zcmdnJfcelIX5IjAW)=|!5MbiCI*~V+kBQ@|Re#8qsP0e(hVIbK7b`w6bEt4B=qjjq
zrfjaN_4J<X)Ga-ELx9NUPbX~H#9+G1_Pw{VzpUK(Qh|ZtrNU;(@MlQcRz^$7@?FgN
zV72DM#Lrhl85pjHZp?d$P%ycwR%Np$Ya%n7p^=V)k;Uc-98+1DP1F@87mCVE&Tdm+
zGBTO`ae>_A)ez=JYuU-K+LS?}3nir{*KOpREWlsOXabg4%`eYrGWnyA++_a-w#o1L
zrNH8HlPx=B!N&MIY;G5r>A+~TSuyYt>twz2+)Nx-CtII45=8Yn1B2w`y7Tgr{cE{(
z0=yZSM3^Drgz8fU27YkpLBNtmiLl9M&&wL1dX|Af2t|=zIRis-PGWI!W^#N^Vr715
O$z;U~B5cNIL8<__Hi1$A

diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index a55f322ce41..e886a1a2f0d 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -54,7 +54,7 @@
 		/>
 			
 		<widget name = 'Button'
-				size = '112, 28'
+				size = '108, 24'
 		/>
 		<widget name = 'Slider'
 				size = '128, 18'
@@ -115,31 +115,31 @@
 			<widget name = 'GameList'/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'LoadGameButton' 
-						height = '24' 
+						height = '20' 
 				/>
 				<widget name = 'AddGameButton' 
-						height = '24'
+						height = '20'
 				/>
 				<widget name = 'EditGameButton' 
-						height = '24'
+						height = '20'
 				/>
 				<widget name = 'RemoveGameButton' 
-						height = '24'
+						height = '20'
 				/>
 			</layout>
 			<space size = '4'/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'QuitButton' 
-						height = '24'
+						height = '20'
 				/>
 				<widget name = 'AboutButton' 
-						height = '24'
+						height = '20'
 				/>
 				<widget name = 'OptionsButton' 
-						height = '24'
+						height = '20'
 				/>
 				<widget name = 'StartButton' 
-						height = '24'
+						height = '20'
 				/>
 			</layout>
 		</layout>
@@ -745,7 +745,7 @@
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'HelpText'
-					height = '220'
+					height = '200'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
 				<widget name = 'Prev'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index d4a92b831ef..b4143964afd 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -744,7 +744,7 @@
 	</dialog>
 
 	<dialog name = 'ScummHelp' overlays = 'screen'>
-		<layout type = 'vertical' padding = '8, 8, 0, 0'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>
 			<widget name = 'Title'
 					width = '180'
 					height = 'Globals.Line.Height'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 71e8bef3d589ce0bf00a613738a7982a8a68191d..b38ee79e84915e4984ada858b4f264e1484c0371 100644
GIT binary patch
delta 1218
zcmcgrT}TvB6u$S2E;_rbm8-UiIpStS&F;+Xx~>z3AQ9z@(GQ|Q=I-q7<j#)l&Mv0q
zB0>*A51Deqmk@f3An{>9B7z7iC^Q2fdMSLcAIQmq-Xvx>#nGUry6|!4-t(O^eCK|5
z;&ti$H>J+b4ywq7%muP>%XtQ5WA?f2g2RmCRDd#LW5wyB-II3=(KFt5_~3bjOw^Lm
zVO&XuqF~p{-r@zSM`YrfHjoy5zH~UFC|Sju&L+KSHIoWUQ8g8lyh%y(rL)PDs%jgY
z&8Vd^$$nofBm1<tq)6#PLQx}9D(NHN7ICee@z4y*cuqz{CV#*%0X`5E7=hzjST4x&
z0>gzwjuVAoH<OmKjJ~pj*G`dM3TPZ6PZlso-p^y2kjHozQC?yP$?XA}gc_g+{2bwb
z;#Ts=z*YLk2AC)Y*%+H-^+^^_(N5VApM8m4pK3;Es#$ll@R`c}L&5n87Q|nSMF+iU
zZE%bFLRQGnW-}cSn)uM~Sv0eJ6C(&B-y-_?ZYH6oB5_qy8QspqKEHj-mCp`UyQ@Gp
zbUuXJ+RcxVLvWLFf^3Mw@{P6SE`*l#Ys2{Kf76?|bVbc*J0<&-jfrew{KWxeWeIz9
zlEWv?f^5w69iW^TT-2uHi4Xxl$Oickff_i6$a)0a=6>4T&pK{TQ?ByP4r`5Df*SZ#
zPJ$BbXLh`c{9`Jtd!wx`vbu=tj%;fozFN;*&C(c|D6v%By-XfTP@S_F4xtJQ>1YO{
zKUie@Uz(23H?CG9WTMQ{!1e&6xRl7Ic!5pu-e@?yt(Lrypr)k$DMkr3rjlb4RM*Ld
z*c+Rhi&F@hpe-H4HZl{1z4aF3bRkq_VSO(J(hvntyKIQju^%Hg3Lz5?3yTf|3df~z
bf1f(&?NbIiJBn>4!GRp;9Uvq|0U`7Yy=QR8

delta 765
zcmZuuOK1~O6uomN4U?Fp)%+SmG^J^=U}9@)tU;mBx~Nf1i4{SiG?V$z&NMM&B*h=8
z2yR@I5uYgTvWl&!Sq$Q);MSIEm{oA$wt}`Bmm)8MA#D$w#eJN6-r?NWUu{n}Y|d1Y
zwRnI6Idj>WM$R<+Jod5rk4_tMW^K(e!XjtB%iM6#@ptExh0cb1l?nKeGas(Z87p(l
z3p;&`ePYJO4{~P0IBi}%a}9vf2V_b@kI`#KljS1za5Nm5%o<e}&R?P0ivu5kpN1ww
zP3_TI$@8TpB~=$jYSF;P1+wbJBl_E82lVZTjTzLxPx$p`X|FD3uj9xdSv!H}-V4<Z
z8YOSVC#)-u+leJI(b$Ot?8J?9k=bhb8b24A!^2JnJ?#Gq$fStF$eCnI#^Bj$0N`bT
zpU>n<v5cBeCELV_H{TZftSkWKp=OK!P$@rRNnOMq>U3YkAbzxxmm&rpaAxB8-R0-~
z768hwwxxg@fG-xbTwz92XBB0?FHfD{?EmEjpmeout9}4kP;M87PDYiXn8@?H<F5Z9
zOA>aEK8^w?IVrcF|Eo*)#(d)dl<oeJQF2+vP<YRITd0)9I}GWvqn|WnboT7IZVQ!i
zz0QFCxjRJi5;|#73o-_Un*#`%Fk9f|-RatI3E*y-L8Z(@5j4K2s%kDP6c%PAu@uv8
Ul~TzLE7du`0SyG`%_0E&1>5Jl+W-In

diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 13346a1d6f4..693efaaca97 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -732,14 +732,14 @@
 		</layout>
 	</dialog>
 
-	<dialog name = 'ScummHelp' overlays = 'screen'>
-		<layout type = 'vertical' padding = '8, 8, 0, 0'>
+	<dialog name = 'ScummHelp' overlays = 'screen' inset = '8'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>
 			<widget name = 'Title'
 					width = '180'
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'HelpText'
-					height = '140'
+					height = '130'
 			/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 				<widget name = 'Prev'