Tweaked a little scumm main dialog and scumm save/load dialog. Still plenty

to do.

svn-id: r21271

3 files changed, 81 insertions, 27 deletions

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 3f243768b8..9a831720a8 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -355,6 +355,8 @@ public:
 SaveLoadChooserEx::SaveLoadChooserEx(const String &title, const String &buttonLabel, bool saveMode, ScummEngine *engine)
 	: Dialog("scummsaveload"), _saveMode(saveMode), _list(0), _chooseButton(0), _gfxWidget(0), _scumm(engine) {
 
+	_drawingHints |= GUI::THEME_HINT_MAIN_DIALOG;
+
 	new StaticTextWidget(this, "scummsaveload_title", title, kTextAlignCenter);
 
 	// Add choice list
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp
index fcf9f528ad..4e6b8f2b7a 100644
--- a/gui/theme-config.cpp
+++ b/gui/theme-config.cpp
@@ -222,30 +222,7 @@ const char *Theme::_defaultConfigINI =
 "##### SCUMM dialogs\n"
 "scummDummyDialog=0 80 0 16\n"
 "\n"
-"## Main dialog\n"
-"# note that scummmain size depends on overall height\n"
-"smY=(scummmainVSpace + scummmainVAddOff)\n"
-"scummmain_resume=scummmainHOffset smY scummmainButtonWidth scummmainButtonHeight\n"
-"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
-"smY=(smY + scummmainVSpace)\n"
-"scummmain_load=prev.x smY prev.w prev.h\n"
-"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
-"scummmain_save=prev.x smY prev.w prev.h\n"
-"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
-"smY=(smY + scummmainVSpace)\n"
-"scummmain_options=prev.x smY prev.w prev.h\n"
-"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
-"scummmain_help=prev.x smY prev.w prev.h\n"
-"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
-"scummmain_about=prev.x smY prev.w prev.h\n"
-"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
-"smY=(smY + scummmainVSpace)\n"
-"scummmain_quit=prev.x smY prev.w prev.h\n"
-"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
-"smW=(scummmainButtonWidth + 2 * scummmainHOffset)\n"
-"smH=(smY + scummmainVSpace)\n"
-"scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH\n"
-"\n"
+"use=scummmain\n"
 "## Engine config\n"
 "# note that scummconfig size depends on overall height\n"
 "# hence it is on the end of the list\n"
@@ -347,6 +324,31 @@ const char *Theme::_defaultConfigINI =
 "opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)\n"
 "mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)\n"
+"\n"
+"[scummmain]\n"
+"## Main dialog\n"
+"# note that scummmain size depends on overall height\n"
+"smY=(scummmainVSpace + scummmainVAddOff)\n"
+"scummmain_resume=scummmainHOffset smY scummmainButtonWidth scummmainButtonHeight\n"
+"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
+"smY=(smY + scummmainVSpace)\n"
+"scummmain_load=prev.x smY prev.w prev.h\n"
+"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
+"scummmain_save=prev.x smY prev.w prev.h\n"
+"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
+"smY=(smY + scummmainVSpace)\n"
+"scummmain_options=prev.x smY prev.w prev.h\n"
+"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
+"scummmain_help=prev.x smY prev.w prev.h\n"
+"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
+"scummmain_about=prev.x smY prev.w prev.h\n"
+"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
+"smY=(smY + scummmainVSpace)\n"
+"scummmain_quit=prev.x smY prev.w prev.h\n"
+"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
+"smW=(scummmainButtonWidth + 2 * scummmainHOffset)\n"
+"smH=(smY + scummmainVSpace)\n"
+"scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH\n"
 "";
 
 using Common::String;
diff --git a/gui/themes/default-theme.ini b/gui/themes/default-theme.ini
index dc5bff7059..ed8ab82884 100644
--- a/gui/themes/default-theme.ini
+++ b/gui/themes/default-theme.ini
@@ -133,19 +133,69 @@ shadow_top_height=2
 pshadow_bottom_height=4
 
 [640xY]
+def_buttonWidth=120
+def_buttonHeight=25
+def_scummmainHOffset=12
+def_scummmainVSpace=15
+def_scummmainVAddOff=5
+
 ##### launcher
 launcher_version=85 21 247 kLineHeight
 launcher_logo=180 5 283 80
 launcher_logo.visible=true
 space1=20
 space2=5
-butWidth=120
-butHeight=25
 launcher_list=23 94 466 (h - 23 - self.y)
-launcher_start_button=(prev.x2 + 17) prev.y butWidth butHeight
+launcher_start_button=(prev.x2 + 17) prev.y buttonWidth buttonHeight
 launcher_addGame_button=prev.x (prev.y2 + space1) prev.w prev.h
 launcher_editGame_button=prev.x (prev.y2 + space2) prev.w prev.h
 launcher_removeGame_button=prev.x (prev.y2 + space2) prev.w prev.h
 launcher_options_button=prev.x (prev.y2 + space1) prev.w prev.h
 launcher_about_button=prev.x (prev.y2 + space2) prev.w prev.h
 launcher_quit_button=prev.x (prev.y2 + space1) prev.w prev.h
+use=scummmain
+
+# Saveload dialog
+scummsaveload=8 8 (w - 2 * 8) (h - 16)
+set_parent=scummsaveload
+scummsaveload_title=10 2 (parent.w - 2 * 10 - 180) kLineHeight
+scummsaveload_list=10 18 prev.w (parent.h - 17 - buttonHeight - 8 - self.y)
+scummsaveload_thumbnail=(parent.w - (kThumbnailWidth + 22)) 18
+scummsaveload_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+scummsaveload_choose=(prev.x2 + 10) prev.y prev.w prev.h
+opHeight=(h * 9 / 10)
+useWithPrefix=chooser scummsaveload_
+
+
+############################################
+[chooser]
+chooserW=(w - 2 * 8)
+chooser=((w - chooserW) / 2) ((h - opHeight) / 2) chooserW opHeight
+chooser_headline=10 6 (chooserW - 2 * 10) (kLineHeight)
+chooser_list=10 (6 + kLineHeight + 2) prev.w (opHeight - self.y - buttonHeight - 12)
+chooser_cancel=(chooserW - 2 * (buttonWidth + 10)) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
+chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
+
+[scummmain]
+## Main dialog
+# note that scummmain size depends on overall height
+smY=scummmainHOffset
+scummmain_resume=scummmainHOffset smY buttonWidth buttonHeight
+smY=(smY + buttonHeight + scummmainVAddOff)
+smY=(smY + scummmainVSpace)
+scummmain_load=prev.x smY prev.w prev.h
+smY=(smY + buttonHeight + scummmainVAddOff)
+scummmain_save=prev.x smY prev.w prev.h
+smY=(smY + buttonHeight + scummmainVAddOff)
+smY=(smY + scummmainVSpace)
+scummmain_options=prev.x smY prev.w prev.h
+smY=(smY + buttonHeight + scummmainVAddOff)
+scummmain_help=prev.x smY prev.w prev.h
+smY=(smY + buttonHeight + scummmainVAddOff)
+scummmain_about=prev.x smY prev.w prev.h
+smY=(smY + buttonHeight + scummmainVAddOff)
+smY=(smY + scummmainVSpace)
+scummmain_quit=prev.x smY prev.w prev.h
+smH=(smY + buttonHeight + scummmainHOffset)
+smW=(buttonWidth + 2 * scummmainHOffset)
+scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH