diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs index c2debb8573..c1071e31fe 100644 --- a/OpenRA.Game/Widgets/ButtonWidget.cs +++ b/OpenRA.Game/Widgets/ButtonWidget.cs @@ -18,24 +18,32 @@ namespace OpenRA.Widgets public class ButtonWidget : Widget { public string Text = ""; - public bool Bold = false; public bool Depressed = false; public int VisualHeight = ChromeMetrics.GetInt("ButtonDepth"); + public string Font = ChromeMetrics.GetString("ButtonFont"); public Func GetText; + public Func IsDisabled = () => false; + public Action OnClick = () => {}; + + [Obsolete] public bool Bold = false; + public ButtonWidget() : base() { GetText = () => { return Text; }; + OnMouseUp = mi => { if (!IsDisabled()) OnClick(); return true; }; } protected ButtonWidget(ButtonWidget widget) : base(widget) { Text = widget.Text; + Font = widget.Font; Depressed = widget.Depressed; VisualHeight = widget.VisualHeight; GetText = widget.GetText; + OnMouseUp = mi => { if (!IsDisabled()) OnClick(); return true; }; } public override bool LoseFocus(MouseInput mi) @@ -86,16 +94,24 @@ namespace OpenRA.Widgets public override void DrawInner() { - var font = (Bold) ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"]; - var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0); - WidgetUtils.DrawPanel(Depressed ? "dialog3" : "dialog2", RenderBounds); - + var rb = RenderBounds; + if (Font == "Regular" && Bold) + Font = "Bold"; + + var font = Game.Renderer.Fonts[Font]; + var state = IsDisabled() ? "button-disabled" : + Depressed ? "button-pressed" : + rb.Contains(Viewport.LastMousePos) ? "button-hover" : + "button"; + + WidgetUtils.DrawPanel(state, rb); var text = GetText(); - + var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0); + font.DrawText(text, - RenderOrigin + new int2(UsableWidth / 2, Bounds.Height / 2) + new int2(rb.X + UsableWidth / 2, rb.Y + Bounds.Height / 2) - new int2(font.Measure(text).X / 2, - font.Measure(text).Y / 2) + stateOffset, Color.White); + font.Measure(text).Y / 2) + stateOffset, IsDisabled() ? Color.Gray : Color.White); } public override Widget Clone() { return new ButtonWidget(this); } diff --git a/OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs index bf61a27300..18a76b8741 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs @@ -43,7 +43,7 @@ namespace OpenRA.Mods.Cnc.Widgets pathCheckbox.OnClick = () => Order(world, "DevPathDebug"); - panel.GetWidget("GIVE_CASH_BUTTON").OnClick = () => + panel.GetWidget("GIVE_CASH_BUTTON").OnClick = () => world.IssueOrder(new Order("DevGiveCash", world.LocalPlayer.PlayerActor, false)); var fastBuildCheckbox = panel.GetWidget("INSTANT_BUILD_CHECKBOX"); @@ -66,10 +66,10 @@ namespace OpenRA.Mods.Cnc.Widgets buildAnywhereCheckbox.IsChecked = () => devTrait.BuildAnywhere; buildAnywhereCheckbox.OnClick = () => Order(world, "DevBuildAnywhere"); - panel.GetWidget("GIVE_EXPLORATION_BUTTON").OnClick = () => + panel.GetWidget("GIVE_EXPLORATION_BUTTON").OnClick = () => world.IssueOrder(new Order("DevGiveExploration", world.LocalPlayer.PlayerActor, false)); - panel.GetWidget("CLOSE_BUTTON").OnClick = Widget.CloseWindow; + panel.GetWidget("CLOSE_BUTTON").OnClick = Widget.CloseWindow; } public void Order(World world, string order) diff --git a/OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs index d038eea444..04c14c2095 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs @@ -76,7 +76,7 @@ namespace OpenRA.Mods.Cnc.Widgets } var panel = widget.GetWidget("CONNECTING_PANEL"); - panel.GetWidget("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); }; + panel.GetWidget("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); }; widget.GetWidget("CONNECTING_DESC").GetText = () => "Connecting to {0}:{1}...".F(host, port); @@ -106,8 +106,8 @@ namespace OpenRA.Mods.Cnc.Widgets [ObjectCreator.Param] Action onAbort) { var panel = widget.GetWidget("CONNECTIONFAILED_PANEL"); - panel.GetWidget("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); }; - panel.GetWidget("RETRY_BUTTON").OnClick = () => { Widget.CloseWindow(); onRetry(); }; + panel.GetWidget("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); }; + panel.GetWidget("RETRY_BUTTON").OnClick = () => { Widget.CloseWindow(); onRetry(); }; widget.GetWidget("CONNECTING_DESC").GetText = () => "Could not connect to {0}:{1}".F(host, port); diff --git a/OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs index 513b5e956e..c78530f7cd 100755 --- a/OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs @@ -55,8 +55,8 @@ namespace OpenRA.Mods.Cnc.Widgets if (world.LocalPlayer != null) widget.GetWidget("PLAYER_WIDGETS").IsVisible = () => true; - ingameRoot.GetWidget("DIPLOMACY_BUTTON").IsDisabled = () => true; - ingameRoot.GetWidget("OPTIONS_BUTTON").OnClick = () => + ingameRoot.GetWidget("DIPLOMACY_BUTTON").IsDisabled = () => true; + ingameRoot.GetWidget("OPTIONS_BUTTON").OnClick = () => { ingameRoot.IsVisible = () => false; Game.LoadWidget(world, "INGAME_MENU", Widget.RootWidget, new WidgetArgs() @@ -65,7 +65,7 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - var cheatsButton = ingameRoot.GetWidget("CHEATS_BUTTON"); + var cheatsButton = ingameRoot.GetWidget("CHEATS_BUTTON"); cheatsButton.OnClick = () => Game.OpenWindow("CHEATS_PANEL", new WidgetArgs()); cheatsButton.IsVisible = () => world.LobbyInfo.GlobalSettings.AllowCheats; @@ -108,16 +108,16 @@ namespace OpenRA.Mods.Cnc.Widgets Action doNothing = () => {}; - menu.GetWidget("QUIT_BUTTON").OnClick = () => + menu.GetWidget("QUIT_BUTTON").OnClick = () => PromptConfirmAction("Quit", "Are you sure you want to quit?", onQuit, doNothing); Action onSurrender = () => world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false)); - var surrenderButton = menu.GetWidget("SURRENDER_BUTTON"); + var surrenderButton = menu.GetWidget("SURRENDER_BUTTON"); surrenderButton.IsDisabled = () => (world.LocalPlayer == null || world.LocalPlayer.WinState != WinState.Undefined); surrenderButton.OnClick = () => PromptConfirmAction("Surrender", "Are you sure you want to surrender?", onSurrender, doNothing); - menu.GetWidget("MUSIC_BUTTON").OnClick = () => + menu.GetWidget("MUSIC_BUTTON").OnClick = () => { hideButtons = true; Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs() @@ -126,7 +126,7 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - menu.GetWidget("PREFERENCES_BUTTON").OnClick = () => + menu.GetWidget("PREFERENCES_BUTTON").OnClick = () => { hideButtons = true; Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs() @@ -136,7 +136,7 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - menu.GetWidget("RESUME_BUTTON").OnClick = () => + menu.GetWidget("RESUME_BUTTON").OnClick = () => { Widget.RootWidget.RemoveChild(menu); world.WorldActor.Trait().Active = false; @@ -151,13 +151,13 @@ namespace OpenRA.Mods.Cnc.Widgets prompt.GetWidget("PROMPT_TITLE").GetText = () => title; prompt.GetWidget("PROMPT_TEXT").GetText = () => text; - prompt.GetWidget("CONFIRM_BUTTON").OnClick = () => + prompt.GetWidget("CONFIRM_BUTTON").OnClick = () => { prompt.IsVisible = () => false; onConfirm(); }; - prompt.GetWidget("CANCEL_BUTTON").OnClick = () => + prompt.GetWidget("CANCEL_BUTTON").OnClick = () => { prompt.IsVisible = () => false; onCancel(); diff --git a/OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs index d75f2de97b..a7418dc42f 100755 --- a/OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs @@ -35,16 +35,16 @@ namespace OpenRA.Mods.Cnc.Widgets { "installData", installData } }; - panel.GetWidget("DOWNLOAD_BUTTON").OnClick = () => + panel.GetWidget("DOWNLOAD_BUTTON").OnClick = () => Widget.OpenWindow("INSTALL_DOWNLOAD_PANEL", args); - panel.GetWidget("INSTALL_BUTTON").OnClick = () => + panel.GetWidget("INSTALL_BUTTON").OnClick = () => Widget.OpenWindow("INSTALL_FROMCD_PANEL", args); - panel.GetWidget("QUIT_BUTTON").OnClick = Game.Exit; + panel.GetWidget("QUIT_BUTTON").OnClick = Game.Exit; // TODO: - panel.GetWidget("MODS_BUTTON").OnClick = () => + panel.GetWidget("MODS_BUTTON").OnClick = () => { Widget.OpenWindow("MODS_PANEL", new WidgetArgs() { @@ -72,11 +72,11 @@ namespace OpenRA.Mods.Cnc.Widgets progressBar = panel.GetWidget("PROGRESS_BAR"); statusLabel = panel.GetWidget("STATUS_LABEL"); - var backButton = panel.GetWidget("BACK_BUTTON"); + var backButton = panel.GetWidget("BACK_BUTTON"); backButton.OnClick = Widget.CloseWindow; backButton.IsVisible = () => false; - var retryButton = panel.GetWidget("RETRY_BUTTON"); + var retryButton = panel.GetWidget("RETRY_BUTTON"); retryButton.OnClick = PromptForCD; retryButton.IsVisible = () => false; @@ -177,10 +177,10 @@ namespace OpenRA.Mods.Cnc.Widgets { statusLabel.GetText = () => "Initializing..."; progressBar.SetIndeterminate(true); - var retryButton = panel.GetWidget("RETRY_BUTTON"); + var retryButton = panel.GetWidget("RETRY_BUTTON"); retryButton.IsVisible = () => false; - var cancelButton = panel.GetWidget("CANCEL_BUTTON"); + var cancelButton = panel.GetWidget("CANCEL_BUTTON"); // Save the package to a temp file var file = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); diff --git a/OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs index 6888f6818d..d246a59ea2 100755 --- a/OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs @@ -186,7 +186,7 @@ namespace OpenRA.Mods.Cnc.Widgets CountryNames = Rules.Info["world"].Traits.WithInterface().ToDictionary(a => a.Race, a => a.Name); CountryNames.Add("random", "Random"); - var mapButton = lobby.GetWidget("CHANGEMAP_BUTTON"); + var mapButton = lobby.GetWidget("CHANGEMAP_BUTTON"); mapButton.OnClick = () => { var onSelect = new Action(m => @@ -205,7 +205,7 @@ namespace OpenRA.Mods.Cnc.Widgets }; mapButton.IsVisible = () => mapButton.Visible && Game.IsHost; - var disconnectButton = lobby.GetWidget("DISCONNECT_BUTTON"); + var disconnectButton = lobby.GetWidget("DISCONNECT_BUTTON"); disconnectButton.OnClick = () => { Widget.CloseWindow(); onExit(); }; var gameStarting = false; @@ -221,7 +221,7 @@ namespace OpenRA.Mods.Cnc.Widgets allowCheats.OnClick = () => orderManager.IssueOrder(Order.Command( "allowcheats {0}".F(!orderManager.LobbyInfo.GlobalSettings.AllowCheats))); - var startGameButton = lobby.GetWidget("START_GAME_BUTTON"); + var startGameButton = lobby.GetWidget("START_GAME_BUTTON"); startGameButton.IsVisible = () => Game.IsHost; startGameButton.IsDisabled = () => gameStarting; startGameButton.OnClick = () => @@ -254,7 +254,7 @@ namespace OpenRA.Mods.Cnc.Widgets chatPanel = lobby.GetWidget("CHAT_DISPLAY"); chatTemplate = chatPanel.GetWidget("CHAT_TEMPLATE"); - lobby.GetWidget("MUSIC_BUTTON").OnClick = () => + lobby.GetWidget("MUSIC_BUTTON").OnClick = () => { Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs() { @@ -627,8 +627,8 @@ namespace OpenRA.Mods.Cnc.Widgets lumSlider.SetOffset(ramp.L / 255f); }; - panel.GetWidget("SAVE_BUTTON").OnClick = () => onSelect(ramp); - panel.GetWidget("RANDOM_BUTTON").OnClick = () => + panel.GetWidget("SAVE_BUTTON").OnClick = () => onSelect(ramp); + panel.GetWidget("RANDOM_BUTTON").OnClick = () => { var hue = (byte)Game.CosmeticRandom.Next(255); var sat = (byte)Game.CosmeticRandom.Next(255); diff --git a/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs index 6438f30367..726f59a005 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs @@ -45,11 +45,11 @@ namespace OpenRA.Mods.Cnc.Widgets panel.GetWidget("CURMAP_THEATER").GetText = () => Rules.TileSets[map.Tileset].Name; panel.GetWidget("CURMAP_PLAYERS").GetText = () => map.PlayerCount.ToString(); - panel.GetWidget("BUTTON_OK").OnClick = () => { Widget.CloseWindow(); onSelect(map); }; - panel.GetWidget("BUTTON_CANCEL").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BUTTON_OK").OnClick = () => { Widget.CloseWindow(); onSelect(map); }; + panel.GetWidget("BUTTON_CANCEL").OnClick = () => { Widget.CloseWindow(); onExit(); }; - panel.GetWidget("BUTTON_INSTALL").IsDisabled = () => true; - panel.GetWidget("BUTTON_INSTALL").OnClick = () => InstallMap(); + panel.GetWidget("BUTTON_INSTALL").IsDisabled = () => true; + panel.GetWidget("BUTTON_INSTALL").OnClick = () => InstallMap(); scrollpanel = panel.GetWidget("MAP_LIST"); itemTemplate = scrollpanel.GetWidget("MAP_TEMPLATE"); diff --git a/OpenRA.Mods.Cnc/Widgets/CncMenuButton.cs b/OpenRA.Mods.Cnc/Widgets/CncMenuButton.cs index a868e76adb..3d67f5db15 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncMenuButton.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncMenuButton.cs @@ -16,47 +16,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.Cnc.Widgets { - public class CncMenuButtonWidget : ButtonWidget - { - public Func IsDisabled = () => false; - public Action OnClick = () => {}; - public string Font = "Bold"; - - public CncMenuButtonWidget() - : base() - { - OnMouseUp = mi => { if (!IsDisabled()) OnClick(); return true; }; - } - - protected CncMenuButtonWidget(CncMenuButtonWidget other) - : base(other) - { - OnMouseUp = mi => { if (!IsDisabled()) OnClick(); return true; }; - Font = other.Font; - } - - public override int2 ChildOrigin { get { return RenderOrigin; } } - public override void DrawInner() - { - var rb = RenderBounds; - var font = Game.Renderer.Fonts[Font]; - var state = IsDisabled() ? "button-disabled" : - Depressed ? "button-pressed" : - rb.Contains(Viewport.LastMousePos) ? "button-hover" : - "button"; - - WidgetUtils.DrawPanel(state, rb); - var text = GetText(); - - font.DrawText(text, - new int2(rb.X + UsableWidth / 2, rb.Y + Bounds.Height / 2) - - new int2(font.Measure(text).X / 2, - font.Measure(text).Y / 2), IsDisabled() ? Color.Gray : Color.White); - } - public override Widget Clone() { return new CncMenuButtonWidget(this); } - } - - public class CncCheckboxWidget : CncMenuButtonWidget + public class CncCheckboxWidget : ButtonWidget { public CncCheckboxWidget() : base() { } @@ -338,7 +298,7 @@ namespace OpenRA.Mods.Cnc.Widgets } } - public class ScrollItemWidget : CncMenuButtonWidget + public class ScrollItemWidget : ButtonWidget { public ScrollItemWidget() : base() diff --git a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs index 08ff7d0cd2..c7dde0522d 100755 --- a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs @@ -44,10 +44,10 @@ namespace OpenRA.Mods.Cnc.Widgets var mainMenu = widget.GetWidget("MAIN_MENU"); mainMenu.IsVisible = () => Menu == MenuType.Main; - mainMenu.GetWidget("SOLO_BUTTON").OnClick = StartSkirmishGame; - mainMenu.GetWidget("MULTIPLAYER_BUTTON").OnClick = () => Menu = MenuType.Multiplayer; + mainMenu.GetWidget("SOLO_BUTTON").OnClick = StartSkirmishGame; + mainMenu.GetWidget("MULTIPLAYER_BUTTON").OnClick = () => Menu = MenuType.Multiplayer; - mainMenu.GetWidget("REPLAYS_BUTTON").OnClick = () => + mainMenu.GetWidget("REPLAYS_BUTTON").OnClick = () => { Menu = MenuType.None; Widget.OpenWindow("REPLAYBROWSER_PANEL", new WidgetArgs() @@ -57,15 +57,15 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - mainMenu.GetWidget("SETTINGS_BUTTON").OnClick = () => Menu = MenuType.Settings; - mainMenu.GetWidget("QUIT_BUTTON").OnClick = Game.Exit; + mainMenu.GetWidget("SETTINGS_BUTTON").OnClick = () => Menu = MenuType.Settings; + mainMenu.GetWidget("QUIT_BUTTON").OnClick = Game.Exit; // Multiplayer menu var multiplayerMenu = widget.GetWidget("MULTIPLAYER_MENU"); multiplayerMenu.IsVisible = () => Menu == MenuType.Multiplayer; - multiplayerMenu.GetWidget("BACK_BUTTON").OnClick = () => Menu = MenuType.Main; - multiplayerMenu.GetWidget("JOIN_BUTTON").OnClick = () => + multiplayerMenu.GetWidget("BACK_BUTTON").OnClick = () => Menu = MenuType.Main; + multiplayerMenu.GetWidget("JOIN_BUTTON").OnClick = () => { Menu = MenuType.None; Widget.OpenWindow("SERVERBROWSER_PANEL", new WidgetArgs() @@ -75,7 +75,7 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - multiplayerMenu.GetWidget("CREATE_BUTTON").OnClick = () => + multiplayerMenu.GetWidget("CREATE_BUTTON").OnClick = () => { Menu = MenuType.None; Widget.OpenWindow("CREATESERVER_PANEL", new WidgetArgs() @@ -85,7 +85,7 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - multiplayerMenu.GetWidget("DIRECTCONNECT_BUTTON").OnClick = () => + multiplayerMenu.GetWidget("DIRECTCONNECT_BUTTON").OnClick = () => { Menu = MenuType.None; Widget.OpenWindow("DIRECTCONNECT_PANEL", new WidgetArgs() @@ -99,7 +99,7 @@ namespace OpenRA.Mods.Cnc.Widgets var settingsMenu = widget.GetWidget("SETTINGS_MENU"); settingsMenu.IsVisible = () => Menu == MenuType.Settings; - settingsMenu.GetWidget("MODS_BUTTON").OnClick = () => + settingsMenu.GetWidget("MODS_BUTTON").OnClick = () => { Menu = MenuType.None; Widget.OpenWindow("MODS_PANEL", new WidgetArgs() @@ -109,7 +109,7 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - settingsMenu.GetWidget("MUSIC_BUTTON").OnClick = () => + settingsMenu.GetWidget("MUSIC_BUTTON").OnClick = () => { Menu = MenuType.None; Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs() @@ -118,7 +118,7 @@ namespace OpenRA.Mods.Cnc.Widgets }); }; - settingsMenu.GetWidget("PREFERENCES_BUTTON").OnClick = () => + settingsMenu.GetWidget("PREFERENCES_BUTTON").OnClick = () => { Menu = MenuType.None; Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs() @@ -127,7 +127,7 @@ namespace OpenRA.Mods.Cnc.Widgets { "onExit", () => Menu = MenuType.Settings }, }); }; - settingsMenu.GetWidget("BACK_BUTTON").OnClick = () => Menu = MenuType.Main; + settingsMenu.GetWidget("BACK_BUTTON").OnClick = () => Menu = MenuType.Main; } void RemoveShellmapUI() diff --git a/OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs index c9823f1189..f0a646968f 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.Cnc.Widgets { var panel = widget.GetWidget("MODS_PANEL"); var modList = panel.GetWidget("MOD_LIST"); - var loadButton = panel.GetWidget("LOAD_BUTTON"); + var loadButton = panel.GetWidget("LOAD_BUTTON"); loadButton.OnClick = () => { // TODO: This is crap @@ -54,7 +54,7 @@ namespace OpenRA.Mods.Cnc.Widgets }; loadButton.IsDisabled = () => currentMod.Id == Game.CurrentMods.Keys.First(); - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; currentMod = Mod.AllMods[Game.modData.Manifest.Mods[0]]; // Mod list diff --git a/OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs index b0c576100b..c60a983ae8 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs @@ -41,7 +41,7 @@ namespace OpenRA.Mods.Cnc.Widgets installed = Rules.Music.Where(m => m.Value.Exists).Any(); Func noMusic = () => !installed; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; Action afterInstall = path => { @@ -57,30 +57,30 @@ namespace OpenRA.Mods.Cnc.Widgets BuildMusicTable(panel); }; - var installButton = panel.GetWidget("INSTALL_BUTTON"); + var installButton = panel.GetWidget("INSTALL_BUTTON"); installButton.OnClick = () => Widget.OpenWindow("INSTALL_MUSIC_PANEL", new WidgetArgs() {{ "afterInstall", afterInstall }}); installButton.IsVisible = () => music.Length < 2; // Hack around ra shipping (only) hellmarch by default panel.GetWidget("NO_MUSIC_LABEL").IsVisible = noMusic; - var playButton = panel.GetWidget("BUTTON_PLAY"); + var playButton = panel.GetWidget("BUTTON_PLAY"); playButton.OnClick = Play; playButton.IsDisabled = noMusic; - var pauseButton = panel.GetWidget("BUTTON_PAUSE"); + var pauseButton = panel.GetWidget("BUTTON_PAUSE"); pauseButton.OnClick = Pause; pauseButton.IsDisabled = noMusic; - var stopButton = panel.GetWidget("BUTTON_STOP"); + var stopButton = panel.GetWidget("BUTTON_STOP"); stopButton.OnClick = Stop; stopButton.IsDisabled = noMusic; - var nextButton = panel.GetWidget("BUTTON_NEXT"); + var nextButton = panel.GetWidget("BUTTON_NEXT"); nextButton.OnClick = () => { currentSong = GetNextSong(); Play(); }; nextButton.IsDisabled = noMusic; - var prevButton = panel.GetWidget("BUTTON_PREV"); + var prevButton = panel.GetWidget("BUTTON_PREV"); prevButton.OnClick = () => { currentSong = GetPrevSong(); Play(); }; prevButton.IsDisabled = noMusic; @@ -194,11 +194,11 @@ namespace OpenRA.Mods.Cnc.Widgets progressBar = panel.GetWidget("PROGRESS_BAR"); statusLabel = panel.GetWidget("STATUS_LABEL"); - var backButton = panel.GetWidget("BACK_BUTTON"); + var backButton = panel.GetWidget("BACK_BUTTON"); backButton.OnClick = Widget.CloseWindow; backButton.IsVisible = () => false; - var retryButton = panel.GetWidget("RETRY_BUTTON"); + var retryButton = panel.GetWidget("RETRY_BUTTON"); retryButton.OnClick = PromptForCD; retryButton.IsVisible = () => false; diff --git a/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs index c64cbe819b..09bb04e633 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.Cnc.Widgets { panel = widget.GetWidget("REPLAYBROWSER_PANEL"); - panel.GetWidget("CANCEL_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("CANCEL_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; var rl = panel.GetWidget("REPLAY_LIST"); var replayDir = Path.Combine(Platform.SupportDir, "Replays"); @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Cnc.Widgets SelectReplay(files.FirstOrDefault()); } - var watch = panel.GetWidget("WATCH_BUTTON"); + var watch = panel.GetWidget("WATCH_BUTTON"); watch.IsDisabled = () => currentSummary == null || currentMap == null || currentSummary.Duration == 0; watch.OnClick = () => { diff --git a/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs index 32c43ddfdf..2b74870b19 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs @@ -92,7 +92,7 @@ namespace OpenRA.Mods.Cnc.Widgets var sl = panel.GetWidget("SERVER_LIST"); // Menu buttons - var refreshButton = panel.GetWidget("REFRESH_BUTTON"); + var refreshButton = panel.GetWidget("REFRESH_BUTTON"); refreshButton.IsDisabled = () => refreshing; refreshButton.OnClick = () => { @@ -103,7 +103,7 @@ namespace OpenRA.Mods.Cnc.Widgets refreshing = true; }; - var join = panel.GetWidget("JOIN_BUTTON"); + var join = panel.GetWidget("JOIN_BUTTON"); join.IsDisabled = () => currentServer == null || !ServerBrowserDelegate.CanJoin(currentServer); join.OnClick = () => { @@ -117,7 +117,7 @@ namespace OpenRA.Mods.Cnc.Widgets CncConnectingLogic.Connect(host, port, openLobby, onExit); }; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; // Server list serverTemplate = sl.GetWidget("SERVER_TEMPLATE"); @@ -224,7 +224,7 @@ namespace OpenRA.Mods.Cnc.Widgets ipField.Text = last.Length > 1 ? last[0] : "localhost"; portField.Text = last.Length > 2 ? last[1] : "1234"; - panel.GetWidget("JOIN_BUTTON").OnClick = () => + panel.GetWidget("JOIN_BUTTON").OnClick = () => { int port; if (!int.TryParse(portField.Text, out port)) @@ -237,7 +237,7 @@ namespace OpenRA.Mods.Cnc.Widgets CncConnectingLogic.Connect(ipField.Text, port, openLobby, onExit); }; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; } } } diff --git a/OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs index a878789ce0..858c36177e 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs @@ -34,10 +34,10 @@ namespace OpenRA.Mods.Cnc.Widgets this.onExit = onExit; var settings = Game.Settings; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; - panel.GetWidget("CREATE_BUTTON").OnClick = CreateAndJoin; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("CREATE_BUTTON").OnClick = CreateAndJoin; - panel.GetWidget("MAP_BUTTON").OnClick = () => + panel.GetWidget("MAP_BUTTON").OnClick = () => { Widget.OpenWindow("MAPCHOOSER_PANEL", new WidgetArgs() { diff --git a/OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs index 74e03a43d7..2120b4ce4f 100755 --- a/OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs @@ -43,7 +43,7 @@ namespace OpenRA.Mods.Cnc.Widgets var panel = widget.GetWidget("SETTINGS_PANEL"); // General pane - var generalButton = panel.GetWidget("GENERAL_BUTTON"); + var generalButton = panel.GetWidget("GENERAL_BUTTON"); generalButton.OnClick = () => Settings = PanelType.General; generalButton.IsDisabled = () => Settings == PanelType.General; @@ -119,7 +119,7 @@ namespace OpenRA.Mods.Cnc.Widgets var inputPane = panel.GetWidget("INPUT_CONTROLS"); inputPane.IsVisible = () => Settings == PanelType.Input; - var inputButton = panel.GetWidget("INPUT_BUTTON"); + var inputButton = panel.GetWidget("INPUT_BUTTON"); inputButton.OnClick = () => Settings = PanelType.Input; inputButton.IsDisabled = () => Settings == PanelType.Input; @@ -151,13 +151,13 @@ namespace OpenRA.Mods.Cnc.Widgets groupModifierDropdown.GetText = () => groupAddModifier.ToString(); - panel.GetWidget("CANCEL_BUTTON").OnClick = () => + panel.GetWidget("CANCEL_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; - panel.GetWidget("SAVE_BUTTON").OnClick = () => + panel.GetWidget("SAVE_BUTTON").OnClick = () => { var s = Game.Settings; s.Player.Name = nameTextfield.Text; diff --git a/mods/cnc/chrome/cheats.yaml b/mods/cnc/chrome/cheats.yaml index e42adb3b03..281d57cf9a 100644 --- a/mods/cnc/chrome/cheats.yaml +++ b/mods/cnc/chrome/cheats.yaml @@ -67,21 +67,21 @@ Container@CHEATS_PANEL: Width:200 Height:20 Text:Show Unit Paths - CncMenuButton@CLOSE_BUTTON: + Button@CLOSE_BUTTON: Id:CLOSE_BUTTON X:0 Y:109 Width:140 Height:35 Text:Close - CncMenuButton@GIVE_CASH: + Button@GIVE_CASH: Id:GIVE_CASH_BUTTON X:300 Y:109 Width:140 Height:35 Text:Give Cash - CncMenuButton@GIVE_EXPLORATION: + Button@GIVE_EXPLORATION: Id:GIVE_EXPLORATION_BUTTON X:450 Y:109 diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml index 1eb3f9cea6..94640e88c9 100644 --- a/mods/cnc/chrome/connection.yaml +++ b/mods/cnc/chrome/connection.yaml @@ -26,7 +26,7 @@ Container@CONNECTING_PANEL: Text:Connecting... Font:Bold Align:Center - CncMenuButton@ABORT_BUTTON: + Button@ABORT_BUTTON: Id:ABORT_BUTTON X:230 Y:89 @@ -62,13 +62,13 @@ Container@CONNECTIONFAILED_PANEL: Text:Failed to connect Font:Bold Align:Center - CncMenuButton@RETRY_BUTTON: + Button@RETRY_BUTTON: Id:RETRY_BUTTON Y:89 Width:140 Height:35 Text:Retry - CncMenuButton@ABORT_BUTTON: + Button@ABORT_BUTTON: Id:ABORT_BUTTON X:230 Y:89 diff --git a/mods/cnc/chrome/createserver.yaml b/mods/cnc/chrome/createserver.yaml index 5f352f8185..5abdb57e9a 100644 --- a/mods/cnc/chrome/createserver.yaml +++ b/mods/cnc/chrome/createserver.yaml @@ -129,21 +129,21 @@ Container@CREATESERVER_PANEL: MaxLength:5 Height:25 Text:1234 - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON X:0 Y:259 Width:140 Height:35 Text:Back - CncMenuButton@MAP_BUTTON: + Button@MAP_BUTTON: Id:MAP_BUTTON X:314 Y:259 Width:140 Height:35 Text:Choose Map - CncMenuButton@CREATE_BUTTON: + Button@CREATE_BUTTON: Id:CREATE_BUTTON X:464 Y:259 diff --git a/mods/cnc/chrome/directconnect.yaml b/mods/cnc/chrome/directconnect.yaml index 088a57f401..c7993e1560 100644 --- a/mods/cnc/chrome/directconnect.yaml +++ b/mods/cnc/chrome/directconnect.yaml @@ -44,14 +44,14 @@ Container@DIRECTCONNECT_PANEL: Y:50 Width:200 Height:25 - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON X:0 Y:89 Width:140 Height:35 Text:Back - CncMenuButton@JOIN_BUTTON: + Button@JOIN_BUTTON: Id:JOIN_BUTTON X:230 Y:89 diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 8b3e99afae..d39e6ad8ab 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -17,21 +17,21 @@ Container@INGAME_ROOT: Id:STRATEGIC_PROGRESS X: WINDOW_RIGHT/2 Y: 40 - CncMenuButton@OPTIONS_BUTTON: + Button@OPTIONS_BUTTON: Id:OPTIONS_BUTTON X:5 Y:5 Width:140 Height:35 Text:Options - CncMenuButton@DIPLOMACY_BUTTON: + Button@DIPLOMACY_BUTTON: Id:DIPLOMACY_BUTTON X:150 Y:5 Width:140 Height:35 Text:Diplomacy - CncMenuButton@CHEATS_BUTTON: + Button@CHEATS_BUTTON: Id:CHEATS_BUTTON X:295 Y:5 diff --git a/mods/cnc/chrome/ingamemenu.yaml b/mods/cnc/chrome/ingamemenu.yaml index 33834660dc..7527a69523 100644 --- a/mods/cnc/chrome/ingamemenu.yaml +++ b/mods/cnc/chrome/ingamemenu.yaml @@ -26,35 +26,35 @@ Container@INGAME_MENU: Width:740 Height:35 Children: - CncMenuButton@QUIT_BUTTON: + Button@QUIT_BUTTON: Id:QUIT_BUTTON X:0 Y:0 Width:140 Height:35 Text:Quit - CncMenuButton@SURRENDER_BUTTON: + Button@SURRENDER_BUTTON: Id:SURRENDER_BUTTON X:150 Y:0 Width:140 Height:35 Text:Surrender - CncMenuButton@MUSIC_BUTTON: + Button@MUSIC_BUTTON: Id:MUSIC_BUTTON X:300 Y:0 Width:140 Height:35 Text:Music - CncMenuButton@PREFERENCES_BUTTON: + Button@PREFERENCES_BUTTON: Id:PREFERENCES_BUTTON X:450 Y:0 Width:140 Height:35 Text:Settings - CncMenuButton@RESUME_BUTTON: + Button@RESUME_BUTTON: Id:RESUME_BUTTON X:600 Y:0 @@ -89,13 +89,13 @@ Container@INGAME_MENU: Font:Bold WordWrap:true Align:Center - CncMenuButton@CANCEL_BUTTON: + Button@CANCEL_BUTTON: Id:CANCEL_BUTTON Y:89 Width:140 Height:35 Text:Cancel - CncMenuButton@CONFIRM_BUTTON: + Button@CONFIRM_BUTTON: Id:CONFIRM_BUTTON X:230 Y:89 diff --git a/mods/cnc/chrome/install.yaml b/mods/cnc/chrome/install.yaml index f1111b26c3..d4cd94f6fb 100644 --- a/mods/cnc/chrome/install.yaml +++ b/mods/cnc/chrome/install.yaml @@ -44,27 +44,27 @@ Container@INSTALL_PANEL: WordWrap:true Text:OpenRA can download these files (excluding music and videos) from the internet, or you can install from the original C&C CD. Font:Bold - CncMenuButton@QUIT_BUTTON: + Button@QUIT_BUTTON: Id:QUIT_BUTTON Y:149 Width:140 Height:35 Text:Quit - CncMenuButton@MODS_BUTTON: + Button@MODS_BUTTON: Id:MODS_BUTTON X:150 Y:149 Width:140 Height:35 Text:Change Mod - CncMenuButton@DOWNLOAD_BUTTON: + Button@DOWNLOAD_BUTTON: Id:DOWNLOAD_BUTTON X:350 Y:149 Width:140 Height:35 Text:Download - CncMenuButton@INSTALL_BUTTON: + Button@INSTALL_BUTTON: Id:INSTALL_BUTTON X:500 Y:149 @@ -111,13 +111,13 @@ Container@INSTALL_FROMCD_PANEL: Height:25 Align:Left Text:Waiting for CD - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON Y:149 Width:140 Height:35 Text:Back - CncMenuButton@RETRY_BUTTON: + Button@RETRY_BUTTON: Id:RETRY_BUTTON X:500 Y:149 @@ -164,13 +164,13 @@ Container@INSTALL_DOWNLOAD_PANEL: Height:25 Align:Left Text:Initialising... - CncMenuButton@CANCEL_BUTTON: + Button@CANCEL_BUTTON: Id:CANCEL_BUTTON Y:149 Width:140 Height:35 Text:Cancel - CncMenuButton@RETRY_BUTTON: + Button@RETRY_BUTTON: Id:RETRY_BUTTON X:500 Y:149 diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index 6f96fa8b72..6b02c2ad69 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -137,7 +137,7 @@ Container@SERVER_LOBBY: Height:25 X:5 Y:0-1 - CncMenuButton@KICK: + Button@KICK: Id:KICK Text:X Width:25 @@ -209,7 +209,7 @@ Container@SERVER_LOBBY: Height:25 X:5 Y:0-1 - CncMenuButton@JOIN: + Button@JOIN: Id:JOIN Text:Play in this slot Font:Regular @@ -240,7 +240,7 @@ Container@SERVER_LOBBY: Width:150 Height:25 Font:Regular - CncMenuButton@JOIN: + Button@JOIN: Id:JOIN Text:Play in this slot Font:Regular @@ -354,28 +354,28 @@ Container@SERVER_LOBBY: Height:25 Align:Right Text:Chat: - CncMenuButton@DISCONNECT_BUTTON: + Button@DISCONNECT_BUTTON: Id:DISCONNECT_BUTTON X:0 Y:499 Width:140 Height:35 Text:Leave Game - CncMenuButton@MUSIC_BUTTON: + Button@MUSIC_BUTTON: Id:MUSIC_BUTTON X:300 Y:499 Width:140 Height:35 Text:Music - CncMenuButton@CHANGEMAP_BUTTON: + Button@CHANGEMAP_BUTTON: Id:CHANGEMAP_BUTTON X:450 Y:499 Width:140 Height:35 Text:Change Map - CncMenuButton@START_GAME_BUTTON: + Button@START_GAME_BUTTON: Id:START_GAME_BUTTON X:600 Y:499 @@ -389,14 +389,14 @@ Background@COLOR_CHOOSER: Width:315 Height:130 Children: - CncMenuButton@SAVE_BUTTON: + Button@SAVE_BUTTON: Id:SAVE_BUTTON X:210 Y:90 Width:90 Height:25 Text:Save - CncMenuButton@RANDOM_BUTTON: + Button@RANDOM_BUTTON: Id:RANDOM_BUTTON X:15 Y:90 diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 6b62006964..1713887eb8 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -38,35 +38,35 @@ Container@MENU_BACKGROUND: Align:Center Font:Bold Contrast:True - CncMenuButton@SOLO_BUTTON: + Button@SOLO_BUTTON: Id:SOLO_BUTTON X:0 Y:0 Width:140 Height:35 Text:Singleplayer - CncMenuButton@MULTIPLAYER_BUTTON: + Button@MULTIPLAYER_BUTTON: Id:MULTIPLAYER_BUTTON X:150 Y:0 Width:140 Height:35 Text:Multiplayer - CncMenuButton@SETTINGS_BUTTON: + Button@SETTINGS_BUTTON: Id:SETTINGS_BUTTON X:300 Y:0 Width:140 Height:35 Text:Settings - CncMenuButton@REPLAYS_BUTTON: + Button@REPLAYS_BUTTON: Id:REPLAYS_BUTTON X:450 Y:0 Width:140 Height:35 Text: Replays - CncMenuButton@QUIT_BUTTON: + Button@QUIT_BUTTON: Id:QUIT_BUTTON X:600 Y:0 @@ -87,28 +87,28 @@ Container@MENU_BACKGROUND: Align:Center Font:Bold Contrast:True - CncMenuButton@CREATE_BUTTON: + Button@CREATE_BUTTON: Id:CREATE_BUTTON X:0 Y:0 Width:140 Height:35 Text:Create Server - CncMenuButton@JOIN_BUTTON: + Button@JOIN_BUTTON: Id:JOIN_BUTTON X:150 Y:0 Width:140 Height:35 Text:Find Server - CncMenuButton@DIRECTCONNECT_BUTTON: + Button@DIRECTCONNECT_BUTTON: Id:DIRECTCONNECT_BUTTON X:300 Y:0 Width:140 Height:35 Text:Direct Connect - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON X:600 Y:0 @@ -129,28 +129,28 @@ Container@MENU_BACKGROUND: Align:Center Font:Bold Contrast:True - CncMenuButton@MODS_BUTTON: + Button@MODS_BUTTON: Id:MODS_BUTTON X:0 Y:0 Width:140 Height:35 Text:Mods - CncMenuButton@MUSIC_BUTTON: + Button@MUSIC_BUTTON: Id:MUSIC_BUTTON X:150 Y:0 Width:140 Height:35 Text:Music - CncMenuButton@PREFERENCES_BUTTON: + Button@PREFERENCES_BUTTON: Id:PREFERENCES_BUTTON X:300 Y:0 Width:140 Height:35 Text:Preferences - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON X:600 Y:0 diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml index bec7ee2d0f..d33c06986d 100644 --- a/mods/cnc/chrome/mapchooser.yaml +++ b/mods/cnc/chrome/mapchooser.yaml @@ -189,21 +189,21 @@ Container@MAPCHOOSER_PANEL: Width:117 Height:20 WordWrap:True - CncMenuButton@BUTTON_CANCEL: + Button@BUTTON_CANCEL: Id:BUTTON_CANCEL X:0 Y:499 Width:140 Height:35 Text:Cancel - CncMenuButton@BUTTON_INSTALL: + Button@BUTTON_INSTALL: Id:BUTTON_INSTALL X:450 Y:499 Width:140 Height:35 Text:Install Map - CncMenuButton@BUTTON_OK: + Button@BUTTON_OK: Id:BUTTON_OK X:600 Y:499 diff --git a/mods/cnc/chrome/modchooser.yaml b/mods/cnc/chrome/modchooser.yaml index dc9b4854aa..bdeac5b4c3 100644 --- a/mods/cnc/chrome/modchooser.yaml +++ b/mods/cnc/chrome/modchooser.yaml @@ -78,14 +78,14 @@ Container@MODS_PANEL: Height:25 Text:Version Font:Bold - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON X:0 Y:499 Width:140 Height:35 Text:Back - CncMenuButton@LOAD_BUTTON: + Button@LOAD_BUTTON: Id:LOAD_BUTTON X:600 Y:499 diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index c461fe958d..5481776e60 100644 --- a/mods/cnc/chrome/music.yaml +++ b/mods/cnc/chrome/music.yaml @@ -77,7 +77,7 @@ Container@MUSIC_PANEL: Y:320 Width:170 Children: - CncMenuButton@BUTTON_PREV: + Button@BUTTON_PREV: Id:BUTTON_PREV Width:35 Height:35 @@ -90,7 +90,7 @@ Container@MUSIC_PANEL: Height:25 ImageCollection:music ImageName:prev - CncMenuButton@BUTTON_PLAY: + Button@BUTTON_PLAY: Id:BUTTON_PLAY X:45 Width:35 @@ -104,7 +104,7 @@ Container@MUSIC_PANEL: Height:25 ImageCollection:music ImageName:play - CncMenuButton@BUTTON_PAUSE: + Button@BUTTON_PAUSE: Id:BUTTON_PAUSE Visible:false X:45 @@ -119,7 +119,7 @@ Container@MUSIC_PANEL: Height:25 ImageCollection:music ImageName:pause - CncMenuButton@BUTTON_STOP: + Button@BUTTON_STOP: Id:BUTTON_STOP X:90 Width:35 @@ -133,7 +133,7 @@ Container@MUSIC_PANEL: Height:25 ImageCollection:music ImageName:stop - CncMenuButton@BUTTON_NEXT: + Button@BUTTON_NEXT: Id:BUTTON_NEXT X:135 Width:35 @@ -169,14 +169,14 @@ Container@MUSIC_PANEL: Width:70 Height:20 Text:Loop - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON X:0 Y:399 Width:140 Height:35 Text:Back - CncMenuButton@INSTALL_BUTTON: + Button@INSTALL_BUTTON: Id:INSTALL_BUTTON X:220 Y:399 @@ -223,13 +223,13 @@ Container@INSTALL_MUSIC_PANEL: Height:25 Align:Left Text:Waiting for file - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON Y:149 Width:140 Height:35 Text:Back - CncMenuButton@RETRY_BUTTON: + Button@RETRY_BUTTON: Id:RETRY_BUTTON X:500 Y:149 diff --git a/mods/cnc/chrome/preferences.yaml b/mods/cnc/chrome/preferences.yaml index dd82bf58ab..72777773b0 100644 --- a/mods/cnc/chrome/preferences.yaml +++ b/mods/cnc/chrome/preferences.yaml @@ -333,27 +333,27 @@ Container@SETTINGS_PANEL: # Y:85 # Width:350 # Height:150 - CncMenuButton@GENERAL_BUTTON: + Button@GENERAL_BUTTON: Id:GENERAL_BUTTON Y:249 Width:140 Height:35 Text:General - CncMenuButton@INPUT_BUTTON: + Button@INPUT_BUTTON: Id:INPUT_BUTTON X:150 Y:249 Width:140 Height:35 Text:Input - CncMenuButton@CANCEL_BUTTON: + Button@CANCEL_BUTTON: Id:CANCEL_BUTTON X:450 Y:249 Width:140 Height:35 Text:Cancel - CncMenuButton@SAVE_BUTTON: + Button@SAVE_BUTTON: Id:SAVE_BUTTON X:600 Y:249 diff --git a/mods/cnc/chrome/replaybrowser.yaml b/mods/cnc/chrome/replaybrowser.yaml index 77b718fd27..62f2d0f4b9 100644 --- a/mods/cnc/chrome/replaybrowser.yaml +++ b/mods/cnc/chrome/replaybrowser.yaml @@ -96,14 +96,14 @@ Container@REPLAYBROWSER_PANEL: Y:40 Width:70 Height:20 - CncMenuButton@CANCEL_BUTTON: + Button@CANCEL_BUTTON: Id:CANCEL_BUTTON X:0 Y:299 Width:140 Height:35 Text:Back - CncMenuButton@WATCH_BUTTON: + Button@WATCH_BUTTON: Id:WATCH_BUTTON X:380 Y:299 diff --git a/mods/cnc/chrome/serverbrowser.yaml b/mods/cnc/chrome/serverbrowser.yaml index 9ea5a29183..a15faad75e 100644 --- a/mods/cnc/chrome/serverbrowser.yaml +++ b/mods/cnc/chrome/serverbrowser.yaml @@ -191,21 +191,21 @@ Container@SERVERBROWSER_PANEL: VAlign:Top Width:70 Height:20 - CncMenuButton@BACK_BUTTON: + Button@BACK_BUTTON: Id:BACK_BUTTON X:0 Y:499 Width:140 Height:35 Text:Back - CncMenuButton@REFRESH_BUTTON: + Button@REFRESH_BUTTON: Id:REFRESH_BUTTON X:450 Y:499 Width:140 Height:35 Text:Refresh - CncMenuButton@JOIN_BUTTON: + Button@JOIN_BUTTON: Id:JOIN_BUTTON X:600 Y:499 diff --git a/mods/cnc/metrics.yaml b/mods/cnc/metrics.yaml index b6dbf4861a..764337ef91 100644 --- a/mods/cnc/metrics.yaml +++ b/mods/cnc/metrics.yaml @@ -1,4 +1,5 @@ # General dumping-ground for UI element sizes, etc. Metrics: - ButtonDepth: 1 \ No newline at end of file + ButtonDepth: 0 + ButtonFont: Bold \ No newline at end of file diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index 003dea01fc..fbdf542214 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -237,3 +237,51 @@ progressbar-thumb: dialog.png corner-tr: 594,0,1,1 corner-bl: 512,82,1,1 corner-br: 594,82,1,1 + +# A copy of dialog2 +button: dialog.png + background: 513,1,126,126 + border-r: 639,1,1,126 + border-l: 512,1,1,126 + border-b: 513,127,126,1 + border-t: 513,0,126,1 + corner-tl: 512,0,1,1 + corner-tr: 594,0,1,1 + corner-bl: 512,82,1,1 + corner-br: 594,82,1,1 + +# A copy of dialog2 +button-hover: dialog.png + background: 513,1,126,126 + border-r: 639,1,1,126 + border-l: 512,1,1,126 + border-b: 513,127,126,1 + border-t: 513,0,126,1 + corner-tl: 512,0,1,1 + corner-tr: 594,0,1,1 + corner-bl: 512,82,1,1 + corner-br: 594,82,1,1 + +# A copy of dialog2 +button-disabled: dialog.png + background: 513,1,126,126 + border-r: 639,1,1,126 + border-l: 512,1,1,126 + border-b: 513,127,126,1 + border-t: 513,0,126,1 + corner-tl: 512,0,1,1 + corner-tr: 594,0,1,1 + corner-bl: 512,82,1,1 + corner-br: 594,82,1,1 + +# A copy of dialog3 +button-pressed: dialog.png + background: 641,1,126,126 + border-r: 767,1,1,126 + border-l: 640,1,1,126 + border-b: 641,127,126,1 + border-t: 641,0,126,1 + corner-tl: 640,0,1,1 + corner-tr: 722,0,1,1 + corner-bl: 640,82,1,1 + corner-br: 722,82,1,1 diff --git a/mods/ra/metrics.yaml b/mods/ra/metrics.yaml index b6dbf4861a..c4561b9523 100644 --- a/mods/ra/metrics.yaml +++ b/mods/ra/metrics.yaml @@ -1,4 +1,5 @@ # General dumping-ground for UI element sizes, etc. Metrics: - ButtonDepth: 1 \ No newline at end of file + ButtonDepth: 1 + ButtonFont: Regular \ No newline at end of file