[Scummvm-cvs-logs] SF.net SVN: scummvm:[33760] scummvm/branches/gsoc2008-gui/gui

Tanoku at users.sourceforge.net Tanoku at users.sourceforge.net
Sun Aug 10 19:22:15 CEST 2008


Revision: 33760
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33760&view=rev
Author:   Tanoku
Date:     2008-08-10 17:22:12 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Bitmap cursor loading from XML files.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp
    scummvm/branches/gsoc2008-gui/gui/ThemeParser.h
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern.zip

Added Paths:
-----------
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx

Removed Paths:
-------------
    scummvm/branches/gsoc2008-gui/gui/themes/modern.stx

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp	2008-08-10 17:16:05 UTC (rev 33759)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp	2008-08-10 17:22:12 UTC (rev 33760)
@@ -150,6 +150,26 @@
 	return true;	
 }
 
+bool ThemeParser::parserCallback_cursor(ParserNode *node) {
+	if (resolutionCheck(node->values["resolution"])) {
+		node->ignore = true;
+		return true;
+	}
+	
+	int spotx, spoty, scale;
+	
+	if (!parseIntegerKey(node->values["hotspot"].c_str(), 2, &spotx, &spoty))
+		return parserError("Error when parsing cursor Hot Spot coordinates.");
+		
+	if (!parseIntegerKey(node->values["scale"].c_str(), 1, &scale))
+		return parserError("Error when parsing cursor scale.");
+		
+	if (!_theme->createCursor(node->values["file"], spotx, spoty, scale))
+		return parserError("Error when creating Bitmap Cursor.");
+		
+	return true;
+}
+
 bool ThemeParser::parserCallback_bitmap(ParserNode *node) {
 	if (resolutionCheck(node->values["resolution"])) {
 		node->ignore = true;

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeParser.h
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeParser.h	2008-08-10 17:16:05 UTC (rev 33759)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeParser.h	2008-08-10 17:22:12 UTC (rev 33760)
@@ -361,6 +361,13 @@
 					XML_PROP(resolution, false)
 				KEY_END()
 			KEY_END()
+			
+			XML_KEY(cursor)
+				XML_PROP(file, true)
+				XML_PROP(hotspot, true)
+				XML_PROP(scale, true)
+				XML_PROP(resolution, false)
+			KEY_END()
 
 			XML_KEY(defaults)
 				XML_PROP(stroke, false)
@@ -499,7 +506,9 @@
 	bool parserCallback_drawdata(ParserNode *node);
 	bool parserCallback_bitmaps(ParserNode *node) { return true; }
 	bool parserCallback_bitmap(ParserNode *node);
+	bool parserCallback_cursor(ParserNode *node);
 	
+	
 	/** Layout info callbacks */
 	bool parserCallback_layout_info(ParserNode *node);
 	bool parserCallback_globals(ParserNode *node) { return true; }

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-10 17:16:05 UTC (rev 33759)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-10 17:22:12 UTC (rev 33760)
@@ -386,10 +386,6 @@
 		}
 	}
 	
-	if (_system->hasFeature(OSystem::kFeatureCursorHasPalette)) {
-		createCursor();
-	}
-	
 	_themeName = "DEBUG - A Theme name";
 	_themeOk = true;
 	return true;
@@ -913,17 +909,19 @@
 	CursorMan.showMouse(true);
 }
 
-void ThemeRenderer::createCursor() {
-	const Surface *cursor = _bitmaps["cursor.bmp"];
+bool ThemeRenderer::createCursor(const Common::String &filename, int hotspotX, int hotspotY, int scale) {
+	if (!_system->hasFeature(OSystem::kFeatureCursorHasPalette))
+		return false;
+		
+	const Surface *cursor = _bitmaps[filename];
 	
 	if (!cursor)
-		return;
+		return false;
 		
-	_cursorHotspotX = _themeEval->getVar("Cursor.Hotspot.X", 0);
-	_cursorHotspotY = _themeEval->getVar("Cursor.Hotspot.Y", 0);
+	_cursorHotspotX = hotspotX;
+	_cursorHotspotY = hotspotY;
+	_cursorTargetScale = scale;
 
-	_cursorTargetScale = _themeEval->getVar("Cursor.TargetScale", 3);
-
 	_cursorWidth = cursor->w;
 	_cursorHeight = cursor->h;
 
@@ -957,8 +955,10 @@
 				_cursorPal[index * 4 + 2] = b;
 				_cursorPal[index * 4 + 3] = 0xFF;
 
-				if (colorsFound > MAX_CURS_COLORS)
-					error("Cursor contains too much colors (%d, but only %d are allowed)", colorsFound, MAX_CURS_COLORS);
+				if (colorsFound > MAX_CURS_COLORS) {
+					warning("Cursor contains too much colors (%d, but only %d are allowed)", colorsFound, MAX_CURS_COLORS);
+					return false;
+				}
 			}
 
 			if (col != transparency) {
@@ -971,6 +971,8 @@
 
 	_useCursor = true;
 	delete[] table;
+	
+	return true;
 }
 
 } // end of namespace GUI.

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-08-10 17:16:05 UTC (rev 33759)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.h	2008-08-10 17:22:12 UTC (rev 33760)
@@ -472,6 +472,17 @@
 			
 		return 0;
 	}
