aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Page2008-08-17 02:02:22 +0000
committerChristopher Page2008-08-17 02:02:22 +0000
commitf45749759e8788b7751dbd6423a4471be4e80f22 (patch)
tree198a8bd97915b64537e46a51a93b8831db4a247c
parentd370c8eedda98c1bd1601844cf2c91c559bce49d (diff)
downloadscummvm-rg350-f45749759e8788b7751dbd6423a4471be4e80f22.tar.gz
scummvm-rg350-f45749759e8788b7751dbd6423a4471be4e80f22.tar.bz2
scummvm-rg350-f45749759e8788b7751dbd6423a4471be4e80f22.zip
Added ScummVM Title and version info to GMM
svn-id: r33955
-rw-r--r--engines/dialogs.cpp6
-rw-r--r--gui/theme-config.cpp14
2 files changed, 15 insertions, 5 deletions
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index c4b9a7808a..4f95b12143 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -22,6 +22,8 @@
* $Id$
*/
+#include "base/version.h"
+
#include "common/config-manager.h"
#include "common/savefile.h"
#include "common/system.h"
@@ -75,6 +77,10 @@ enum {
MainMenuDialog::MainMenuDialog(Engine *engine)
: GlobalDialog("globalmain"), _engine(engine) {
+ new StaticTextWidget(this, "global_title", "ScummVM");
+
+ new StaticTextWidget(this, "global_version", gScummVMVersionDate);
+
new GUI::ButtonWidget(this, "globalmain_resume", "Resume", kPlayCmd, 'P');
// new GUI::ButtonWidget(this, "globalmain_load", "Load", kLoadCmd, 'L');
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp
index 71235daebb..9fc23c5e7d 100644
--- a/gui/theme-config.cpp
+++ b/gui/theme-config.cpp
@@ -119,6 +119,7 @@ const char *Theme::_defaultConfigINI =
"def_aboutXOff=8\n"
"def_aboutYOff=5\n"
"def_aboutOuterBorder=80\n"
+"def_globalmainHOffset=52\n"
"def_scummmainHOffset=12\n"
"def_scummmainVSpace=7\n"
"def_scummmainVAddOff=3\n"
@@ -485,12 +486,17 @@ const char *Theme::_defaultConfigINI =
"smH=(smY + scummmainVSpace)\n"
"scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH\n"
"\n"
-
"#### Global Main Menu Dialog"
"[globalmain]\n"
"# note that globalmain size depends on overall height\n"
-"gmY=(scummmainVSpace + scummmainVAddOff)\n"
-"globalmain_resume=scummmainHOffset gmY scummmainButtonWidth scummmainButtonHeight\n"
+"hBorder=10\n"
+"gmW=(scummmainButtonWidth + (2 * scummmainHOffset) + 80)\n"
+"global_title=hBorder 8 (gmW - 2 * hBorder) kLineHeight\n"
+"global_title.align=kTextAlignCenter\n"
+"global_version=hBorder 25 (gmW - 2 * hBorder) kLineHeight\n"
+"global_version.align=kTextAlignCenter\n"
+"gmY=((scummmainVSpace * 7)+ scummmainVAddOff)\n"
+"globalmain_resume=globalmainHOffset gmY scummmainButtonWidth scummmainButtonHeight\n"
"gmY=(gmY + scummmainButtonHeight + scummmainVAddOff)\n"
"gmY=(gmY + scummmainVSpace)\n"
"globalmain_options=prev.x gmY prev.w prev.h\n"
@@ -500,10 +506,8 @@ const char *Theme::_defaultConfigINI =
"gmY=(gmY + scummmainVSpace)\n"
"globalmain_rtl=prev.x gmY prev.w prev.h\n"
"gmY=(gmY + scummmainButtonHeight + scummmainVAddOff)\n"
-"gmW=(scummmainButtonWidth + 2 * scummmainHOffset)\n"
"globalmain_quit=prev.x gmY prev.w prev.h\n"
"gmY=(gmY + scummmainButtonHeight + scummmainVAddOff)\n"
-"gmW=(scummmainButtonWidth + 2 * scummmainHOffset)\n"
"gmH=(gmY + scummmainVSpace)\n"
"globalmain=((w - gmW) / 2) ((h - gmH) / 2) gmW gmH\n"
"\n"