diff --git a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs index 4cff2b4679..46f713596b 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs @@ -27,6 +27,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic rootMenu.IsVisible = () => Menu == MenuType.Main; Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Ui.Root, "PERF_BG" ); + var versionLabel = Ui.Root.GetOrNull("VERSION_LABEL"); + if (versionLabel != null) + versionLabel.GetText = WidgetUtils.ActiveModVersion; widget.Get("MAINMENU_BUTTON_JOIN").OnClick = () => OpenGamePanel("JOINSERVER_BG"); widget.Get("MAINMENU_BUTTON_CREATE").OnClick = () => OpenGamePanel("CREATESERVER_BG"); diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index 0707efdef4..7750f99996 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -525,4 +525,18 @@ scrollitem-hover: dialog.png corner-tl: 512,0,1,1 corner-tr: 594,0,1,1 corner-bl: 512,82,1,1 - corner-br: 594,82,1,1 \ No newline at end of file + corner-br: 594,82,1,1 + +logos: loadscreen.png + logo: 0,0,256,256 + +mainmenu-border: dialog.png + background: 552,313,40,40 + border-r: 592,313,40,40 + border-l: 512,313,40,40 + border-b: 552,353,40,40 + border-t: 552,273,40,40 + corner-tl: 512,273,40,40 + corner-tr: 592,273,40,40 + corner-bl: 512,353,40,40 + corner-br: 592,353,40,40 diff --git a/mods/ra/chrome/mainmenu.yaml b/mods/ra/chrome/mainmenu.yaml index 6eda3690b0..08b9df2ef7 100644 --- a/mods/ra/chrome/mainmenu.yaml +++ b/mods/ra/chrome/mainmenu.yaml @@ -1,75 +1,95 @@ -Background@MAINMENU: - X:(WINDOW_RIGHT - WIDTH)/2 - Y:(WINDOW_BOTTOM - HEIGHT)/2 - Width:250 - Height:420 - Visible:true - Logic:MainMenuButtonsLogic +Container@MAINMENU: Children: - Label@MAINMENU_LABEL_TITLE: - X:0 - Y:20 - Width:250 + Background@BORDER: + Background:mainmenu-border + X:0 - 15 + Y:0 - 15 + Width:WINDOW_RIGHT + 30 + Height:WINDOW_BOTTOM + 30 + Image@LOGO: + X:WINDOW_RIGHT - 296 + Y:30 + ImageCollection:logos + ImageName:logo + Label@VERSION_LABEL: + X:WINDOW_RIGHT - 296 + Y:296 - 20 # border + Width:296 - 20 Height:25 - Text:OpenRA Main Menu Align:Center - Font:Bold - Button@MAINMENU_BUTTON_JOIN: - X:45 - Y:70 - Width:160 - Height:25 - Text:Join Game - Font:Bold - Button@MAINMENU_BUTTON_CREATE: - X:45 - Y:110 - Width:160 - Height:25 - Text:Create Game - Font:Bold - Button@MAINMENU_BUTTON_DIRECTCONNECT: - X:45 - Y:150 - Width:160 - Height:25 - Text:Direct Connect - Font:Bold - Button@MAINMENU_BUTTON_SETTINGS: - X:45 - Y:190 - Width:160 - Height:25 - Text:Settings - Font:Bold - Button@MAINMENU_BUTTON_MODS: - X:45 - Y:230 - Width:160 - Height:25 - Text:Mods - Font:Bold - Button@MAINMENU_BUTTON_MUSIC: - X:45 - Y:270 - Width:160 - Height:25 - Text:Music - Font:Bold - Button@MAINMENU_BUTTON_REPLAY_VIEWER: - X:45 - Y:310 - Width:160 - Height:25 - Text:Replay Viewer - Font:Bold - Button@MAINMENU_BUTTON_QUIT: - X:45 - Y:350 - Width:160 - Height:25 - Text:Quit - Font:Bold + Font:Regular + Contrast:True + Background@MAINMENU_BG: + X:(WINDOW_RIGHT - WIDTH)/8 + Y:(WINDOW_BOTTOM - HEIGHT)/2 + Width:250 + Height:505 + Logic:MainMenuButtonsLogic + Children: + Label@MAINMENU_LABEL_TITLE: + X:0 + Y:20 + Width:250 + Height:35 + Text:OpenRA + Align:Center + Font:Title + Button@MAINMENU_BUTTON_JOIN: + X:45 + Y:80 + Width:160 + Height:35 + Text:Join Game + Font:Bold + Button@MAINMENU_BUTTON_CREATE: + X:45 + Y:130 + Width:160 + Height:35 + Text:Create Game + Font:Bold + Button@MAINMENU_BUTTON_DIRECTCONNECT: + X:45 + Y:180 + Width:160 + Height:35 + Text:Direct Connect + Font:Bold + Button@MAINMENU_BUTTON_SETTINGS: + X:45 + Y:230 + Width:160 + Height:35 + Text:Settings + Font:Bold + Button@MAINMENU_BUTTON_MODS: + X:45 + Y:280 + Width:160 + Height:35 + Text:Mods + Font:Bold + Button@MAINMENU_BUTTON_MUSIC: + X:45 + Y:330 + Width:160 + Height:35 + Text:Music + Font:Bold + Button@MAINMENU_BUTTON_REPLAY_VIEWER: + X:45 + Y:380 + Width:160 + Height:35 + Text:Replay Viewer + Font:Bold + Button@MAINMENU_BUTTON_QUIT: + X:45 + Y:430 + Width:160 + Height:35 + Text:Quit + Font:Bold Background@PERF_BG: ClickThrough:true Background:dialog4 diff --git a/mods/ra/uibits/dialog.png b/mods/ra/uibits/dialog.png index a5f2cc0411..d23d272312 100644 Binary files a/mods/ra/uibits/dialog.png and b/mods/ra/uibits/dialog.png differ