[Scummvm-cvs-logs] scummvm master -> 79f6e7080a0542a4e58fbde689f17b79a088db09

[digitall]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
49ea7cd1fd GUI: Add too long string literal warning code to theme generation tool.
01a1e63786 GUI: Add code to default theme generation to reduce string length.
79f6e7080a Merge pull request #384 from digitall/themeMaxSize


Commit: 49ea7cd1fdac7e85f6744ca79232fcfc9e11d3c4
    https://github.com/scummvm/scummvm/commit/49ea7cd1fdac7e85f6744ca79232fcfc9e11d3c4
Author: D G Turner (digitall at scummvm.org)
Date: 2013-08-15T22:54:54-07:00

Commit Message:
GUI: Add too long string literal warning code to theme generation tool.

This has the same effect as clang's -Woverlength-strings warning of
string literals longer than C++ compilers are specified to work with.

Changed paths:
    gui/themes/scummtheme.py



diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py
index 4c55fd7..e8001f8 100755
--- a/gui/themes/scummtheme.py
+++ b/gui/themes/scummtheme.py
@@ -37,6 +37,7 @@ def parseSTX(theme_file, def_file):
 	comm = re.compile("<!--(.*?)-->", re.DOTALL)
 	head = re.compile("<\?(.*?)\?>")
 
+	strlitcount = 0
 	output = ""
 	for line in theme_file:
 		output +=  line.rstrip("\r\n\t ").lstrip() + " \n"
@@ -48,7 +49,9 @@ def parseSTX(theme_file, def_file):
 
 	for line in output.splitlines():
 		if line and not line.isspace():
+			strlitcount += len(line)
 			def_file.write("\"" + line + "\"\n")
+	return strlitcount
 
 def buildDefTheme(themeName):
 	def_file = open("default.inc", "w")
@@ -57,16 +60,23 @@ def buildDefTheme(themeName):
 		print ("Cannot open default theme dir.")
 
 	def_file.write(""" "<?xml version = '1.0'?>"\n""")
+	strlitcount = 24
 
 	for filename in os.listdir(themeName):
 		filename = os.path.join(themeName, filename)
 		if os.path.isfile(filename) and filename.endswith(".stx"):
 			theme_file = open(filename, "r")
-			parseSTX(theme_file, def_file)
+			strlitcount += parseSTX(theme_file, def_file)
 			theme_file.close()
 
 	def_file.close()
 
+	if strlitcount > 65535:
+		print("WARNING: default.inc string literal is of length %d which exceeds the" % strlitcount)
+		print("         maximum length of 65536 that C++ compilers are required to support.")
+		print("         It is likely that bugs will occur dependent on compiler behaviour.")
+		print("         To avoid this, reduce the size of the theme.")
+
 def printUsage():
 	print ("===============================")
 	print ("ScummVM Theme Generation Script")


Commit: 01a1e63786cc8c37d1a49f9eb33635d2ad1a2b62
    https://github.com/scummvm/scummvm/commit/01a1e63786cc8c37d1a49f9eb33635d2ad1a2b62
Author: D G Turner (digitall at scummvm.org)
Date: 2013-08-15T22:57:40-07:00

Commit Message:
GUI: Add code to default theme generation to reduce string length.

The additional code skips the extraneous spaces after the end of an
XML close brace (>) reducing the string literal by 3106 characters,
thus bringing it within the limit for C++ string literals.

Have regenerated the default.inc from scummclassic with this change.

Changed paths:
    gui/themes/default.inc
    gui/themes/scummtheme.py



diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 1b6ae3e..352cc86 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,142 +1,142 @@
  "<?xml version = '1.0'?>"
-"<render_info> "
-"<palette> "
+"<render_info>"
+"<palette>"
 "<color name='black' "
 "rgb='0,0,0' "
-"/> "
+"/>"
 "<color name='lightgrey' "
 "rgb='104,104,104' "
-"/> "
+"/>"
 "<color name='darkgrey' "
 "rgb='64,64,64' "
-"/> "
+"/>"
 "<color name='green' "
 "rgb='32,160,32' "
-"/> "
+"/>"
 "<color name='green2' "
 "rgb='0,255,0' "
-"/> "
-"</palette> "
-"<fonts> "
+"/>"
+"</palette>"
+"<fonts>"
 "<font id='text_default' "
 "file='helvb12.bdf' "
-"/> "
+"/>"
 "<font resolution='y<400' "
 "id='text_default' "
 "file='clR6x12.bdf' "
-"/> "
+"/>"
 "<font id='text_button' "
 "file='helvb12.bdf' "
-"/> "
+"/>"
 "<font resolution='y<400' "
 "id='text_button' "
 "file='clR6x12.bdf' "
-"/> "
+"/>"
 "<font id='text_normal' "
 "file='helvb12.bdf' "
-"/> "
+"/>"
 "<font resolution='y<400' "
 "id='text_normal' "
 "file='clR6x12.bdf' "
-"/> "
+"/>"
 "<font id='tooltip_normal' "
 "file='fixed5x8.bdf' "
-"/> "
+"/>"
 "<text_color id='color_normal' "
 "color='green' "
-"/> "
+"/>"
 "<text_color id='color_normal_inverted' "
 "color='black' "
-"/> "
+"/>"
 "<text_color id='color_normal_hover' "
 "color='green2' "
-"/> "
+"/>"
 "<text_color id='color_normal_disabled' "
 "color='lightgrey' "
-"/> "
+"/>"
 "<text_color id='color_alternative' "
 "color='lightgrey' "
-"/> "
+"/>"
 "<text_color id='color_alternative_inverted' "
 "color='255,255,255' "
-"/> "
+"/>"
 "<text_color id='color_alternative_hover' "
 "color='176,176,176' "
-"/> "
+"/>"
 "<text_color id='color_alternative_disabled' "
 "color='darkgrey' "
-"/> "
+"/>"
 "<text_color id='color_button' "
 "color='green' "
-"/> "
+"/>"
 "<text_color id='color_button_hover' "
 "color='green2' "
-"/> "
+"/>"
 "<text_color id='color_button_disabled' "
 "color='lightgrey' "
