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

[tanoku at users.sourceforge.net]

Revision: 34806
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34806&view=rev
Author:   tanoku
Date:     2008-10-15 11:22:22 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
Fixed: Game version selection menu (Bugs 2167730 and 2164305).

Modified Paths:
--------------
    scummvm/trunk/gui/chooser.cpp
    scummvm/trunk/gui/chooser.h

Modified: scummvm/trunk/gui/chooser.cpp
===================================================================
--- scummvm/trunk/gui/chooser.cpp	2008-10-14 23:42:54 UTC (rev 34805)
+++ scummvm/trunk/gui/chooser.cpp	2008-10-15 11:22:22 UTC (rev 34806)
@@ -33,21 +33,19 @@
 	kChooseCmd = 'Chos'
 };
 
-ChooserDialog::ChooserDialog(const String &title, String prefix, const String &buttonLabel)
-	: Dialog(prefix + "chooser") {
+ChooserDialog::ChooserDialog(const String &title, String dialogId)
+	: Dialog(dialogId) {
 
 	// Headline
-	new StaticTextWidget(this, prefix + "chooser_headline", title);
+	new StaticTextWidget(this, dialogId + ".Headline", title);
 
 	// Add choice list
-	// HACK: Subtracting -12 from the height makes the list look good when
-	// it's used to list savegames in the 320x200 version of the GUI.
-	_list = new ListWidget(this, prefix + "chooser_list");
+	_list = new ListWidget(this, dialogId + ".List");
 	_list->setNumberingMode(kListNumberingOff);
 
 	// Buttons
-	new ButtonWidget(this, prefix + "chooser_cancel", "Cancel", kCloseCmd, 0);
-	_chooseButton = new ButtonWidget(this, prefix + "chooser_ok", buttonLabel, kChooseCmd, 0);
+	new ButtonWidget(this, dialogId + ".Cancel", "Cancel", kCloseCmd, 0);
+	_chooseButton = new ButtonWidget(this, dialogId + ".Choose", "Choose", kChooseCmd, 0);
 	_chooseButton->setEnabled(false);
 }
 

Modified: scummvm/trunk/gui/chooser.h
===================================================================
--- scummvm/trunk/gui/chooser.h	2008-10-14 23:42:54 UTC (rev 34805)
+++ scummvm/trunk/gui/chooser.h	2008-10-15 11:22:22 UTC (rev 34806)
@@ -45,7 +45,7 @@
 	ButtonWidget	*_chooseButton;
 
 public:
-	ChooserDialog(const String &title, String prefix = "defaultChooser_", const String &buttonLabel = "Choose");
+	ChooserDialog(const String &title, String dialogId = "Browser");
 
 	void setList(const StringList& list);
 


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