Added KeyConfiguration dialog to classic theme(320 and normal). Updated KeysDialog to follow xml syntax properly.

svn-id: r35416

6 files changed, 117 insertions, 11 deletions

diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp
index 12c97b1a59..7a9256e30f 100644
--- a/gui/KeysDialog.cpp
+++ b/gui/KeysDialog.cpp
@@ -39,17 +39,17 @@ enum {
 };
 
 KeysDialog::KeysDialog(const Common::String &title)
-	: GUI::Dialog("keysdialog") {
+	: GUI::Dialog("KeysDialog") {
 
-	new ButtonWidget(this, "keysdialog_map", "Map", kMapCmd, 0);
-	new ButtonWidget(this, "keysdialog_ok", "OK", kOKCmd, 0);
-	new ButtonWidget(this, "keysdialog_cancel", "Cancel", kCloseCmd, 0);
+	new ButtonWidget(this, "KeysDialog.Map", "Map", kMapCmd, 0);
+	new ButtonWidget(this, "KeysDialog.Ok", "OK", kOKCmd, 0);
+	new ButtonWidget(this, "KeysDialog.Cancel", "Cancel", kCloseCmd, 0);
 
-	_actionsList = new ListWidget(this, "keysdialog_list");
+	_actionsList = new ListWidget(this, "KeysDialog.List");
 	_actionsList->setNumberingMode(kListNumberingZero);
 
-	_actionTitle = new StaticTextWidget(this, "keysdialog_action", title);
-	_keyMapping = new StaticTextWidget(this, "keysdialog_mapping", "Select an action and click 'Map'");
+	_actionTitle = new StaticTextWidget(this, "KeysDialog.Action", title);
+	_keyMapping = new StaticTextWidget(this, "KeysDialog.Mapping", "Select an action and click 'Map'");
 
 	_actionTitle->setFlags(WIDGET_CLEARBG);
 	_keyMapping->setFlags(WIDGET_CLEARBG);
diff --git a/gui/options.cpp b/gui/options.cpp
index 9f0bcfb48e..8ac1720e25 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -720,10 +720,6 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 #endif
 #endif
 
-#ifdef SMALL_SCREEN_DEVICE
-	new ButtonWidget(tab, "GlobalOptions_Paths.KeysButton", "Keys", kChooseKeyMappingCmd, 0);
-#endif
-
 	tab->addTab("Misc");
 
 	new ButtonWidget(tab, "GlobalOptions_Misc.ThemeButton", "Theme:", kChooseThemeCmd, 0);
@@ -743,6 +739,10 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 		_autosavePeriodPopUp->appendEntry(savePeriodLabels[i], savePeriodValues[i]);
 	}
 
+#ifdef SMALL_SCREEN_DEVICE
+	new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", "Keys", kChooseKeyMappingCmd, 0);
+#endif
+
 	// TODO: joystick setting
 
 
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 89a9a5d620..986d832bd9 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -607,6 +607,32 @@
 "<widget name='AutosavePeriod' "
 "type='PopUp' "
 "/> "
+"<widget name='KeysButton' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='List'/> "
+"<widget name='Action' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
+"/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Map' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
 "</layout> "
 "</dialog> "
 "<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
@@ -1217,6 +1243,32 @@
 "<widget name='AutosavePeriod' "
 "type='PopUp' "
 "/> "
+"<widget name='KeysButton' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='List'/> "
+"<widget name='Action' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
+"/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Map' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
 "</layout> "
 "</dialog> "
 "<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 4add34070c..377aeb2265 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 3b447e29af..087db1b6ed 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -341,8 +341,35 @@
 			<widget name = 'AutosavePeriod'
 					type = 'PopUp'
 			/>
+			<widget name='KeysButton' 
+ 				     type='Button' 
+			/> 
 		</layout>
 	</dialog>
+
+	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> 
+		<layout type='vertical' padding='8,8,8,8' center='true'> 
+			<widget name='List'/> 
+			<widget name='Action' 
+					height='Globals.Line.Height' 
+			/> 
+			<widget name='Mapping' 
+					height='Globals.Line.Height' 
+			/> 
+			<layout type='horizontal' padding='0,0,16,0'> 
+				<widget name='Map' 
+						type='Button' 
+				/> 
+				<space/> 
+				<widget name='Cancel' 
+						type='Button' 
+				/> 
+				<widget name='Ok' 
+						type='Button' 
+				/> 
+			</layout> 
+		</layout> 
+	</dialog> 
 	
 	<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx
index c77518ea21..faf6f20d6f 100644
--- a/gui/themes/scummclassic/classic_layout_320.stx
+++ b/gui/themes/scummclassic/classic_layout_320.stx
@@ -338,9 +338,36 @@
 			<widget name = 'AutosavePeriod'
 					type = 'PopUp'
 			/>
+			<widget name='KeysButton' 
+ 				     type='Button' 
+			/> 
 		</layout>
 	</dialog>
 
+	<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> 
+		<layout type='vertical' padding='8,8,8,8' center='true'> 
+			<widget name='List'/> 
+			<widget name='Action' 
+					height='Globals.Line.Height' 
+			/> 
+			<widget name='Mapping' 
+					height='Globals.Line.Height' 
+			/> 
+			<layout type='horizontal' padding='0,0,16,0'> 
+				<widget name='Map' 
+						type='Button' 
+				/> 
+				<space/> 
+				<widget name='Cancel' 
+						type='Button' 
+				/> 
+				<widget name='Ok' 
+						type='Button' 
+				/> 
+			</layout> 
+		</layout> 
+	</dialog> 
+	
 	<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim'>
 		<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
 			<widget name = 'TabWidget'/>