-"/> "
-"</fonts> "
-"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> "
-"<drawdata id='text_selection' cache='false'> "
+"/>"
+"</fonts>"
+"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/>"
+"<drawdata id='text_selection' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='text_selection_focus' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='text_selection_focus' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='mainmenu_bg' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='mainmenu_bg' cache='false'>"
 "<drawstep func='fill' "
 "fill='foreground' "
 "fg_color='black' "
-"/> "
-"</drawdata> "
-"<drawdata id='special_bg' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='special_bg' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='tooltip_bg' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='tooltip_bg' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='foreground' "
 "fg_color='black' "
-"/> "
-"</drawdata> "
-"<drawdata id='separator' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='separator' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "height='2' "
 "ypos='center' "
 "fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_base' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='scrollbar_base' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_hover' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='scrollbar_handle_hover' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='green2' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_idle' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='scrollbar_handle_idle' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'> "
+"/>"
+"</drawdata>"
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -146,13 +146,13 @@
 "ypos='center' "
 "padding='0,0,3,0' "
 "orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'> "
+"/>"
+"</drawdata>"
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -162,13 +162,13 @@
 "ypos='center' "
 "padding='0,0,2,0' "
 "orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'> "
+"/>"
+"</drawdata>"
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -178,13 +178,13 @@
 "ypos='center' "
 "padding='0,0,3,0' "
 "orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'> "
+"/>"
+"</drawdata>"
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -194,69 +194,69 @@
 "ypos='center' "
 "padding='0,0,2,0' "
 "orientation='top' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_active' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='tab_active' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal_hover' "
 "vertical_align='center' "
 "horizontal_align='center' "
-"/> "
+"/>"
 "<drawstep func='tab' "
 "bevel='2' "
 "radius='0' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_inactive' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='tab_inactive' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='center' "
-"/> "
+"/>"
 "<drawstep func='tab' "
 "bevel='2' "
 "radius='0' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='tab_background' cache='false'> "
-"</drawdata> "
-"<drawdata id='widget_slider' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='tab_background' cache='false'>"
+"</drawdata>"
+"<drawdata id='widget_slider' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='slider_disabled' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='slider_disabled' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='slider_full' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='slider_full' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='slider_hover' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='slider_hover' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='green2' "
-"/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='widget_small' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false' resolution='y>399'> "
+"/>"
+"</drawdata>"
+"<drawdata id='popup_idle' cache='false' resolution='y>399'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -266,7 +266,7 @@
 "ypos='10' "
 "padding='0,0,7,0' "
 "orientation='bottom' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -276,18 +276,18 @@
 "ypos='4' "
 "padding='0,0,7,0' "
 "orientation='top' "
-"/> "
+"/>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false' resolution='y<400'> "
+"/>"
+"</drawdata>"
+"<drawdata id='popup_idle' cache='false' resolution='y<400'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -297,7 +297,7 @@
 "ypos='9' "
 "padding='0,0,3,0' "
 "orientation='bottom' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -307,18 +307,18 @@
 "ypos='4' "
 "padding='0,0,3,0' "
 "orientation='top' "
-"/> "
+"/>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false' resolution='y>399'> "
+"/>"
+"</drawdata>"
+"<drawdata id='popup_disabled' cache='false' resolution='y>399'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -328,7 +328,7 @@
 "ypos='10' "
 "padding='0,0,7,0' "
 "orientation='bottom' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -338,18 +338,18 @@
 "ypos='4' "
 "padding='0,0,7,0' "
 "orientation='top' "
-"/> "
+"/>"
 "<text font='text_default' "
 "text_color='color_normal_disabled' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false' resolution='y<400'> "
+"/>"
+"</drawdata>"
+"<drawdata id='popup_disabled' cache='false' resolution='y<400'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -359,7 +359,7 @@
 "ypos='9' "
 "padding='0,0,3,0' "
 "orientation='bottom' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -369,18 +369,18 @@
 "ypos='4' "
 "padding='0,0,3,0' "
 "orientation='top' "
-"/> "
+"/>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false' resolution='y>399'> "
+"/>"
+"</drawdata>"
+"<drawdata id='popup_hover' cache='false' resolution='y>399'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -390,7 +390,7 @@
 "ypos='10' "
 "padding='0,0,7,0' "
 "orientation='bottom' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -400,18 +400,18 @@
 "ypos='4' "
 "padding='0,0,7,0' "
 "orientation='top' "
-"/> "
+"/>"
 "<text font='text_default' "
 "text_color='color_normal_hover' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false' resolution='y<400'> "
+"/>"
+"</drawdata>"
+"<drawdata id='popup_hover' cache='false' resolution='y<400'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -421,7 +421,7 @@
 "ypos='9' "
 "padding='0,0,3,0' "
 "orientation='bottom' "
-"/> "
+"/>"
 "<drawstep func='triangle' "
 "fg_color='green' "
 "fill='foreground' "
@@ -431,123 +431,123 @@
 "ypos='4' "
 "padding='0,0,3,0' "
 "orientation='top' "
-"/> "
+"/>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
-"</drawdata> "
-"<drawdata id='widget_textedit' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='widget_textedit' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='plain_bg' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='plain_bg' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='caret' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='caret' cache='false'>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id='default_bg' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='default_bg' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='button_pressed' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='button_pressed' cache='false'>"
 "<text font='text_button' "
 "text_color='color_alternative_inverted' "
 "vertical_align='center' "
 "horizontal_align='center' "
-"/> "
+"/>"
 "<drawstep func='square' "
 "fill='foreground' "
 "fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='button_idle' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='button_idle' cache='false'>"
 "<text font='text_button' "
 "text_color='color_button' "
 "vertical_align='center' "
 "horizontal_align='center' "
-"/> "
+"/>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='button_hover' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='button_hover' cache='false'>"
 "<text font='text_button' "
 "text_color='color_button_hover' "
 "vertical_align='center' "
 "horizontal_align='center' "
-"/> "
+"/>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='button_disabled' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='button_disabled' cache='false'>"
 "<text font='text_button' "
 "text_color='color_button_disabled' "
 "vertical_align='center' "
 "horizontal_align='center' "
-"/> "
+"/>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='checkbox_disabled' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='checkbox_disabled' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal_disabled' "
 "vertical_align='top' "
 "horizontal_align='left' "