+	
+	/**
+	 *	Interface for the Theme Parser: Creates a new cursor by loading the given
+	 *	bitmap and sets it as the active cursor.
+	 *
+	 *	@param filename File name of the bitmap to load.
+	 * 	@param hotspotX X Coordinate of the bitmap which does the cursor click.
+	 *	@param hotspotY	Y Coordinate of the bitmap which does the cursor click.
+	 *	@param scale	Scale at which the bitmap is supposed to be used.
+	 */
+	bool createCursor(const Common::String &filename, int hotspotX, int hotspotY, int scale);
 
 protected:
 
@@ -702,7 +713,6 @@
 	
 	/** Custom Cursor Management */
 	void setUpCursor();
-	void createCursor();
 	
 	bool _useCursor;
 	int _cursorHotspotX, _cursorHotspotY;

Deleted: scummvm/branches/gsoc2008-gui/gui/themes/modern.stx
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/modern.stx	2008-08-10 17:16:05 UTC (rev 33759)
+++ scummvm/branches/gsoc2008-gui/gui/themes/modern.stx	2008-08-10 17:22:12 UTC (rev 33760)
@@ -1,1051 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-/* ScummVM Theme XML file */
-/* Modern Theme */
-
-<render_info>
-	<palette>
-		<color name = 'darkred'
-				rgb = '168, 42, 12'
-		/>
-		<color name = 'brightred'
-				rgb = '200, 124, 104'
-		/>
-		<color name = 'xtrabrightred'
-				rgb = '251, 241, 206'
-		/>
-		<color name = 'blandyellow'
-				rgb = '247, 228, 166'
-		/>
-		<color name = 'bgreen'
-				rgb = '96, 160, 8'
-		/>
-		<color name = 'blue'
-				rgb = '0, 255, 255'
-		/>
-		<color name = 'black'
-				rgb = '0, 0, 0'
-		/>
-		<color name = 'white'
-				rgb = '255, 255, 255'
-		/>
-		<color name = 'shadowcolor'
-				rgb = '63, 60, 17'
-		/>
-	</palette>
-	
-	<bitmaps>
-		<bitmap filename = 'logo.bmp'/>
-		<bitmap filename = 'cursor.bmp'/>
-	</bitmaps>
-
-	<fonts>
-		<font	id = 'text_default'
-				file = 'default'
-				color = 'black'
-		/>
-		<font	id = 'text_hover'
-				file = 'default'
-				color = 'bgreen'
-		/>
-		<font	id = 'text_disabled'
-				file = 'default'
-				color = '128, 128, 128'
-		/>
-		<font	id = 'text_inverted'
-				file = 'default'
-				color = '0, 0, 0'
-		/>
-		<font	id = 'text_button'
-				file = 'default'
-				color = 'white'
-		/>
-		<font	id = 'text_button_hover'
-				file = 'default'
-				color = 'blandyellow'
-		/>
-		<font	id = 'text_normal'
-				file = 'helvr12-l1.bdf'
-				color = 'black'
-		/>
-	</fonts>
-
-	<defaults fill = 'gradient' fg_color = 'white' bevel_color = '237, 169, 72'/>
-
-	<drawdata id = 'text_selection' cache = false>
-		<drawstep	func = 'square'
-					fill = 'foreground'
-					fg_color = 'bgreen'
-		/>
-	</drawdata>
-
-	<drawdata id = 'mainmenu_bg' cache = false>
-		<drawstep	func = 'fill'
-					fill = 'gradient'
-					gradient_start = '208, 112, 8'
-					gradient_end = '232, 192, 16'
-		/>
-	</drawdata>
-	
-	<drawdata id = 'special_bg' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = '4'
-					fill = 'gradient'
-					stroke = '0'
-					gradient_start = '208, 112, 8'
-					gradient_end = '232, 192, 16'
-					shadow = '3'
-		/>
-	</drawdata>
-
-	<drawdata id = 'separator' cache = false>
-		<drawstep	func = 'square'
-					fill = 'foreground'
-					height = '1'
-					ypos = 'center'
-					fg_color = 'black'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_base' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
-					fill = 'background'
-					fg_color = '176, 164, 160'
-					bg_color = '240, 228, 160'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_handle_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
-					fill = 'gradient'
-					fg_color = 'blandyellow'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_handle_idle' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
-					fill = 'gradient'
-					fg_color = 'blandyellow'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_button_idle' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = '4'
-					fill = 'none'
-					fg_color = '176, 164, 160'
-					stroke = 1
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '0, 0, 0'
-					fill = 'foreground'
-					width = 'auto'
-					height = 'auto'
-					xpos = 'center'
-					ypos = 'center'
-					orientation = 'top'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_button_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = '4'
-					fill = 'background'
-					fg_color = '120, 120, 120'
-					bg_color = '206, 121, 99'
-					stroke = 1
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '0, 0, 0'
-					fill = 'foreground'
-					width = 'auto'
-					height = 'auto'
-					xpos = 'center'
-					ypos = 'center'
-					orientation = 'top'
-		/>
-	</drawdata>
-
-	<drawdata id = 'tab_active' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'tab'
-					radius = '4'
-					stroke = '0'
-					fill = 'gradient'
-					gradient_end = 'xtrabrightred'
-					gradient_start = 'blandyellow'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'tab_inactive' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'tab'
-					radius = '4'
-					stroke = '0'
-					fill = 'foreground'
-					fg_color = '240, 205, 118'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'tab_background' cache = false>
-		<drawstep	func = 'tab'
-					radius = '8'
-					stroke = '0'
-					fill = 'foreground'
-					fg_color = '232, 180, 81'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'widget_slider' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
-					fill = 'foreground'
-					fg_color = 'blandyellow'
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-
-	<drawdata id = 'slider_full' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
-					fill = 'gradient'
-					fg_color = '123, 112, 56'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'slider_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
-					fill = 'gradient'
-					fg_color = '123, 112, 56'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'popup_idle' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
-					fill = 'foreground'
-					fg_color = '250, 237, 190'
-					shadow = 2
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '63, 60, 52'
-					fill = 'foreground'
-					width = 'height'
-					height = 'auto'
-					xpos = 'right'
-					ypos = 'center'
-					orientation = 'bottom'
-		/>
-		<text	font = 'text_default'
-				vertical_align = 'center'
-				horizontal_align = 'right'
-		/>
-	</drawdata>
-
-
-	<drawdata id = 'popup_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
-					fill = 'gradient'
-					gradient_start = 'blandyellow'
-					gradient_end = '250, 237, 190'
-					shadow = 0
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '63, 60, 52'
-					fill = 'foreground'
-					width = 'height'
-					height = 'auto'
-					xpos = 'right'
-					ypos = 'center'
-					orientation = 'bottom'
-		/>
-		<text	font = 'text_hover'
-				vertical_align = 'center'
-				horizontal_align = 'right'
-		/>
-	</drawdata>
-
-	<drawdata id = 'widget_textedit' cache = false>
-		<drawstep	func = 'roundedsq'
-					fill = 'foreground'
-					radius = 4
-					fg_color = 'blandyellow'
-					shadow = 0
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-	
-	<drawdata id = 'caret' cache = false>
-		<drawstep	func = 'square'
-					fill = 'foreground'
-					fg_color = 'black'
-		/>
-	</drawdata>
-
-	<drawdata id = 'default_bg' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = 12
-					stroke = 0
-					fg_color = 'xtrabrightred'
-					fill = 'foreground'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'button_idle' cache = false>
-		<text	font = 'text_button'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'roundedsq'
-					radius = '6'
-					stroke = 1
-					fill = 'gradient'
-					shadow = 0
-					fg_color = 'shadowcolor'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-					bevel = 1
-		/>
-	</drawdata>
-
-	<drawdata id = 'button_hover' cache = false>
-		<text	font = 'text_button_hover'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'roundedsq'
-					radius = '6'
-					gradient_factor = 1
-					stroke = 1 
-					fill = 'gradient'
-					shadow = 0
-					fg_color = 'shadowcolor'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'darkred'
-					bevel_color = 'xtrabrightred'
-					bevel = 1
-		/>
-	</drawdata>
-
-	<drawdata id = 'button_disabled' cache = false>
-		<text	font = 'text_disabled'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'roundedsq'
-					radius = '8'
-					stroke = 0
-					fill = 'foreground'
-					fg_color = '200, 200, 200'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'checkbox_disabled' cache = false>
-		<text	font = 'text_disabled'
-				vertical_align = 'top'
-				horizontal_align = 'left'
-		/>
-		<drawstep	func = 'roundedsq'
-					fill = 'none'
-					radius = 4
-					fg_color = 'black'
-					shadow = 0
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-
-	<drawdata id = 'checkbox_selected' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'top'
-				horizontal_align = 'left'
-		/>
-		<drawstep	func = 'roundedsq'
-					fill = 'gradient'
-					radius = 4
-					fg_color = 'white'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-					shadow = 0
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-
-	<drawdata id = 'checkbox_default' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'top'
-				horizontal_align = 'left'
-		/>
-		<drawstep	func = 'roundedsq'
-					fill = 'foreground'
-					radius = 4
-					fg_color = 'blandyellow'
-					shadow = 0
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-
-	<drawdata id = 'widget_default' cache = false>
-		<drawstep	func = 'roundedsq'
-					gradient_factor = 6
-					radius = '8'
-					fill = 'gradient'
-					gradient_start = '240, 224, 136'
-					gradient_end = 'xtrabrightred'
-					shadow = 3
-		/>
-	</drawdata>
-</render_info>
-
-<layout_info>
-	<globals>
-		<def var = 'Widget.Size' value = '32' />
-		<def var = 'Line.Height' value = '16' />
-		<def var = 'Font.Height' value = '16' />
-		<def var = 'TabLabelWidth' value = '110' />
-		
-		<def var = 'WidgetSize' value = 'kBigWidgetSize' />
-		
-		<def resolution = '320xY' var = 'WidgetSize' value = 'kNormalWidgetSize' />
-		
-		<def var = 'Padding.Bottom' value = '16' />
-		<def var = 'Padding.Left' value = '16' />
-		<def var = 'Padding.Right' value = '16' />
-		<def var = 'Padding.Top' value = '16' />
-		
-		<def var = 'About.OuterBorder' value = '80'/>
-		<def resolution = '320xY' var = 'About.OuterBorder' value = '16'/>
-		
-		<def var = 'ListWidget.hlLeftPadding' value = '0'/>
-		<def var = 'ListWidget.hlRightPadding' value = '16'/>
-		<def var = 'PopUpWidget.labelSpacing' value = '10' />
-		
-		<def var = 'ShowLauncherLogo' value = '1'/>
-		<def resolution = '320xY' var = 'ShowLauncherLogo' value = '0'/>
-
-		<widget name = 'OptionsLabel'
-				size = '110, Globals.Line.Height'
-		/>
-		<widget name = 'SmallLabel'
-				size = '24, Globals.Line.Height'
-		/>
-		
-		<widget name = 'Button'
-				size = 'kBigButtonWidth, kBigButtonHeight'
-		/>
-		<widget resolution = '320xY'
-				name = 'Button'
-				size = 'kButtonWidth, kButtonHeight'
-		/>
-		
-		
-		<widget name = 'Slider'
-				size = '128, 18'
-		/>
-		<widget name = 'PopUp'
-				size = '-1, 19'
-		/>
-		<widget name = 'Checkbox'
-				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 = '7, 5, 0, 0'
-		/>
-		<widget name = 'Console'
-				padding = '7, 5, 5, 5'
-		/>
-
-		<widget name = 'TabWidget'>
-			<child	name = 'Tab'
-					size = '75, 27'
-					padding = '0, 0, 8, 0'
-			/>
-			<child name = 'NavButton'
-					size = '15, 18'
-					padding = '0, 3, 4, 0'
-			/>
-		</widget>
-	</globals>
-
-	<dialog name = 'Launcher' overlays = 'screen'>
-		<layout type = 'vertical' center = 'true' padding = '23, 23, 8, 23'>
-			<widget name = 'Version'
-					width = '247'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Logo'
-					width = '283'
-					height = '80'
-			/>
-			<layout type = 'horizontal' direction = 'right2left' padding = '0, 0, 0, 0'>
-				<layout type = 'vertical' padding = '16, 0, 0, 0'>
-					<widget name = 'StartButton' 
-							type = 'Button'
-					/>
-					<space size = '16' />
-					<widget name = 'AddGameButton' 
-							type = 'Button' 
-					/>
-					<widget name = 'EditGameButton' 
-							type = 'Button' 
-					/>
-					<widget name = 'RemoveGameButton' 
-							type = 'Button' 
-					/>
-					<space size = '16' />
-					<widget name = 'OptionsButton' 
-							type = 'Button' 
-					/>
-					<widget name = 'AboutButton' 
-							type = 'Button' 
-					/>
-					<space size = '16' />
-					<widget name = 'QuitButton' 
-							type = 'Button' 
-					/>
-					<space/>
-				</layout>
-				<widget name = 'GameList'/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog resolution = '320xY' name = 'Launcher' overlays = 'screen'>
-		<layout type = 'vertical' center = 'true' padding = '8, 8, 8, 8'>
-			<widget name = 'Version'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'GameList' width = '304' height = '120'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6'>
-				<widget name = 'AddGameButton' 
-						width = '95'
-						height = 'Globals.Button.Height' 
-				/>
-				<widget name = 'EditGameButton' 
-						width = '95'
-						height = 'Globals.Button.Height'
-				/>
-				<widget name = 'RemoveGameButton' 
-						width = '95'
-						height = 'Globals.Button.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'QuitButton' 
-						type = 'Button' 
-				/>
-				<widget name = 'AboutButton' 
-						type = 'Button' 
-				/>
-				<widget name = 'OptionsButton' 
-						type = 'Button' 
-				/>
-				<widget name = 'StartButton' 
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
-						type = 'Button'
-				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<space/>
-				<widget name = 'Up'
-						type = 'Button'
-				/>
-			</layout>
-			<widget name = 'List'/>
-			<widget name = 'Path'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Headline'
-					height = 'Globals.Line.Height'
-			/>
-		</layout>
-	</dialog>	
-	
-	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
-				<widget name = 'Ok' 
-						type = 'Button'
-				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<space/>
-			</layout>
-			<widget name = 'TabWidget'/>
-		</layout>
-	</dialog>
-	
-	
-	
-	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<widget name = 'grModePopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'grRenderPopup'
-					type = 'PopUp'
-			/>
-			<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'>
-			<widget name = 'auMidiPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'auSampleRatePopup'
-					type = 'PopUp'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'subToggleDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subToggleButton'
-						width = '150'
-						height = 'Globals.Slider.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<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'>
-				<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>
-	</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'>
-				<widget name = 'mcFontButton'
-						type = 'Button'
-				/>
-				<widget name = 'mcFontClearButton'
-						height = 'Globals.Line.Height'
-						width = 'Globals.Line.Height'
-				/>		
-				<widget name = 'mcFontPath'
-						height = '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'
-						type = 'SmallLabel'
-				/>
-			</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 = '16'>
-				<widget name = 'SaveButton'
-						type = 'Button'
-				/>
-				<widget name = 'SavePath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ThemeButton'
-						type = 'Button'
-				/>
-				<widget name = 'ThemePath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ExtraButton'
-						type = 'Button'
-				/>
-				<widget name = 'ExtraPath'
-						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'>
-				<widget name = 'ThemeButton'
-						type = 'Button'
-				/>
-				<widget name = 'CurTheme'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<widget name = 'AutosavePeriod'
-					type = 'PopUp'
-			/>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
-				<widget name = 'Ok' 
-						type = 'Button'
-				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<space/>
-			</layout>
-			<widget name = 'TabWidget'/>
-		</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 = '16'>
-				<widget name = 'Id'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'Domain'
-						type = 'PopUp'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'Name'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'Desc'
-						type = 'PopUp'
-				/>
-			</layout>
-			<widget name = 'Lang'
-					type = 'PopUp'
-			/>
-			<widget name = 'Platform'
-					type = 'PopUp'
-			/>
-		</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 = '16' center = 'true'>
-				<widget name = 'Savepath'
-						type = 'Button'
-				/>
-				<widget name = 'SavepathText'
-						height = 'Globals.Line.Height'
-				/>
-			</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'
-				/>
-			</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 = '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' center = 'true' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<space size = 'Globals.Button.Width' />
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<widget name = 'Ok'
-						type = 'Button'
-				/>
-			</layout>
-			<space size = '100'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subSubtitleSpeedDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subSubtitleSpeedSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'subSubtitleSpeedLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subToggleDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subToggleButton'
-						width = '158'
-						height = 'Globals.Slider.Height'
-				/>
-			</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 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 = 'vcMusicText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcMusicSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcMusicLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>			
-		</layout>
-	</dialog>
-	
-	<dialog name = 'ScummSaveLoad' overlays = 'screen'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
-						type = 'Button'
-				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<space/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'>
-				<layout type = 'vertical' padding = '0, 0, 0, 0'>
-					<widget name = 'Thumbnail'
-							width = '180'
-							height = '200'
-					/>
-					<space/>
-				</layout>
-				<widget name = 'List' />
-			</layout>
-		</layout>
-	</dialog>
-</layout_info>
\ No newline at end of file

