[Scummvm-cvs-logs] SF.net SVN: scummvm: [21270] scummvm/trunk/gui

sev at users.sourceforge.net sev at users.sourceforge.net
Mon Mar 13 19:09:00 CET 2006


Revision: 21270
Author:   sev
Date:     2006-03-13 19:08:14 -0800 (Mon, 13 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21270&view=rev

Log Message:
-----------
Positioned logo properly, added different version number rendering and
got rid of antialiasing artifacts

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp
    scummvm/trunk/base/version.h
    scummvm/trunk/gui/launcher.cpp
    scummvm/trunk/gui/themes/default-theme.ini
    scummvm/trunk/gui/themes/default-theme.zip
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-03-14 02:55:54 UTC (rev 21269)
+++ scummvm/trunk/base/main.cpp	2006-03-14 03:08:14 UTC (rev 21270)
@@ -97,6 +97,7 @@
  */
 const char *gScummVMVersion = SCUMMVM_VERSION;
 const char *gScummVMBuildDate = __DATE__ " " __TIME__;
+const char *gScummVMVersionDate = SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
 const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
 const char *gScummVMFeatures = ""
 #ifdef USE_TREMOR

Modified: scummvm/trunk/base/version.h
===================================================================
--- scummvm/trunk/base/version.h	2006-03-14 02:55:54 UTC (rev 21269)
+++ scummvm/trunk/base/version.h	2006-03-14 03:08:14 UTC (rev 21270)
@@ -24,6 +24,7 @@
 
 extern const char *gScummVMVersion;		// e.g. "0.4.1"
 extern const char *gScummVMBuildDate;	// e.g. "2003-06-24"
+extern const char *gScummVMVersionDate; // e.g. "0.4.1 (2003-06-24)"
 extern const char *gScummVMFullVersion;	// e.g. "ScummVM 0.4.1 (2003-06-24)"
 extern const char *gScummVMFeatures; 	// e.g. "ALSA MPEG2 zLib"
 

Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2006-03-14 02:55:54 UTC (rev 21269)
+++ scummvm/trunk/gui/launcher.cpp	2006-03-14 03:08:14 UTC (rev 21270)
@@ -443,9 +443,6 @@
 	_w = screenW;
 	_h = screenH;
 
-	// Show ScummVM version
-	new StaticTextWidget(this, "launcher_version", gScummVMFullVersion, kTextAlignCenter);
-
 #ifndef DISABLE_FANCY_THEMES
 	if (g_gui.evaluator()->getVar("launcher_logo.visible") == 1) {
 		GraphicsWidget *logo = new GraphicsWidget(this, "launcher_logo");
@@ -453,7 +450,13 @@
 		logo->useTransparency(true);
 
 		logo->setGfx(th->getImageSurface(th->kThemeLogo));
-	}
+
+		new StaticTextWidget(this, "launcher_version", gScummVMVersionDate, kTextAlignRight);
+	} else
+		new StaticTextWidget(this, "launcher_version", gScummVMFullVersion, kTextAlignCenter);
+#else
+	// Show ScummVM version
+	new StaticTextWidget(this, "launcher_version", gScummVMFullVersion, kTextAlignCenter);
 #endif
 
 	new ButtonWidget(this, "launcher_quit_button", "Quit", kQuitCmd, 'Q');

Modified: scummvm/trunk/gui/themes/default-theme.ini
===================================================================
--- scummvm/trunk/gui/themes/default-theme.ini	2006-03-14 02:55:54 UTC (rev 21269)
+++ scummvm/trunk/gui/themes/default-theme.ini	2006-03-14 03:08:14 UTC (rev 21270)
@@ -134,8 +134,8 @@
 
 [640xY]
 ##### launcher
-launcher_version=82 22 247 kLineHeight
-launcher_logo=180 2 283 80
+launcher_version=85 21 247 kLineHeight
+launcher_logo=180 5 283 80
 launcher_logo.visible=true
 space1=20
 space2=5

Modified: scummvm/trunk/gui/themes/default-theme.zip
===================================================================
(Binary files differ)


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





More information about the Scummvm-git-logs mailing list