Remove obsolete Bold field from widgets

This commit is contained in:
Paul Chote
2011-05-22 13:30:52 +12:00
parent 8eb4e663d2
commit 35673a058a
13 changed files with 112 additions and 138 deletions

View File

@@ -25,9 +25,6 @@ namespace OpenRA.Widgets
public Func<bool> IsDisabled = () => false; public Func<bool> IsDisabled = () => false;
public Action OnClick = () => {}; public Action OnClick = () => {};
[Obsolete] public bool Bold = false;
public ButtonWidget() public ButtonWidget()
: base() : base()
{ {
@@ -96,8 +93,6 @@ namespace OpenRA.Widgets
{ {
var rb = RenderBounds; var rb = RenderBounds;
var disabled = IsDisabled(); var disabled = IsDisabled();
if (Font == "Regular" && Bold)
Font = "Bold";
var font = Game.Renderer.Fonts[Font]; var font = Game.Renderer.Fonts[Font];
var text = GetText(); var text = GetText();

View File

@@ -63,9 +63,6 @@ namespace OpenRA.Widgets
public override void DrawInner() public override void DrawInner()
{ {
if (Font == "Regular" && Bold)
Font = "Bold";
var font = Game.Renderer.Fonts[Font]; var font = Game.Renderer.Fonts[Font];
var rect = RenderBounds; var rect = RenderBounds;
var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height)); var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height));

View File

@@ -30,8 +30,6 @@ namespace OpenRA.Widgets
public Func<string> GetText; public Func<string> GetText;
[Obsolete] public Func<string> GetBackground; [Obsolete] public Func<string> GetBackground;
[Obsolete] public bool Bold = false; // Legacy flag. TODO: Remove
public LabelWidget() public LabelWidget()
: base() : base()
{ {
@@ -44,7 +42,6 @@ namespace OpenRA.Widgets
{ {
Text = other.Text; Text = other.Text;
Align = other.Align; Align = other.Align;
Bold = other.Bold;
Font = other.Font; Font = other.Font;
Color = other.Color; Color = other.Color;
Contrast = other.Contrast; Contrast = other.Contrast;
@@ -61,9 +58,6 @@ namespace OpenRA.Widgets
if (bg != null) if (bg != null)
WidgetUtils.DrawPanel(bg, RenderBounds ); WidgetUtils.DrawPanel(bg, RenderBounds );
if (Font == "Regular" && Bold)
Font = "Bold";
SpriteFont font = Game.Renderer.Fonts[Font]; SpriteFont font = Game.Renderer.Fonts[Font];
var text = GetText(); var text = GetText();
if (text == null) if (text == null)

View File

@@ -39,15 +39,12 @@ namespace OpenRA.Widgets
public Color DisabledColor = Color.Gray; public Color DisabledColor = Color.Gray;
public string Font = "Regular"; public string Font = "Regular";
[Obsolete] public bool Bold = false;
public TextFieldWidget() : base() {} public TextFieldWidget() : base() {}
protected TextFieldWidget(TextFieldWidget widget) protected TextFieldWidget(TextFieldWidget widget)
: base(widget) : base(widget)
{ {
Text = widget.Text; Text = widget.Text;
MaxLength = widget.MaxLength; MaxLength = widget.MaxLength;
Bold = widget.Bold;
Font = widget.Font; Font = widget.Font;
TextColor = widget.TextColor; TextColor = widget.TextColor;
DisabledColor = widget.DisabledColor; DisabledColor = widget.DisabledColor;
@@ -86,9 +83,6 @@ namespace OpenRA.Widgets
public int ClosestCursorPosition(int x) public int ClosestCursorPosition(int x)
{ {
if (Font == "Regular" && Bold)
Font = "Bold";
var font = Game.Renderer.Fonts[Font]; var font = Game.Renderer.Fonts[Font];
var textSize = font.Measure(Text); var textSize = font.Measure(Text);
@@ -200,9 +194,6 @@ namespace OpenRA.Widgets
public virtual void DrawWithString(string text) public virtual void DrawWithString(string text)
{ {
if (Font == "Regular" && Bold)
Font = "Bold";
var font = Game.Renderer.Fonts[Font]; var font = Game.Renderer.Fonts[Font];
var pos = RenderOrigin; var pos = RenderOrigin;

View File

@@ -43,7 +43,8 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
Game.AfterGameStart += _ => validPlayers = world.players.Values.Where(a => a != world.LocalPlayer && !a.NonCombatant).Count(); Game.AfterGameStart += _ => validPlayers = world.players.Values.Where(a => a != world.LocalPlayer && !a.NonCombatant).Count();
diplomacy.IsVisible = () => (validPlayers > 0); diplomacy.IsVisible = () => (validPlayers > 0);
} }
// This is shit
void LayoutDialog(Widget bg) void LayoutDialog(Widget bg)
{ {
bg.Children.RemoveAll(w => controls.Contains(w)); bg.Children.RemoveAll(w => controls.Contains(w));
@@ -55,7 +56,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
var ts = new LabelWidget var ts = new LabelWidget
{ {
Bold = true, Font = "Bold",
Bounds = new Rectangle(margin + labelWidth + 10, y, labelWidth, 25), Bounds = new Rectangle(margin + labelWidth + 10, y, labelWidth, 25),
Text = "Their Stance", Text = "Their Stance",
Align = LabelWidget.TextAlign.Left, Align = LabelWidget.TextAlign.Left,
@@ -66,7 +67,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
var ms = new LabelWidget var ms = new LabelWidget
{ {
Bold = true, Font = "Bold",
Bounds = new Rectangle(margin + 2 * labelWidth + 20, y, labelWidth, 25), Bounds = new Rectangle(margin + 2 * labelWidth + 20, y, labelWidth, 25),
Text = "My Stance", Text = "My Stance",
Align = LabelWidget.TextAlign.Left, Align = LabelWidget.TextAlign.Left,
@@ -86,7 +87,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
Id = "DIPLOMACY_PLAYER_LABEL_{0}".F(p.Index), Id = "DIPLOMACY_PLAYER_LABEL_{0}".F(p.Index),
Text = p.PlayerName, Text = p.PlayerName,
Align = LabelWidget.TextAlign.Left, Align = LabelWidget.TextAlign.Left,
Bold = true, Font = "Bold",
}; };
bg.AddChild(label); bg.AddChild(label);
@@ -98,7 +99,6 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
Id = "DIPLOMACY_PLAYER_LABEL_THEIR_{0}".F(p.Index), Id = "DIPLOMACY_PLAYER_LABEL_THEIR_{0}".F(p.Index),
Text = p.PlayerName, Text = p.PlayerName,
Align = LabelWidget.TextAlign.Left, Align = LabelWidget.TextAlign.Left,
Bold = false,
GetText = () => pp.Stances[ world.LocalPlayer ].ToString(), GetText = () => pp.Stances[ world.LocalPlayer ].ToString(),
}; };

View File

@@ -21,7 +21,7 @@ Background@INIT_CHOOSEINSTALL:
Height:25 Height:25
Text:Install Required Text:Install Required
Align:Center Align:Center
Bold:True Font:Bold
Label@DESC1: Label@DESC1:
X:0 X:0
Y:65 Y:65
@@ -44,7 +44,7 @@ Background@INIT_CHOOSEINSTALL:
Width:120 Width:120
Height:25 Height:25
Text:Download Text:Download
Bold:True Font:Bold
Button@FROMCD: Button@FROMCD:
Id:FROMCD Id:FROMCD
X:PARENT_RIGHT - 420 X:PARENT_RIGHT - 420
@@ -53,7 +53,7 @@ Background@INIT_CHOOSEINSTALL:
Height:25 Height:25
Text:From CD Text:From CD
Visible:false Visible:false
Bold:True Font:Bold
Button@QUIT: Button@QUIT:
Id:QUIT Id:QUIT
X:PARENT_RIGHT - 140 X:PARENT_RIGHT - 140
@@ -61,7 +61,7 @@ Background@INIT_CHOOSEINSTALL:
Width:120 Width:120
Height:25 Height:25
Text:Quit Text:Quit
Bold:True Font:Bold
Background@INIT_DOWNLOAD: Background@INIT_DOWNLOAD:
Id:INIT_DOWNLOAD Id:INIT_DOWNLOAD
@@ -77,7 +77,7 @@ Background@INIT_DOWNLOAD:
Height:25 Height:25
Text:Downloading Red Alert Content Text:Downloading Red Alert Content
Align:Center Align:Center
Bold:True Font:Bold
ProgressBar@PROGRESS: ProgressBar@PROGRESS:
Id:PROGRESS Id:PROGRESS
X:50 X:50
@@ -99,7 +99,7 @@ Background@INIT_DOWNLOAD:
Height:25 Height:25
Visible: false Visible: false
Text:Retry Text:Retry
Bold:True Font:Bold
Button@CANCEL: Button@CANCEL:
Id:CANCEL Id:CANCEL
X:PARENT_RIGHT - 140 X:PARENT_RIGHT - 140
@@ -107,7 +107,7 @@ Background@INIT_DOWNLOAD:
Width:120 Width:120
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold
Button@EXTRACT: Button@EXTRACT:
Id:EXTRACT Id:EXTRACT
X:PARENT_RIGHT - 140 X:PARENT_RIGHT - 140
@@ -116,7 +116,7 @@ Background@INIT_DOWNLOAD:
Height:25 Height:25
Visible: false Visible: false
Text:Extract Text:Extract
Bold:True Font:Bold
Background@INIT_COPY: Background@INIT_COPY:
Id:INIT_COPY Id:INIT_COPY
@@ -132,7 +132,7 @@ Background@INIT_COPY:
Height:25 Height:25
Text:Copying Red Alert Content Text:Copying Red Alert Content
Align:Center Align:Center
Bold:True Font:Bold
ProgressBar@PROGRESS: ProgressBar@PROGRESS:
Id:PROGRESS Id:PROGRESS
X:50 X:50
@@ -154,7 +154,7 @@ Background@INIT_COPY:
Height:25 Height:25
Visible: false Visible: false
Text:Retry Text:Retry
Bold:True Font:Bold
Button@CANCEL: Button@CANCEL:
Id:CANCEL Id:CANCEL
X:PARENT_RIGHT - 140 X:PARENT_RIGHT - 140
@@ -162,4 +162,4 @@ Background@INIT_COPY:
Width:120 Width:120
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold

View File

@@ -13,7 +13,7 @@ Background@SERVER_LOBBY:
Align:Center Align:Center
Width:800 Width:800
Height:20 Height:20
Bold:True Font:Bold
Text:OpenRA Multiplayer Lobby Text:OpenRA Multiplayer Lobby
Background@LOBBY_MAP_BG: Background@LOBBY_MAP_BG:
X:PARENT_RIGHT-268 X:PARENT_RIGHT-268
@@ -106,7 +106,7 @@ Background@SERVER_LOBBY:
X:160 X:160
Y:0 Y:0
Align:Center Align:Center
Bold:True Font:Bold
Container@TEMPLATE_REMOTE: Container@TEMPLATE_REMOTE:
Id:TEMPLATE_REMOTE Id:TEMPLATE_REMOTE
X:5 X:5
@@ -129,7 +129,7 @@ Background@SERVER_LOBBY:
Height:23 Height:23
X:125 X:125
Y:2 Y:2
Bold:Yes Font:Bold
ColorBlock@COLOR: ColorBlock@COLOR:
Id:COLOR Id:COLOR
X:165 X:165
@@ -178,7 +178,7 @@ Background@SERVER_LOBBY:
X:160 X:160
Y:0 Y:0
Align:Center Align:Center
Bold:True Font:Bold
Container@TEMPLATE_EMPTY: Container@TEMPLATE_EMPTY:
Id:TEMPLATE_EMPTY Id:TEMPLATE_EMPTY
X:5 X:5
@@ -209,7 +209,7 @@ Background@SERVER_LOBBY:
X:160 X:160
Y:0 Y:0
Align:Center Align:Center
Bold:True Font:Bold
Container@TEMPLATE_EMPTY_HOST: Container@TEMPLATE_EMPTY_HOST:
Id:TEMPLATE_EMPTY_HOST Id:TEMPLATE_EMPTY_HOST
X:5 X:5
@@ -240,7 +240,7 @@ Background@SERVER_LOBBY:
X:160 X:160
Y:0 Y:0
Align:Center Align:Center
Bold:True Font:Bold
Container@LABEL_CONTAINER: Container@LABEL_CONTAINER:
X:25 X:25
Y:40 Y:40
@@ -253,7 +253,7 @@ Background@SERVER_LOBBY:
Y:0 Y:0
Text:Name Text:Name
Align:Center Align:Center
Bold:True Font:Bold
Label@LABEL_LOBBY_COLOR: Label@LABEL_LOBBY_COLOR:
Id:LABEL_LOBBY_COLOR Id:LABEL_LOBBY_COLOR
Width:80 Width:80
@@ -262,7 +262,7 @@ Background@SERVER_LOBBY:
Y:0 Y:0
Text:Color Text:Color
Align:Center Align:Center
Bold:True Font:Bold
Label@LABEL_LOBBY_FACTION: Label@LABEL_LOBBY_FACTION:
Id:LABEL_LOBBY_FACTION Id:LABEL_LOBBY_FACTION
Width:130 Width:130
@@ -271,7 +271,7 @@ Background@SERVER_LOBBY:
Y:0 Y:0
Text:Faction Text:Faction
Align:Center Align:Center
Bold:True Font:Bold
Label@LABEL_LOBBY_TEAM: Label@LABEL_LOBBY_TEAM:
Id:LABEL_LOBBY_TEAM Id:LABEL_LOBBY_TEAM
Width:48 Width:48
@@ -280,7 +280,7 @@ Background@SERVER_LOBBY:
Y:0 Y:0
Text:Team Text:Team
Align:Center Align:Center
Bold:True Font:Bold
Label@LABEL_LOBBY_STATUS: Label@LABEL_LOBBY_STATUS:
Id:LABEL_LOBBY_STATUS Id:LABEL_LOBBY_STATUS
X:448 X:448
@@ -289,7 +289,7 @@ Background@SERVER_LOBBY:
Height:25 Height:25
Text:Ready Text:Ready
Align:Left Align:Left
Bold:True Font:Bold
Button@CHANGEMAP_BUTTON: Button@CHANGEMAP_BUTTON:
Id:CHANGEMAP_BUTTON Id:CHANGEMAP_BUTTON
X:PARENT_RIGHT-154 X:PARENT_RIGHT-154
@@ -297,7 +297,7 @@ Background@SERVER_LOBBY:
Width:120 Width:120
Height:25 Height:25
Text:Change Map Text:Change Map
Bold:True Font:Bold
ChatDisplay@CHAT_DISPLAY: ChatDisplay@CHAT_DISPLAY:
Id:CHAT_DISPLAY Id:CHAT_DISPLAY
X:20 X:20
@@ -326,7 +326,7 @@ Background@SERVER_LOBBY:
Width:120 Width:120
Height:25 Height:25
Text:Start Game Text:Start Game
Bold:True Font:Bold
Button@DISCONNECT_BUTTON: Button@DISCONNECT_BUTTON:
Id:DISCONNECT_BUTTON Id:DISCONNECT_BUTTON
X:PARENT_RIGHT-154 X:PARENT_RIGHT-154
@@ -334,7 +334,7 @@ Background@SERVER_LOBBY:
Width:120 Width:120
Height:25 Height:25
Text:Disconnect Text:Disconnect
Bold:True Font:Bold
Checkbox@LOCKTEAMS_CHECKBOX: Checkbox@LOCKTEAMS_CHECKBOX:
Id:LOCKTEAMS_CHECKBOX Id:LOCKTEAMS_CHECKBOX
X: PARENT_RIGHT-154 X: PARENT_RIGHT-154
@@ -362,7 +362,7 @@ Background@COLOR_CHOOSER:
Width:90 Width:90
Height:25 Height:25
Text:Ok Text:Ok
Bold:True Font:Bold
ShpImage@FACT: ShpImage@FACT:
Id:FACT Id:FACT
X:220 X:220
@@ -442,7 +442,7 @@ Background@MAP_CHOOSER:
Width:800 Width:800
Height:20 Height:20
Text:Choose Map Text:Choose Map
Bold:True Font:Bold
ScrollPanel@MAP_LIST: ScrollPanel@MAP_LIST:
Id:MAP_LIST Id:MAP_LIST
X:20 X:20
@@ -487,16 +487,16 @@ Background@MAP_CHOOSER:
Y:0 Y:0
Text:Title Text:Title
Align:Center Align:Center
Bold:True Font:Bold
Label@PLAYERS: Label@PLAYERS:
Text:Players Text:Players
Bold:true Font:Bold
Width:50 Width:50
X:304 X:304
Height:25 Height:25
Label@TYPE: Label@TYPE:
Text:Type Text:Type
Bold:true Font:Bold
Width:50 Width:50
X:420 X:420
Height:25 Height:25
@@ -527,7 +527,7 @@ Background@MAP_CHOOSER:
Width:70 Width:70
Height:20 Height:20
Text:Title: Text:Title:
Bold:True Font:Bold
Label@CURMAP_TITLE: Label@CURMAP_TITLE:
Id:CURMAP_TITLE Id:CURMAP_TITLE
X:75 X:75
@@ -543,7 +543,7 @@ Background@MAP_CHOOSER:
Width:70 Width:70
Height:20 Height:20
Text:Author: Text:Author:
Bold:True Font:Bold
Label@CURMAP_AUTHOR: Label@CURMAP_AUTHOR:
Id:CURMAP_AUTHOR Id:CURMAP_AUTHOR
X:75 X:75
@@ -560,7 +560,7 @@ Background@MAP_CHOOSER:
Width:70 Width:70
Height:20 Height:20
Text:Size: Text:Size:
Bold:True Font:Bold
Label@CURMAP_SIZE: Label@CURMAP_SIZE:
Id:CURMAP_SIZE Id:CURMAP_SIZE
X:75 X:75
@@ -576,7 +576,7 @@ Background@MAP_CHOOSER:
Width:70 Width:70
Height:20 Height:20
Text:Theater: Text:Theater:
Bold:True Font:Bold
Label@CURMAP_THEATER: Label@CURMAP_THEATER:
Id:CURMAP_THEATER Id:CURMAP_THEATER
X:75 X:75
@@ -592,7 +592,7 @@ Background@MAP_CHOOSER:
Width:70 Width:70
Height:20 Height:20
Text:Players: Text:Players:
Bold:True Font:Bold
Label@CURMAP_PLAYERS: Label@CURMAP_PLAYERS:
Id:CURMAP_PLAYERS Id:CURMAP_PLAYERS
X:75 X:75
@@ -608,7 +608,7 @@ Background@MAP_CHOOSER:
Width:70 Width:70
Height:20 Height:20
Text:Desc: Text:Desc:
Bold:True Font:Bold
Label@CURMAP_DESC: Label@CURMAP_DESC:
Id:CURMAP_DESC Id:CURMAP_DESC
X:75 X:75
@@ -624,7 +624,7 @@ Background@MAP_CHOOSER:
Width:120 Width:120
Height:25 Height:25
Text:Ok Text:Ok
Bold:True Font:Bold
Button@BUTTON_CANCEL: Button@BUTTON_CANCEL:
Id:BUTTON_CANCEL Id:BUTTON_CANCEL
X:PARENT_RIGHT-154 X:PARENT_RIGHT-154
@@ -632,7 +632,7 @@ Background@MAP_CHOOSER:
Width:120 Width:120
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold
Button@BUTTON_INSTALL: Button@BUTTON_INSTALL:
Id:BUTTON_INSTALL Id:BUTTON_INSTALL
X:20 X:20
@@ -640,4 +640,4 @@ Background@MAP_CHOOSER:
Width:120 Width:120
Height:25 Height:25
Text:Install Map Text:Install Map
Bold:True Font:Bold

View File

@@ -42,7 +42,7 @@ Container@INGAME_ROOT:
Width:200 Width:200
Height:40 Height:40
Align:Center Align:Center
Bold:True Font:Bold
SpecialPowerBin@INGAME_POWERS_BIN: SpecialPowerBin@INGAME_POWERS_BIN:
Id:INGAME_POWERS_BIN Id:INGAME_POWERS_BIN
X:0 X:0
@@ -60,7 +60,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Options Text:Options
Bold:True Font:Bold
Button@INGAME_DIPLOMACY_BUTTON: Button@INGAME_DIPLOMACY_BUTTON:
Id:INGAME_DIPLOMACY_BUTTON Id:INGAME_DIPLOMACY_BUTTON
X:162 X:162
@@ -68,7 +68,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Diplomacy Text:Diplomacy
Bold:True Font:Bold
Button@INGAME_DEVELOPERMODE_BUTTON: Button@INGAME_DEVELOPERMODE_BUTTON:
Id:INGAME_DEVELOPERMODE_BUTTON Id:INGAME_DEVELOPERMODE_BUTTON
X:324 X:324
@@ -77,7 +77,7 @@ Container@INGAME_ROOT:
Height:25 Height:25
Text:Developer Mode Text:Developer Mode
Visible:false Visible:false
Bold:True Font:Bold
RadarBin@INGAME_RADAR_BIN: RadarBin@INGAME_RADAR_BIN:
Id:INGAME_RADAR_BIN Id:INGAME_RADAR_BIN
WorldInteractionController:INTERACTION_CONTROLLER WorldInteractionController:INTERACTION_CONTROLLER
@@ -138,7 +138,7 @@ Container@INGAME_ROOT:
Height:25 Height:25
Text:Options Text:Options
Align:Center Align:Center
Bold:True Font:Bold
Button@RESUME: Button@RESUME:
Id:RESUME Id:RESUME
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -146,7 +146,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Resume Text:Resume
Bold:True Font:Bold
Button@SETTINGS: Button@SETTINGS:
Id:SETTINGS Id:SETTINGS
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -154,7 +154,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Settings Text:Settings
Bold:True Font:Bold
Button@MUSIC: Button@MUSIC:
Id:MUSIC Id:MUSIC
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -162,7 +162,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Music Text:Music
Bold:True Font:Bold
Button@SURRENDER: Button@SURRENDER:
Id:SURRENDER Id:SURRENDER
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -170,7 +170,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Surrender Text:Surrender
Bold:True Font:Bold
Button@DISCONNECT: Button@DISCONNECT:
Id:DISCONNECT Id:DISCONNECT
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -178,7 +178,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Disconnect Text:Disconnect
Bold:True Font:Bold
Button@QUIT: Button@QUIT:
Id:QUIT Id:QUIT
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -186,7 +186,7 @@ Container@INGAME_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Quit Text:Quit
Bold:True Font:Bold
Background@DIPLOMACY_BG: Background@DIPLOMACY_BG:
Id:DIPLOMACY_BG Id:DIPLOMACY_BG
Delegate:DiplomacyDelegate Delegate:DiplomacyDelegate
@@ -204,7 +204,7 @@ Container@INGAME_ROOT:
Height:25 Height:25
Text:Diplomacy Text:Diplomacy
Align:Center Align:Center
Bold:True Font:Bold
ChatDisplay@CHAT_DISPLAY: ChatDisplay@CHAT_DISPLAY:
Id:CHAT_DISPLAY Id:CHAT_DISPLAY
X:250 X:250
@@ -319,7 +319,6 @@ Container@INGAME_ROOT:
Height:200 Height:200
Label@TEXT: Label@TEXT:
Id:TEXT Id:TEXT
Bold: false
X:20 X:20
Y:205 Y:205
Width:170 Width:170
@@ -359,7 +358,7 @@ Container@OBSERVER_ROOT:
Width:200 Width:200
Height:40 Height:40
Align:Center Align:Center
Bold:True Font:Bold
SpecialPowerBin@INGAME_POWERS_BIN: SpecialPowerBin@INGAME_POWERS_BIN:
Id:INGAME_POWERS_BIN Id:INGAME_POWERS_BIN
X:0 X:0
@@ -371,7 +370,7 @@ Container@OBSERVER_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Options Text:Options
Bold:True Font:Bold
WorldTooltip: WorldTooltip:
Background@INGAME_OPTIONS_BG: Background@INGAME_OPTIONS_BG:
Id:INGAME_OPTIONS_BG Id:INGAME_OPTIONS_BG
@@ -389,7 +388,7 @@ Container@OBSERVER_ROOT:
Height:25 Height:25
Text:Options Text:Options
Align:Center Align:Center
Bold:True Font:Bold
Button@RESUME: Button@RESUME:
Id:RESUME Id:RESUME
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -397,7 +396,7 @@ Container@OBSERVER_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Resume Text:Resume
Bold:True Font:Bold
Button@SETTINGS: Button@SETTINGS:
Id:SETTINGS Id:SETTINGS
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -405,7 +404,7 @@ Container@OBSERVER_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Settings Text:Settings
Bold:True Font:Bold
Button@MUSIC: Button@MUSIC:
Id:MUSIC Id:MUSIC
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -413,7 +412,7 @@ Container@OBSERVER_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Music Text:Music
Bold:True Font:Bold
Button@SURRENDER: Button@SURRENDER:
Id:SURRENDER Id:SURRENDER
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -421,7 +420,7 @@ Container@OBSERVER_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Surrender Text:Surrender
Bold:True Font:Bold
Button@DISCONNECT: Button@DISCONNECT:
Id:DISCONNECT Id:DISCONNECT
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -429,7 +428,7 @@ Container@OBSERVER_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Disconnect Text:Disconnect
Bold:True Font:Bold
Button@QUIT: Button@QUIT:
Id:QUIT Id:QUIT
X:(PARENT_RIGHT - WIDTH)/2 X:(PARENT_RIGHT - WIDTH)/2
@@ -437,7 +436,7 @@ Container@OBSERVER_ROOT:
Width:160 Width:160
Height:25 Height:25
Text:Quit Text:Quit
Bold:True Font:Bold
ChatDisplay@CHAT_DISPLAY: ChatDisplay@CHAT_DISPLAY:
Id:CHAT_DISPLAY Id:CHAT_DISPLAY
X:250 X:250
@@ -470,7 +469,6 @@ Container@OBSERVER_ROOT:
Height:200 Height:200
Label@TEXT: Label@TEXT:
Id:TEXT Id:TEXT
Bold: false
X:20 X:20
Y:205 Y:205
Width:170 Width:170

View File

@@ -15,7 +15,7 @@ Background@MAINMENU_BG:
Height:25 Height:25
Text:OpenRA Main Menu Text:OpenRA Main Menu
Align:Center Align:Center
Bold:True Font:Bold
Button@MAINMENU_BUTTON_JOIN: Button@MAINMENU_BUTTON_JOIN:
Id:MAINMENU_BUTTON_JOIN Id:MAINMENU_BUTTON_JOIN
X:45 X:45
@@ -23,7 +23,7 @@ Background@MAINMENU_BG:
Width:160 Width:160
Height:25 Height:25
Text:Join Game Text:Join Game
Bold:True Font:Bold
Button@MAINMENU_BUTTON_CREATE: Button@MAINMENU_BUTTON_CREATE:
Id:MAINMENU_BUTTON_CREATE Id:MAINMENU_BUTTON_CREATE
X:45 X:45
@@ -31,7 +31,7 @@ Background@MAINMENU_BG:
Width:160 Width:160
Height:25 Height:25
Text:Create Game Text:Create Game
Bold:True Font:Bold
Button@MAINMENU_BUTTON_SETTINGS: Button@MAINMENU_BUTTON_SETTINGS:
Id:MAINMENU_BUTTON_SETTINGS Id:MAINMENU_BUTTON_SETTINGS
X:45 X:45
@@ -39,7 +39,7 @@ Background@MAINMENU_BG:
Width:160 Width:160
Height:25 Height:25
Text:Settings Text:Settings
Bold:True Font:Bold
Button@MAINMENU_BUTTON_MUSIC: Button@MAINMENU_BUTTON_MUSIC:
Id:MAINMENU_BUTTON_MUSIC Id:MAINMENU_BUTTON_MUSIC
X:45 X:45
@@ -47,15 +47,15 @@ Background@MAINMENU_BG:
Width:160 Width:160
Height:25 Height:25
Text:Music Text:Music
Bold:True Font:Bold
Button@MAINMENU_BUTTON_REPLAY_VIEWER: Button@MAINMENU_BUTTON_REPLAY_VIEWER:
Id:MAINMENU_BUTTON_REPLAY_VIEWER Id:MAINMENU_BUTTON_REPLAY_VIEWER
X:45 X:45
Y:230 Y:230
Width:160 Width:160
Height:25 Height:25
Text: Replay Viewer Text:Replay Viewer
Bold: True Font:Bold
Button@MAINMENU_BUTTON_QUIT: Button@MAINMENU_BUTTON_QUIT:
Id:MAINMENU_BUTTON_QUIT Id:MAINMENU_BUTTON_QUIT
X:45 X:45
@@ -63,7 +63,7 @@ Background@MAINMENU_BG:
Width:160 Width:160
Height:25 Height:25
Text:Quit Text:Quit
Bold:True Font:Bold
Button@MAINMENU_BUTTON_VIDEOPLAYER: Button@MAINMENU_BUTTON_VIDEOPLAYER:
Id:MAINMENU_BUTTON_VIDEOPLAYER Id:MAINMENU_BUTTON_VIDEOPLAYER
Visible:false Visible:false
@@ -72,7 +72,7 @@ Background@MAINMENU_BG:
Width:200 Width:200
Height:25 Height:25
Text:Video Player Text:Video Player
Bold:True Font:Bold
Background@QUICKMODSWITCHER: Background@QUICKMODSWITCHER:
Id:QUICKMODSWITCHER Id:QUICKMODSWITCHER
Background: dialog4 Background: dialog4
@@ -88,7 +88,7 @@ Background@QUICKMODSWITCHER:
Height:25 Height:25
Text:Mod: Text:Mod:
Align:Left Align:Left
Bold:True Font:Bold
DropDownButton@SWITCHER: DropDownButton@SWITCHER:
Id:SWITCHER Id:SWITCHER
Text:Team Text:Team
@@ -103,7 +103,7 @@ Background@QUICKMODSWITCHER:
Width:150 Width:150
Height:25 Height:25
Align:Center Align:Center
Bold:True Font:Bold
Background@PERF_BG: Background@PERF_BG:
ClickThrough:true ClickThrough:true
Id:PERF_BG Id:PERF_BG
@@ -122,7 +122,6 @@ Background@PERF_BG:
Height:200 Height:200
Label@TEXT: Label@TEXT:
Id:TEXT Id:TEXT
Bold: false
X:20 X:20
Y:205 Y:205
Width:170 Width:170
@@ -144,7 +143,7 @@ Background@MUSIC_MENU:
Height:25 Height:25
Text:Music Text:Music
Align:Center Align:Center
Bold:True Font:Bold
Button@BUTTON_INSTALL: Button@BUTTON_INSTALL:
Id:BUTTON_INSTALL Id:BUTTON_INSTALL
X:20 X:20
@@ -152,7 +151,7 @@ Background@MUSIC_MENU:
Width:160 Width:160
Height:25 Height:25
Text:Install Music Text:Install Music
Bold:True Font:Bold
Button@BUTTON_CLOSE: Button@BUTTON_CLOSE:
Id:BUTTON_CLOSE Id:BUTTON_CLOSE
X:PARENT_RIGHT - 180 X:PARENT_RIGHT - 180
@@ -160,7 +159,7 @@ Background@MUSIC_MENU:
Width:160 Width:160
Height:25 Height:25
Text:Close Text:Close
Bold:True Font:Bold
Container@BUTTONS: Container@BUTTONS:
X:PARENT_RIGHT - 150 X:PARENT_RIGHT - 150
Y:50 Y:50

View File

@@ -14,7 +14,7 @@ Background@REPLAYBROWSER_BG:
Height:25 Height:25
Text:Choose Replay Text:Choose Replay
Align:Center Align:Center
Bold:True Font:Bold
ScrollPanel@REPLAY_LIST: ScrollPanel@REPLAY_LIST:
Id:REPLAY_LIST Id:REPLAY_LIST
X:20 X:20
@@ -51,7 +51,7 @@ Background@REPLAYBROWSER_BG:
Width:70 Width:70
Height:20 Height:20
Text:Map: Text:Map:
Bold:True Font:Bold
Label@MAP_TITLE: Label@MAP_TITLE:
Id:MAP_TITLE Id:MAP_TITLE
X:PARENT_RIGHT - 195 X:PARENT_RIGHT - 195
@@ -67,7 +67,7 @@ Background@REPLAYBROWSER_BG:
Width:70 Width:70
Height:20 Height:20
Text:Duration: Text:Duration:
Bold:True Font:Bold
Label@DURATION: Label@DURATION:
Id:DURATION Id:DURATION
X:PARENT_RIGHT - 195 X:PARENT_RIGHT - 195
@@ -82,7 +82,7 @@ Background@REPLAYBROWSER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Watch Text:Watch
Bold:True Font:Bold
Button@CANCEL_BUTTON: Button@CANCEL_BUTTON:
Id:CANCEL_BUTTON Id:CANCEL_BUTTON
X:PARENT_RIGHT - 140 X:PARENT_RIGHT - 140
@@ -90,4 +90,4 @@ Background@REPLAYBROWSER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold

View File

@@ -14,7 +14,7 @@ Background@CREATESERVER_BG:
Height:25 Height:25
Text:Create Server Text:Create Server
Align:Center Align:Center
Bold:True Font:Bold
Label@GAME_TITLE_LABEL: Label@GAME_TITLE_LABEL:
Id:GAME_TITLE_LABEL Id:GAME_TITLE_LABEL
X:50 X:50
@@ -76,7 +76,7 @@ Background@CREATESERVER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Create Text:Create
Bold:True Font:Bold
Button@BUTTON_CANCEL: Button@BUTTON_CANCEL:
Id:BUTTON_CANCEL Id:BUTTON_CANCEL
X:260 X:260
@@ -84,7 +84,7 @@ Background@CREATESERVER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold
Background@JOINSERVER_BG: Background@JOINSERVER_BG:
Id:JOINSERVER_BG Id:JOINSERVER_BG
Delegate:ServerBrowserDelegate Delegate:ServerBrowserDelegate
@@ -101,7 +101,7 @@ Background@JOINSERVER_BG:
Height:25 Height:25
Text:Join Server Text:Join Server
Align:Center Align:Center
Bold:True Font:Bold
ScrollPanel@SERVER_LIST: ScrollPanel@SERVER_LIST:
Id:SERVER_LIST Id:SERVER_LIST
X:20 X:20
@@ -147,7 +147,7 @@ Background@JOINSERVER_BG:
Width:70 Width:70
Height:20 Height:20
Text:Server: Text:Server:
Bold:True Font:Bold
Label@SERVER_IP: Label@SERVER_IP:
Id:SERVER_IP Id:SERVER_IP
X:PARENT_RIGHT - 195 X:PARENT_RIGHT - 195
@@ -163,7 +163,7 @@ Background@JOINSERVER_BG:
Width:70 Width:70
Height:20 Height:20
Text:Players: Text:Players:
Bold:True Font:Bold
Label@MAP_PLAYERS: Label@MAP_PLAYERS:
Id:MAP_PLAYERS Id:MAP_PLAYERS
X:PARENT_RIGHT - 195 X:PARENT_RIGHT - 195
@@ -179,7 +179,7 @@ Background@JOINSERVER_BG:
Width:70 Width:70
Height:20 Height:20
Text:Map: Text:Map:
Bold:True Font:Bold
Label@MAP_TITLE: Label@MAP_TITLE:
Id:MAP_TITLE Id:MAP_TITLE
X:PARENT_RIGHT - 195 X:PARENT_RIGHT - 195
@@ -195,7 +195,7 @@ Background@JOINSERVER_BG:
Width:70 Width:70
Height:20 Height:20
Text:Mods: Text:Mods:
Bold:True Font:Bold
Label@SERVER_MODS: Label@SERVER_MODS:
Id:SERVER_MODS Id:SERVER_MODS
X:PARENT_RIGHT - 195 X:PARENT_RIGHT - 195
@@ -211,7 +211,7 @@ Background@JOINSERVER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Direct Connect Text:Direct Connect
Bold:True Font:Bold
Button@REFRESH_BUTTON: Button@REFRESH_BUTTON:
Id:REFRESH_BUTTON Id:REFRESH_BUTTON
X:160 X:160
@@ -219,7 +219,7 @@ Background@JOINSERVER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Refresh Text:Refresh
Bold:True Font:Bold
Button@JOIN_BUTTON: Button@JOIN_BUTTON:
Id:JOIN_BUTTON Id:JOIN_BUTTON
X:PARENT_RIGHT - 140 - 130 X:PARENT_RIGHT - 140 - 130
@@ -227,7 +227,7 @@ Background@JOINSERVER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Join Text:Join
Bold:True Font:Bold
Button@CANCEL_BUTTON: Button@CANCEL_BUTTON:
Id:CANCEL_BUTTON Id:CANCEL_BUTTON
X:PARENT_RIGHT - 140 X:PARENT_RIGHT - 140
@@ -235,7 +235,7 @@ Background@JOINSERVER_BG:
Width:120 Width:120
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold
Background@DIRECTCONNECT_BG: Background@DIRECTCONNECT_BG:
Id:DIRECTCONNECT_BG Id:DIRECTCONNECT_BG
Delegate:DirectConnectDelegate Delegate:DirectConnectDelegate
@@ -252,7 +252,7 @@ Background@DIRECTCONNECT_BG:
Height:25 Height:25
Text:Direct Connect Text:Direct Connect
Align:Center Align:Center
Bold:True Font:Bold
Label@ADDRESS_LABEL: Label@ADDRESS_LABEL:
Id:ADDRESS_LABEL Id:ADDRESS_LABEL
X:50 X:50
@@ -275,7 +275,7 @@ Background@DIRECTCONNECT_BG:
Width:120 Width:120
Height:25 Height:25
Text:Join Text:Join
Bold:True Font:Bold
Button@CANCEL_BUTTON: Button@CANCEL_BUTTON:
Id:CANCEL_BUTTON Id:CANCEL_BUTTON
X:260 X:260
@@ -283,7 +283,7 @@ Background@DIRECTCONNECT_BG:
Width:120 Width:120
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold
Background@CONNECTION_FAILED_BG: Background@CONNECTION_FAILED_BG:
Id:CONNECTION_FAILED_BG Id:CONNECTION_FAILED_BG
Delegate:ConnectionFailedDelegate Delegate:ConnectionFailedDelegate
@@ -300,7 +300,7 @@ Background@CONNECTION_FAILED_BG:
Height:25 Height:25
Text:Connection Failed Text:Connection Failed
Align:Center Align:Center
Bold:True Font:Bold
Label@CONNECTION_FAILED_DESC: Label@CONNECTION_FAILED_DESC:
Id:CONNECTION_FAILED_DESC Id:CONNECTION_FAILED_DESC
X:0 X:0
@@ -316,7 +316,7 @@ Background@CONNECTION_FAILED_BG:
Width:160 Width:160
Height:25 Height:25
Text:Retry Text:Retry
Bold:True Font:Bold
Button@CONNECTION_BUTTON_CANCEL: Button@CONNECTION_BUTTON_CANCEL:
Id:CONNECTION_BUTTON_CANCEL Id:CONNECTION_BUTTON_CANCEL
X:PARENT_RIGHT - 180 X:PARENT_RIGHT - 180
@@ -324,7 +324,7 @@ Background@CONNECTION_FAILED_BG:
Width:160 Width:160
Height:25 Height:25
Text:Cancel Text:Cancel
Bold:True Font:Bold
Background@CONNECTING_BG: Background@CONNECTING_BG:
Id:CONNECTING_BG Id:CONNECTING_BG
Delegate:ConnectionDialogsDelegate Delegate:ConnectionDialogsDelegate
@@ -341,7 +341,7 @@ Background@CONNECTING_BG:
Height:25 Height:25
Text:Connecting Text:Connecting
Align:Center Align:Center
Bold:True Font:Bold
Label@CONNECTING_DESC: Label@CONNECTING_DESC:
Id:CONNECTING_DESC Id:CONNECTING_DESC
X:0 X:0
@@ -357,4 +357,4 @@ Background@CONNECTING_BG:
Width:160 Width:160
Height:25 Height:25
Text:Abort Text:Abort
Bold:True Font:Bold

View File

@@ -14,7 +14,7 @@ Background@SETTINGS_MENU:
Height:25 Height:25
Text:Settings Text:Settings
Align:Center Align:Center
Bold:True Font:Bold
Button@BUTTON_CLOSE: Button@BUTTON_CLOSE:
Id:BUTTON_CLOSE Id:BUTTON_CLOSE
X:PARENT_RIGHT - 180 X:PARENT_RIGHT - 180
@@ -22,7 +22,7 @@ Background@SETTINGS_MENU:
Width:160 Width:160
Height:25 Height:25
Text:Close Text:Close
Bold:True Font:Bold
Container@TAB_CONTAINER: Container@TAB_CONTAINER:
Id:TAB_CONTAINER Id:TAB_CONTAINER
X:0 X:0
@@ -37,7 +37,7 @@ Background@SETTINGS_MENU:
Width:90 Width:90
Height:25 Height:25
Text:General Text:General
Bold:True Font:Bold
Button@AUDIO: Button@AUDIO:
Id:AUDIO Id:AUDIO
X:135 X:135
@@ -45,7 +45,7 @@ Background@SETTINGS_MENU:
Width:90 Width:90
Height:25 Height:25
Text:Audio Text:Audio
Bold:True Font:Bold
Button@DISPLAY: Button@DISPLAY:
Id:DISPLAY Id:DISPLAY
X:225 X:225
@@ -53,7 +53,7 @@ Background@SETTINGS_MENU:
Width:90 Width:90
Height:25 Height:25
Text:Display Text:Display
Bold:True Font:Bold
Button@DEBUG: Button@DEBUG:
Id:DEBUG Id:DEBUG
X:315 X:315
@@ -61,7 +61,7 @@ Background@SETTINGS_MENU:
Width:90 Width:90
Height:25 Height:25
Text:Debug Text:Debug
Bold:True Font:Bold
Container@GENERAL_PANE: Container@GENERAL_PANE:
Id:GENERAL_PANE Id:GENERAL_PANE
X:37 X:37

View File

@@ -13,7 +13,7 @@ Background@VIDEOPLAYER_MENU:
Width:PARENT_RIGHT Width:PARENT_RIGHT
Height:20 Height:20
Text:Video Player Text:Video Player
Bold:True Font:Bold
VqaPlayer: VqaPlayer:
Id:VIDEOPLAYER Id:VIDEOPLAYER
X:30 X:30
@@ -72,4 +72,4 @@ Background@VIDEOPLAYER_MENU:
Width:160 Width:160
Height:25 Height:25
Text:Close Text:Close
Bold:True Font:Bold