-"/> "
+"/>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='checkbox_selected' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='checkbox_selected' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='top' "
 "horizontal_align='left' "
-"/> "
+"/>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
+"/>"
 "<drawstep func='cross' "
 "fill='foreground' "
 "stroke='2' "
 "fg_color='green' "
-"/> "
-"</drawdata> "
-"<drawdata id='checkbox_default' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='checkbox_default' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='top' "
 "horizontal_align='left' "
-"/> "
+"/>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
 "fill='none' "
-"/> "
-"</drawdata> "
-"<drawdata id='radiobutton_default' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='radiobutton_default' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
+"/>"
 "<drawstep func='circle' "
 "width='7' "
 "height='7' "
@@ -556,14 +556,14 @@
 "bg_color='darkgrey' "
 "xpos='0' "
 "ypos='0' "
-"/> "
-"</drawdata> "
-"<drawdata id='radiobutton_selected' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='radiobutton_selected' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
+"/>"
 "<drawstep func='circle' "
 "width='7' "
 "height='7' "
@@ -572,7 +572,7 @@
 "fill='none' "
 "xpos='0' "
 "ypos='0' "
-"/> "
+"/>"
 "<drawstep func='circle' "
 "width='7' "
 "height='7' "
@@ -581,14 +581,14 @@
 "fill='foreground' "
 "xpos='2' "
 "ypos='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='radiobutton_disabled' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='radiobutton_disabled' cache='false'>"
 "<text font='text_default' "
 "text_color='color_normal_disabled' "
 "vertical_align='center' "
 "horizontal_align='left' "
-"/> "
+"/>"
 "<drawstep func='circle' "
 "width='7' "
 "height='7' "
@@ -597,2510 +597,2510 @@
 "fill='background' "
 "xpos='0' "
 "ypos='0' "
-"/> "
-"</drawdata> "
-"<drawdata id='widget_default' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='widget_default' cache='false'>"
 "<drawstep func='bevelsq' "
 "bevel='2' "
-"/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
+"/>"
+"</drawdata>"
+"<drawdata id='widget_small' cache='false'>"
 "<drawstep func='square' "
 "stroke='0' "
-"/> "
-"</drawdata> "
-"</render_info> "
-"<layout_info resolution='y>399'> "
-"<globals> "
-"<def var='Line.Height' value='16' /> "
-"<def var='Font.Height' value='16' /> "
-"<def var='About.OuterBorder' value='80'/> "
-"<def var='Layout.Spacing' value='8' /> "
-"<def var='ShowLauncherLogo' value='0'/> "
-"<def var='ShowGlobalMenuLogo' value='0'/> "
-"<def var='ShowSearchPic' value='0'/> "
-"<def var='ShowChooserPics' value='0'/> "
-"<def var='ShowChooserPageDisplay' value='1'/> "
-"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/> "
-"<def var='RecorderDialog.ExtInfo.Visible' value='1'/> "
-"<def var='OnScreenDialog.ShowPics' value='0'/> "
-"<def var='KeyMapper.Spacing' value='10'/> "
-"<def var='KeyMapper.LabelWidth' value='100'/> "
-"<def var='KeyMapper.ButtonWidth' value='80'/> "
-"<def var='Tooltip.MaxWidth' value='200'/> "
+"/>"
+"</drawdata>"
+"</render_info>"
+"<layout_info resolution='y>399'>"
+"<globals>"
+"<def var='Line.Height' value='16' />"
+"<def var='Font.Height' value='16' />"
+"<def var='About.OuterBorder' value='80'/>"
+"<def var='Layout.Spacing' value='8' />"
+"<def var='ShowLauncherLogo' value='0'/>"
+"<def var='ShowGlobalMenuLogo' value='0'/>"
+"<def var='ShowSearchPic' value='0'/>"
+"<def var='ShowChooserPics' value='0'/>"
+"<def var='ShowChooserPageDisplay' value='1'/>"
+"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/>"
+"<def var='RecorderDialog.ExtInfo.Visible' value='1'/>"
+"<def var='OnScreenDialog.ShowPics' value='0'/>"
+"<def var='KeyMapper.Spacing' value='10'/>"
+"<def var='KeyMapper.LabelWidth' value='100'/>"
+"<def var='KeyMapper.ButtonWidth' value='80'/>"
+"<def var='Tooltip.MaxWidth' value='200'/>"
 "<def var='Tooltip.XDelta' value='16'/> "
-"<def var='Tooltip.YDelta' value='16'/> "
-"<def var='Predictive.Button.Width' value='60' /> "
+"<def var='Tooltip.YDelta' value='16'/>"
+"<def var='Predictive.Button.Width' value='60' />"
 "<widget name='OptionsLabel' "
 "size='110,Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='SmallLabel' "
 "size='24,Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ShortOptionsLabel' "
 "size='60,Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Button' "
 "size='108,24' "
-"/> "
+"/>"
 "<widget name='Slider' "
 "size='128,18' "
-"/> "
+"/>"
 "<widget name='PopUp' "
 "size='-1,19' "
-"/> "
+"/>"
 "<widget name='Checkbox' "
 "size='-1,14' "
-"/> "
+"/>"
 "<widget name='Radiobutton' "
 "size='-1,Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ListWidget' "
 "padding='5,0,8,0' "
-"/> "
+"/>"
 "<widget name='PopUpWidget' "
 "padding='7,5,0,0' "
-"/> "
+"/>"
 "<widget name='EditTextWidget' "
 "padding='5,5,0,0' "
-"/> "
+"/>"
 "<widget name='Console' "
 "padding='7,5,5,5' "
-"/> "
+"/>"
 "<widget name='Scrollbar' "
 "size='15,0' "
-"/> "
+"/>"
 "<widget name='TabWidget.Tab' "
 "size='75,27' "
 "padding='0,0,8,0' "
-"/> "
+"/>"
 "<widget name='TabWidget.Body' "
 "padding='0,0,0,0' "
-"/> "
+"/>"
 "<widget name='TabWidget.NavButton' "
 "size='15,18' "
 "padding='0,3,4,0' "
-"/> "
+"/>"
 "<widget name='EditRecordLabel' "
 "size='60,25' "
-"/> "
+"/>"
 "<widget name='EditRecord' "
 "size='240,25' "