Added: scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx	                        (rev 0)
+++ scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx	2008-08-10 17:22:12 UTC (rev 33760)
@@ -0,0 +1,1053 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+/* ScummVM Theme XML file */
+/* Modern Theme */
+
+<render_info>
+	<palette>
+		<color name = 'darkred'
+				rgb = '168, 42, 12'
+		/>
+		<color name = 'brightred'
+				rgb = '200, 124, 104'
+		/>
+		<color name = 'xtrabrightred'
+				rgb = '251, 241, 206'
+		/>
+		<color name = 'blandyellow'
+				rgb = '247, 228, 166'
+		/>
+		<color name = 'bgreen'
+				rgb = '96, 160, 8'
+		/>
+		<color name = 'blue'
+				rgb = '0, 255, 255'
+		/>
+		<color name = 'black'
+				rgb = '0, 0, 0'
+		/>
+		<color name = 'white'
+				rgb = '255, 255, 255'
+		/>
+		<color name = 'shadowcolor'
+				rgb = '63, 60, 17'
+		/>
+	</palette>
+	
+	<bitmaps>
+		<bitmap filename = 'logo.bmp'/>
+		<bitmap filename = 'cursor.bmp'/>
+	</bitmaps>
+
+	<fonts>
+		<font	id = 'text_default'
+				file = 'default'
+				color = 'black'
+		/>
+		<font	id = 'text_hover'
+				file = 'default'
+				color = 'bgreen'
+		/>
+		<font	id = 'text_disabled'
+				file = 'default'
+				color = '128, 128, 128'
+		/>
+		<font	id = 'text_inverted'
+				file = 'default'
+				color = '0, 0, 0'
+		/>
+		<font	id = 'text_button'
+				file = 'default'
+				color = 'white'
+		/>
+		<font	id = 'text_button_hover'
+				file = 'default'
+				color = 'blandyellow'
+		/>
+		<font	id = 'text_normal'
+				file = 'helvr12-l1.bdf'
+				color = 'black'
+		/>
+	</fonts>
+
+	<defaults fill = 'gradient' fg_color = 'white' bevel_color = '237, 169, 72'/>
+	
+	<cursor file = 'cursor.bmp' hotspot = '0, 0' scale = '3'/>
+
+	<drawdata id = 'text_selection' cache = false>
+		<drawstep	func = 'square'
+					fill = 'foreground'
+					fg_color = 'bgreen'
+		/>
+	</drawdata>
+
+	<drawdata id = 'mainmenu_bg' cache = false>
+		<drawstep	func = 'fill'
+					fill = 'gradient'
+					gradient_start = '208, 112, 8'
+					gradient_end = '232, 192, 16'
+		/>
+	</drawdata>
+	
+	<drawdata id = 'special_bg' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = '4'
+					fill = 'gradient'
+					stroke = '0'
+					gradient_start = '208, 112, 8'
+					gradient_end = '232, 192, 16'
+					shadow = '3'
+		/>
+	</drawdata>
+
+	<drawdata id = 'separator' cache = false>
+		<drawstep	func = 'square'
+					fill = 'foreground'
+					height = '1'
+					ypos = 'center'
+					fg_color = 'black'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_base' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 6
+					fill = 'background'
+					fg_color = '176, 164, 160'
+					bg_color = '240, 228, 160'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_handle_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 6
+					fill = 'gradient'
+					fg_color = 'blandyellow'
+					gradient_start = 'xtrabrightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_handle_idle' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 6
+					fill = 'gradient'
+					fg_color = 'blandyellow'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_button_idle' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = '4'
+					fill = 'none'
+					fg_color = '176, 164, 160'
+					stroke = 1
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '0, 0, 0'
+					fill = 'foreground'
+					width = 'auto'
+					height = 'auto'
+					xpos = 'center'
+					ypos = 'center'
+					orientation = 'top'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_button_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = '4'
+					fill = 'background'
+					fg_color = '120, 120, 120'
+					bg_color = '206, 121, 99'
+					stroke = 1
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '0, 0, 0'
+					fill = 'foreground'
+					width = 'auto'
+					height = 'auto'
+					xpos = 'center'
+					ypos = 'center'
+					orientation = 'top'
+		/>
+	</drawdata>
+
+	<drawdata id = 'tab_active' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'tab'
+					radius = '4'
+					stroke = '0'
+					fill = 'gradient'
+					gradient_end = 'xtrabrightred'
+					gradient_start = 'blandyellow'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'tab_inactive' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'tab'
+					radius = '4'
+					stroke = '0'
+					fill = 'foreground'
+					fg_color = '240, 205, 118'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'tab_background' cache = false>
+		<drawstep	func = 'tab'
+					radius = '8'
+					stroke = '0'
+					fill = 'foreground'
+					fg_color = '232, 180, 81'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'widget_slider' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 0
+					radius = 4
+					fill = 'foreground'
+					fg_color = 'blandyellow'
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+
+	<drawdata id = 'slider_full' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 4
+					fill = 'gradient'
+					fg_color = '123, 112, 56'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'slider_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 4
+					fill = 'gradient'
+					fg_color = '123, 112, 56'
+					gradient_start = 'xtrabrightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'popup_idle' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 0
+					radius = 4
+					fill = 'foreground'
+					fg_color = '250, 237, 190'
+					shadow = 2
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '63, 60, 52'
+					fill = 'foreground'
+					width = 'height'
+					height = 'auto'
+					xpos = 'right'
+					ypos = 'center'
+					orientation = 'bottom'
+		/>
+		<text	font = 'text_default'
+				vertical_align = 'center'
+				horizontal_align = 'right'
+		/>
+	</drawdata>
+
+
+	<drawdata id = 'popup_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 0
+					radius = 4
+					fill = 'gradient'
+					gradient_start = 'blandyellow'
+					gradient_end = '250, 237, 190'
+					shadow = 0
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '63, 60, 52'
+					fill = 'foreground'
+					width = 'height'
+					height = 'auto'
+					xpos = 'right'
+					ypos = 'center'
+					orientation = 'bottom'
+		/>
+		<text	font = 'text_hover'
+				vertical_align = 'center'
+				horizontal_align = 'right'
+		/>
+	</drawdata>
+
+	<drawdata id = 'widget_textedit' cache = false>
+		<drawstep	func = 'roundedsq'
+					fill = 'foreground'
+					radius = 4
+					fg_color = 'blandyellow'
+					shadow = 0
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+	
+	<drawdata id = 'caret' cache = false>
+		<drawstep	func = 'square'
+					fill = 'foreground'
+					fg_color = 'black'
+		/>
+	</drawdata>
+
+	<drawdata id = 'default_bg' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = 12
+					stroke = 0
+					fg_color = 'xtrabrightred'
+					fill = 'foreground'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'button_idle' cache = false>
+		<text	font = 'text_button'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'roundedsq'
+					radius = '6'
+					stroke = 1
+					fill = 'gradient'
+					shadow = 0
+					fg_color = 'shadowcolor'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+					bevel = 1
+		/>
+	</drawdata>
+
+	<drawdata id = 'button_hover' cache = false>
+		<text	font = 'text_button_hover'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'roundedsq'
+					radius = '6'
+					gradient_factor = 1
+					stroke = 1 
+					fill = 'gradient'
+					shadow = 0
+					fg_color = 'shadowcolor'
+					gradient_start = 'xtrabrightred'
+					gradient_end = 'darkred'
+					bevel_color = 'xtrabrightred'
+					bevel = 1
+		/>
+	</drawdata>
+
+	<drawdata id = 'button_disabled' cache = false>
+		<text	font = 'text_disabled'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'roundedsq'
+					radius = '8'
+					stroke = 0
+					fill = 'foreground'
+					fg_color = '200, 200, 200'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'checkbox_disabled' cache = false>
+		<text	font = 'text_disabled'
+				vertical_align = 'top'
+				horizontal_align = 'left'
+		/>
+		<drawstep	func = 'roundedsq'
+					fill = 'none'
+					radius = 4
+					fg_color = 'black'
+					shadow = 0
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+
+	<drawdata id = 'checkbox_selected' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'top'
+				horizontal_align = 'left'
+		/>
+		<drawstep	func = 'roundedsq'
+					fill = 'gradient'
+					radius = 4
+					fg_color = 'white'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+					shadow = 0
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+
+	<drawdata id = 'checkbox_default' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'top'
+				horizontal_align = 'left'
+		/>
+		<drawstep	func = 'roundedsq'
+					fill = 'foreground'
+					radius = 4
+					fg_color = 'blandyellow'
+					shadow = 0
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+
+	<drawdata id = 'widget_default' cache = false>
+		<drawstep	func = 'roundedsq'
+					gradient_factor = 6
+					radius = '8'
+					fill = 'gradient'
+					gradient_start = '240, 224, 136'
+					gradient_end = 'xtrabrightred'
+					shadow = 3
+		/>
+	</drawdata>
+</render_info>
+
+<layout_info>
+	<globals>
+		<def var = 'Widget.Size' value = '32' />
+		<def var = 'Line.Height' value = '16' />
+		<def var = 'Font.Height' value = '16' />
+		<def var = 'TabLabelWidth' value = '110' />
+		
+		<def var = 'WidgetSize' value = 'kBigWidgetSize' />
+		
+		<def resolution = '320xY' var = 'WidgetSize' value = 'kNormalWidgetSize' />
+		
+		<def var = 'Padding.Bottom' value = '16' />
+		<def var = 'Padding.Left' value = '16' />
+		<def var = 'Padding.Right' value = '16' />
+		<def var = 'Padding.Top' value = '16' />
+		
+		<def var = 'About.OuterBorder' value = '80'/>
+		<def resolution = '320xY' var = 'About.OuterBorder' value = '16'/>
+		
+		<def var = 'ListWidget.hlLeftPadding' value = '0'/>
+		<def var = 'ListWidget.hlRightPadding' value = '16'/>
+		<def var = 'PopUpWidget.labelSpacing' value = '10' />
+		
+		<def var = 'ShowLauncherLogo' value = '1'/>
+		<def resolution = '320xY' var = 'ShowLauncherLogo' value = '0'/>
+
+		<widget name = 'OptionsLabel'
+				size = '110, Globals.Line.Height'
+		/>
+		<widget name = 'SmallLabel'
+				size = '24, Globals.Line.Height'
+		/>
+		
+		<widget name = 'Button'
+				size = 'kBigButtonWidth, kBigButtonHeight'
+		/>
+		<widget resolution = '320xY'
+				name = 'Button'
+				size = 'kButtonWidth, kButtonHeight'
+		/>
+		
+		
+		<widget name = 'Slider'
+				size = '128, 18'
+		/>
+		<widget name = 'PopUp'
+				size = '-1, 19'
+		/>
+		<widget name = 'Checkbox'
+				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 = '7, 5, 0, 0'
+		/>
+		<widget name = 'Console'
+				padding = '7, 5, 5, 5'
+		/>
+
+		<widget name = 'TabWidget'>
+			<child	name = 'Tab'
+					size = '75, 27'
+					padding = '0, 0, 8, 0'
+			/>
+			<child name = 'NavButton'
+					size = '15, 18'
+					padding = '0, 3, 4, 0'
+			/>
+		</widget>
+	</globals>
+
+	<dialog name = 'Launcher' overlays = 'screen'>
+		<layout type = 'vertical' center = 'true' padding = '23, 23, 8, 23'>
+			<widget name = 'Version'
+					width = '247'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Logo'
+					width = '283'
+					height = '80'
+			/>
+			<layout type = 'horizontal' direction = 'right2left' padding = '0, 0, 0, 0'>
+				<layout type = 'vertical' padding = '16, 0, 0, 0'>
+					<widget name = 'StartButton' 
+							type = 'Button'
+					/>
+					<space size = '16' />
+					<widget name = 'AddGameButton' 
+							type = 'Button' 
+					/>
+					<widget name = 'EditGameButton' 
+							type = 'Button' 
+					/>
+					<widget name = 'RemoveGameButton' 
+							type = 'Button' 
+					/>
+					<space size = '16' />
+					<widget name = 'OptionsButton' 
+							type = 'Button' 
+					/>
+					<widget name = 'AboutButton' 
+							type = 'Button' 
+					/>
+					<space size = '16' />
+					<widget name = 'QuitButton' 
+							type = 'Button' 
+					/>
+					<space/>
+				</layout>
+				<widget name = 'GameList'/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog resolution = '320xY' name = 'Launcher' overlays = 'screen'>
+		<layout type = 'vertical' center = 'true' padding = '8, 8, 8, 8'>
+			<widget name = 'Version'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'GameList' width = '304' height = '120'/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6'>
+				<widget name = 'AddGameButton' 
+						width = '95'
+						height = 'Globals.Button.Height' 
+				/>
+				<widget name = 'EditGameButton' 
+						width = '95'
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'RemoveGameButton' 
+						width = '95'
+						height = 'Globals.Button.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'QuitButton' 
+						type = 'Button' 
+				/>
+				<widget name = 'AboutButton' 
+						type = 'Button' 
+				/>
+				<widget name = 'OptionsButton' 
+						type = 'Button' 
+				/>
+				<widget name = 'StartButton' 
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
+			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
+				<widget name = 'Choose'
+						type = 'Button'
+				/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<space/>
+				<widget name = 'Up'
+						type = 'Button'
+				/>
+			</layout>
+			<widget name = 'List'/>
+			<widget name = 'Path'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Headline'
+					height = 'Globals.Line.Height'
+			/>
+		</layout>
+	</dialog>	
+	
+	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'>
+			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
+				<widget name = 'Ok' 
+						type = 'Button'
+				/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<space/>
+			</layout>
+			<widget name = 'TabWidget'/>
+		</layout>
+	</dialog>
+	
+	
+	
+	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<widget name = 'grModePopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'grRenderPopup'
+					type = 'PopUp'
+			/>
+			<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'>
+			<widget name = 'auMidiPopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'auSampleRatePopup'
+					type = 'PopUp'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'subToggleDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subToggleButton'
+						width = '150'
+						height = 'Globals.Slider.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<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'>
+				<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>
+	</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'>
+				<widget name = 'mcFontButton'
+						type = 'Button'
+				/>
+				<widget name = 'mcFontClearButton'
+						height = 'Globals.Line.Height'
+						width = 'Globals.Line.Height'
+				/>		
+				<widget name = 'mcFontPath'
+						height = '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'
+						type = 'SmallLabel'
+				/>
+			</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 = '16'>
+				<widget name = 'SaveButton'
+						type = 'Button'
+				/>
+				<widget name = 'SavePath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ThemeButton'
+						type = 'Button'
+				/>
+				<widget name = 'ThemePath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ExtraButton'
+						type = 'Button'
+				/>
+				<widget name = 'ExtraPath'
+						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'>
+				<widget name = 'ThemeButton'
+						type = 'Button'
+				/>
+				<widget name = 'CurTheme'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'AutosavePeriod'
+					type = 'PopUp'
+			/>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'>
+			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
+				<widget name = 'Ok' 
+						type = 'Button'
+				/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<space/>
+			</layout>
+			<widget name = 'TabWidget'/>
+		</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 = '16'>
+				<widget name = 'Id'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Domain'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'Name'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Desc'
+						type = 'PopUp'
+				/>
+			</layout>
+			<widget name = 'Lang'
+					type = 'PopUp'
+			/>
+			<widget name = 'Platform'
+					type = 'PopUp'
+			/>
+		</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 = '16' center = 'true'>
+				<widget name = 'Savepath'
+						type = 'Button'
+				/>
+				<widget name = 'SavepathText'
+						height = 'Globals.Line.Height'
+				/>
+			</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'
+				/>
+			</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 = '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' center = 'true' direction = 'bottom2top'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<space size = 'Globals.Button.Width' />
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Ok'
+						type = 'Button'
+				/>
+			</layout>
+			<space size = '100'/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'subSubtitleSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subSubtitleSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'subSubtitleSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'subToggleDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subToggleButton'
+						width = '158'
+						height = 'Globals.Slider.Height'
+				/>
+			</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 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 = 'vcMusicText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcMusicSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcMusicLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>			
+		</layout>
+	</dialog>
+	
+	<dialog name = 'ScummSaveLoad' overlays = 'screen'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
+			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
+				<widget name = 'Choose'
+						type = 'Button'
+				/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<space/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'>
+				<layout type = 'vertical' padding = '0, 0, 0, 0'>
+					<widget name = 'Thumbnail'
+							width = '180'
+							height = '200'
+					/>
+					<space/>
+				</layout>
+				<widget name = 'List' />
+			</layout>
+		</layout>
+	</dialog>
+</layout_info>
\ No newline at end of file


Property changes on: scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list