[Scummvm-cvs-logs] scummvm master -> 7dc15bc07053fc0d632e0bd987ee7b6b8b6f1666

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1115c2b323 GUI: Fix text alignment for the version in the launcher.
7dc15bc070 GUI: Center Launcher.Version in all themes.


Commit: 1115c2b323717311e2192e23318338103bc0e4f4
    https://github.com/scummvm/scummvm/commit/1115c2b323717311e2192e23318338103bc0e4f4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-02-02T15:43:32-08:00

Commit Message:
GUI: Fix text alignment for the version in the launcher.

Formerly in LauncherDialog::reflowLayout an incorrect way to query the acutal
text alignment was used for the static text widget used for the ScummVM
version.

Changed paths:
    gui/launcher.cpp



diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 0f4867c..4e35b54 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -1128,7 +1128,7 @@ void LauncherDialog::reflowLayout() {
 	if (g_gui.xmlEval()->getVar("Globals.ShowLauncherLogo") == 1 && g_gui.theme()->supportsImages()) {
 		StaticTextWidget *ver = (StaticTextWidget *)findWidget("Launcher.Version");
 		if (ver) {
-			ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter));
+			ver->setAlign(g_gui.xmlEval()->getWidgetTextHAlign("Launcher.Version"));
 			ver->setLabel(gScummVMVersionDate);
 		}
 
@@ -1139,7 +1139,7 @@ void LauncherDialog::reflowLayout() {
 	} else {
 		StaticTextWidget *ver = (StaticTextWidget *)findWidget("Launcher.Version");
 		if (ver) {
-			ver->setAlign((Graphics::TextAlign)g_gui.xmlEval()->getVar("Launcher.Version.Align", Graphics::kTextAlignCenter));
+			ver->setAlign(g_gui.xmlEval()->getWidgetTextHAlign("Launcher.Version"));
 			ver->setLabel(gScummVMFullVersion);
 		}
 


Commit: 7dc15bc07053fc0d632e0bd987ee7b6b8b6f1666
    https://github.com/scummvm/scummvm/commit/7dc15bc07053fc0d632e0bd987ee7b6b8b6f1666
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-02-02T15:46:51-08:00

Commit Message:
GUI: Center Launcher.Version in all themes.

Now that we actually use the textalign field of Launcher.Version the version
would be left aligned by default. This looks odd for the classic theme and
the low resolution version of the modern theme and is contrary to the old
"default" value, so I decided to center the string explicitly again.

Changed paths:
    gui/themes/default.inc
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/classic_layout.stx
    gui/themes/scummclassic/classic_layout_lowres.stx
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_layout_lowres.stx



diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index b0db473..6d8e6ba 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -683,6 +683,7 @@
 "<layout type='vertical' center='true' padding='6,6,2,2'> "
 "<widget name='Version' "
 "height='Globals.Line.Height' "
+"textalign='center' "
 "/> "
 "<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
 "<widget name='SearchDesc' "
@@ -1815,6 +1816,7 @@
 "<layout type='vertical' center='true' padding='16,16,8,8'> "
 "<widget name='Version' "
 "height='Globals.Line.Height' "
+"textalign='center' "
 "/> "
 "<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
 "<widget name='SearchDesc' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 3529288..297ff20 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 656d780..180e8fb 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -107,6 +107,7 @@
 		<layout type = 'vertical' center = 'true' padding = '16, 16, 8, 8'>
 			<widget name = 'Version'
 					height = 'Globals.Line.Height'
+					textalign = 'center'
 			/>
 			<layout type = 'horizontal' spacing = '5' padding = '10, 0, 0, 0'>
 				<widget name = 'SearchDesc'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 097f4d6..8bb03de 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -105,6 +105,7 @@
 		<layout type = 'vertical' center = 'true' padding = '6, 6, 2, 2'>
 			<widget name = 'Version'
 					height = 'Globals.Line.Height'
+					textalign = 'center'
 			/>
 			<layout type = 'horizontal' spacing = '5' padding = '0, 0, 0, 0'>
 				<widget name = 'SearchDesc'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 8daabf8..dbd8499 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 5e6ba32..9658402 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -103,6 +103,7 @@
 		<layout type = 'vertical' center = 'true' padding = '4, 4, 2, 2' spacing = '2'>
 			<widget name = 'Version'
 					height = 'Globals.Line.Height'
+					textalign = 'center'
 			/>
 			<layout type = 'horizontal' spacing = '5' padding = '0, 0, 2, 2'>
 				<widget name = 'SearchDesc'