epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize ButtonWidgets

Browse Source
This commit is contained in:
Paul Chote
2011-05-16 21:57:41 +12:00
parent 3eb3ae76f0
commit eb8aafced0
33 changed files with 224 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Cnc.Widgets
pathCheckbox.OnClick = () => Order(world, "DevPathDebug");
panel.GetWidget<CncMenuButtonWidget>("GIVE_CASH_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("GIVE_CASH_BUTTON").OnClick = () =>
world.IssueOrder(new Order("DevGiveCash", world.LocalPlayer.PlayerActor, false));
var fastBuildCheckbox = panel.GetWidget<CncCheckboxWidget>("INSTANT_BUILD_CHECKBOX");
@@ -66,10 +66,10 @@ namespace OpenRA.Mods.Cnc.Widgets
buildAnywhereCheckbox.IsChecked = () => devTrait.BuildAnywhere;
buildAnywhereCheckbox.OnClick = () => Order(world, "DevBuildAnywhere");
panel.GetWidget<CncMenuButtonWidget>("GIVE_EXPLORATION_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("GIVE_EXPLORATION_BUTTON").OnClick = () =>
world.IssueOrder(new Order("DevGiveExploration", world.LocalPlayer.PlayerActor, false));
panel.GetWidget<CncMenuButtonWidget>("CLOSE_BUTTON").OnClick = Widget.CloseWindow;
panel.GetWidget<ButtonWidget>("CLOSE_BUTTON").OnClick = Widget.CloseWindow;
}
public void Order(World world, string order)

6
OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Mods.Cnc.Widgets
}
var panel = widget.GetWidget("CONNECTING_PANEL");
panel.GetWidget<CncMenuButtonWidget>("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); };
panel.GetWidget<ButtonWidget>("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); };
widget.GetWidget<LabelWidget>("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<CncMenuButtonWidget>("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); };
panel.GetWidget<CncMenuButtonWidget>("RETRY_BUTTON").OnClick = () => { Widget.CloseWindow(); onRetry(); };
panel.GetWidget<ButtonWidget>("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); };
panel.GetWidget<ButtonWidget>("RETRY_BUTTON").OnClick = () => { Widget.CloseWindow(); onRetry(); };
widget.GetWidget<LabelWidget>("CONNECTING_DESC").GetText = () =>
"Could not connect to {0}:{1}".F(host, port);

20
OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs
View File

@@ -55,8 +55,8 @@ namespace OpenRA.Mods.Cnc.Widgets
if (world.LocalPlayer != null)
widget.GetWidget("PLAYER_WIDGETS").IsVisible = () => true;
ingameRoot.GetWidget<CncMenuButtonWidget>("DIPLOMACY_BUTTON").IsDisabled = () => true;
ingameRoot.GetWidget<CncMenuButtonWidget>("OPTIONS_BUTTON").OnClick = () =>
ingameRoot.GetWidget<ButtonWidget>("DIPLOMACY_BUTTON").IsDisabled = () => true;
ingameRoot.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("CHEATS_BUTTON");
var cheatsButton = ingameRoot.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("QUIT_BUTTON").OnClick = () =>
menu.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("SURRENDER_BUTTON");
var surrenderButton = menu.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("MUSIC_BUTTON").OnClick = () =>
menu.GetWidget<ButtonWidget>("MUSIC_BUTTON").OnClick = () =>
{
hideButtons = true;
Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs()
@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Cnc.Widgets
});
};
menu.GetWidget<CncMenuButtonWidget>("PREFERENCES_BUTTON").OnClick = () =>
menu.GetWidget<ButtonWidget>("PREFERENCES_BUTTON").OnClick = () =>
{
hideButtons = true;
Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs()
@@ -136,7 +136,7 @@ namespace OpenRA.Mods.Cnc.Widgets
});
};
menu.GetWidget<CncMenuButtonWidget>("RESUME_BUTTON").OnClick = () =>
menu.GetWidget<ButtonWidget>("RESUME_BUTTON").OnClick = () =>
{
Widget.RootWidget.RemoveChild(menu);
world.WorldActor.Trait<DesaturatedPaletteEffect>().Active = false;
@@ -151,13 +151,13 @@ namespace OpenRA.Mods.Cnc.Widgets
prompt.GetWidget<LabelWidget>("PROMPT_TITLE").GetText = () => title;
prompt.GetWidget<LabelWidget>("PROMPT_TEXT").GetText = () => text;
prompt.GetWidget<CncMenuButtonWidget>("CONFIRM_BUTTON").OnClick = () =>
prompt.GetWidget<ButtonWidget>("CONFIRM_BUTTON").OnClick = () =>
{
prompt.IsVisible = () => false;
onConfirm();
};
prompt.GetWidget<CncMenuButtonWidget>("CANCEL_BUTTON").OnClick = () =>
prompt.GetWidget<ButtonWidget>("CANCEL_BUTTON").OnClick = () =>
{
prompt.IsVisible = () => false;
onCancel();

16
OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs
View File

@@ -35,16 +35,16 @@ namespace OpenRA.Mods.Cnc.Widgets
{ "installData", installData }
};
panel.GetWidget<CncMenuButtonWidget>("DOWNLOAD_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("DOWNLOAD_BUTTON").OnClick = () =>
Widget.OpenWindow("INSTALL_DOWNLOAD_PANEL", args);
panel.GetWidget<CncMenuButtonWidget>("INSTALL_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("INSTALL_BUTTON").OnClick = () =>
Widget.OpenWindow("INSTALL_FROMCD_PANEL", args);
panel.GetWidget<CncMenuButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;
panel.GetWidget<ButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;
// TODO:
panel.GetWidget<CncMenuButtonWidget>("MODS_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("MODS_BUTTON").OnClick = () =>
{
Widget.OpenWindow("MODS_PANEL", new WidgetArgs()
{
@@ -72,11 +72,11 @@ namespace OpenRA.Mods.Cnc.Widgets
progressBar = panel.GetWidget<ProgressBarWidget>("PROGRESS_BAR");
statusLabel = panel.GetWidget<LabelWidget>("STATUS_LABEL");
var backButton = panel.GetWidget<CncMenuButtonWidget>("BACK_BUTTON");
var backButton = panel.GetWidget<ButtonWidget>("BACK_BUTTON");
backButton.OnClick = Widget.CloseWindow;
backButton.IsVisible = () => false;
var retryButton = panel.GetWidget<CncMenuButtonWidget>("RETRY_BUTTON");
var retryButton = panel.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("RETRY_BUTTON");
var retryButton = panel.GetWidget<ButtonWidget>("RETRY_BUTTON");
retryButton.IsVisible = () => false;
var cancelButton = panel.GetWidget<CncMenuButtonWidget>("CANCEL_BUTTON");
var cancelButton = panel.GetWidget<ButtonWidget>("CANCEL_BUTTON");
// Save the package to a temp file
var file = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());

12
OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs
View File

@@ -186,7 +186,7 @@ namespace OpenRA.Mods.Cnc.Widgets
CountryNames = Rules.Info["world"].Traits.WithInterface<OpenRA.Traits.CountryInfo>().ToDictionary(a => a.Race, a => a.Name);
CountryNames.Add("random", "Random");
var mapButton = lobby.GetWidget<CncMenuButtonWidget>("CHANGEMAP_BUTTON");
var mapButton = lobby.GetWidget<ButtonWidget>("CHANGEMAP_BUTTON");
mapButton.OnClick = () =>
{
var onSelect = new Action<Map>(m =>
@@ -205,7 +205,7 @@ namespace OpenRA.Mods.Cnc.Widgets
};
mapButton.IsVisible = () => mapButton.Visible && Game.IsHost;
var disconnectButton = lobby.GetWidget<CncMenuButtonWidget>("DISCONNECT_BUTTON");
var disconnectButton = lobby.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("START_GAME_BUTTON");
var startGameButton = lobby.GetWidget<ButtonWidget>("START_GAME_BUTTON");
startGameButton.IsVisible = () => Game.IsHost;
startGameButton.IsDisabled = () => gameStarting;
startGameButton.OnClick = () =>
@@ -254,7 +254,7 @@ namespace OpenRA.Mods.Cnc.Widgets
chatPanel = lobby.GetWidget<CncScrollPanelWidget>("CHAT_DISPLAY");
chatTemplate = chatPanel.GetWidget("CHAT_TEMPLATE");
lobby.GetWidget<CncMenuButtonWidget>("MUSIC_BUTTON").OnClick = () =>
lobby.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("SAVE_BUTTON").OnClick = () => onSelect(ramp);
panel.GetWidget<CncMenuButtonWidget>("RANDOM_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("SAVE_BUTTON").OnClick = () => onSelect(ramp);
panel.GetWidget<ButtonWidget>("RANDOM_BUTTON").OnClick = () =>
{
var hue = (byte)Game.CosmeticRandom.Next(255);
var sat = (byte)Game.CosmeticRandom.Next(255);

8
OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs
View File

@@ -45,11 +45,11 @@ namespace OpenRA.Mods.Cnc.Widgets
panel.GetWidget<LabelWidget>("CURMAP_THEATER").GetText = () => Rules.TileSets[map.Tileset].Name;
panel.GetWidget<LabelWidget>("CURMAP_PLAYERS").GetText = () => map.PlayerCount.ToString();
panel.GetWidget<CncMenuButtonWidget>("BUTTON_OK").OnClick = () => { Widget.CloseWindow(); onSelect(map); };
panel.GetWidget<CncMenuButtonWidget>("BUTTON_CANCEL").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("BUTTON_OK").OnClick = () => { Widget.CloseWindow(); onSelect(map); };
panel.GetWidget<ButtonWidget>("BUTTON_CANCEL").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<CncMenuButtonWidget>("BUTTON_INSTALL").IsDisabled = () => true;
panel.GetWidget<CncMenuButtonWidget>("BUTTON_INSTALL").OnClick = () => InstallMap();
panel.GetWidget<ButtonWidget>("BUTTON_INSTALL").IsDisabled = () => true;
panel.GetWidget<ButtonWidget>("BUTTON_INSTALL").OnClick = () => InstallMap();
scrollpanel = panel.GetWidget<ScrollPanelWidget>("MAP_LIST");
itemTemplate = scrollpanel.GetWidget<ScrollItemWidget>("MAP_TEMPLATE");

44
OpenRA.Mods.Cnc/Widgets/CncMenuButton.cs
View File

@@ -16,47 +16,7 @@ using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets
{
public class CncMenuButtonWidget : ButtonWidget
{
public Func<bool> 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()

26
OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs
View File

@@ -44,10 +44,10 @@ namespace OpenRA.Mods.Cnc.Widgets
var mainMenu = widget.GetWidget("MAIN_MENU");
mainMenu.IsVisible = () => Menu == MenuType.Main;
mainMenu.GetWidget<CncMenuButtonWidget>("SOLO_BUTTON").OnClick = StartSkirmishGame;
mainMenu.GetWidget<CncMenuButtonWidget>("MULTIPLAYER_BUTTON").OnClick = () => Menu = MenuType.Multiplayer;
mainMenu.GetWidget<ButtonWidget>("SOLO_BUTTON").OnClick = StartSkirmishGame;
mainMenu.GetWidget<ButtonWidget>("MULTIPLAYER_BUTTON").OnClick = () => Menu = MenuType.Multiplayer;
mainMenu.GetWidget<CncMenuButtonWidget>("REPLAYS_BUTTON").OnClick = () =>
mainMenu.GetWidget<ButtonWidget>("REPLAYS_BUTTON").OnClick = () =>
{
Menu = MenuType.None;
Widget.OpenWindow("REPLAYBROWSER_PANEL", new WidgetArgs()
@@ -57,15 +57,15 @@ namespace OpenRA.Mods.Cnc.Widgets
});
};
mainMenu.GetWidget<CncMenuButtonWidget>("SETTINGS_BUTTON").OnClick = () => Menu = MenuType.Settings;
mainMenu.GetWidget<CncMenuButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;
mainMenu.GetWidget<ButtonWidget>("SETTINGS_BUTTON").OnClick = () => Menu = MenuType.Settings;
mainMenu.GetWidget<ButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;
// Multiplayer menu
var multiplayerMenu = widget.GetWidget("MULTIPLAYER_MENU");
multiplayerMenu.IsVisible = () => Menu == MenuType.Multiplayer;
multiplayerMenu.GetWidget<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => Menu = MenuType.Main;
multiplayerMenu.GetWidget<CncMenuButtonWidget>("JOIN_BUTTON").OnClick = () =>
multiplayerMenu.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => Menu = MenuType.Main;
multiplayerMenu.GetWidget<ButtonWidget>("JOIN_BUTTON").OnClick = () =>
{
Menu = MenuType.None;
Widget.OpenWindow("SERVERBROWSER_PANEL", new WidgetArgs()
@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Cnc.Widgets
});
};
multiplayerMenu.GetWidget<CncMenuButtonWidget>("CREATE_BUTTON").OnClick = () =>
multiplayerMenu.GetWidget<ButtonWidget>("CREATE_BUTTON").OnClick = () =>
{
Menu = MenuType.None;
Widget.OpenWindow("CREATESERVER_PANEL", new WidgetArgs()
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Cnc.Widgets
});
};
multiplayerMenu.GetWidget<CncMenuButtonWidget>("DIRECTCONNECT_BUTTON").OnClick = () =>
multiplayerMenu.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("MODS_BUTTON").OnClick = () =>
settingsMenu.GetWidget<ButtonWidget>("MODS_BUTTON").OnClick = () =>
{
Menu = MenuType.None;
Widget.OpenWindow("MODS_PANEL", new WidgetArgs()
@@ -109,7 +109,7 @@ namespace OpenRA.Mods.Cnc.Widgets
});
};
settingsMenu.GetWidget<CncMenuButtonWidget>("MUSIC_BUTTON").OnClick = () =>
settingsMenu.GetWidget<ButtonWidget>("MUSIC_BUTTON").OnClick = () =>
{
Menu = MenuType.None;
Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs()
@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Cnc.Widgets
});
};
settingsMenu.GetWidget<CncMenuButtonWidget>("PREFERENCES_BUTTON").OnClick = () =>
settingsMenu.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => Menu = MenuType.Main;
settingsMenu.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => Menu = MenuType.Main;
}
void RemoveShellmapUI()

4
OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{
var panel = widget.GetWidget("MODS_PANEL");
var modList = panel.GetWidget<ScrollPanelWidget>("MOD_LIST");
var loadButton = panel.GetWidget<CncMenuButtonWidget>("LOAD_BUTTON");
var loadButton = panel.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
currentMod = Mod.AllMods[Game.modData.Manifest.Mods[0]];
// Mod list

18
OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Cnc.Widgets
installed = Rules.Music.Where(m => m.Value.Exists).Any();
Func<bool> noMusic = () => !installed;
panel.GetWidget<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
Action<string> afterInstall = path =>
{
@@ -57,30 +57,30 @@ namespace OpenRA.Mods.Cnc.Widgets
BuildMusicTable(panel);
};
var installButton = panel.GetWidget<CncMenuButtonWidget>("INSTALL_BUTTON");
var installButton = panel.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("BUTTON_PLAY");
var playButton = panel.GetWidget<ButtonWidget>("BUTTON_PLAY");
playButton.OnClick = Play;
playButton.IsDisabled = noMusic;
var pauseButton = panel.GetWidget<CncMenuButtonWidget>("BUTTON_PAUSE");
var pauseButton = panel.GetWidget<ButtonWidget>("BUTTON_PAUSE");
pauseButton.OnClick = Pause;
pauseButton.IsDisabled = noMusic;
var stopButton = panel.GetWidget<CncMenuButtonWidget>("BUTTON_STOP");
var stopButton = panel.GetWidget<ButtonWidget>("BUTTON_STOP");
stopButton.OnClick = Stop;
stopButton.IsDisabled = noMusic;
var nextButton = panel.GetWidget<CncMenuButtonWidget>("BUTTON_NEXT");
var nextButton = panel.GetWidget<ButtonWidget>("BUTTON_NEXT");
nextButton.OnClick = () => { currentSong = GetNextSong(); Play(); };
nextButton.IsDisabled = noMusic;
var prevButton = panel.GetWidget<CncMenuButtonWidget>("BUTTON_PREV");
var prevButton = panel.GetWidget<ButtonWidget>("BUTTON_PREV");
prevButton.OnClick = () => { currentSong = GetPrevSong(); Play(); };
prevButton.IsDisabled = noMusic;
@@ -194,11 +194,11 @@ namespace OpenRA.Mods.Cnc.Widgets
progressBar = panel.GetWidget<ProgressBarWidget>("PROGRESS_BAR");
statusLabel = panel.GetWidget<LabelWidget>("STATUS_LABEL");
var backButton = panel.GetWidget<CncMenuButtonWidget>("BACK_BUTTON");
var backButton = panel.GetWidget<ButtonWidget>("BACK_BUTTON");
backButton.OnClick = Widget.CloseWindow;
backButton.IsVisible = () => false;
var retryButton = panel.GetWidget<CncMenuButtonWidget>("RETRY_BUTTON");
var retryButton = panel.GetWidget<ButtonWidget>("RETRY_BUTTON");
retryButton.OnClick = PromptForCD;
retryButton.IsVisible = () => false;

4
OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{
panel = widget.GetWidget("REPLAYBROWSER_PANEL");
panel.GetWidget<CncMenuButtonWidget>("CANCEL_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("CANCEL_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
var rl = panel.GetWidget<ScrollPanelWidget>("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<CncMenuButtonWidget>("WATCH_BUTTON");
var watch = panel.GetWidget<ButtonWidget>("WATCH_BUTTON");
watch.IsDisabled = () => currentSummary == null || currentMap == null || currentSummary.Duration == 0;
watch.OnClick = () =>
{

10
OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs
View File

@@ -92,7 +92,7 @@ namespace OpenRA.Mods.Cnc.Widgets
var sl = panel.GetWidget<ScrollPanelWidget>("SERVER_LIST");
// Menu buttons
var refreshButton = panel.GetWidget<CncMenuButtonWidget>("REFRESH_BUTTON");
var refreshButton = panel.GetWidget<ButtonWidget>("REFRESH_BUTTON");
refreshButton.IsDisabled = () => refreshing;
refreshButton.OnClick = () =>
{
@@ -103,7 +103,7 @@ namespace OpenRA.Mods.Cnc.Widgets
refreshing = true;
};
var join = panel.GetWidget<CncMenuButtonWidget>("JOIN_BUTTON");
var join = panel.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
// Server list
serverTemplate = sl.GetWidget<ScrollItemWidget>("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<CncMenuButtonWidget>("JOIN_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
}
}
}

6
OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs
View File

@@ -34,10 +34,10 @@ namespace OpenRA.Mods.Cnc.Widgets
this.onExit = onExit;
var settings = Game.Settings;
panel.GetWidget<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<CncMenuButtonWidget>("CREATE_BUTTON").OnClick = CreateAndJoin;
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };
panel.GetWidget<ButtonWidget>("CREATE_BUTTON").OnClick = CreateAndJoin;
panel.GetWidget<CncMenuButtonWidget>("MAP_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("MAP_BUTTON").OnClick = () =>
{
Widget.OpenWindow("MAPCHOOSER_PANEL", new WidgetArgs()
{

8
OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Cnc.Widgets
var panel = widget.GetWidget("SETTINGS_PANEL");
// General pane
var generalButton = panel.GetWidget<CncMenuButtonWidget>("GENERAL_BUTTON");
var generalButton = panel.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("INPUT_BUTTON");
var inputButton = panel.GetWidget<ButtonWidget>("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<CncMenuButtonWidget>("CANCEL_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("CANCEL_BUTTON").OnClick = () =>
{
Widget.CloseWindow();
onExit();
};
panel.GetWidget<CncMenuButtonWidget>("SAVE_BUTTON").OnClick = () =>
panel.GetWidget<ButtonWidget>("SAVE_BUTTON").OnClick = () =>
{
var s = Game.Settings;
s.Player.Name = nameTextfield.Text;