Added Classic Theme - WIP (yes, it's working).

Added Builtin theme back.
Added Python script to automatically build themes.

svn-id: r33868

1 files changed, 276 insertions, 268 deletions

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 262260a7fc..d87a1f5632 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,137 +1,101 @@
 "<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 = 'lightgrey' "
+"rgb = '104, 104, 104' "
 "/> "
-"<color name = 'shadowcolor' "
-"rgb = '63, 60, 17' "
+"<color name = 'darkgrey' "
+"rgb = '64, 64, 64' "
+"/> "
+"<color name = 'green' "
+"rgb = '32, 160, 32' "
+"/> "
+"<color name = 'green2' "
+"rgb = '0, 255, 0' "
 "/> "
 "</palette> "
-"<bitmaps> "
-"<bitmap filename = 'logo.bmp'/> "
-"<bitmap filename = 'cursor.bmp'/> "
-"</bitmaps> "
 "<fonts> "
 "<font id = 'text_default' "
 "file = 'default' "
-"color = 'black' "
+"color = 'green' "
 "/> "
 "<font id = 'text_hover' "
 "file = 'default' "
-"color = 'bgreen' "
+"color = 'green2' "
 "/> "
 "<font id = 'text_disabled' "
 "file = 'default' "
-"color = '128, 128, 128' "
+"color = 'lightgrey' "
 "/> "
 "<font id = 'text_inverted' "
 "file = 'default' "
-"color = '0, 0, 0' "
+"color = 'black' "
 "/> "
 "<font id = 'text_button' "
 "file = 'default' "
-"color = 'white' "
+"color = 'green' "
 "/> "
 "<font id = 'text_button_hover' "
 "file = 'default' "
-"color = 'blandyellow' "
+"color = 'green2' "
 "/> "
 "<font id = 'text_normal' "
-"file = 'helvr12-l1.bdf' "
-"color = 'black' "
+"file = 'default' "
+"color = 'green' "
 "/> "
 "</fonts> "
-"<defaults fill = 'gradient' fg_color = 'white' bevel_color = '237, 169, 72'/> "
+"<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 = 'bgreen' "
+"fg_color = 'green' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'mainmenu_bg' cache = false> "
 "<drawstep func = 'fill' "
-"fill = 'gradient' "
-"gradient_start = '208, 112, 8' "
-"gradient_end = '232, 192, 16' "
+"fill = 'foreground' "
+"fg_color = 'black' "
 "/> "
 "</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' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'separator' cache = false> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
-"height = '1' "
+"height = '2' "
 "ypos = 'center' "
-"fg_color = 'black' "
+"fg_color = 'lightgrey' "
 "/> "
 "</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' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
 "</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' "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green2' "
 "/> "
 "</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' "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'scrollbar_button_idle' cache = false> "
-"<drawstep func = 'roundedsq' "
-"radius = '4' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "fill = 'none' "
-"fg_color = '176, 164, 160' "
-"stroke = 1 "
 "/> "
 "<drawstep func = 'triangle' "
-"fg_color = '0, 0, 0' "
+"fg_color = 'green' "
 "fill = 'foreground' "
 "width = 'auto' "
 "height = 'auto' "
@@ -141,15 +105,12 @@
 "/> "
 "</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 = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "<drawstep func = 'triangle' "
-"fg_color = '0, 0, 0' "
+"fg_color = 'green2' "
 "fill = 'foreground' "
 "width = 'auto' "
 "height = 'auto' "
@@ -159,17 +120,14 @@
 "/> "
 "</drawdata> "
 "<drawdata id = 'tab_active' cache = false> "
-"<text font = 'text_default' "
+"<text font = 'text_hover' "
 "vertical_align = 'center' "
 "horizontal_align = 'center' "
 "/> "
 "<drawstep func = 'tab' "
-"radius = '4' "
-"stroke = '0' "
-"fill = 'gradient' "
-"gradient_end = 'xtrabrightred' "
-"gradient_start = 'blandyellow' "
-"shadow = 3 "
+"bevel = '2' "
+"radius = '0' "
+"fill = 'none' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'tab_inactive' cache = false> "
@@ -178,62 +136,50 @@
 "horizontal_align = 'center' "
 "/> "
 "<drawstep func = 'tab' "
-"radius = '4' "
-"stroke = '0' "
-"fill = 'foreground' "
-"fg_color = '240, 205, 118' "
-"shadow = 3 "
+"bevel = '2' "
+"radius = '0' "
+"fill = 'none' "
 "/> "
 "</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 "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'slider_disabled' cache = false> "
+"<drawstep func = 'square' "
 "fill = 'foreground' "
-"fg_color = 'blandyellow' "
-"bevel = 1 "
-"bevel_color = 'shadowcolor' "
+"fg_color = 'lightgrey' "
 "/> "
 "</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' "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
 "/> "
 "</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' "
+"<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 = 'roundedsq' "
-"stroke = 0 "
-"radius = 4 "
-"fill = 'foreground' "
-"fg_color = '250, 237, 190' "
-"shadow = 2 "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "<drawstep func = 'triangle' "
-"fg_color = '63, 60, 52' "
+"fg_color = 'green' "
 "fill = 'foreground' "
 "width = 'height' "
 "height = 'auto' "
@@ -247,16 +193,12 @@
 "/> "
 "</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 = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "<drawstep func = 'triangle' "
-"fg_color = '63, 60, 52' "
+"fg_color = 'green2' "
 "fill = 'foreground' "
 "width = 'height' "
 "height = 'auto' "
@@ -270,28 +212,25 @@
 "/> "
 "</drawdata> "
 "<drawdata id = 'widget_textedit' cache = false> "
-"<drawstep func = 'roundedsq' "
-"fill = 'foreground' "
-"radius = 4 "
-"fg_color = 'blandyellow' "
-"shadow = 0 "
-"bevel = 1 "
-"bevel_color = 'shadowcolor' "
+"<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 = 'black' "
+"fg_color = 'lightgrey' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'default_bg' cache = false> "
-"<drawstep func = 'roundedsq' "
-"radius = 12 "
-"stroke = 0 "
-"fg_color = 'xtrabrightred' "
-"fill = 'foreground' "
-"shadow = 3 "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'button_idle' cache = false> "
@@ -299,15 +238,9 @@
 "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 "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'button_hover' cache = false> "
@@ -315,17 +248,9 @@
 "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 "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'button_disabled' cache = false> "
@@ -333,12 +258,9 @@
 "vertical_align = 'center' "
 "horizontal_align = 'center' "
 "/> "
-"<drawstep func = 'roundedsq' "
-"radius = '8' "
-"stroke = 0 "
-"fill = 'foreground' "
-"fg_color = '200, 200, 200' "
-"shadow = 3 "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'checkbox_disabled' cache = false> "
@@ -346,13 +268,9 @@
 "vertical_align = 'top' "
 "horizontal_align = 'left' "
 "/> "
-"<drawstep func = 'roundedsq' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "fill = 'none' "
-"radius = 4 "
-"fg_color = 'black' "
-"shadow = 0 "
-"bevel = 1 "
-"bevel_color = 'shadowcolor' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'checkbox_selected' cache = false> "
@@ -360,15 +278,9 @@
 "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' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'checkbox_default' cache = false> "
@@ -376,66 +288,70 @@
 "vertical_align = 'top' "
 "horizontal_align = 'left' "
 "/> "
-"<drawstep func = 'roundedsq' "
-"fill = 'foreground' "
-"radius = 4 "
-"fg_color = 'blandyellow' "
-"shadow = 0 "
-"bevel = 1 "
-"bevel_color = 'shadowcolor' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
 "</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 "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
 "</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 resolution = '320xY, 256x240' var = 'Line.Height' value = '12' /> "
+"<def resolution = '320xY, 256x240' var = 'Font.Height' value = '10' /> "
+"<def resolution = '320xY, 256x240' var = 'TabLabelWidth' value = '100' /> "
 "<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'/> "
+"<def resolution = '320xY, 256x240' var = 'WidgetSize' value = 'kNormalWidgetSize' /> "
+"<def resolution = '320xY, 256x240' var = 'About.OuterBorder' value = '10'/> "
+"<def resolution = '320xY, 256x240' var = 'PopUpWidget.labelSpacing' value = '6' /> "
+"<def var = 'Layout.Spacing' value = '8' /> "
+"<def var = 'ShowLauncherLogo' value = '0'/> "
+"<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> "
+"<def resolution = '320xY, 256x240' var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> "
 "<widget name = 'OptionsLabel' "
 "size = '110, Globals.Line.Height' "
 "/> "
 "<widget name = 'SmallLabel' "
 "size = '24, Globals.Line.Height' "
 "/> "
+"<widget name = 'ShortOptionsLabel' "
+"size = '60, Globals.Line.Height' "
+"/> "
+"<widget resolution = '320xY, 256x240' name = 'ShortOptionsLabel' "
+"size = '40, Globals.Line.Height' "
+"/> "
 "<widget name = 'Button' "
 "size = 'kBigButtonWidth, kBigButtonHeight' "
 "/> "
-"<widget resolution = '320xY' "
-"name = 'Button' "
+"<widget name = 'Slider' "
+"size = 'kBigSliderWidth, kBigSliderHeight' "
+"/> "
+"<widget resolution = '320xY, 256x240' name = 'Button' "
 "size = 'kButtonWidth, kButtonHeight' "
 "/> "
-"<widget name = 'Slider' "
-"size = '128, 18' "
+"<widget resolution = '320xY, 256x240' name = 'Slider' "
+"size = 'kSliderWidth, kSliderHeight' "
 "/> "
 "<widget name = 'PopUp' "
 "size = '-1, 19' "
 "/> "
+"<widget name = 'PopUp' resolution = '320xY, 256x240' "
+"size = '-1, 15' "
+"/> "
 "<widget name = 'Checkbox' "
-"size = '-1, Globals.Line.Height' "
+"size = '-1, 14' "
+"/> "
+"<widget name = 'Checkbox' resolution = '320xY, 256x240' "
+"size = '-1, 10' "
 "/> "
 "<widget name = 'ListWidget' "
 "padding = '5, 0, 8, 0' "
@@ -444,96 +360,106 @@
 "padding = '7, 5, 0, 0' "
 "/> "
 "<widget name = 'EditTextWidget' "
-"padding = '7, 5, 0, 0' "
+"padding = '5, 5, 0, 0' "
 "/> "
 "<widget name = 'Console' "
 "padding = '7, 5, 5, 5' "
 "/> "
-"<widget name = 'TabWidget'> "
-"<child name = 'Tab' "
+"<widget name = 'TabWidget.Tab' "
 "size = '75, 27' "
 "padding = '0, 0, 8, 0' "
 "/> "
-"<child name = 'NavButton' "
+"<widget name = 'TabWidget.NavButton' "
 "size = '15, 18' "
 "padding = '0, 3, 4, 0' "
 "/> "
-"</widget> "
+"<widget name = 'TabWidget.Tab' resolution = '320xY, 256x240' "
+"size = '45, 16' "
+"padding = '0, 0, 0, 0' "
+"/> "
+"<widget name = 'TabWidget.NavButton' resolution = '320xY, 256x240' "
+"size = '32, 18' "
+"padding = '0, 3, 4, 0' "
+"/> "
 "</globals> "
 "<dialog name = 'Launcher' overlays = 'screen'> "
-"<layout type = 'vertical' center = 'true' padding = '23, 23, 8, 23'> "
+"<layout type = 'vertical' center = 'true' padding = '16, 16, 8, 8'> "
 "<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 = 'GameList'/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
 "<widget name = 'AddGameButton' "
-"type = 'Button' "
+"width = '190' "
+"height = '20' "
 "/> "
 "<widget name = 'EditGameButton' "
-"type = 'Button' "
+"width = '190' "
+"height = '20' "
 "/> "
 "<widget name = 'RemoveGameButton' "
-"type = 'Button' "
+"width = '190' "
+"height = '20' "
 "/> "
-"<space size = '16' /> "
-"<widget name = 'OptionsButton' "
-"type = 'Button' "
+"</layout> "
+"<space size = '12'/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
+"<widget name = 'QuitButton' "
+"width = '140' "
+"height = '20' "
 "/> "
 "<widget name = 'AboutButton' "
-"type = 'Button' "
+"width = '140' "
+"height = '20' "
 "/> "
-"<space size = '16' /> "
-"<widget name = 'QuitButton' "
-"type = 'Button' "
+"<widget name = 'OptionsButton' "
+"width = '140' "
+"height = '20' "
+"/> "
+"<widget name = 'StartButton' "
+"width = '140' "
+"height = '20' "
 "/> "
-"<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'> "
+"<dialog name = 'Launcher' overlays = 'screen' resolution = '320xY, 256x240'> "
+"<layout type = 'vertical' center = 'true' padding = '8, 8, 4, 4'> "
 "<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 = 'GameList'/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
 "<widget name = 'AddGameButton' "
-"width = '95' "
-"height = 'Globals.Button.Height' "
+"width = '90' "
+"height = '12' "
 "/> "
 "<widget name = 'EditGameButton' "
-"width = '95' "
-"height = 'Globals.Button.Height' "
+"width = '90' "
+"height = '12' "
 "/> "
 "<widget name = 'RemoveGameButton' "
-"width = '95' "
-"height = 'Globals.Button.Height' "
+"width = '90' "
+"height = '12' "
 "/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
+"<space size = '4'/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
 "<widget name = 'QuitButton' "
-"type = 'Button' "
+"width = '65' "
+"height = '12' "
 "/> "
 "<widget name = 'AboutButton' "
-"type = 'Button' "
+"width = '65' "
+"height = '12' "
 "/> "
 "<widget name = 'OptionsButton' "
-"type = 'Button' "
+"width = '65' "
+"height = '12' "
 "/> "
 "<widget name = 'StartButton' "
-"type = 'Button' "
+"width = '65' "
+"height = '12' "
 "/> "
 "</layout> "
 "</layout> "
@@ -575,6 +501,43 @@
 "<widget name = 'TabWidget'/> "
 "</layout> "
 "</dialog> "
+"<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> "
+"<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 = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> "
+"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> "
+"<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> "
+"<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' "
@@ -604,7 +567,7 @@
 "type = 'OptionsLabel' "
 "/> "
 "<widget name = 'subToggleButton' "
-"width = '150' "
+"width = 'Globals.Slider.Width' "
 "height = 'Globals.Slider.Height' "
 "/> "
 "</layout> "
@@ -689,7 +652,8 @@
 "type = 'Slider' "
 "/> "
 "<widget name = 'mcMidiGainLabel' "
-"type = 'SmallLabel' "
+"width = '32' "
+"height = 'Globals.Line.Height' "
 "/> "
 "</layout> "
 "</layout> "
@@ -720,6 +684,14 @@
 "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'> "
@@ -751,6 +723,20 @@
 "<widget name = 'TabWidget'/> "
 "</layout> "
 "</dialog> "
+"<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> "
+"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> "
+"<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> "
+"<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' "
@@ -787,7 +773,7 @@
 "<layout type = 'vertical' padding = '16, 16, 16, 16'> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
 "<widget name = 'Id' "
-"type = 'OptionsLabel' "
+"type = 'ShortOptionsLabel' "
 "/> "
 "<widget name = 'Domain' "
 "type = 'PopUp' "
@@ -795,7 +781,7 @@
 "</layout> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
 "<widget name = 'Name' "
-"type = 'OptionsLabel' "
+"type = 'ShortOptionsLabel' "
 "/> "
 "<widget name = 'Desc' "
 "type = 'PopUp' "
@@ -955,4 +941,26 @@
 "</layout> "
 "</layout> "
 "</dialog> "
+"<dialog name = 'ScummHelp' overlays = 'screen_center'> "
+"<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> "
+"<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> "
+"<widget name = 'HelpText' "
+"height = '220' "
+"/> "
+"<widget name = 'Title' "
+"height = 'Globals.Line.Height' "
+"/> "
+"</layout> "
+"</dialog> "
 "</layout_info> "