-"/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='16,16,8,8'> "
+"/>"
+"</globals>"
+"<dialog name='Launcher' overlays='screen'>"
+"<layout type='vertical' center='true' padding='16,16,8,8'>"
 "<widget name='Version' "
 "height='Globals.Line.Height' "
 "textalign='center' "
-"/> "
-"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
+"/>"
+"<layout type='horizontal' spacing='5' padding='10,0,0,0'>"
 "<widget name='SearchDesc' "
 "width='60' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='Search' "
 "width='150' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='SearchClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"<space /> "
-"</layout> "
-"<widget name='GameList'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"/>"
+"<space />"
+"</layout>"
+"<widget name='GameList'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
 "<widget name='LoadGameButton' "
 "height='20' "
-"/> "
+"/>"
 "<widget name='AddGameButton' "
 "height='20' "
-"/> "
+"/>"
 "<widget name='EditGameButton' "
 "height='20' "
-"/> "
+"/>"
 "<widget name='RemoveGameButton' "
 "height='20' "
-"/> "
-"</layout> "
-"<space size='4'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"/>"
+"</layout>"
+"<space size='4'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
 "<widget name='QuitButton' "
 "height='20' "
-"/> "
+"/>"
 "<widget name='AboutButton' "
 "height='20' "
-"/> "
+"/>"
 "<widget name='OptionsButton' "
 "height='20' "
-"/> "
+"/>"
 "<widget name='StartButton' "
 "height='20' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8'>"
 "<widget name='Headline' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Path' "
 "height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
-"<layout type='vertical' padding='0,0,16,0'> "
+"/>"
+"<widget name='List'/>"
+"<layout type='vertical' padding='0,0,16,0'>"
 "<widget name='Hidden' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='Up' "
 "type='Button' "
-"/> "
-"<space/> "
+"/>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Choose' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='16,16,16,16'> "
-"<space/> "
+"/>"
+"</layout>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='16,16,16,16'>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='grModePopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='grModePopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='grRenderPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='grRenderPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='grAspectCheckbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='auMidiPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auMidiPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='auOPLPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auOPLPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='auSampleRatePopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auSampleRatePopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='subToggleSpeechOnly' "
 "type='Radiobutton' "
-"/> "
+"/>"
 "<widget name='subToggleSubOnly' "
 "type='Radiobutton' "
-"/> "
+"/>"
 "<widget name='subToggleSubBoth' "
 "type='Radiobutton' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='horizontal' padding='16,16,16,16' spacing='8'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcMusicSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcMusicLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSfxSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSfxLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSpeechSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSpeechLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"</layout> "
-"<layout type='vertical' padding='24,0,24,0' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='vertical' padding='24,0,24,0' center='true'>"
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='auPrefGmPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auPrefGmPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='mcFontButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='mcFontPath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='mcFontClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='mcMixedCheckbox' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='mcMidiGainText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='mcMidiGainSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='mcMidiGainLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='mcFluidSynthSettings' "
 "width='200' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='auPrefMt32PopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auPrefMt32Popup' "
 "type='PopUp' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='mcMt32Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='mcGSCheckbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='SaveButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='SavePath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='SavePathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='ThemeButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='ThemePath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ThemePathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='ExtraButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='ExtraPath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ExtraPathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
 "<widget name='PluginsButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='PluginsPath' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='ThemeButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='CurTheme' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='RendererPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='RendererPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='AutosavePeriodPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='AutosavePeriodPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='GuiLanguagePopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='GuiLanguagePopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='KeysButton' "
 "type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Action' "
 "height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
+"/>"
+"<widget name='List'/>"
 "<widget name='Mapping' "
 "height='Globals.Line.Height' "
-"/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
+"/>"
+"<space size='Globals.Line.Height'/>"
+"<layout type='horizontal'>"
 "<widget name='Map' "
 "type='Button' "
-"/> "
-"<space/> "
+"/>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='16,16,16,4'> "
-"<space/> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='16'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='16,16,16,4'>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Graphics' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_Graphics' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Audio' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_Audio' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_MIDI' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_MT32' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Volume' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='16,16,16,16'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_Volume' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='16,16,16,16'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='Id' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='Domain' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='Name' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='Desc' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='LangPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='LangPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='PlatformPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='PlatformPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='16,16,16,16'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='16,16,16,16'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='Savepath' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='SavepathText' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='SavePathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='Extrapath' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='ExtrapathText' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ExtraPathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='Gamepath' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='GamepathText' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='16,16,16,16'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='16,16,16,16'>"
 "<widget name='customOption1Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption2Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption3Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption4Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption5Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption6Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption7Checkbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalMenu' overlays='screen_center'> "
-"<layout type='vertical' padding='16,16,16,16' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalMenu' overlays='screen_center'>"
+"<layout type='vertical' padding='16,16,16,16' center='true'>"
 "<widget name='Title' "
 "width='210' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Version' "
 "width='210' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Resume' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
+"/>"
+"<space size='10'/>"
 "<widget name='Load' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Save' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
+"/>"
+"<space size='10'/>"
 "<widget name='Options' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Help' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='About' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
+"/>"
+"<space size='10'/>"
 "<widget name='RTL' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Quit' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<layout type='vertical' padding='0,0,0,0' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalConfig' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8'>"
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<layout type='vertical' padding='0,0,0,0' center='true'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcMusicSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcMusicLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSfxSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSfxLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSpeechSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSpeechLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"</layout> "
-"<layout type='vertical' padding='24,24,24,24' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"<layout type='vertical' padding='24,24,24,24' center='true'>"
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
 "width='80'  "
-"/> "
-"</layout> "
-"</layout> "
-"<space size='8' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"/>"
+"</layout>"
+"</layout>"
+"<space size='8' />"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='subToggleSpeechOnly' "
 "type='Radiobutton' "
 "width='100' "
-"/> "
+"/>"
 "<widget name='subToggleSubOnly' "
 "type='Radiobutton' "
 "width='100' "
-"/> "
+"/>"
 "<widget name='subToggleSubBoth' "
 "type='Radiobutton' "
 "width='100' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<space size='60'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"/>"
+"</layout>"
+"<space size='60'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
 "<widget name='Keys' "
 "type='Button' "
