epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename 'preferences' to 'settings' in various internal cnc bits; UI strings were 'settings' already

Browse Source
This commit is contained in:
Chris Forbes
2011-09-24 21:06:30 +12:00
parent 635315b0af
commit 15d846bfb0
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
}); });
}; };
menu.GetWidget<ButtonWidget>("PREFERENCES_BUTTON").OnClick = () => menu.GetWidget<ButtonWidget>("SETTINGS_BUTTON").OnClick = () =>
{ {
hideButtons = true; hideButtons = true;
Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs() Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs()

2
OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
View File

@@ -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; Menu = MenuType.None;
Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs() Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs()

4
OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs
View File

@@ -85,8 +85,8 @@ namespace OpenRA.Mods.RA.Widgets
var rectBounds = RenderBounds; var rectBounds = RenderBounds;
WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(rectBounds.X,rectBounds.Y)); WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world, "specialbin-top"),new float2(rectBounds.X,rectBounds.Y));
for (var i = 1; i < numPowers; i++) 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-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-bottom"), new float2(rectBounds.X, rectBounds.Y + numPowers * 51));
// Hack Hack Hack // Hack Hack Hack
rectBounds.Width = 69; rectBounds.Width = 69;

4
mods/cnc/chrome/ingamemenu.yaml
View File

@@ -50,8 +50,8 @@ Container@INGAME_MENU:
Width:140 Width:140
Height:35 Height:35
Text:Music Text:Music
Button@PREFERENCES_BUTTON: Button@SETTINGS_BUTTON:
Id:PREFERENCES_BUTTON Id:SETTINGS_BUTTON
X:450 X:450
Y:0 Y:0
Width:140 Width:140

6
mods/cnc/chrome/mainmenu.yaml
View File

@@ -168,8 +168,8 @@ Container@MENU_BACKGROUND:
Width:140 Width:140
Height:35 Height:35
Text:Music Text:Music
Button@PREFERENCES_BUTTON: Button@SETTINGS_BUTTON:
Id:PREFERENCES_BUTTON Id:SETTINGS_BUTTON
X:300 X:300
Y:0 Y:0
Width:140 Width:140
@@ -207,4 +207,4 @@ Container@MENU_BACKGROUND:
X:10 X:10
Y:10 Y:10
Width:200 Width:200
Height:200 Height:200

0
mods/cnc/chrome/preferences.yaml → mods/cnc/chrome/settings.yaml
View File

2
mods/cnc/mod.yaml
View File

@@ -75,7 +75,7 @@ ChromeLayout:
mods/cnc/chrome/ingamemenu.yaml mods/cnc/chrome/ingamemenu.yaml
mods/cnc/chrome/music.yaml mods/cnc/chrome/music.yaml
mods/cnc/chrome/modchooser.yaml mods/cnc/chrome/modchooser.yaml
mods/cnc/chrome/preferences.yaml mods/cnc/chrome/settings.yaml
mods/cnc/chrome/cheats.yaml mods/cnc/chrome/cheats.yaml
mods/cnc/chrome/dialogs.yaml mods/cnc/chrome/dialogs.yaml
mods/cnc/chrome/objectives.yaml mods/cnc/chrome/objectives.yaml