aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2006-03-14 03:08:14 +0000
committerEugene Sandulenko2006-03-14 03:08:14 +0000
commit60793c0e641a36ef1153605657b48df268b86830 (patch)
treea67716ef116d199775c0dfe226c5d8e6503947c1
parentb45dcc4df372f2d860e13972eee96f3540f04405 (diff)
downloadscummvm-rg350-60793c0e641a36ef1153605657b48df268b86830.tar.gz
scummvm-rg350-60793c0e641a36ef1153605657b48df268b86830.tar.bz2
scummvm-rg350-60793c0e641a36ef1153605657b48df268b86830.zip
Positioned logo properly, added different version number rendering and
got rid of antialiasing artifacts svn-id: r21270
-rw-r--r--base/main.cpp1
-rw-r--r--base/version.h1
-rw-r--r--gui/launcher.cpp11
-rw-r--r--gui/themes/default-theme.ini4
-rw-r--r--gui/themes/default-theme.zipbin28215 -> 28075 bytes
5 files changed, 11 insertions, 6 deletions
diff --git a/base/main.cpp b/base/main.cpp
index d32849dfb0..b2f32edb1e 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -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
diff --git a/base/version.h b/base/version.h
index f274f18889..887fc4df1d 100644
--- a/base/version.h
+++ b/base/version.h
@@ -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"
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index cd9132b541..26be849690 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -443,9 +443,6 @@ LauncherDialog::LauncherDialog(GameDetector &detector)
_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 @@ LauncherDialog::LauncherDialog(GameDetector &detector)
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');
diff --git a/gui/themes/default-theme.ini b/gui/themes/default-theme.ini
index 8df46fb2ed..dc5bff7059 100644
--- a/gui/themes/default-theme.ini
+++ b/gui/themes/default-theme.ini
@@ -134,8 +134,8 @@ pshadow_bottom_height=4
[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
diff --git a/gui/themes/default-theme.zip b/gui/themes/default-theme.zip
index 49aa5c8ac3..ae363f124d 100644
--- a/gui/themes/default-theme.zip
+++ b/gui/themes/default-theme.zip
Binary files differ