-"/> "
-"<space size='Globals.Button.Width' /> "
+"/>"
+"<space size='Globals.Button.Width' />"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='16,16,16,16'> "
-"<space/> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='16,16,16,16'>"
+"<space/>"
 "<widget name='ResetSettings' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='VoiceCountText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='VoiceCountSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='VoiceCountLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='LevelText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='LevelSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='LevelLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='SpeedText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='SpeedSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='SpeedLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='DepthText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='DepthSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='DepthLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='WaveFormTypeText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='WaveFormType' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='RoomSizeText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='RoomSizeSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='RoomSizeLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='DampingText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='DampingSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='DampingLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='WidthText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='WidthSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='WidthLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='LevelText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='LevelSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='LevelLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='InterpolationText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='Interpolation' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,32' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,32' center='true'>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='Title' "
 "height='Globals.Line.Height' "
-"/> "
-"<space/> "
+"/>"
+"<space/>"
 "<widget name='PageDisplay' "
 "width='200' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
-"<widget name='List' /> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'>"
+"<widget name='List' />"
 "<widget name='Thumbnail' "
 "width='180' "
 "height='200' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='ListSwitch' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='GridSwitch' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"<space/> "
+"/>"
+"<space/>"
 "<widget name='Delete' "
 "type='Button' "
-"/> "
-"<space size='32'/> "
+"/>"
+"<space size='32'/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Choose' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='SavenameDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='SavenameDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8'>"
 "<widget name='DescriptionText' "
 "width='320' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Description' "
 "height='19' "
-"/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,16,0'>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
-"<space size='96'/> "
+"/>"
+"<space size='96'/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,32' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,32' center='true'>"
 "<widget name='Title' "
 "height='Globals.Line.Height' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
-"<widget name='List' /> "
-"<layout type='vertical' padding='0,0,0,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'>"
+"<widget name='List' />"
+"<layout type='vertical' padding='0,0,0,0'>"
 "<widget name='Thumbnail' "
 "width='180' "
 "height='170' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='NextScreenShotButton' "
 "width='25' "
 "height='25' "
-"/> "
+"/>"
 "<widget name='currentScreenshot' "
 "width='125' "
 "height='25' "
 "textalign='center' "
-"/> "
+"/>"
 "<widget name='PreviousScreenShotButton' "
 "width='25' "
 "height='25' "
-"/> "
-"</layout> "
-"<widget name='Author' height='Globals.Line.Height' /> "
-"<widget name='Notes' height='Globals.Line.Height' /> "
-"</layout> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"</layout>"
+"<widget name='Author' height='Globals.Line.Height' />"
+"<widget name='Notes' height='Globals.Line.Height' />"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='Delete' "
 "type='Button' "
-"/> "
-"<space size='16'/> "
+"/>"
+"<space size='16'/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
-"<space size='16'/> "
+"/>"
+"<space size='16'/>"
 "<widget name='Edit' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Record' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Playback' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='OnScreenDialog' overlays='screen_center'> "
-"<layout type='horizontal' spacing='5' padding='5,3,5,3' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='OnScreenDialog' overlays='screen_center'>"
+"<layout type='horizontal' spacing='5' padding='5,3,5,3' center='true'>"
 "<widget name='StopButton' "
 "width='32' "
 "height='32' "
-"/> "
+"/>"
 "<widget name='EditButton' "
 "width='32' "
 "height='32' "
-"/> "
+"/>"
 "<widget name='SwitchModeButton' "
 "width='32' "
 "height='32' "
-"/> "
+"/>"
 "<widget name='FastReplayButton' "
 "width='32' "
 "height='32' "
-"/> "
+"/>"
 "<widget name='TimeLabel' "
 "width='50' "
 "height='30' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='EditRecordDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='EditRecordDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Title' "
 "width='320' "
 "height='Globals.Line.Height' "
-"/> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'> "
+"/>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='AuthorLabel' "
 "type='EditRecordLabel' "
-"/> "
+"/>"
 "<widget name='AuthorEdit' "
 "type='EditRecord' "
-"/> "
-"</layout> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='NameLabel' "
 "type='EditRecordLabel' "
-"/> "
+"/>"
 "<widget name='NameEdit' "
 "type='EditRecord' "
-"/> "
-"</layout> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='NotesLabel' "
 "type='EditRecordLabel' "
-"/> "
+"/>"
 "<widget name='NotesEdit' "
 "type='EditRecord' "
-"/> "
-"</layout> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='OK' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummHelp' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='ScummHelp' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Title' "
 "width='320' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='HelpText' "
 "height='200' "
-"/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,16,0'>"
 "<widget name='Prev' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Next' "
 "type='Button' "
-"/> "
-"<space size='32'/> "
+"/>"
+"<space size='32'/>"
 "<widget name='Close' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Description1' "
 "width='320' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Description2' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Standard' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Practice' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Expert' "
 "type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'>"
+"<layout type='vertical' padding='8,8,32,8' center='true'>"
 "<widget name='DirProgressText' "
 "width='480' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='GameProgressText' "
 "width='480' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='GameList' "
 "width='480' "
 "height='250' "
-"/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
+"/>"
+"<layout type='horizontal' padding='8,8,8,8'>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'>"
+"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='PopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='Popup' "
 "type='PopUp' "
 "width='400' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='KeymapArea' "
 "width='600' "
 "height='280' "
-"/> "
+"/>"
 "<widget name='Close' "
 "type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='Predictive' overlays='screen_center'> "
-"<layout type='vertical' padding='5,5,5,5' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='Predictive' overlays='screen_center'>"
+"<layout type='vertical' padding='5,5,5,5' center='true'>"
 "<widget name='Headline' "
 "height='Globals.Line.Height' "
 "width='210' "
 "textalign='center' "
-"/> "
-"<layout type='horizontal' padding='5,5,5,5'> "
+"/>"
+"<layout type='horizontal' padding='5,5,5,5'>"
 "<widget name='Word' "
 "width='190' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Delete' "
 "width='20' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"<space size='5' /> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<space size='5' />"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Button1' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button2' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button3' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Button4' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button5' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button6' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Button7' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button8' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button9' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Pre' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button0' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Next' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"<space size='5' /> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<space size='5' />"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Add' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
