Rename KeyRemapper dialog to KeyMapper

svn-id: r41462

8 files changed, 32 insertions, 32 deletions

diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 8b0a5c2e36..0440acdd0a 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -39,17 +39,17 @@ enum {
 };
 
 RemapDialog::RemapDialog()
-	: Dialog("KeyRemapper"), _keymapTable(0), _activeRemapAction(0), _topAction(0), _remapTimeout(0) {
+	: Dialog("KeyMapper"), _keymapTable(0), _activeRemapAction(0), _topAction(0), _remapTimeout(0) {
 
 	_keymapper = g_system->getEventManager()->getKeymapper();
 	assert(_keymapper);
 
-	_kmPopUpDesc = new GUI::StaticTextWidget(this, "KeyRemapper.PopupDesc", "Keymap:");
-	_kmPopUp = new GUI::PopUpWidget(this, "KeyRemapper.Popup");
+	_kmPopUpDesc = new GUI::StaticTextWidget(this, "KeyMapper.PopupDesc", "Keymap:");
+	_kmPopUp = new GUI::PopUpWidget(this, "KeyMapper.Popup");
 
 	_scrollBar = new GUI::ScrollBarWidget(this, 0, 0, 0, 0);
 
-	new GUI::ButtonWidget(this, "KeyRemapper.Close", "Close", kCloseCmd);
+	new GUI::ButtonWidget(this, "KeyMapper.Close", "Close", kCloseCmd);
 }
 
 RemapDialog::~RemapDialog() {
@@ -138,12 +138,12 @@ void RemapDialog::reflowLayout() {
 
 	int16 areaX, areaY;
 	uint16 areaW, areaH;
-	int spacing = g_gui.xmlEval()->getVar("Globals.KeyRemapper.Spacing");
-	int labelWidth =  g_gui.xmlEval()->getVar("Globals.KeyRemapper.LabelWidth");
-	int buttonWidth = g_gui.xmlEval()->getVar("Globals.KeyRemapper.ButtonWidth");
+	int spacing = g_gui.xmlEval()->getVar("Globals.KeyMapper.Spacing");
+	int labelWidth =  g_gui.xmlEval()->getVar("Globals.KeyMapper.LabelWidth");
+	int buttonWidth = g_gui.xmlEval()->getVar("Globals.KeyMapper.ButtonWidth");
 	int colWidth = labelWidth + buttonWidth + spacing;
 
-	g_gui.xmlEval()->getWidgetData((const String&)String("KeyRemapper.KeymapArea"), areaX, areaY, areaW, areaH);
+	g_gui.xmlEval()->getWidgetData((const String&)String("KeyMapper.KeymapArea"), areaX, areaY, areaW, areaH);
 
 	_colCount = (areaW - scrollbarWidth) / colWidth;
 	_rowCount = (areaH + spacing) / (buttonHeight + spacing);
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index d23c7ff060..d2fe7dade5 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -334,9 +334,9 @@
 "<def var='ShowGlobalMenuLogo' value='0'/> "
 "<def var='ShowSearchPic' value='0'/> "
 "<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'/> "
+"<def var='KeyMapper.Spacing' value='10'/> "
+"<def var='KeyMapper.LabelWidth' value='100'/> "
+"<def var='KeyMapper.ButtonWidth' value='80'/> "
 "<widget name='OptionsLabel' "
 "size='110,Globals.Line.Height' "
 "textalign='right' "
@@ -1055,7 +1055,7 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='KeyRemapper' overlays='screen_center' shading='dim'> "
+"<dialog name='KeyMapper' 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' "
@@ -1087,9 +1087,9 @@
 "<def var='ShowGlobalMenuLogo' value='0'/> "
 "<def var='ShowSearchPic' value='0'/> "
 "<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'/> "
+"<def var='KeyMapper.Spacing' value='5'/> "
+"<def var='KeyMapper.LabelWidth' value='80'/> "
+"<def var='KeyMapper.ButtonWidth' value='60'/> "
 "<widget name='Button' "
 "size='72,16' "
 "/> "
@@ -1812,7 +1812,7 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='KeyRemapper' overlays='screen_center' shading='dim'> "
+"<dialog name='KeyMapper' 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' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 9f2701fcd0..cd686aaf1e 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 567b0f0d9e..0256fc7dd6 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -37,9 +37,9 @@
 		
 		<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'/>
+		<def var = 'KeyMapper.Spacing' value = '10'/>
+		<def var = 'KeyMapper.LabelWidth' value = '100'/>
+		<def var = 'KeyMapper.ButtonWidth' value = '80'/>
 
 		<widget name = 'OptionsLabel'
 				size = '110, Globals.Line.Height'
@@ -786,7 +786,7 @@
 			</layout>
 		</layout>
 	</dialog>
-	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+	<dialog name = 'KeyMapper' 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'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 809ceccf9f..d4a92b831e 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -38,9 +38,9 @@
 
 		<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'/>
+		<def var = 'KeyMapper.Spacing' value = '5'/>
+		<def var = 'KeyMapper.LabelWidth' value = '80'/>
+		<def var = 'KeyMapper.ButtonWidth' value = '60'/>
 
 		<widget name = 'Button'
 				size = '72, 16'
@@ -791,7 +791,7 @@
 			</layout>
 		</layout>
 	</dialog>
-	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+	<dialog name = 'KeyMapper' 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'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 8a1739adb5..a133723d99 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index d3cd048f1d..8c13217c65 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -44,9 +44,9 @@
 		
 		<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'/>
+		<def var = 'KeyMapper.Spacing' value = '10'/>
+		<def var = 'KeyMapper.LabelWidth' value = '100'/>
+		<def var = 'KeyMapper.ButtonWidth' value = '80'/>
 
 		<widget name = 'OptionsLabel'
 				size = '110, Globals.Line.Height'
@@ -801,7 +801,7 @@
 		</layout>
 	</dialog>
 	
-	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+	<dialog name = 'KeyMapper' 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'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 6f7f25db20..13346a1d6f 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -44,9 +44,9 @@
 				size = '85, 12'
 		/>
 
-		<def var = 'KeyRemapper.Spacing' value = '5'/>
-		<def var = 'KeyRemapper.LabelWidth' value = '80'/>
-		<def var = 'KeyRemapper.ButtonWidth' value = '60'/>
+		<def var = 'KeyMapper.Spacing' value = '5'/>
+		<def var = 'KeyMapper.LabelWidth' value = '80'/>
+		<def var = 'KeyMapper.ButtonWidth' value = '60'/>
 
 		<widget name = 'OptionsLabel'
 				size = '100, Globals.Line.Height'
@@ -780,7 +780,7 @@
 			</layout>
 		</layout>
 	</dialog>
-	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+	<dialog name = 'KeyMapper' 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'