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

svn-id: r34806

2 files changed, 7 insertions, 9 deletions

diff --git a/gui/chooser.cpp b/gui/chooser.cpp
index 690a42874f..f5f9b0975a 100644
--- a/gui/chooser.cpp
+++ b/gui/chooser.cpp
@@ -33,21 +33,19 @@ enum {
 	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);
 }
 
diff --git a/gui/chooser.h b/gui/chooser.h
index ef36d1e59a..836f30bd8c 100644
--- a/gui/chooser.h
+++ b/gui/chooser.h
@@ -45,7 +45,7 @@ protected:
 	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);