diff --git a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs index 7bea4f5668..062426a499 100755 --- a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs @@ -33,17 +33,24 @@ namespace OpenRA.Mods.RA.Widgets.Delegates public CncMenuLogic([ObjectCreator.Param] Widget widget) { // Root level menu - var mainButtons = widget.GetWidget("MAIN_BUTTONS"); - mainButtons.IsVisible = () => Menu == MenuType.Main; + var mainMenu = widget.GetWidget("MAIN_MENU"); + mainMenu.IsVisible = () => Menu == MenuType.Main; - mainButtons.GetWidget("MULTIPLAYER_BUTTON").OnMouseUp = mi => { Menu = MenuType.Multiplayer; return true; }; - mainButtons.GetWidget("QUIT_BUTTON").OnMouseUp = mi => { Game.Exit(); return true; }; + mainMenu.GetWidget("MULTIPLAYER_BUTTON").OnMouseUp = mi => { Menu = MenuType.Multiplayer; return true; }; + mainMenu.GetWidget("SETTINGS_BUTTON").OnMouseUp = mi => { Menu = MenuType.Settings; return true; }; + mainMenu.GetWidget("QUIT_BUTTON").OnMouseUp = mi => { Game.Exit(); return true; }; // Multiplayer menu - var multiplayerButtons = widget.GetWidget("MULTIPLAYER_BUTTONS"); - multiplayerButtons.IsVisible = () => Menu == MenuType.Multiplayer; + var multiplayerMenu = widget.GetWidget("MULTIPLAYER_MENU"); + multiplayerMenu.IsVisible = () => Menu == MenuType.Multiplayer; - multiplayerButtons.GetWidget("BACK_BUTTON").OnMouseUp = mi => { Menu = MenuType.Main; return true; }; + multiplayerMenu.GetWidget("BACK_BUTTON").OnMouseUp = mi => { Menu = MenuType.Main; return true; }; + + // Settings menu + var settingsMenu = widget.GetWidget("SETTINGS_MENU"); + settingsMenu.IsVisible = () => Menu == MenuType.Settings; + + settingsMenu.GetWidget("BACK_BUTTON").OnMouseUp = mi => { Menu = MenuType.Main; return true; }; } } } diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 88af571fa4..9ebcb82b3a 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -19,8 +19,8 @@ Container@MAINMENU_BG: Width:WINDOW_RIGHT Height:WINDOW_BOTTOM Background:shellmapborder - Container@MAIN_BUTTONS: - Id:MAIN_BUTTONS + Container@MAIN_MENU: + Id:MAIN_MENU X:(WINDOW_RIGHT-WIDTH)/2 Y:WINDOW_BOTTOM-33-HEIGHT-10 Width:740 @@ -51,22 +51,22 @@ Container@MAINMENU_BG: Height:35 Text:Multiplayer Bold:True + Button@SETTINGS_BUTTON: + Id:SETTINGS_BUTTON + X:300 + Y:0 + Width:140 + Height:35 + Text:Settings + Bold:True Button@REPLAY_BUTTON: Id:REPLAY_BUTTON - X:300 + X:450 Y:0 Width:140 Height:35 Text: Replays Bold: True - Button@SETTINGS_BUTTON: - Id:SETTINGS_BUTTON - X:450 - Y:0 - Width:140 - Height:35 - Text:Options - Bold:True Button@QUIT_BUTTON: Id:QUIT_BUTTON X:600 @@ -75,8 +75,8 @@ Container@MAINMENU_BG: Height:35 Text:Quit Bold:True - Container@MULTIPLAYER_BUTTONS: - Id:MULTIPLAYER_BUTTONS + Container@MULTIPLAYER_MENU: + Id:MULTIPLAYER_MENU X:(WINDOW_RIGHT-WIDTH)/2 Y:WINDOW_BOTTOM-33-HEIGHT-10 Width:740 @@ -124,6 +124,55 @@ Container@MAINMENU_BG: Height:35 Text:Back Bold:True + Container@SETTINGS_MENU: + Id:SETTINGS_MENU + X:(WINDOW_RIGHT-WIDTH)/2 + Y:WINDOW_BOTTOM-33-HEIGHT-10 + Width:740 + Height:35 + Visible:False + Children: + Label@TITLE: + X:0 + Y:0-30 + Width:PARENT_RIGHT + Height:20 + Text:Settings + Align:Center + Bold:True + Contrast:True + Button@MODS_BUTTON: + Id:MODS_BUTTON + X:0 + Y:0 + Width:140 + Height:35 + Text:Mods + Bold:True + Button@MUSIC_BUTTON: + Id:MUSIC_BUTTON + X:150 + Y:0 + Width:140 + Height:35 + Text:Music + Bold:True + Button@PREFERENCES_BUTTON: + Id:PREFERENCES_BUTTON + X:300 + Y:0 + Width:140 + Height:35 + Text:Preferences + Bold:True + Button@BACK_BUTTON: + Id:BACK_BUTTON + X:600 + Y:0 + Width:140 + Height:35 + Text:Back + Bold:True Background@QUICKMODSWITCHER: Id:QUICKMODSWITCHER Background: dialog4