From 35673a058ad1ebf4a9554833ddd8a3a412fdba32 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 22 May 2011 13:30:52 +1200 Subject: [PATCH] Remove obsolete Bold field from widgets --- OpenRA.Game/Widgets/ButtonWidget.cs | 5 -- OpenRA.Game/Widgets/CheckboxWidget.cs | 3 - OpenRA.Game/Widgets/LabelWidget.cs | 6 -- OpenRA.Game/Widgets/TextFieldWidget.cs | 9 --- .../Widgets/Delegates/DiplomacyDelegate.cs | 10 ++-- mods/ra/chrome/gameinit.yaml | 22 ++++---- mods/ra/chrome/gamelobby.yaml | 56 +++++++++---------- mods/ra/chrome/ingame.yaml | 44 +++++++-------- mods/ra/chrome/mainmenu.yaml | 29 +++++----- mods/ra/chrome/replaybrowser.yaml | 10 ++-- mods/ra/chrome/serverbrowser.yaml | 40 ++++++------- mods/ra/chrome/settings.yaml | 12 ++-- mods/ra/chrome/videoplayer.yaml | 4 +- 13 files changed, 112 insertions(+), 138 deletions(-) diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs index 49f1c43e7c..01520731e5 100644 --- a/OpenRA.Game/Widgets/ButtonWidget.cs +++ b/OpenRA.Game/Widgets/ButtonWidget.cs @@ -25,9 +25,6 @@ namespace OpenRA.Widgets public Func IsDisabled = () => false; public Action OnClick = () => {}; - [Obsolete] public bool Bold = false; - - public ButtonWidget() : base() { @@ -96,8 +93,6 @@ namespace OpenRA.Widgets { var rb = RenderBounds; var disabled = IsDisabled(); - if (Font == "Regular" && Bold) - Font = "Bold"; var font = Game.Renderer.Fonts[Font]; var text = GetText(); diff --git a/OpenRA.Game/Widgets/CheckboxWidget.cs b/OpenRA.Game/Widgets/CheckboxWidget.cs index 9ad55f83f8..2f9b58fec0 100644 --- a/OpenRA.Game/Widgets/CheckboxWidget.cs +++ b/OpenRA.Game/Widgets/CheckboxWidget.cs @@ -63,9 +63,6 @@ namespace OpenRA.Widgets public override void DrawInner() { - if (Font == "Regular" && Bold) - Font = "Bold"; - var font = Game.Renderer.Fonts[Font]; var rect = RenderBounds; var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height)); diff --git a/OpenRA.Game/Widgets/LabelWidget.cs b/OpenRA.Game/Widgets/LabelWidget.cs index 3ac13c97c3..810208690d 100644 --- a/OpenRA.Game/Widgets/LabelWidget.cs +++ b/OpenRA.Game/Widgets/LabelWidget.cs @@ -30,8 +30,6 @@ namespace OpenRA.Widgets public Func GetText; [Obsolete] public Func GetBackground; - [Obsolete] public bool Bold = false; // Legacy flag. TODO: Remove - public LabelWidget() : base() { @@ -44,7 +42,6 @@ namespace OpenRA.Widgets { Text = other.Text; Align = other.Align; - Bold = other.Bold; Font = other.Font; Color = other.Color; Contrast = other.Contrast; @@ -61,9 +58,6 @@ namespace OpenRA.Widgets if (bg != null) WidgetUtils.DrawPanel(bg, RenderBounds ); - if (Font == "Regular" && Bold) - Font = "Bold"; - SpriteFont font = Game.Renderer.Fonts[Font]; var text = GetText(); if (text == null) diff --git a/OpenRA.Game/Widgets/TextFieldWidget.cs b/OpenRA.Game/Widgets/TextFieldWidget.cs index 3c572103a2..a136e77c18 100644 --- a/OpenRA.Game/Widgets/TextFieldWidget.cs +++ b/OpenRA.Game/Widgets/TextFieldWidget.cs @@ -39,15 +39,12 @@ namespace OpenRA.Widgets public Color DisabledColor = Color.Gray; public string Font = "Regular"; - [Obsolete] public bool Bold = false; - public TextFieldWidget() : base() {} protected TextFieldWidget(TextFieldWidget widget) : base(widget) { Text = widget.Text; MaxLength = widget.MaxLength; - Bold = widget.Bold; Font = widget.Font; TextColor = widget.TextColor; DisabledColor = widget.DisabledColor; @@ -86,9 +83,6 @@ namespace OpenRA.Widgets public int ClosestCursorPosition(int x) { - if (Font == "Regular" && Bold) - Font = "Bold"; - var font = Game.Renderer.Fonts[Font]; var textSize = font.Measure(Text); @@ -200,9 +194,6 @@ namespace OpenRA.Widgets public virtual void DrawWithString(string text) { - if (Font == "Regular" && Bold) - Font = "Bold"; - var font = Game.Renderer.Fonts[Font]; var pos = RenderOrigin; diff --git a/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs index 8e7fa81da4..f95cd9d538 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs @@ -43,7 +43,8 @@ namespace OpenRA.Mods.RA.Widgets.Delegates Game.AfterGameStart += _ => validPlayers = world.players.Values.Where(a => a != world.LocalPlayer && !a.NonCombatant).Count(); diplomacy.IsVisible = () => (validPlayers > 0); } - + + // This is shit void LayoutDialog(Widget bg) { bg.Children.RemoveAll(w => controls.Contains(w)); @@ -55,7 +56,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates var ts = new LabelWidget { - Bold = true, + Font = "Bold", Bounds = new Rectangle(margin + labelWidth + 10, y, labelWidth, 25), Text = "Their Stance", Align = LabelWidget.TextAlign.Left, @@ -66,7 +67,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates var ms = new LabelWidget { - Bold = true, + Font = "Bold", Bounds = new Rectangle(margin + 2 * labelWidth + 20, y, labelWidth, 25), Text = "My Stance", Align = LabelWidget.TextAlign.Left, @@ -86,7 +87,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates Id = "DIPLOMACY_PLAYER_LABEL_{0}".F(p.Index), Text = p.PlayerName, Align = LabelWidget.TextAlign.Left, - Bold = true, + Font = "Bold", }; bg.AddChild(label); @@ -98,7 +99,6 @@ namespace OpenRA.Mods.RA.Widgets.Delegates Id = "DIPLOMACY_PLAYER_LABEL_THEIR_{0}".F(p.Index), Text = p.PlayerName, Align = LabelWidget.TextAlign.Left, - Bold = false, GetText = () => pp.Stances[ world.LocalPlayer ].ToString(), }; diff --git a/mods/ra/chrome/gameinit.yaml b/mods/ra/chrome/gameinit.yaml index 07822dd115..45a3299482 100644 --- a/mods/ra/chrome/gameinit.yaml +++ b/mods/ra/chrome/gameinit.yaml @@ -21,7 +21,7 @@ Background@INIT_CHOOSEINSTALL: Height:25 Text:Install Required Align:Center - Bold:True + Font:Bold Label@DESC1: X:0 Y:65 @@ -44,7 +44,7 @@ Background@INIT_CHOOSEINSTALL: Width:120 Height:25 Text:Download - Bold:True + Font:Bold Button@FROMCD: Id:FROMCD X:PARENT_RIGHT - 420 @@ -53,7 +53,7 @@ Background@INIT_CHOOSEINSTALL: Height:25 Text:From CD Visible:false - Bold:True + Font:Bold Button@QUIT: Id:QUIT X:PARENT_RIGHT - 140 @@ -61,7 +61,7 @@ Background@INIT_CHOOSEINSTALL: Width:120 Height:25 Text:Quit - Bold:True + Font:Bold Background@INIT_DOWNLOAD: Id:INIT_DOWNLOAD @@ -77,7 +77,7 @@ Background@INIT_DOWNLOAD: Height:25 Text:Downloading Red Alert Content Align:Center - Bold:True + Font:Bold ProgressBar@PROGRESS: Id:PROGRESS X:50 @@ -99,7 +99,7 @@ Background@INIT_DOWNLOAD: Height:25 Visible: false Text:Retry - Bold:True + Font:Bold Button@CANCEL: Id:CANCEL X:PARENT_RIGHT - 140 @@ -107,7 +107,7 @@ Background@INIT_DOWNLOAD: Width:120 Height:25 Text:Cancel - Bold:True + Font:Bold Button@EXTRACT: Id:EXTRACT X:PARENT_RIGHT - 140 @@ -116,7 +116,7 @@ Background@INIT_DOWNLOAD: Height:25 Visible: false Text:Extract - Bold:True + Font:Bold Background@INIT_COPY: Id:INIT_COPY @@ -132,7 +132,7 @@ Background@INIT_COPY: Height:25 Text:Copying Red Alert Content Align:Center - Bold:True + Font:Bold ProgressBar@PROGRESS: Id:PROGRESS X:50 @@ -154,7 +154,7 @@ Background@INIT_COPY: Height:25 Visible: false Text:Retry - Bold:True + Font:Bold Button@CANCEL: Id:CANCEL X:PARENT_RIGHT - 140 @@ -162,4 +162,4 @@ Background@INIT_COPY: Width:120 Height:25 Text:Cancel - Bold:True \ No newline at end of file + Font:Bold \ No newline at end of file diff --git a/mods/ra/chrome/gamelobby.yaml b/mods/ra/chrome/gamelobby.yaml index 2da30b04c9..24dab1e5db 100644 --- a/mods/ra/chrome/gamelobby.yaml +++ b/mods/ra/chrome/gamelobby.yaml @@ -13,7 +13,7 @@ Background@SERVER_LOBBY: Align:Center Width:800 Height:20 - Bold:True + Font:Bold Text:OpenRA Multiplayer Lobby Background@LOBBY_MAP_BG: X:PARENT_RIGHT-268 @@ -106,7 +106,7 @@ Background@SERVER_LOBBY: X:160 Y:0 Align:Center - Bold:True + Font:Bold Container@TEMPLATE_REMOTE: Id:TEMPLATE_REMOTE X:5 @@ -129,7 +129,7 @@ Background@SERVER_LOBBY: Height:23 X:125 Y:2 - Bold:Yes + Font:Bold ColorBlock@COLOR: Id:COLOR X:165 @@ -178,7 +178,7 @@ Background@SERVER_LOBBY: X:160 Y:0 Align:Center - Bold:True + Font:Bold Container@TEMPLATE_EMPTY: Id:TEMPLATE_EMPTY X:5 @@ -209,7 +209,7 @@ Background@SERVER_LOBBY: X:160 Y:0 Align:Center - Bold:True + Font:Bold Container@TEMPLATE_EMPTY_HOST: Id:TEMPLATE_EMPTY_HOST X:5 @@ -240,7 +240,7 @@ Background@SERVER_LOBBY: X:160 Y:0 Align:Center - Bold:True + Font:Bold Container@LABEL_CONTAINER: X:25 Y:40 @@ -253,7 +253,7 @@ Background@SERVER_LOBBY: Y:0 Text:Name Align:Center - Bold:True + Font:Bold Label@LABEL_LOBBY_COLOR: Id:LABEL_LOBBY_COLOR Width:80 @@ -262,7 +262,7 @@ Background@SERVER_LOBBY: Y:0 Text:Color Align:Center - Bold:True + Font:Bold Label@LABEL_LOBBY_FACTION: Id:LABEL_LOBBY_FACTION Width:130 @@ -271,7 +271,7 @@ Background@SERVER_LOBBY: Y:0 Text:Faction Align:Center - Bold:True + Font:Bold Label@LABEL_LOBBY_TEAM: Id:LABEL_LOBBY_TEAM Width:48 @@ -280,7 +280,7 @@ Background@SERVER_LOBBY: Y:0 Text:Team Align:Center - Bold:True + Font:Bold Label@LABEL_LOBBY_STATUS: Id:LABEL_LOBBY_STATUS X:448 @@ -289,7 +289,7 @@ Background@SERVER_LOBBY: Height:25 Text:Ready Align:Left - Bold:True + Font:Bold Button@CHANGEMAP_BUTTON: Id:CHANGEMAP_BUTTON X:PARENT_RIGHT-154 @@ -297,7 +297,7 @@ Background@SERVER_LOBBY: Width:120 Height:25 Text:Change Map - Bold:True + Font:Bold ChatDisplay@CHAT_DISPLAY: Id:CHAT_DISPLAY X:20 @@ -326,7 +326,7 @@ Background@SERVER_LOBBY: Width:120 Height:25 Text:Start Game - Bold:True + Font:Bold Button@DISCONNECT_BUTTON: Id:DISCONNECT_BUTTON X:PARENT_RIGHT-154 @@ -334,7 +334,7 @@ Background@SERVER_LOBBY: Width:120 Height:25 Text:Disconnect - Bold:True + Font:Bold Checkbox@LOCKTEAMS_CHECKBOX: Id:LOCKTEAMS_CHECKBOX X: PARENT_RIGHT-154 @@ -362,7 +362,7 @@ Background@COLOR_CHOOSER: Width:90 Height:25 Text:Ok - Bold:True + Font:Bold ShpImage@FACT: Id:FACT X:220 @@ -442,7 +442,7 @@ Background@MAP_CHOOSER: Width:800 Height:20 Text:Choose Map - Bold:True + Font:Bold ScrollPanel@MAP_LIST: Id:MAP_LIST X:20 @@ -487,16 +487,16 @@ Background@MAP_CHOOSER: Y:0 Text:Title Align:Center - Bold:True + Font:Bold Label@PLAYERS: Text:Players - Bold:true + Font:Bold Width:50 X:304 Height:25 Label@TYPE: Text:Type - Bold:true + Font:Bold Width:50 X:420 Height:25 @@ -527,7 +527,7 @@ Background@MAP_CHOOSER: Width:70 Height:20 Text:Title: - Bold:True + Font:Bold Label@CURMAP_TITLE: Id:CURMAP_TITLE X:75 @@ -543,7 +543,7 @@ Background@MAP_CHOOSER: Width:70 Height:20 Text:Author: - Bold:True + Font:Bold Label@CURMAP_AUTHOR: Id:CURMAP_AUTHOR X:75 @@ -560,7 +560,7 @@ Background@MAP_CHOOSER: Width:70 Height:20 Text:Size: - Bold:True + Font:Bold Label@CURMAP_SIZE: Id:CURMAP_SIZE X:75 @@ -576,7 +576,7 @@ Background@MAP_CHOOSER: Width:70 Height:20 Text:Theater: - Bold:True + Font:Bold Label@CURMAP_THEATER: Id:CURMAP_THEATER X:75 @@ -592,7 +592,7 @@ Background@MAP_CHOOSER: Width:70 Height:20 Text:Players: - Bold:True + Font:Bold Label@CURMAP_PLAYERS: Id:CURMAP_PLAYERS X:75 @@ -608,7 +608,7 @@ Background@MAP_CHOOSER: Width:70 Height:20 Text:Desc: - Bold:True + Font:Bold Label@CURMAP_DESC: Id:CURMAP_DESC X:75 @@ -624,7 +624,7 @@ Background@MAP_CHOOSER: Width:120 Height:25 Text:Ok - Bold:True + Font:Bold Button@BUTTON_CANCEL: Id:BUTTON_CANCEL X:PARENT_RIGHT-154 @@ -632,7 +632,7 @@ Background@MAP_CHOOSER: Width:120 Height:25 Text:Cancel - Bold:True + Font:Bold Button@BUTTON_INSTALL: Id:BUTTON_INSTALL X:20 @@ -640,4 +640,4 @@ Background@MAP_CHOOSER: Width:120 Height:25 Text:Install Map - Bold:True + Font:Bold diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml index a91c50199f..18ea8ef77e 100644 --- a/mods/ra/chrome/ingame.yaml +++ b/mods/ra/chrome/ingame.yaml @@ -42,7 +42,7 @@ Container@INGAME_ROOT: Width:200 Height:40 Align:Center - Bold:True + Font:Bold SpecialPowerBin@INGAME_POWERS_BIN: Id:INGAME_POWERS_BIN X:0 @@ -60,7 +60,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Options - Bold:True + Font:Bold Button@INGAME_DIPLOMACY_BUTTON: Id:INGAME_DIPLOMACY_BUTTON X:162 @@ -68,7 +68,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Diplomacy - Bold:True + Font:Bold Button@INGAME_DEVELOPERMODE_BUTTON: Id:INGAME_DEVELOPERMODE_BUTTON X:324 @@ -77,7 +77,7 @@ Container@INGAME_ROOT: Height:25 Text:Developer Mode Visible:false - Bold:True + Font:Bold RadarBin@INGAME_RADAR_BIN: Id:INGAME_RADAR_BIN WorldInteractionController:INTERACTION_CONTROLLER @@ -138,7 +138,7 @@ Container@INGAME_ROOT: Height:25 Text:Options Align:Center - Bold:True + Font:Bold Button@RESUME: Id:RESUME X:(PARENT_RIGHT - WIDTH)/2 @@ -146,7 +146,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Resume - Bold:True + Font:Bold Button@SETTINGS: Id:SETTINGS X:(PARENT_RIGHT - WIDTH)/2 @@ -154,7 +154,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Settings - Bold:True + Font:Bold Button@MUSIC: Id:MUSIC X:(PARENT_RIGHT - WIDTH)/2 @@ -162,7 +162,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Music - Bold:True + Font:Bold Button@SURRENDER: Id:SURRENDER X:(PARENT_RIGHT - WIDTH)/2 @@ -170,7 +170,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Surrender - Bold:True + Font:Bold Button@DISCONNECT: Id:DISCONNECT X:(PARENT_RIGHT - WIDTH)/2 @@ -178,7 +178,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Disconnect - Bold:True + Font:Bold Button@QUIT: Id:QUIT X:(PARENT_RIGHT - WIDTH)/2 @@ -186,7 +186,7 @@ Container@INGAME_ROOT: Width:160 Height:25 Text:Quit - Bold:True + Font:Bold Background@DIPLOMACY_BG: Id:DIPLOMACY_BG Delegate:DiplomacyDelegate @@ -204,7 +204,7 @@ Container@INGAME_ROOT: Height:25 Text:Diplomacy Align:Center - Bold:True + Font:Bold ChatDisplay@CHAT_DISPLAY: Id:CHAT_DISPLAY X:250 @@ -319,7 +319,6 @@ Container@INGAME_ROOT: Height:200 Label@TEXT: Id:TEXT - Bold: false X:20 Y:205 Width:170 @@ -359,7 +358,7 @@ Container@OBSERVER_ROOT: Width:200 Height:40 Align:Center - Bold:True + Font:Bold SpecialPowerBin@INGAME_POWERS_BIN: Id:INGAME_POWERS_BIN X:0 @@ -371,7 +370,7 @@ Container@OBSERVER_ROOT: Width:160 Height:25 Text:Options - Bold:True + Font:Bold WorldTooltip: Background@INGAME_OPTIONS_BG: Id:INGAME_OPTIONS_BG @@ -389,7 +388,7 @@ Container@OBSERVER_ROOT: Height:25 Text:Options Align:Center - Bold:True + Font:Bold Button@RESUME: Id:RESUME X:(PARENT_RIGHT - WIDTH)/2 @@ -397,7 +396,7 @@ Container@OBSERVER_ROOT: Width:160 Height:25 Text:Resume - Bold:True + Font:Bold Button@SETTINGS: Id:SETTINGS X:(PARENT_RIGHT - WIDTH)/2 @@ -405,7 +404,7 @@ Container@OBSERVER_ROOT: Width:160 Height:25 Text:Settings - Bold:True + Font:Bold Button@MUSIC: Id:MUSIC X:(PARENT_RIGHT - WIDTH)/2 @@ -413,7 +412,7 @@ Container@OBSERVER_ROOT: Width:160 Height:25 Text:Music - Bold:True + Font:Bold Button@SURRENDER: Id:SURRENDER X:(PARENT_RIGHT - WIDTH)/2 @@ -421,7 +420,7 @@ Container@OBSERVER_ROOT: Width:160 Height:25 Text:Surrender - Bold:True + Font:Bold Button@DISCONNECT: Id:DISCONNECT X:(PARENT_RIGHT - WIDTH)/2 @@ -429,7 +428,7 @@ Container@OBSERVER_ROOT: Width:160 Height:25 Text:Disconnect - Bold:True + Font:Bold Button@QUIT: Id:QUIT X:(PARENT_RIGHT - WIDTH)/2 @@ -437,7 +436,7 @@ Container@OBSERVER_ROOT: Width:160 Height:25 Text:Quit - Bold:True + Font:Bold ChatDisplay@CHAT_DISPLAY: Id:CHAT_DISPLAY X:250 @@ -470,7 +469,6 @@ Container@OBSERVER_ROOT: Height:200 Label@TEXT: Id:TEXT - Bold: false X:20 Y:205 Width:170 diff --git a/mods/ra/chrome/mainmenu.yaml b/mods/ra/chrome/mainmenu.yaml index 9d711329bd..bdeaa5f796 100644 --- a/mods/ra/chrome/mainmenu.yaml +++ b/mods/ra/chrome/mainmenu.yaml @@ -15,7 +15,7 @@ Background@MAINMENU_BG: Height:25 Text:OpenRA Main Menu Align:Center - Bold:True + Font:Bold Button@MAINMENU_BUTTON_JOIN: Id:MAINMENU_BUTTON_JOIN X:45 @@ -23,7 +23,7 @@ Background@MAINMENU_BG: Width:160 Height:25 Text:Join Game - Bold:True + Font:Bold Button@MAINMENU_BUTTON_CREATE: Id:MAINMENU_BUTTON_CREATE X:45 @@ -31,7 +31,7 @@ Background@MAINMENU_BG: Width:160 Height:25 Text:Create Game - Bold:True + Font:Bold Button@MAINMENU_BUTTON_SETTINGS: Id:MAINMENU_BUTTON_SETTINGS X:45 @@ -39,7 +39,7 @@ Background@MAINMENU_BG: Width:160 Height:25 Text:Settings - Bold:True + Font:Bold Button@MAINMENU_BUTTON_MUSIC: Id:MAINMENU_BUTTON_MUSIC X:45 @@ -47,15 +47,15 @@ Background@MAINMENU_BG: Width:160 Height:25 Text:Music - Bold:True + Font:Bold Button@MAINMENU_BUTTON_REPLAY_VIEWER: Id:MAINMENU_BUTTON_REPLAY_VIEWER X:45 Y:230 Width:160 Height:25 - Text: Replay Viewer - Bold: True + Text:Replay Viewer + Font:Bold Button@MAINMENU_BUTTON_QUIT: Id:MAINMENU_BUTTON_QUIT X:45 @@ -63,7 +63,7 @@ Background@MAINMENU_BG: Width:160 Height:25 Text:Quit - Bold:True + Font:Bold Button@MAINMENU_BUTTON_VIDEOPLAYER: Id:MAINMENU_BUTTON_VIDEOPLAYER Visible:false @@ -72,7 +72,7 @@ Background@MAINMENU_BG: Width:200 Height:25 Text:Video Player - Bold:True + Font:Bold Background@QUICKMODSWITCHER: Id:QUICKMODSWITCHER Background: dialog4 @@ -88,7 +88,7 @@ Background@QUICKMODSWITCHER: Height:25 Text:Mod: Align:Left - Bold:True + Font:Bold DropDownButton@SWITCHER: Id:SWITCHER Text:Team @@ -103,7 +103,7 @@ Background@QUICKMODSWITCHER: Width:150 Height:25 Align:Center - Bold:True + Font:Bold Background@PERF_BG: ClickThrough:true Id:PERF_BG @@ -122,7 +122,6 @@ Background@PERF_BG: Height:200 Label@TEXT: Id:TEXT - Bold: false X:20 Y:205 Width:170 @@ -144,7 +143,7 @@ Background@MUSIC_MENU: Height:25 Text:Music Align:Center - Bold:True + Font:Bold Button@BUTTON_INSTALL: Id:BUTTON_INSTALL X:20 @@ -152,7 +151,7 @@ Background@MUSIC_MENU: Width:160 Height:25 Text:Install Music - Bold:True + Font:Bold Button@BUTTON_CLOSE: Id:BUTTON_CLOSE X:PARENT_RIGHT - 180 @@ -160,7 +159,7 @@ Background@MUSIC_MENU: Width:160 Height:25 Text:Close - Bold:True + Font:Bold Container@BUTTONS: X:PARENT_RIGHT - 150 Y:50 diff --git a/mods/ra/chrome/replaybrowser.yaml b/mods/ra/chrome/replaybrowser.yaml index cedf3e375e..bdd556c865 100644 --- a/mods/ra/chrome/replaybrowser.yaml +++ b/mods/ra/chrome/replaybrowser.yaml @@ -14,7 +14,7 @@ Background@REPLAYBROWSER_BG: Height:25 Text:Choose Replay Align:Center - Bold:True + Font:Bold ScrollPanel@REPLAY_LIST: Id:REPLAY_LIST X:20 @@ -51,7 +51,7 @@ Background@REPLAYBROWSER_BG: Width:70 Height:20 Text:Map: - Bold:True + Font:Bold Label@MAP_TITLE: Id:MAP_TITLE X:PARENT_RIGHT - 195 @@ -67,7 +67,7 @@ Background@REPLAYBROWSER_BG: Width:70 Height:20 Text:Duration: - Bold:True + Font:Bold Label@DURATION: Id:DURATION X:PARENT_RIGHT - 195 @@ -82,7 +82,7 @@ Background@REPLAYBROWSER_BG: Width:120 Height:25 Text:Watch - Bold:True + Font:Bold Button@CANCEL_BUTTON: Id:CANCEL_BUTTON X:PARENT_RIGHT - 140 @@ -90,4 +90,4 @@ Background@REPLAYBROWSER_BG: Width:120 Height:25 Text:Cancel - Bold:True + Font:Bold diff --git a/mods/ra/chrome/serverbrowser.yaml b/mods/ra/chrome/serverbrowser.yaml index 0ed63b8f9a..4b0c4973c1 100644 --- a/mods/ra/chrome/serverbrowser.yaml +++ b/mods/ra/chrome/serverbrowser.yaml @@ -14,7 +14,7 @@ Background@CREATESERVER_BG: Height:25 Text:Create Server Align:Center - Bold:True + Font:Bold Label@GAME_TITLE_LABEL: Id:GAME_TITLE_LABEL X:50 @@ -76,7 +76,7 @@ Background@CREATESERVER_BG: Width:120 Height:25 Text:Create - Bold:True + Font:Bold Button@BUTTON_CANCEL: Id:BUTTON_CANCEL X:260 @@ -84,7 +84,7 @@ Background@CREATESERVER_BG: Width:120 Height:25 Text:Cancel - Bold:True + Font:Bold Background@JOINSERVER_BG: Id:JOINSERVER_BG Delegate:ServerBrowserDelegate @@ -101,7 +101,7 @@ Background@JOINSERVER_BG: Height:25 Text:Join Server Align:Center - Bold:True + Font:Bold ScrollPanel@SERVER_LIST: Id:SERVER_LIST X:20 @@ -147,7 +147,7 @@ Background@JOINSERVER_BG: Width:70 Height:20 Text:Server: - Bold:True + Font:Bold Label@SERVER_IP: Id:SERVER_IP X:PARENT_RIGHT - 195 @@ -163,7 +163,7 @@ Background@JOINSERVER_BG: Width:70 Height:20 Text:Players: - Bold:True + Font:Bold Label@MAP_PLAYERS: Id:MAP_PLAYERS X:PARENT_RIGHT - 195 @@ -179,7 +179,7 @@ Background@JOINSERVER_BG: Width:70 Height:20 Text:Map: - Bold:True + Font:Bold Label@MAP_TITLE: Id:MAP_TITLE X:PARENT_RIGHT - 195 @@ -195,7 +195,7 @@ Background@JOINSERVER_BG: Width:70 Height:20 Text:Mods: - Bold:True + Font:Bold Label@SERVER_MODS: Id:SERVER_MODS X:PARENT_RIGHT - 195 @@ -211,7 +211,7 @@ Background@JOINSERVER_BG: Width:120 Height:25 Text:Direct Connect - Bold:True + Font:Bold Button@REFRESH_BUTTON: Id:REFRESH_BUTTON X:160 @@ -219,7 +219,7 @@ Background@JOINSERVER_BG: Width:120 Height:25 Text:Refresh - Bold:True + Font:Bold Button@JOIN_BUTTON: Id:JOIN_BUTTON X:PARENT_RIGHT - 140 - 130 @@ -227,7 +227,7 @@ Background@JOINSERVER_BG: Width:120 Height:25 Text:Join - Bold:True + Font:Bold Button@CANCEL_BUTTON: Id:CANCEL_BUTTON X:PARENT_RIGHT - 140 @@ -235,7 +235,7 @@ Background@JOINSERVER_BG: Width:120 Height:25 Text:Cancel - Bold:True + Font:Bold Background@DIRECTCONNECT_BG: Id:DIRECTCONNECT_BG Delegate:DirectConnectDelegate @@ -252,7 +252,7 @@ Background@DIRECTCONNECT_BG: Height:25 Text:Direct Connect Align:Center - Bold:True + Font:Bold Label@ADDRESS_LABEL: Id:ADDRESS_LABEL X:50 @@ -275,7 +275,7 @@ Background@DIRECTCONNECT_BG: Width:120 Height:25 Text:Join - Bold:True + Font:Bold Button@CANCEL_BUTTON: Id:CANCEL_BUTTON X:260 @@ -283,7 +283,7 @@ Background@DIRECTCONNECT_BG: Width:120 Height:25 Text:Cancel - Bold:True + Font:Bold Background@CONNECTION_FAILED_BG: Id:CONNECTION_FAILED_BG Delegate:ConnectionFailedDelegate @@ -300,7 +300,7 @@ Background@CONNECTION_FAILED_BG: Height:25 Text:Connection Failed Align:Center - Bold:True + Font:Bold Label@CONNECTION_FAILED_DESC: Id:CONNECTION_FAILED_DESC X:0 @@ -316,7 +316,7 @@ Background@CONNECTION_FAILED_BG: Width:160 Height:25 Text:Retry - Bold:True + Font:Bold Button@CONNECTION_BUTTON_CANCEL: Id:CONNECTION_BUTTON_CANCEL X:PARENT_RIGHT - 180 @@ -324,7 +324,7 @@ Background@CONNECTION_FAILED_BG: Width:160 Height:25 Text:Cancel - Bold:True + Font:Bold Background@CONNECTING_BG: Id:CONNECTING_BG Delegate:ConnectionDialogsDelegate @@ -341,7 +341,7 @@ Background@CONNECTING_BG: Height:25 Text:Connecting Align:Center - Bold:True + Font:Bold Label@CONNECTING_DESC: Id:CONNECTING_DESC X:0 @@ -357,4 +357,4 @@ Background@CONNECTING_BG: Width:160 Height:25 Text:Abort - Bold:True \ No newline at end of file + Font:Bold \ No newline at end of file diff --git a/mods/ra/chrome/settings.yaml b/mods/ra/chrome/settings.yaml index c257261a79..ceffb7b40a 100644 --- a/mods/ra/chrome/settings.yaml +++ b/mods/ra/chrome/settings.yaml @@ -14,7 +14,7 @@ Background@SETTINGS_MENU: Height:25 Text:Settings Align:Center - Bold:True + Font:Bold Button@BUTTON_CLOSE: Id:BUTTON_CLOSE X:PARENT_RIGHT - 180 @@ -22,7 +22,7 @@ Background@SETTINGS_MENU: Width:160 Height:25 Text:Close - Bold:True + Font:Bold Container@TAB_CONTAINER: Id:TAB_CONTAINER X:0 @@ -37,7 +37,7 @@ Background@SETTINGS_MENU: Width:90 Height:25 Text:General - Bold:True + Font:Bold Button@AUDIO: Id:AUDIO X:135 @@ -45,7 +45,7 @@ Background@SETTINGS_MENU: Width:90 Height:25 Text:Audio - Bold:True + Font:Bold Button@DISPLAY: Id:DISPLAY X:225 @@ -53,7 +53,7 @@ Background@SETTINGS_MENU: Width:90 Height:25 Text:Display - Bold:True + Font:Bold Button@DEBUG: Id:DEBUG X:315 @@ -61,7 +61,7 @@ Background@SETTINGS_MENU: Width:90 Height:25 Text:Debug - Bold:True + Font:Bold Container@GENERAL_PANE: Id:GENERAL_PANE X:37 diff --git a/mods/ra/chrome/videoplayer.yaml b/mods/ra/chrome/videoplayer.yaml index 8a9437eb58..164e1ff14e 100644 --- a/mods/ra/chrome/videoplayer.yaml +++ b/mods/ra/chrome/videoplayer.yaml @@ -13,7 +13,7 @@ Background@VIDEOPLAYER_MENU: Width:PARENT_RIGHT Height:20 Text:Video Player - Bold:True + Font:Bold VqaPlayer: Id:VIDEOPLAYER X:30 @@ -72,4 +72,4 @@ Background@VIDEOPLAYER_MENU: Width:160 Height:25 Text:Close - Bold:True \ No newline at end of file + Font:Bold \ No newline at end of file