-"<space size='22'/> "
+"/>"
+"<space size='22'/>"
 "<widget name='Cancel' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='OK' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"</layout_info> "
-"<layout_info resolution='y<400'> "
-"<globals> "
-"<def var='Line.Height' value='12' /> "
-"<def var='Font.Height' value='10' /> "
-"<def var='About.OuterBorder' value='10'/> "
-"<def var='Layout.Spacing' value='8'/> "
-"<def var='ShowLauncherLogo' value='0'/> "
-"<def var='ShowGlobalMenuLogo' value='0'/> "
-"<def var='ShowSearchPic' value='0'/> "
-"<def var='ShowChooserPics' value='0'/> "
-"<def var='ShowChooserPageDisplay' value='0'/> "
-"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> "
-"<def var='RecorderDialog.ExtInfo.Visible' value='0'/> "
-"<def var='OnScreenDialog.ShowPics' value='0'/> "
-"<def var='KeyMapper.Spacing' value='5'/> "
-"<def var='KeyMapper.LabelWidth' value='80'/> "
-"<def var='KeyMapper.ButtonWidth' value='60'/> "
-"<def var='Tooltip.MaxWidth' value='70'/> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"</layout_info>"
+"<layout_info resolution='y<400'>"
+"<globals>"
+"<def var='Line.Height' value='12' />"
+"<def var='Font.Height' value='10' />"
+"<def var='About.OuterBorder' value='10'/>"
+"<def var='Layout.Spacing' value='8'/>"
+"<def var='ShowLauncherLogo' value='0'/>"
+"<def var='ShowGlobalMenuLogo' value='0'/>"
+"<def var='ShowSearchPic' value='0'/>"
+"<def var='ShowChooserPics' value='0'/>"
+"<def var='ShowChooserPageDisplay' value='0'/>"
+"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/>"
+"<def var='RecorderDialog.ExtInfo.Visible' value='0'/>"
+"<def var='OnScreenDialog.ShowPics' value='0'/>"
+"<def var='KeyMapper.Spacing' value='5'/>"
+"<def var='KeyMapper.LabelWidth' value='80'/>"
+"<def var='KeyMapper.ButtonWidth' value='60'/>"
+"<def var='Tooltip.MaxWidth' value='70'/>"
 "<def var='Tooltip.XDelta' value='8'/> "
-"<def var='Tooltip.YDelta' value='8'/> "
-"<def var='Predictive.Button.Width' value='45' /> "
-"<def var='Predictive.Button.Height' value='15' /> "
+"<def var='Tooltip.YDelta' value='8'/>"
+"<def var='Predictive.Button.Width' value='45' />"
+"<def var='Predictive.Button.Height' value='15' />"
 "<widget name='Button' "
 "size='72,16' "
-"/> "
+"/>"
 "<widget name='Slider' "
 "size='85,12' "
-"/> "
+"/>"
 "<widget name='OptionsLabel' "
 "size='110,Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='SmallLabel' "
 "size='18,Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='PopUp' "
 "size='-1,15' "
-"/> "
+"/>"
 "<widget name='Checkbox' "
 "size='-1,Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Radiobutton' "
 "size='-1,Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ListWidget' "
 "padding='5,0,0,0' "
-"/> "
+"/>"
 "<widget name='PopUpWidget' "
 "padding='7,5,0,0' "
-"/> "
+"/>"
 "<widget name='EditTextWidget' "
 "padding='5,5,0,0' "
-"/> "
+"/>"
 "<widget name='Console' "
 "padding='7,5,5,5' "
-"/> "
+"/>"
 "<widget name='Scrollbar' "
 "size='9,0' "
-"/> "
+"/>"
 "<widget name='TabWidget.Tab' "
 "size='45,16' "
 "padding='0,0,2,0' "
-"/> "
+"/>"
 "<widget name='TabWidget.Body' "
 "padding='0,0,0,-8' "
-"/> "
+"/>"
 "<widget name='TabWidget.NavButton' "
 "size='32,18' "
 "padding='0,0,1,0' "
-"/> "
+"/>"
 "<widget name='EditRecordLabel' "
 "size='60,Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='EditRecord' "
 "size='120,15' "
-"/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='6,6,2,2'> "
+"/>"
+"</globals>"
+"<dialog name='Launcher' overlays='screen'>"
+"<layout type='vertical' center='true' padding='6,6,2,2'>"
 "<widget name='Version' "
 "height='Globals.Line.Height' "
 "textalign='center' "
-"/> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
+"/>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,0'>"
 "<widget name='SearchDesc' "
 "width='50' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='Search' "
 "width='150' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='SearchClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"<space /> "
-"</layout> "
-"<widget name='GameList'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"/>"
+"<space />"
+"</layout>"
+"<widget name='GameList'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
 "<widget name='LoadGameButton' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='AddGameButton' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='EditGameButton' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='RemoveGameButton' "
 "height='12' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
 "<widget name='QuitButton' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='AboutButton' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='OptionsButton' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='StartButton' "
 "height='12' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,0,4'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='Browser' overlays='screen' inset='8' shading='dim'>"
+"<layout type='vertical' padding='8,8,0,4'>"
 "<widget name='Headline' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Path' "
 "height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
-"<layout type='vertical' padding='0,0,8,0'> "
+"/>"
+"<widget name='List'/>"
+"<layout type='vertical' padding='0,0,8,0'>"
 "<widget name='Hidden' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='Up' "
 "type='Button' "
-"/> "
-"<space/> "
+"/>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Choose' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<space/> "
+"/>"
+"</layout>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='grModePopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='grModePopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='grRenderPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='grRenderPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='grAspectCheckbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='auMidiPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auMidiPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='auOPLPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auOPLPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='auSampleRatePopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auSampleRatePopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'>"
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='subToggleSpeechOnly' "
 "type='Radiobutton' "
-"/> "
+"/>"
 "<widget name='subToggleSubOnly' "
 "type='Radiobutton' "
