From 2f86208a9a99ee1dce028452ff3bdad2ec928cf3 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 2 Jun 2011 17:45:11 +1200 Subject: [PATCH] Swap mod and replay buttons --- OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs | 14 +++++++------- mods/cnc/chrome/mainmenu.yaml | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs index 93a927c1ca..0ab0a40d0f 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs @@ -43,14 +43,14 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic mainMenu.GetWidget("SOLO_BUTTON").OnClick = StartSkirmishGame; mainMenu.GetWidget("MULTIPLAYER_BUTTON").OnClick = () => Menu = MenuType.Multiplayer; - - mainMenu.GetWidget("REPLAYS_BUTTON").OnClick = () => + + mainMenu.GetWidget("MODS_BUTTON").OnClick = () => { Menu = MenuType.None; - Widget.OpenWindow("REPLAYBROWSER_PANEL", new WidgetArgs() + Widget.OpenWindow("MODS_PANEL", new WidgetArgs() { { "onExit", () => Menu = MenuType.Main }, - { "onStart", RemoveShellmapUI } + { "onSwitch", RemoveShellmapUI } }); }; @@ -96,13 +96,13 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic var settingsMenu = widget.GetWidget("SETTINGS_MENU"); settingsMenu.IsVisible = () => Menu == MenuType.Settings; - settingsMenu.GetWidget("MODS_BUTTON").OnClick = () => + settingsMenu.GetWidget("REPLAYS_BUTTON").OnClick = () => { Menu = MenuType.None; - Widget.OpenWindow("MODS_PANEL", new WidgetArgs() + Widget.OpenWindow("REPLAYBROWSER_PANEL", new WidgetArgs() { { "onExit", () => Menu = MenuType.Settings }, - { "onSwitch", RemoveShellmapUI } + { "onStart", RemoveShellmapUI } }); }; diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 1b88ba641b..f01edd3866 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -82,14 +82,14 @@ Container@MENU_BACKGROUND: Y:0 Width:140 Height:35 - Text:Settings - Button@REPLAYS_BUTTON: - Id:REPLAYS_BUTTON + Text:Options + Button@MODS_BUTTON: + Id:MODS_BUTTON X:450 Y:0 Width:140 Height:35 - Text: Replays + Text:Mods Button@QUIT_BUTTON: Id:QUIT_BUTTON X:600 @@ -150,17 +150,17 @@ Container@MENU_BACKGROUND: Y:0-30 Width:PARENT_RIGHT Height:20 - Text:Settings + Text:Options Align:Center Font:Bold Contrast:True - Button@MODS_BUTTON: - Id:MODS_BUTTON + Button@REPLAYS_BUTTON: + Id:REPLAYS_BUTTON X:0 Y:0 Width:140 Height:35 - Text:Mods + Text: Replays Button@MUSIC_BUTTON: Id:MUSIC_BUTTON X:150 @@ -174,7 +174,7 @@ Container@MENU_BACKGROUND: Y:0 Width:140 Height:35 - Text:Preferences + Text:Settings Button@BACK_BUTTON: Id:BACK_BUTTON Key:escape