[Scummvm-cvs-logs] SF.net SVN: scummvm:[33955] scummvm/branches/gsoc2008-rtl

[cpage88 at users.sourceforge.net]

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

Log Message:
-----------
Added ScummVM Title and version info to GMM

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/dialogs.cpp
    scummvm/branches/gsoc2008-rtl/gui/theme-config.cpp

Modified: scummvm/branches/gsoc2008-rtl/engines/dialogs.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/dialogs.cpp	2008-08-16 22:42:19 UTC (rev 33954)
+++ scummvm/branches/gsoc2008-rtl/engines/dialogs.cpp	2008-08-17 02:02:22 UTC (rev 33955)
@@ -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 @@
 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');

Modified: scummvm/branches/gsoc2008-rtl/gui/theme-config.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/gui/theme-config.cpp	2008-08-16 22:42:19 UTC (rev 33954)
+++ scummvm/branches/gsoc2008-rtl/gui/theme-config.cpp	2008-08-17 02:02:22 UTC (rev 33955)
@@ -119,6 +119,7 @@
 "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 @@
 "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 @@
 "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"


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