-"/> "
+"/>"
 "<widget name='subToggleSubBoth' "
 "type='Radiobutton' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcMusicSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcMusicLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSfxSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSfxLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSpeechSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSpeechLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<space size='110' /> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<space size='110' />"
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='6'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='6'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='auPrefGmPopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auPrefGmPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'>"
 "<widget name='mcFontButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='mcFontPath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='mcFontClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='mcMixedCheckbox' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='mcMidiGainText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='mcMidiGainSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='mcMidiGainLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='mcFluidSynthSettings' "
 "width='150' "
 "height='Globals.Button.Height' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='auPrefMt32PopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='auPrefMt32Popup' "
 "type='PopUp' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='mcMt32Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='mcGSCheckbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
 "<widget name='SaveButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='SavePath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='SavePathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
 "<widget name='ThemeButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='ThemePath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ThemePathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
 "<widget name='ExtraButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='ExtraPath' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ExtraPathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
 "<widget name='PluginsButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='PluginsPath' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
 "<widget name='ThemeButton' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='CurTheme' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='RendererPopupDesc' "
 "width='80' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='RendererPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='AutosavePeriodPopupDesc' "
 "width='80' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='AutosavePeriodPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='GuiLanguagePopupDesc' "
 "width='80' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='GuiLanguagePopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='KeysButton' "
 "type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Action' "
 "height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
+"/>"
+"<widget name='List'/>"
 "<widget name='Mapping' "
 "height='Globals.Line.Height' "
-"/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
+"/>"
+"<space size='Globals.Line.Height'/>"
+"<layout type='horizontal'>"
 "<widget name='Map' "
 "type='Button' "
-"/> "
-"<space/> "
+"/>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<space/> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='16'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<space/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Graphics' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_Graphics' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Audio' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_Audio' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_MIDI' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_MT32' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Volume' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"<import layout='Dialog.GlobalOptions_Volume' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='Id' "
 "width='35' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='Domain' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='Name' "
 "width='35' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='Desc' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<space size='8'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<space size='8'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='LangPopupDesc' "
 "width='60' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='LangPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='PlatformPopupDesc' "
 "width='60' "
 "height='Globals.Line.Height' "
 "textalign='right' "
-"/> "
+"/>"
 "<widget name='PlatformPopup' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'>"
 "<widget name='Savepath' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='SavepathText' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='SavePathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'>"
 "<widget name='Extrapath' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='ExtrapathText' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='ExtraPathClearButton' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'>"
 "<widget name='Gamepath' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='GamepathText' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8'>"
 "<widget name='customOption1Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption2Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption3Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption4Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption5Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption6Checkbox' "
 "type='Checkbox' "
-"/> "
+"/>"
 "<widget name='customOption7Checkbox' "
 "type='Checkbox' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalMenu' overlays='screen_center'> "
-"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalMenu' overlays='screen_center'>"
+"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'>"
 "<widget name='Title' "
 "width='160' "
 "height='4' "
-"/> "
+"/>"
 "<widget name='Version' "
 "width='160' "
 "height='4' "
-"/> "
-"<space size='1'/> "
+"/>"
+"<space size='1'/>"
 "<widget name='Load' "
 "width='120' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='Save' "
 "width='120' "
 "height='12' "
-"/> "
-"<space size='1'/> "
+"/>"
+"<space size='1'/>"
 "<widget name='Options' "
 "width='120' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='Help' "
 "width='120' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='About' "
 "width='120' "
 "height='12' "
-"/> "
-"<space size='1'/> "
+"/>"
+"<space size='1'/>"
 "<widget name='Resume' "
 "width='120' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='RTL' "
 "width='120' "
 "height='12' "
-"/> "
+"/>"
 "<widget name='Quit' "
 "width='120' "
 "height='12' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalConfig' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcMusicSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcMusicLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSfxSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSfxLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='vcSpeechSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='vcSpeechLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<space size='110' /> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
+"<space size='110' />"
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
 "width='80' "
-"/> "
-"</layout> "
-"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
+"/>"
+"</layout>"
+"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'>"
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='subToggleSpeechOnly' "
 "type='Radiobutton' "
 "width='90' "
-"/> "
+"/>"
 "<widget name='subToggleSubOnly' "
 "type='Radiobutton' "
 "width='90' "
-"/> "
+"/>"
 "<widget name='subToggleSubBoth' "
 "type='Radiobutton' "
 "width='90' "
-"/> "
-"</layout> "
-"</layout> "
-"<space size='2' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"<space size='2' />"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'>"
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='subSubtitleSpeedLabel' "
 "type='SmallLabel' "
-"/> "
-"</layout> "
-"<space size='16'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
+"/>"
+"</layout>"
+"<space size='16'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='4'>"
 "<widget name='Keys' "
 "type='Button' "
-"/> "
-"<space size='Globals.Button.Width' /> "
+"/>"
+"<space size='Globals.Button.Width' />"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<space/> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<space/>"
 "<widget name='ResetSettings' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='VoiceCountText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='VoiceCountSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='VoiceCountLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='LevelText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='LevelSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='LevelLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='SpeedText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='SpeedSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='SpeedLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='DepthText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='DepthSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='DepthLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='WaveFormTypeText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='WaveFormType' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
 "<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='RoomSizeText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='RoomSizeSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='RoomSizeLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='DampingText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='DampingSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='DampingLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='WidthText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='WidthSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='WidthLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='LevelText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='LevelSlider' "
 "type='Slider' "
-"/> "
+"/>"
 "<widget name='LevelLabel' "
 "width='32' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.TabWidget'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='6'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='InterpolationText' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='Interpolation' "
 "type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Title' height='Globals.Line.Height'/> "
-"<widget name='List' /> "
-"<layout type='horizontal' padding='0,0,16,0'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
+"<widget name='Title' height='Globals.Line.Height'/>"
+"<widget name='List' />"
+"<layout type='horizontal' padding='0,0,16,0'>"
 "<widget name='ListSwitch' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='GridSwitch' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
-"/> "
-"<space/> "
+"/>"
+"<space/>"
 "<widget name='Delete' "
 "type='Button' "
-"/> "
-"<space size='16'/> "
+"/>"
+"<space size='16'/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Choose' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='SavenameDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='SavenameDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8'>"
 "<widget name='DescriptionText' "
 "width='180' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Description' "
 "height='19' "
-"/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,16,0'>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,4' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,4' center='true'>"
 "<widget name='Title' "
 "height='Globals.Line.Height' "
