From 15d846bfb0cf5e8d889edcf1b8bdeb9ecf52cc15 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 24 Sep 2011 21:06:30 +1200
Subject: [PATCH] rename 'preferences' to 'settings' in various internal cnc
 bits; UI strings were 'settings' already

---
 OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs | 2 +-
 OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs       | 2 +-
 OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs     | 4 ++--
 mods/cnc/chrome/ingamemenu.yaml                     | 4 ++--
 mods/cnc/chrome/mainmenu.yaml                       | 6 +++---
 mods/cnc/chrome/{preferences.yaml => settings.yaml} | 0
 mods/cnc/mod.yaml                                   | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename mods/cnc/chrome/{preferences.yaml => settings.yaml} (100%)

diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
index 253549ae10..4064c71b63 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				});
 			};
 			
-			menu.GetWidget<ButtonWidget>("PREFERENCES_BUTTON").OnClick = () =>
+			menu.GetWidget<ButtonWidget>("SETTINGS_BUTTON").OnClick = () =>
 			{
 				hideButtons = true;
 				Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs()
diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
index 48460362ab..72cff693ad 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
@@ -110,7 +110,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				});
 			};
 
-			settingsMenu.GetWidget<ButtonWidget>("PREFERENCES_BUTTON").OnClick = () =>
+			settingsMenu.GetWidget<ButtonWidget>("SETTINGS_BUTTON").OnClick = () =>
 			{
 				Menu = MenuType.None;
 				Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs()
diff --git a/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs
index 4605e4b6d9..d4a592b2a9 100755
--- a/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs
@@ -85,8 +85,8 @@ namespace OpenRA.Mods.RA.Widgets
 			var rectBounds = RenderBounds;
 			WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(rectBounds.X,rectBounds.Y));
 			for (var i = 1; i < numPowers; i++)
-				WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-middle"), new float2(rectBounds.X, rectBounds.Y + i * 51));
-			WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-bottom"), new float2(rectBounds.X, rectBounds.Y + numPowers * 51));
+				WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-middle"), new float2(rectBounds.X, rectBounds.Y + i * 51));
+			WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-bottom"), new float2(rectBounds.X, rectBounds.Y + numPowers * 51));
 
 			// Hack Hack Hack
 			rectBounds.Width = 69;
diff --git a/mods/cnc/chrome/ingamemenu.yaml b/mods/cnc/chrome/ingamemenu.yaml
index cd42f949e9..aebaf31c2f 100644
--- a/mods/cnc/chrome/ingamemenu.yaml
+++ b/mods/cnc/chrome/ingamemenu.yaml
@@ -50,8 +50,8 @@ Container@INGAME_MENU:
 					Width:140
 					Height:35
 					Text:Music
-				Button@PREFERENCES_BUTTON:
-					Id:PREFERENCES_BUTTON
+				Button@SETTINGS_BUTTON:
+					Id:SETTINGS_BUTTON
 					X:450
 					Y:0
 					Width:140
diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml
index f01edd3866..46f94d5a34 100644
--- a/mods/cnc/chrome/mainmenu.yaml
+++ b/mods/cnc/chrome/mainmenu.yaml
@@ -168,8 +168,8 @@ Container@MENU_BACKGROUND:
 							Width:140
 							Height:35
 							Text:Music
-						Button@PREFERENCES_BUTTON:
-							Id:PREFERENCES_BUTTON
+						Button@SETTINGS_BUTTON:
+							Id:SETTINGS_BUTTON
 							X:300
 							Y:0
 							Width:140
@@ -207,4 +207,4 @@ Container@MENU_BACKGROUND:
 							X:10
 							Y:10
 							Width:200
-							Height:200
\ No newline at end of file
+							Height:200
diff --git a/mods/cnc/chrome/preferences.yaml b/mods/cnc/chrome/settings.yaml
similarity index 100%
rename from mods/cnc/chrome/preferences.yaml
rename to mods/cnc/chrome/settings.yaml
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index fdd5953f9d..7001ceaee4 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -75,7 +75,7 @@ ChromeLayout:
 	mods/cnc/chrome/ingamemenu.yaml
 	mods/cnc/chrome/music.yaml
 	mods/cnc/chrome/modchooser.yaml
-	mods/cnc/chrome/preferences.yaml
+	mods/cnc/chrome/settings.yaml
 	mods/cnc/chrome/cheats.yaml
 	mods/cnc/chrome/dialogs.yaml
 	mods/cnc/chrome/objectives.yaml