From 28a114c70210dffe7bb957da2ed2a041bd64f392 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 7 Jun 2009 22:05:57 +0000
Subject: Added current keymapper dialog to all themes so it could be tested by
 other devs.

svn-id: r41352
---
 gui/themes/scummclassic.zip                        | Bin 51435 -> 52924 bytes
 gui/themes/scummclassic/classic_layout.stx         |  25 +++++++++++++++++++++
 gui/themes/scummclassic/classic_layout_lowres.stx  |  25 +++++++++++++++++++++
 gui/themes/scummmodern.zip                         | Bin 156821 -> 157601 bytes
 gui/themes/scummmodern/scummmodern_layout.stx      |   5 +++--
 .../scummmodern/scummmodern_layout_lowres.stx      |  25 +++++++++++++++++++++
 6 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index c96b575249..3b50cd1954 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 431db7756d..969788cea0 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -37,6 +37,10 @@
 		
 		<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/>
 
+		<def var = 'KeyRemapper.Spacing' value = '10'/>
+		<def var = 'KeyRemapper.LabelWidth' value = '100'/>
+		<def var = 'KeyRemapper.ButtonWidth' value = '80'/>
+
 		<widget name = 'OptionsLabel'
 				size = '110, Globals.Line.Height'
 				textalign = 'right'
@@ -778,4 +782,25 @@
 			</layout>
 		</layout>
 	</dialog>
+	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+		<layout type = 'vertical' padding = '8, 8, 32, 8' spacing = '10' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'PopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Popup'
+						type = 'PopUp'
+						width = '400'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'KeymapArea'
+					width = '600'
+					height = '280'
+			/>
+			<widget name = 'Close'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
 </layout_info>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index a5f8e627e9..932ee16389 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -38,6 +38,10 @@
 
 		<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/>
 
+		<def var = 'KeyRemapper.Spacing' value = '5'/>
+		<def var = 'KeyRemapper.LabelWidth' value = '80'/>
+		<def var = 'KeyRemapper.ButtonWidth' value = '60'/>
+
 		<widget name = 'Button'
 				size = '72, 16'
 		/>
@@ -783,4 +787,25 @@
 			</layout>
 		</layout>
 	</dialog>
+	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' spacing = '10' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'PopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Popup'
+						type = 'PopUp'
+						width = '150'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'KeymapArea'
+					width = '300'
+					height = '120'
+			/>
+			<widget name = 'Close'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
 </layout_info>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 1f53da672e..c84ff72b55 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 1d26edc42c..d30e4a805b 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -805,12 +805,13 @@
 				/>
 				<widget name = 'Popup'
 						type = 'PopUp'
-						width = '500'
+						width = '400'
+						height = 'Globals.Line.Height'
 				/>
 			</layout>
 			<widget name = 'KeymapArea'
 					width = '600'
-					height = '378'
+					height = '280'
 			/>
 			<widget name = 'Close'
 					type = 'Button'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 96b3763540..5d15d2efc7 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -44,6 +44,10 @@
 				size = '85, 12'
 		/>
 
+		<def var = 'KeyRemapper.Spacing' value = '5'/>
+		<def var = 'KeyRemapper.LabelWidth' value = '80'/>
+		<def var = 'KeyRemapper.ButtonWidth' value = '60'/>
+
 		<widget name = 'OptionsLabel'
 				size = '100, Globals.Line.Height'
 				textalign = 'right'
@@ -772,4 +776,25 @@
 			</layout>
 		</layout>
 	</dialog>
+	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' spacing = '10' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'PopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Popup'
+						type = 'PopUp'
+						width = '150'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'KeymapArea'
+					width = '300'
+					height = '120'
+			/>
+			<widget name = 'Close'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
 </layout_info>
-- 
cgit v1.2.3