-"/> "
-"<widget name='List' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='2'> "
+"/>"
+"<widget name='List' />"
+"<layout type='horizontal' padding='0,0,0,0' spacing='2'>"
 "<widget name='Edit' "
 "type='Button' "
-"/> "
-"<space /> "
+"/>"
+"<space />"
 "<widget name='Record' "
 "type='Button' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='2'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='2'>"
 "<widget name='Delete' "
 "type='Button' "
-"/> "
-"<space /> "
+"/>"
+"<space />"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Playback' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='OnScreenDialog' overlays='screen_center'> "
-"<layout type='horizontal' spacing='5' padding='3,2,3,2' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='OnScreenDialog' overlays='screen_center'>"
+"<layout type='horizontal' spacing='5' padding='3,2,3,2' center='true'>"
 "<widget name='StopButton' "
 "width='16' "
 "height='16' "
-"/> "
+"/>"
 "<widget name='EditButton' "
 "width='16' "
 "height='16' "
-"/> "
+"/>"
 "<widget name='SwitchModeButton' "
 "width='16' "
 "height='16' "
-"/> "
+"/>"
 "<widget name='FastReplayButton' "
 "width='16' "
 "height='16' "
-"/> "
+"/>"
 "<widget name='TimeLabel' "
 "width='50' "
 "height='16' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='EditRecordDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='EditRecordDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Title' "
 "height='Globals.Line.Height' "
-"/> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'> "
+"/>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='AuthorLabel' "
 "type='EditRecordLabel' "
-"/> "
+"/>"
 "<widget name='AuthorEdit' "
 "type='EditRecord' "
-"/> "
-"</layout> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='NameLabel' "
 "type='EditRecordLabel' "
-"/> "
+"/>"
 "<widget name='NameEdit' "
 "type='EditRecord' "
-"/> "
-"</layout> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='NotesLabel' "
 "type='EditRecordLabel' "
-"/> "
+"/>"
 "<widget name='NotesEdit' "
 "type='EditRecord' "
-"/> "
-"</layout> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' spacing='5' padding='0,0,0,0'>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='OK' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummHelp' overlays='screen'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='ScummHelp' overlays='screen'>"
+"<layout type='vertical' padding='8,8,8,8'>"
 "<widget name='Title' "
 "width='180' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='HelpText' "
 "height='140' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"/>"
+"<layout type='horizontal' padding='0,0,0,0'>"
 "<widget name='Prev' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Next' "
 "type='Button' "
-"/> "
-"<space size='32'/> "
+"/>"
+"<space size='32'/>"
 "<widget name='Close' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
 "<widget name='Description1' "
 "width='280' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Description2' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='Standard' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Practice' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Expert' "
 "type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='4,4,16,4' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'>"
+"<layout type='vertical' padding='4,4,16,4' center='true'>"
 "<widget name='DirProgressText' "
 "width='280' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='GameProgressText' "
 "width='280' "
 "height='Globals.Line.Height' "
-"/> "
+"/>"
 "<widget name='GameList' "
 "width='280' "
 "height='100' "
-"/> "
-"<layout type='horizontal' padding='4,4,4,4'> "
+"/>"
+"<layout type='horizontal' padding='4,4,4,4'>"
 "<widget name='Ok' "
 "type='Button' "
-"/> "
+"/>"
 "<widget name='Cancel' "
 "type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
 "<widget name='PopupDesc' "
 "type='OptionsLabel' "
-"/> "
+"/>"
 "<widget name='Popup' "
 "type='PopUp' "
 "width='150' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
+"/>"
+"</layout>"
 "<widget name='KeymapArea' "
 "width='300' "
 "height='120' "
-"/> "
+"/>"
 "<widget name='Close' "
 "type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='Predictive' overlays='screen_center'> "
-"<layout type='vertical' padding='1,1,1,1' center='true'> "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='Predictive' overlays='screen_center'>"
+"<layout type='vertical' padding='1,1,1,1' center='true'>"
 "<widget name='Headline' "
 "height='Globals.Line.Height' "
 "width='150' "
 "textalign='center' "
-"/> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Word' "
 "width='120' "
 "height='Globals.Button.Height' "
-"/> "
+"/>"
 "<widget name='Delete' "
 "width='20' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Button1' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button2' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button3' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Button4' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button5' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button6' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='3,3,3,3'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='3,3,3,3'>"
 "<widget name='Button7' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button8' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button9' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='3,3,3,0'> "
+"/>"
+"</layout>"
+"<layout type='horizontal' padding='3,3,3,0'>"
 "<widget name='Pre' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Button0' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Next' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
-"</layout> "
-"<space size='3' /> "
-"<layout type='horizontal' padding='3,3,0,3'> "
+"/>"
+"</layout>"
+"<space size='3' />"
+"<layout type='horizontal' padding='3,3,0,3'>"
 "<widget name='Add' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='Cancel' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
+"/>"
 "<widget name='OK' "
 "width='Globals.Predictive.Button.Width' "
 "height='Globals.Predictive.Button.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"</layout_info> "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"</layout_info>"
diff --git a/gui/themes/scummtheme.py b/gui/themes/scummtheme.py
index e8001f8..524e914 100755
--- a/gui/themes/scummtheme.py
+++ b/gui/themes/scummtheme.py
@@ -40,7 +40,10 @@ def parseSTX(theme_file, def_file):
 	strlitcount = 0
 	output = ""
 	for line in theme_file:
-		output +=  line.rstrip("\r\n\t ").lstrip() + " \n"
+		output +=  line.rstrip("\r\n\t ").lstrip()
+		if not output.endswith('>'):
+			output += ' '
+		output += "\n"
 
 	output = re.sub(comm, "", output)
 	output = re.sub(head, "", output)


Commit: 79f6e7080a0542a4e58fbde689f17b79a088db09
    https://github.com/scummvm/scummvm/commit/79f6e7080a0542a4e58fbde689f17b79a088db09
Author: David Turner (dgturner at iee.org)
Date: 2013-08-15T23:14:40-07:00

Commit Message:
Merge pull request #384 from digitall/themeMaxSize

Bug fix for default builtin theme exceeding maximum size for C++ string literal..

Changed paths:
    gui/themes/default.inc
    gui/themes/scummtheme.py