diff --git a/OpenRA.Game/Widgets/ScrollPanelWidget.cs b/OpenRA.Game/Widgets/ScrollPanelWidget.cs index 78451ec2f0..0db97d52bf 100644 --- a/OpenRA.Game/Widgets/ScrollPanelWidget.cs +++ b/OpenRA.Game/Widgets/ScrollPanelWidget.cs @@ -137,7 +137,6 @@ namespace OpenRA.Widgets } int2 lastMouseLocation; - // TODO: ScrollPanelWidget doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { if (mi.Button == MouseButton.WheelDown) diff --git a/OpenRA.Game/Widgets/SliderWidget.cs b/OpenRA.Game/Widgets/SliderWidget.cs index 8eabe61400..c1c29bc6e6 100755 --- a/OpenRA.Game/Widgets/SliderWidget.cs +++ b/OpenRA.Game/Widgets/SliderWidget.cs @@ -68,7 +68,6 @@ namespace OpenRA.Widgets Offset = ((newOffset - Little) / Spread).Clamp(0f, 1f); } - // TODO: SliderWidget doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { if (mi.Button != MouseButton.Left) diff --git a/OpenRA.Game/Widgets/TextFieldWidget.cs b/OpenRA.Game/Widgets/TextFieldWidget.cs index a136e77c18..9561c8623c 100644 --- a/OpenRA.Game/Widgets/TextFieldWidget.cs +++ b/OpenRA.Game/Widgets/TextFieldWidget.cs @@ -58,7 +58,6 @@ namespace OpenRA.Widgets return lose; } - // TODO: TextFieldWidgets don't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { if (IsDisabled()) diff --git a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs b/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs index 0c2e822c9a..5988e6d472 100755 --- a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs +++ b/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs @@ -34,7 +34,6 @@ namespace OpenRA.Widgets protected ViewportScrollControllerWidget(ViewportScrollControllerWidget widget) : base(widget) {} public override void DrawInner() {} - // TODO: ViewportScrollController doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { var scrolltype = Game.Settings.Game.MouseScroll; diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index fa3fd0502f..70b0e29455 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -25,8 +25,8 @@ namespace OpenRA.Widgets public string Y = "0"; public string Width = "0"; public string Height = "0"; - public string Delegate = null; - public IWidgetDelegate DelegateObject {get; private set;} + public string Logic = null; + public object LogicObject { get; private set; } public bool Visible = true; public readonly List Children = new List(); @@ -61,7 +61,7 @@ namespace OpenRA.Widgets Y = widget.Y; Width = widget.Width; Height = widget.Height; - Delegate = widget.Delegate; + Logic = widget.Logic; Visible = widget.Visible; Bounds = widget.Bounds; @@ -126,13 +126,13 @@ namespace OpenRA.Widgets public void PostInit(WidgetArgs args) { - if (Delegate == null) + if (Logic == null) return; args["widget"] = this; - DelegateObject = Game.modData.ObjectCreator.CreateObject(Delegate, args); - var iwd = DelegateObject as IWidgetDelegateEx; + LogicObject = Game.modData.ObjectCreator.CreateObject(Logic, args); + var iwd = LogicObject as ILogicWithInit; if (iwd != null) iwd.Init(); @@ -229,7 +229,7 @@ namespace OpenRA.Widgets // TODO: Solve this properly public virtual bool HandleMouseInput(MouseInput mi) { - // Apply any special logic added by delegates; they return true if they caught the input + // Apply any special logic added by event handlers; they return true if they caught the input if (mi.Event == MouseInputEvent.Down && OnMouseDown(mi)) return true; if (mi.Event == MouseInputEvent.Up && OnMouseUp(mi)) return true; if (mi.Event == MouseInputEvent.Move) @@ -252,7 +252,7 @@ namespace OpenRA.Widgets // Do any widgety behavior (enter text etc) var handled = HandleKeyPressInner(e); - // Apply any special logic added by delegates; they return true if they caught the input + // Apply any special logic added by event handlers; they return true if they caught the input if (OnKeyPress(e)) return true; return handled; @@ -372,10 +372,9 @@ namespace OpenRA.Widgets public void Add(string key, Action val) { base.Add(key, val); } } - public interface IWidgetDelegate { } - - // TODO: This can die once ra init is sane - [Obsolete] public interface IWidgetDelegateEx : IWidgetDelegate + // TODO: you should use this anywhere you want to do + // something in a logic ctor, but retain debuggability. + public interface ILogicWithInit { void Init(); } diff --git a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs index 871b939cf7..f0e3ed19ab 100644 --- a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs +++ b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs @@ -57,7 +57,6 @@ namespace OpenRA.Widgets int2 dragStart, dragEnd; - // TODO: WorldInteractionController doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { var xy = Game.viewport.ViewToWorldPx(mi); diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 3d55428839..f46017fb24 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -1,4 +1,4 @@ - + Debug @@ -70,26 +70,26 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - + + @@ -121,8 +121,4 @@ copy "$(TargetPath)" "$(SolutionDir)mods/cnc/" cd "$(SolutionDir)" - - - - \ No newline at end of file diff --git a/OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs similarity index 97% rename from OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs index 47ec0155e0..e110ac7989 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncCheatsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs @@ -22,9 +22,9 @@ using System; using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncCheatsLogic : IWidgetDelegate + public class CncCheatsLogic { [ObjectCreator.UseCtor] public CncCheatsLogic([ObjectCreator.Param] Widget widget, diff --git a/OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs similarity index 94% rename from OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs index 069fe43863..f74b50ad5e 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncConnectionLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs @@ -12,9 +12,9 @@ using System; using OpenRA.Network; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncConnectingLogic : IWidgetDelegate + public class CncConnectingLogic { static bool staticSetup; Action onConnect, onRetry, onAbort; @@ -27,7 +27,7 @@ namespace OpenRA.Mods.Cnc.Widgets if (panel == null) return; - var handler = panel.DelegateObject as CncConnectingLogic; + var handler = panel.LogicObject as CncConnectingLogic; if (handler == null) return; @@ -95,7 +95,7 @@ namespace OpenRA.Mods.Cnc.Widgets } } - public class CncConnectionFailedLogic : IWidgetDelegate + public class CncConnectionFailedLogic { [ObjectCreator.UseCtor] public CncConnectionFailedLogic([ObjectCreator.Param] Widget widget, diff --git a/OpenRA.Mods.Cnc/Widgets/CncDiplomacyLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncDiplomacyLogic.cs old mode 100755 new mode 100644 similarity index 93% rename from OpenRA.Mods.Cnc/Widgets/CncDiplomacyLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncDiplomacyLogic.cs index 1e1d82bffb..e24a207dc0 --- a/OpenRA.Mods.Cnc/Widgets/CncDiplomacyLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncDiplomacyLogic.cs @@ -9,17 +9,13 @@ #endregion using System; -using System.Drawing; -using OpenRA.Mods.RA; -using OpenRA.Widgets; -using OpenRA.Mods.RA.Activities; -using OpenRA.Traits; using System.Linq; -using System.Collections.Generic; +using OpenRA.Traits; +using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncDiplomacyLogic : IWidgetDelegate + public class CncDiplomacyLogic { World world; diff --git a/OpenRA.Mods.Cnc/Widgets/CncDownloadPackagesLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncDownloadPackagesLogic.cs old mode 100755 new mode 100644 similarity index 97% rename from OpenRA.Mods.Cnc/Widgets/CncDownloadPackagesLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncDownloadPackagesLogic.cs index d2801c3eab..ad999a9c51 --- a/OpenRA.Mods.Cnc/Widgets/CncDownloadPackagesLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncDownloadPackagesLogic.cs @@ -17,9 +17,9 @@ using System.Net; using OpenRA.FileFormats; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncDownloadPackagesLogic : IWidgetDelegate + public class CncDownloadPackagesLogic { Widget panel; Dictionary installData; diff --git a/OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs old mode 100755 new mode 100644 similarity index 93% rename from OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs index 5f5ad59bda..a02ca22234 --- a/OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs @@ -8,16 +8,13 @@ */ #endregion -using System; using System.Drawing; -using OpenRA.Mods.RA; -using OpenRA.Widgets; -using OpenRA.Mods.RA.Activities; using System.Linq; +using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncIngameChromeLogic : IWidgetDelegate + public class CncIngameChromeLogic { enum MenuType { None, Diplomacy, Cheats } MenuType menu = MenuType.None; @@ -31,7 +28,7 @@ namespace OpenRA.Mods.Cnc.Widgets if (panel == null) return; - var handler = panel.DelegateObject as CncIngameChromeLogic; + var handler = panel.LogicObject as CncIngameChromeLogic; if (handler == null) return; diff --git a/OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs old mode 100755 new mode 100644 similarity index 96% rename from OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs index 4416aafbc6..d665e4af06 --- a/OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs @@ -9,14 +9,12 @@ #endregion using System; -using System.Drawing; -using OpenRA.Mods.RA; -using OpenRA.Widgets; using OpenRA.Mods.RA.Activities; +using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncIngameMenuLogic : IWidgetDelegate + public class CncIngameMenuLogic { Widget menu; diff --git a/OpenRA.Mods.Cnc/Widgets/CncInstallFromCDLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs old mode 100755 new mode 100644 similarity index 97% rename from OpenRA.Mods.Cnc/Widgets/CncInstallFromCDLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs index b184439f37..82bf77c908 --- a/OpenRA.Mods.Cnc/Widgets/CncInstallFromCDLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs @@ -16,9 +16,9 @@ using OpenRA.FileFormats; using OpenRA.FileFormats.Graphics; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncInstallFromCDLogic : IWidgetDelegate + public class CncInstallFromCDLogic { Widget panel; ProgressBarWidget progressBar; diff --git a/OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallLogic.cs old mode 100755 new mode 100644 similarity index 94% rename from OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncInstallLogic.cs index db64c390b4..7e31f56a81 --- a/OpenRA.Mods.Cnc/Widgets/CncInstallLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallLogic.cs @@ -12,9 +12,9 @@ using System; using System.Collections.Generic; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncInstallLogic : IWidgetDelegate + public class CncInstallLogic { [ObjectCreator.UseCtor] public CncInstallLogic([ObjectCreator.Param] Widget widget, diff --git a/OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs old mode 100755 new mode 100644 similarity index 99% rename from OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs index 50d7f2a1ae..5ecfa3a8a7 --- a/OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs @@ -18,9 +18,9 @@ using OpenRA.Network; using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncLobbyLogic : IWidgetDelegate + public class CncLobbyLogic { Widget LocalPlayerTemplate, RemotePlayerTemplate, EmptySlotTemplate, EmptySlotTemplateHost; ScrollPanelWidget chatPanel; @@ -44,7 +44,7 @@ namespace OpenRA.Mods.Cnc.Widgets if (panel == null) return null; - return panel.DelegateObject as CncLobbyLogic; + return panel.LogicObject as CncLobbyLogic; } static void LobbyInfoChangedStub() @@ -588,7 +588,7 @@ namespace OpenRA.Mods.Cnc.Widgets } } - public class CncColorPickerLogic : IWidgetDelegate + public class CncColorPickerLogic { ColorRamp ramp; [ObjectCreator.UseCtor] diff --git a/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs similarity index 97% rename from OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs index 41b163eb7b..213077a454 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs @@ -11,12 +11,11 @@ using System; using System.IO; using System.Linq; -using OpenRA.Graphics; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncMapChooserLogic : IWidgetDelegate + public class CncMapChooserLogic { Map map; Widget scrollpanel; diff --git a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs old mode 100755 new mode 100644 similarity index 97% rename from OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs index 05ea6b17fb..579d4a9dc3 --- a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs @@ -10,12 +10,11 @@ using System.Linq; using System.Net; -using OpenRA.Mods.RA; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncMenuLogic : IWidgetDelegate + public class CncMenuLogic { enum MenuType { diff --git a/OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncModBrowserLogic.cs similarity index 94% rename from OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncModBrowserLogic.cs index 889c0f7968..90b143780f 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncModBrowserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncModBrowserLogic.cs @@ -12,12 +12,11 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.FileFormats; -using OpenRA.Graphics; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncModBrowserLogic : IWidgetDelegate + public class CncModBrowserLogic { Mod currentMod; diff --git a/OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs similarity index 98% rename from OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs index 349c23a627..0759cdb941 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncMusicPlayerLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs @@ -15,13 +15,12 @@ using System.Threading; using OpenRA.FileFormats; using OpenRA.FileFormats.Graphics; using OpenRA.GameRules; -using OpenRA.Graphics; using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncMusicPlayerLogic : IWidgetDelegate + public class CncMusicPlayerLogic { bool installed; MusicInfo currentSong = null; @@ -185,7 +184,7 @@ namespace OpenRA.Mods.Cnc.Widgets } - public class CncInstallMusicLogic : IWidgetDelegate + public class CncInstallMusicLogic { Widget panel; ProgressBarWidget progressBar; diff --git a/OpenRA.Mods.Cnc/Widgets/CncPerfDebugLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncPerfDebugLogic.cs similarity index 91% rename from OpenRA.Mods.Cnc/Widgets/CncPerfDebugLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncPerfDebugLogic.cs index 9abc3d6dbc..f5e3ac4e6e 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncPerfDebugLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncPerfDebugLogic.cs @@ -8,13 +8,12 @@ */ #endregion -using System; using OpenRA.Support; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncPerfDebugLogic : IWidgetDelegate + public class CncPerfDebugLogic { [ObjectCreator.UseCtor] public CncPerfDebugLogic([ObjectCreator.Param] Widget widget) diff --git a/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncReplayBrowserLogic.cs similarity index 95% rename from OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncReplayBrowserLogic.cs index 13ddac03d7..ef87e705c1 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncReplayBrowserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncReplayBrowserLogic.cs @@ -11,13 +11,12 @@ using System; using System.IO; using System.Linq; -using OpenRA.Graphics; -using OpenRA.Mods.RA.Widgets.Delegates; +using OpenRA.Mods.RA.Widgets.Logic; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncReplayBrowserLogic : IWidgetDelegate + public class CncReplayBrowserLogic { Widget panel; diff --git a/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs similarity index 94% rename from OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs index 0e97a4bcf9..faf39bfbbd 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncServerBrowserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs @@ -11,13 +11,13 @@ using System; using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.RA.Widgets.Delegates; +using OpenRA.Mods.RA.Widgets.Logic; using OpenRA.Network; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncServerBrowserLogic : IWidgetDelegate + public class CncServerBrowserLogic { GameServer currentServer; ScrollItemWidget serverTemplate; @@ -67,7 +67,7 @@ namespace OpenRA.Mods.Cnc.Widgets }; var join = panel.GetWidget("JOIN_BUTTON"); - join.IsDisabled = () => currentServer == null || !ServerBrowserDelegate.CanJoin(currentServer); + join.IsDisabled = () => currentServer == null || !ServerBrowserLogic.CanJoin(currentServer); join.OnClick = () => { if (currentServer == null) @@ -100,7 +100,7 @@ namespace OpenRA.Mods.Cnc.Widgets var infoPanel = panel.GetWidget("SERVER_INFO"); infoPanel.IsVisible = () => currentServer != null; infoPanel.GetWidget("SERVER_IP").GetText = () => currentServer.Address; - infoPanel.GetWidget("SERVER_MODS").GetText = () => ServerBrowserDelegate.GenerateModsLabel(currentServer); + infoPanel.GetWidget("SERVER_MODS").GetText = () => ServerBrowserLogic.GenerateModsLabel(currentServer); infoPanel.GetWidget("MAP_TITLE").GetText = () => (CurrentMap() != null) ? CurrentMap().Title : "Unknown"; infoPanel.GetWidget("MAP_PLAYERS").GetText = () => GetPlayersLabel(currentServer); @@ -142,7 +142,7 @@ namespace OpenRA.Mods.Cnc.Widgets return; } - var gamesWaiting = games.Where(g => ServerBrowserDelegate.CanJoin(g)); + var gamesWaiting = games.Where(g => ServerBrowserLogic.CanJoin(g)); if (gamesWaiting.Count() == 0) { @@ -172,7 +172,7 @@ namespace OpenRA.Mods.Cnc.Widgets } } - public class CncDirectConnectLogic : IWidgetDelegate + public class CncDirectConnectLogic { [ObjectCreator.UseCtor] public CncDirectConnectLogic([ObjectCreator.Param] Widget widget, diff --git a/OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs similarity index 97% rename from OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs index 1eced5335d..164903f29b 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs @@ -14,9 +14,9 @@ using System.Net; using OpenRA.GameRules; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncServerCreationLogic : IWidgetDelegate + public class CncServerCreationLogic { Widget panel; Action onCreate; diff --git a/OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs old mode 100755 new mode 100644 similarity index 99% rename from OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs index b61042cdf8..d842b872ae --- a/OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs @@ -10,22 +10,22 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; using OpenRA.FileFormats; using OpenRA.FileFormats.Graphics; using OpenRA.GameRules; using OpenRA.Widgets; -namespace OpenRA.Mods.Cnc.Widgets +namespace OpenRA.Mods.Cnc.Widgets.Logic { - public class CncSettingsLogic : IWidgetDelegate + public class CncSettingsLogic { enum PanelType { General, Input } + PanelType Settings = PanelType.General; ColorRamp playerColor; Modifiers groupAddModifier; diff --git a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs b/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs index 93fee06eb3..d0f6168894 100644 --- a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs +++ b/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.FileFormats; using OpenRA.Graphics; -using OpenRA.Mods.RA.Widgets.Delegates; +using OpenRA.Mods.RA.Widgets.Logic; using OpenRA.Traits; namespace OpenRA.Mods.RA @@ -42,7 +42,7 @@ namespace OpenRA.Mods.RA public void AdjustPalette(Dictionary palettes) { palettes["colorpicker"] = new Palette(palettes["colorpicker"], - new PlayerColorRemap(LobbyDelegate.CurrentColorPreview, format)); + new PlayerColorRemap(LobbyLogic.CurrentColorPreview, format)); } } } diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index dd83ab07df..0cc401c1a1 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -1,4 +1,4 @@ - + Debug @@ -260,9 +260,9 @@ - - - + + + @@ -277,7 +277,7 @@ - + @@ -308,17 +308,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -328,7 +328,7 @@ - + diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs index 75e48f890b..20d783d1f1 100755 --- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs @@ -157,7 +157,6 @@ namespace OpenRA.Mods.RA.Widgets return DoBuildingHotkey(e.KeyName, world); } - // TODO: BuildPaletteWidget doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { if (mi.Event != MouseInputEvent.Down) diff --git a/OpenRA.Mods.RA/Widgets/GameInitInfoWidget.cs b/OpenRA.Mods.RA/Widgets/GameInitInfoWidget.cs index 205ef02b43..77fd3b6792 100755 --- a/OpenRA.Mods.RA/Widgets/GameInitInfoWidget.cs +++ b/OpenRA.Mods.RA/Widgets/GameInitInfoWidget.cs @@ -9,9 +9,6 @@ #endregion using OpenRA.Widgets; -using System; -using OpenRA.Mods.RA.Widgets.Delegates; -using System.IO; namespace OpenRA.Mods.RA.Widgets { diff --git a/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/ConnectionDialogsLogic.cs similarity index 88% rename from OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/ConnectionDialogsLogic.cs index dfb314efce..0ec988f166 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ConnectionDialogsLogic.cs @@ -11,12 +11,12 @@ using OpenRA.Network; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class ConnectionDialogsDelegate : IWidgetDelegate + public class ConnectionDialogsLogic { [ObjectCreator.UseCtor] - public ConnectionDialogsDelegate( + public ConnectionDialogsLogic( [ObjectCreator.Param] Widget widget, [ObjectCreator.Param] string host, [ObjectCreator.Param] int port ) @@ -35,10 +35,10 @@ namespace OpenRA.Mods.RA.Widgets.Delegates } } - public class ConnectionFailedDelegate : IWidgetDelegate + public class ConnectionFailedLogic { [ObjectCreator.UseCtor] - public ConnectionFailedDelegate( + public ConnectionFailedLogic( [ObjectCreator.Param] Widget widget, [ObjectCreator.Param] OrderManager orderManager) { diff --git a/OpenRA.Mods.RA/Widgets/Delegates/CreateServerMenuDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/CreateServerMenuLogic.cs similarity index 90% rename from OpenRA.Mods.RA/Widgets/Delegates/CreateServerMenuDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/CreateServerMenuLogic.cs index 6003d33b57..177cda76be 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/CreateServerMenuDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/CreateServerMenuLogic.cs @@ -13,12 +13,12 @@ using System.Net; using OpenRA.Widgets; using OpenRA.GameRules; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class CreateServerMenuDelegate : IWidgetDelegate + public class CreateServerMenuLogic { [ObjectCreator.UseCtor] - public CreateServerMenuDelegate( [ObjectCreator.Param( "widget" )] Widget cs ) + public CreateServerMenuLogic( [ObjectCreator.Param( "widget" )] Widget cs ) { var settings = Game.Settings; diff --git a/OpenRA.Mods.RA/Widgets/Delegates/DeveloperModeDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs similarity index 95% rename from OpenRA.Mods.RA/Widgets/Delegates/DeveloperModeDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs index 44043ca6bd..f25f0a1772 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/DeveloperModeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs @@ -23,12 +23,12 @@ using OpenRA; using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class DeveloperModeDelegate : IWidgetDelegate + public class DeveloperModeLogic { [ObjectCreator.UseCtor] - public DeveloperModeDelegate( [ObjectCreator.Param] World world ) + public DeveloperModeLogic( [ObjectCreator.Param] World world ) { var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); var devModeButton = Widget.RootWidget.GetWidget("INGAME_DEVELOPERMODE_BUTTON"); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs similarity index 96% rename from OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs index c12167848f..b071420557 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs @@ -15,9 +15,9 @@ using System.Linq; using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class DiplomacyDelegate : IWidgetDelegate + public class DiplomacyLogic { static List controls = new List(); @@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates readonly World world; [ObjectCreator.UseCtor] - public DiplomacyDelegate( [ObjectCreator.Param] World world ) + public DiplomacyLogic( [ObjectCreator.Param] World world ) { this.world = world; var root = Widget.RootWidget.GetWidget("INGAME_ROOT"); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/GameInitLogic.cs old mode 100755 new mode 100644 similarity index 77% rename from OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/GameInitLogic.cs index c82c7e6418..9ee83ff5fc --- a/OpenRA.Mods.RA/Widgets/Delegates/GameInitDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/GameInitLogic.cs @@ -17,51 +17,49 @@ using OpenRA.FileFormats; using OpenRA.Network; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class GameInitDelegate : IWidgetDelegateEx + public class GameInitLogic : ILogicWithInit { GameInitInfoWidget Info; [ObjectCreator.UseCtor] - public GameInitDelegate([ObjectCreator.Param] Widget widget) + public GameInitLogic([ObjectCreator.Param] Widget widget) { Info = (widget as GameInitInfoWidget); } - public void Init() - { - if (Info.InstallMode != "cnc") - { - Game.ConnectionStateChanged += orderManager => - { - Widget.CloseWindow(); - switch (orderManager.Connection.ConnectionState) - { - case ConnectionState.PreConnecting: - Widget.LoadWidget("MAINMENU_BG", Widget.RootWidget, new WidgetArgs()); - break; - case ConnectionState.Connecting: - Widget.OpenWindow("CONNECTING_BG", - new WidgetArgs() { { "host", orderManager.Host }, { "port", orderManager.Port } }); - break; - case ConnectionState.NotConnected: - Widget.OpenWindow("CONNECTION_FAILED_BG", - new WidgetArgs() { { "orderManager", orderManager } }); - break; - case ConnectionState.Connected: - var lobby = Game.OpenWindow(orderManager.world, "SERVER_LOBBY"); - lobby.GetWidget("CHAT_DISPLAY").ClearChat(); - lobby.GetWidget("CHANGEMAP_BUTTON").Visible = true; - lobby.GetWidget("LOCKTEAMS_CHECKBOX").Visible = true; - lobby.GetWidget("ALLOWCHEATS_CHECKBOX").Visible = true; - lobby.GetWidget("DISCONNECT_BUTTON").Visible = true; - break; - } - }; - } + void ILogicWithInit.Init() + { + Game.ConnectionStateChanged += orderManager => + { + Widget.CloseWindow(); + switch (orderManager.Connection.ConnectionState) + { + case ConnectionState.PreConnecting: + Widget.LoadWidget("MAINMENU_BG", Widget.RootWidget, new WidgetArgs()); + break; + case ConnectionState.Connecting: + Widget.OpenWindow("CONNECTING_BG", + new WidgetArgs() { { "host", orderManager.Host }, { "port", orderManager.Port } }); + break; + case ConnectionState.NotConnected: + Widget.OpenWindow("CONNECTION_FAILED_BG", + new WidgetArgs() { { "orderManager", orderManager } }); + break; + case ConnectionState.Connected: + var lobby = Game.OpenWindow(orderManager.world, "SERVER_LOBBY"); + lobby.GetWidget("CHAT_DISPLAY").ClearChat(); + lobby.GetWidget("CHANGEMAP_BUTTON").Visible = true; + lobby.GetWidget("LOCKTEAMS_CHECKBOX").Visible = true; + lobby.GetWidget("ALLOWCHEATS_CHECKBOX").Visible = true; + lobby.GetWidget("DISCONNECT_BUTTON").Visible = true; + break; + } + }; + TestAndContinue(); - } + } void TestAndContinue() { @@ -76,7 +74,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates } else { - MainMenuButtonsDelegate.DisplayModSelector(); + MainMenuButtonsLogic.DisplayModSelector(); ShowInstallMethodDialog(); } } diff --git a/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs old mode 100755 new mode 100644 similarity index 93% rename from OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs index 448cf3d34c..7989bd101c --- a/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs @@ -11,12 +11,12 @@ using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class IngameChromeDelegate : IWidgetDelegate + public class IngameChromeLogic { [ObjectCreator.UseCtor] - public IngameChromeDelegate( [ObjectCreator.Param] World world ) + public IngameChromeLogic( [ObjectCreator.Param] World world ) { var r = Widget.RootWidget; var gameRoot = r.GetWidget("INGAME_ROOT"); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/IngameObserverChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs similarity index 92% rename from OpenRA.Mods.RA/Widgets/Delegates/IngameObserverChromeDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs index 1d57e4fbeb..88c1150338 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/IngameObserverChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs @@ -11,12 +11,12 @@ using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class IngameObserverChromeDelegate : IWidgetDelegate + public class IngameObserverChromeLogic { [ObjectCreator.UseCtor] - public IngameObserverChromeDelegate([ObjectCreator.Param] World world) + public IngameObserverChromeLogic([ObjectCreator.Param] World world) { var r = Widget.RootWidget; var gameRoot = r.GetWidget("OBSERVER_ROOT"); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs old mode 100755 new mode 100644 similarity index 98% rename from OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index af721e38f0..59f524aac4 --- a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -13,14 +13,14 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.FileFormats; +using OpenRA.Graphics; using OpenRA.Network; using OpenRA.Traits; using OpenRA.Widgets; -using OpenRA.Graphics; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class LobbyDelegate : IWidgetDelegate + public class LobbyLogic { Widget LocalPlayerTemplate, RemotePlayerTemplate, EmptySlotTemplate, EmptySlotTemplateHost; ScrollPanelWidget Players; @@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates readonly OrderManager orderManager; readonly WorldRenderer worldRenderer; [ObjectCreator.UseCtor] - internal LobbyDelegate( [ObjectCreator.Param( "widget" )] Widget lobby, [ObjectCreator.Param] OrderManager orderManager, [ObjectCreator.Param] WorldRenderer worldRenderer) + internal LobbyLogic( [ObjectCreator.Param( "widget" )] Widget lobby, [ObjectCreator.Param] OrderManager orderManager, [ObjectCreator.Param] WorldRenderer worldRenderer) { this.orderManager = orderManager; this.worldRenderer = worldRenderer; diff --git a/OpenRA.Mods.RA/Widgets/Delegates/MainMenuButtonsDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs old mode 100755 new mode 100644 similarity index 94% rename from OpenRA.Mods.RA/Widgets/Delegates/MainMenuButtonsDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs index 704bcd830e..b09141180d --- a/OpenRA.Mods.RA/Widgets/Delegates/MainMenuButtonsDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs @@ -17,12 +17,12 @@ using System; using System.Drawing; using System.Linq; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class MainMenuButtonsDelegate : IWidgetDelegate + public class MainMenuButtonsLogic { [ObjectCreator.UseCtor] - public MainMenuButtonsDelegate([ObjectCreator.Param] Widget widget) + public MainMenuButtonsLogic([ObjectCreator.Param] Widget widget) { Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Widget.RootWidget, "PERF_BG" ); widget.GetWidget("MAINMENU_BUTTON_JOIN").OnMouseUp = mi => { Widget.OpenWindow("JOINSERVER_BG"); return true; }; diff --git a/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs similarity index 96% rename from OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs index 200a1babb6..8a91cea207 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs @@ -15,16 +15,16 @@ using OpenRA.Network; using OpenRA.Widgets; using System.IO; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class MapChooserDelegate : IWidgetDelegate + public class MapChooserLogic { Map Map = null; Widget scrollpanel; ScrollItemWidget itemTemplate; [ObjectCreator.UseCtor] - internal MapChooserDelegate( + internal MapChooserLogic( [ObjectCreator.Param( "widget" )] Widget bg, [ObjectCreator.Param] OrderManager orderManager, [ObjectCreator.Param] string mapName ) diff --git a/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs similarity index 97% rename from OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs index f29d12fffc..139ee9d612 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs @@ -14,12 +14,12 @@ using OpenRA.FileFormats; using OpenRA.Support; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class MusicPlayerDelegate : IWidgetDelegate + public class MusicPlayerLogic { string CurrentSong = null; - public MusicPlayerDelegate() + public MusicPlayerLogic() { var bg = Widget.RootWidget.GetWidget("MUSIC_MENU"); CurrentSong = GetNextSong(); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs similarity index 90% rename from OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs index 69e1f41533..72b9cf3c0f 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs @@ -12,12 +12,12 @@ using OpenRA; using OpenRA.Mods.RA.Orders; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class OrderButtonsChromeDelegate : IWidgetDelegate + public class OrderButtonsChromeLogic { [ObjectCreator.UseCtor] - public OrderButtonsChromeDelegate( [ObjectCreator.Param] World world ) + public OrderButtonsChromeLogic( [ObjectCreator.Param] World world ) { var r = Widget.RootWidget; var gameRoot = r.GetWidget("INGAME_ROOT"); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/PerfDebugDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs similarity index 88% rename from OpenRA.Mods.RA/Widgets/Delegates/PerfDebugDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs index 9a9769fcbb..3ecc084da3 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/PerfDebugDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs @@ -11,11 +11,11 @@ using OpenRA.Support; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class PerfDebugDelegate : IWidgetDelegate + public class PerfDebugLogic { - public PerfDebugDelegate() + public PerfDebugLogic() { var r = Widget.RootWidget; var perfRoot = r.GetWidget("PERF_BG"); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/ReplayBrowserDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs similarity index 95% rename from OpenRA.Mods.RA/Widgets/Delegates/ReplayBrowserDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs index cefec13b93..dd0d65f7c8 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/ReplayBrowserDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs @@ -16,14 +16,14 @@ using OpenRA.FileFormats; using OpenRA.Network; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class ReplayBrowserDelegate : IWidgetDelegate + public class ReplayBrowserLogic { Widget widget; [ObjectCreator.UseCtor] - public ReplayBrowserDelegate( [ObjectCreator.Param] Widget widget ) + public ReplayBrowserLogic( [ObjectCreator.Param] Widget widget ) { this.widget = widget; diff --git a/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs similarity index 95% rename from OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs index c718fc638c..7e11bf2f77 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs @@ -12,12 +12,11 @@ using System.Collections.Generic; using System.Linq; using OpenRA.FileFormats; using OpenRA.Network; -using OpenRA.Server; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class ServerBrowserDelegate : IWidgetDelegate + public class ServerBrowserLogic { static List GameButtons = new List(); @@ -25,7 +24,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates ScrollItemWidget ServerTemplate; [ObjectCreator.UseCtor] - public ServerBrowserDelegate( [ObjectCreator.Param] Widget widget ) + public ServerBrowserLogic( [ObjectCreator.Param] Widget widget ) { var bg = widget.GetWidget("JOINSERVER_BG"); @@ -170,10 +169,10 @@ namespace OpenRA.Mods.RA.Widgets.Delegates } - public class DirectConnectDelegate : IWidgetDelegate + public class DirectConnectLogic { [ObjectCreator.UseCtor] - public DirectConnectDelegate( [ObjectCreator.Param] Widget widget ) + public DirectConnectLogic( [ObjectCreator.Param] Widget widget ) { var dc = widget.GetWidget("DIRECTCONNECT_BG"); diff --git a/OpenRA.Mods.RA/Widgets/Delegates/SettingsMenuDelegate.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs old mode 100755 new mode 100644 similarity index 98% rename from OpenRA.Mods.RA/Widgets/Delegates/SettingsMenuDelegate.cs rename to OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs index de945a1002..ce173d0bb1 --- a/OpenRA.Mods.RA/Widgets/Delegates/SettingsMenuDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs @@ -13,12 +13,12 @@ using OpenRA.FileFormats.Graphics; using OpenRA.GameRules; using OpenRA.Widgets; -namespace OpenRA.Mods.RA.Widgets.Delegates +namespace OpenRA.Mods.RA.Widgets.Logic { - public class SettingsMenuDelegate : IWidgetDelegate + public class SettingsMenuLogic { Widget bg; - public SettingsMenuDelegate() + public SettingsMenuLogic() { bg = Widget.RootWidget.GetWidget("SETTINGS_MENU"); var tabs = bg.GetWidget("TAB_CONTAINER"); diff --git a/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs index 36dabc104f..9487a7df63 100755 --- a/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs @@ -7,6 +7,7 @@ * see COPYING. */ #endregion + using System; using System.Drawing; using System.Linq; @@ -84,7 +85,6 @@ namespace OpenRA.Mods.RA.Widgets return CursorProvider.HasCursorSequence(cursor+"-minimap") ? cursor+"-minimap" : cursor; } - // TODO: RadarBinWidget doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { if (!hasRadar || radarAnimating) return false; // we're not set up for this. diff --git a/OpenRA.Mods.RA/Widgets/RadarWidget.cs b/OpenRA.Mods.RA/Widgets/RadarWidget.cs index dd6afb3425..1756caefd8 100755 --- a/OpenRA.Mods.RA/Widgets/RadarWidget.cs +++ b/OpenRA.Mods.RA/Widgets/RadarWidget.cs @@ -11,7 +11,6 @@ using System; using System.Drawing; using System.Linq; using OpenRA.Graphics; -using OpenRA.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets @@ -85,7 +84,6 @@ namespace OpenRA.Mods.RA.Widgets return CursorProvider.HasCursorSequence(cursor+"-minimap") ? cursor+"-minimap" : cursor; } - // TODO: RadarWidget doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { if (!hasRadar || Animating) return false; diff --git a/OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs index 26a9e04170..49976bcf3c 100755 --- a/OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs @@ -54,7 +54,6 @@ namespace OpenRA.Mods.RA.Widgets get { return buttons.Any() ? buttons.Select(b => b.First).Aggregate(Rectangle.Union) : Bounds; } } - // TODO: SpecialPowerBin doesn't support delegate methods for mouse input public override bool HandleMouseInput(MouseInput mi) { if (mi.Event == MouseInputEvent.Down) diff --git a/mods/cnc/chrome/cheats.yaml b/mods/cnc/chrome/cheats.yaml index de8d2d69af..cc55403bc7 100644 --- a/mods/cnc/chrome/cheats.yaml +++ b/mods/cnc/chrome/cheats.yaml @@ -1,6 +1,6 @@ Container@CHEATS_PANEL: Id:CHEATS_PANEL - Delegate:CncCheatsLogic + Logic:CncCheatsLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 110)/2 Width:590 diff --git a/mods/cnc/chrome/connection.yaml b/mods/cnc/chrome/connection.yaml index 94640e88c9..77c3b68cd5 100644 --- a/mods/cnc/chrome/connection.yaml +++ b/mods/cnc/chrome/connection.yaml @@ -1,6 +1,6 @@ Container@CONNECTING_PANEL: Id:CONNECTING_PANEL - Delegate:CncConnectingLogic + Logic:CncConnectingLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 90)/2 Width:370 @@ -36,7 +36,7 @@ Container@CONNECTING_PANEL: Container@CONNECTIONFAILED_PANEL: Id:CONNECTIONFAILED_PANEL - Delegate:CncConnectionFailedLogic + Logic:CncConnectionFailedLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 90)/2 Width:370 diff --git a/mods/cnc/chrome/createserver.yaml b/mods/cnc/chrome/createserver.yaml index f01e8c0d58..a88194bc38 100644 --- a/mods/cnc/chrome/createserver.yaml +++ b/mods/cnc/chrome/createserver.yaml @@ -3,7 +3,7 @@ # TODO: Have the advertise checkbox en/disable the external port textfield Container@CREATESERVER_PANEL: Id:CREATESERVER_PANEL - Delegate:CncServerCreationLogic + Logic:CncServerCreationLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 260)/2 Width:604 diff --git a/mods/cnc/chrome/diplomacy.yaml b/mods/cnc/chrome/diplomacy.yaml index 41bc582a59..f8a9748f11 100644 --- a/mods/cnc/chrome/diplomacy.yaml +++ b/mods/cnc/chrome/diplomacy.yaml @@ -1,6 +1,6 @@ Container@DIPLOMACY_PANEL: Id:DIPLOMACY_PANEL - Delegate:CncDiplomacyLogic + Logic:CncDiplomacyLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 400)/2 Width:450 diff --git a/mods/cnc/chrome/directconnect.yaml b/mods/cnc/chrome/directconnect.yaml index 1a3c6ba28d..f5f9483e0e 100644 --- a/mods/cnc/chrome/directconnect.yaml +++ b/mods/cnc/chrome/directconnect.yaml @@ -1,6 +1,6 @@ Container@DIRECTCONNECT_PANEL: Id:DIRECTCONNECT_PANEL - Delegate:CncDirectConnectLogic + Logic:CncDirectConnectLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 90)/2 Width:370 diff --git a/mods/cnc/chrome/dropdowns.yaml b/mods/cnc/chrome/dropdowns.yaml index c63d957746..e33996724b 100644 --- a/mods/cnc/chrome/dropdowns.yaml +++ b/mods/cnc/chrome/dropdowns.yaml @@ -1,6 +1,6 @@ Background@COLOR_CHOOSER: Id:COLOR_CHOOSER - Delegate:CncColorPickerLogic + Logic:CncColorPickerLogic Background:panel-black Width:315 Height:130 diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index f354fc1ac6..6939f226d2 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -1,6 +1,6 @@ Container@INGAME_ROOT: Id:INGAME_ROOT - Delegate:CncIngameChromeLogic + Logic:CncIngameChromeLogic Children: WorldInteractionController: Id:INTERACTION_CONTROLLER @@ -57,7 +57,7 @@ Container@INGAME_ROOT: UseContrast: yes Container@PERFORMANCE_INFO: Id:PERFORMANCE_INFO - Delegate:CncPerfDebugLogic + Logic:CncPerfDebugLogic Children: Label@PERF_TEXT: Id:PERF_TEXT @@ -123,7 +123,7 @@ Container@INGAME_ROOT: Children: OrderButton@SELL: Id:SELL - Delegate:OrderButtonsChromeDelegate + Logic:OrderButtonsChromeLogic X:39 Y:0 Width:30 @@ -133,7 +133,7 @@ Container@INGAME_ROOT: LongDesc:Sell buildings, reclaiming a \nproportion of their build cost OrderButton@REPAIR: Id:REPAIR - Delegate:OrderButtonsChromeDelegate + Logic:OrderButtonsChromeLogic X:75 Y:0 Width:30 diff --git a/mods/cnc/chrome/ingamemenu.yaml b/mods/cnc/chrome/ingamemenu.yaml index 995d368868..1f56eb5a67 100644 --- a/mods/cnc/chrome/ingamemenu.yaml +++ b/mods/cnc/chrome/ingamemenu.yaml @@ -2,7 +2,7 @@ Container@INGAME_MENU: Id:INGAME_MENU Width:WINDOW_RIGHT Height:WINDOW_BOTTOM - Delegate:CncIngameMenuLogic + Logic:CncIngameMenuLogic Children: Image@RETICLE: X:(WINDOW_RIGHT-WIDTH)/2 diff --git a/mods/cnc/chrome/install.yaml b/mods/cnc/chrome/install.yaml index 2e4e6267bf..9f70e27403 100644 --- a/mods/cnc/chrome/install.yaml +++ b/mods/cnc/chrome/install.yaml @@ -27,7 +27,7 @@ Container@INSTALL_BACKGROUND: Container@INSTALL_PANEL: Id:INSTALL_PANEL - Delegate:CncInstallLogic + Logic:CncInstallLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 150)/2 Width:640 @@ -95,7 +95,7 @@ Container@INSTALL_PANEL: Container@INSTALL_FROMCD_PANEL: Id:INSTALL_FROMCD_PANEL - Delegate:CncInstallFromCDLogic + Logic:CncInstallFromCDLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 150)/2 Width:640 @@ -148,7 +148,7 @@ Container@INSTALL_FROMCD_PANEL: Container@INSTALL_DOWNLOAD_PANEL: Id:INSTALL_DOWNLOAD_PANEL - Delegate:CncDownloadPackagesLogic + Logic:CncDownloadPackagesLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 150)/2 Width:640 diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index f4494c937b..13dd3f4a22 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -1,6 +1,6 @@ Container@SERVER_LOBBY: Id:SERVER_LOBBY - Delegate:CncLobbyLogic + Logic:CncLobbyLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 500)/2 Width:740 diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 6e9d2ce995..8a6fa8045e 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -2,7 +2,7 @@ Container@MENU_BACKGROUND: Id:MENU_BACKGROUND Width:WINDOW_RIGHT Height:WINDOW_BOTTOM - Delegate:CncMenuLogic + Logic:CncMenuLogic Children: Image@RETICLE: X:(WINDOW_RIGHT-WIDTH)/2 @@ -176,7 +176,7 @@ Container@MENU_BACKGROUND: Text:Back Container@PERFORMANCE_INFO: Id:PERFORMANCE_INFO - Delegate:CncPerfDebugLogic + Logic:CncPerfDebugLogic Children: Label@PERF_TEXT: Id:PERF_TEXT diff --git a/mods/cnc/chrome/mapchooser.yaml b/mods/cnc/chrome/mapchooser.yaml index 9215b98e33..083d84c03e 100644 --- a/mods/cnc/chrome/mapchooser.yaml +++ b/mods/cnc/chrome/mapchooser.yaml @@ -1,6 +1,6 @@ Container@MAPCHOOSER_PANEL: Id:MAPCHOOSER_PANEL - Delegate:CncMapChooserLogic + Logic:CncMapChooserLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 500)/2 Width:740 diff --git a/mods/cnc/chrome/modchooser.yaml b/mods/cnc/chrome/modchooser.yaml index 7e23bb4e43..e776c27026 100644 --- a/mods/cnc/chrome/modchooser.yaml +++ b/mods/cnc/chrome/modchooser.yaml @@ -1,6 +1,6 @@ Container@MODS_PANEL: Id:MODS_PANEL - Delegate:CncModBrowserLogic + Logic:CncModBrowserLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 500)/2 Width:740 diff --git a/mods/cnc/chrome/music.yaml b/mods/cnc/chrome/music.yaml index 74f134c4a1..773f5b5669 100644 --- a/mods/cnc/chrome/music.yaml +++ b/mods/cnc/chrome/music.yaml @@ -1,6 +1,6 @@ Container@MUSIC_PANEL: Id:MUSIC_PANEL - Delegate:CncMusicPlayerLogic + Logic:CncMusicPlayerLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 400)/2 Width:360 @@ -201,7 +201,7 @@ Container@MUSIC_PANEL: Container@INSTALL_MUSIC_PANEL: Id:INSTALL_MUSIC_PANEL - Delegate:CncInstallMusicLogic + Logic:CncInstallMusicLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 150)/2 Width:640 diff --git a/mods/cnc/chrome/preferences.yaml b/mods/cnc/chrome/preferences.yaml index 0b5f83f620..ed3ded259c 100644 --- a/mods/cnc/chrome/preferences.yaml +++ b/mods/cnc/chrome/preferences.yaml @@ -1,6 +1,6 @@ Container@SETTINGS_PANEL: Id:SETTINGS_PANEL - Delegate:CncSettingsLogic + Logic:CncSettingsLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 250)/2 Width:740 diff --git a/mods/cnc/chrome/replaybrowser.yaml b/mods/cnc/chrome/replaybrowser.yaml index 5e8f3b84fd..c20e535b3d 100644 --- a/mods/cnc/chrome/replaybrowser.yaml +++ b/mods/cnc/chrome/replaybrowser.yaml @@ -1,6 +1,6 @@ Container@REPLAYBROWSER_PANEL: Id:REPLAYBROWSER_PANEL - Delegate:CncReplayBrowserLogic + Logic:CncReplayBrowserLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 300)/2 Width:520 diff --git a/mods/cnc/chrome/serverbrowser.yaml b/mods/cnc/chrome/serverbrowser.yaml index 1d8aabcbbc..371ca54e43 100644 --- a/mods/cnc/chrome/serverbrowser.yaml +++ b/mods/cnc/chrome/serverbrowser.yaml @@ -1,6 +1,6 @@ Container@SERVERBROWSER_PANEL: Id:SERVERBROWSER_PANEL - Delegate:CncServerBrowserLogic + Logic:CncServerBrowserLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - 500)/2 Width:740 diff --git a/mods/ra/chrome/gameinit.yaml b/mods/ra/chrome/gameinit.yaml index 45a3299482..a541ad7f31 100644 --- a/mods/ra/chrome/gameinit.yaml +++ b/mods/ra/chrome/gameinit.yaml @@ -5,7 +5,7 @@ GameInitInfo@INIT_SETUP: PackageURL:http://open-ra.org/get-dependency.php?file=ra-packages PackagePath:^/Content/ra InstallMode:ra - Delegate:GameInitDelegate + Logic:GameInitLogic Background@INIT_CHOOSEINSTALL: Id:INIT_CHOOSEINSTALL diff --git a/mods/ra/chrome/gamelobby.yaml b/mods/ra/chrome/gamelobby.yaml index 531e5d116e..d1581d08d2 100644 --- a/mods/ra/chrome/gamelobby.yaml +++ b/mods/ra/chrome/gamelobby.yaml @@ -1,6 +1,6 @@ Background@SERVER_LOBBY: Id:SERVER_LOBBY - Delegate:LobbyDelegate + Logic:LobbyLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:800 @@ -431,7 +431,7 @@ Background@MAP_CHOOSER: Id:MAP_CHOOSER X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 - Delegate:MapChooserDelegate + Logic:MapChooserLogic Width:800 Height:600 Children: diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml index 18ea8ef77e..34bfcb45ad 100644 --- a/mods/ra/chrome/ingame.yaml +++ b/mods/ra/chrome/ingame.yaml @@ -1,6 +1,6 @@ Container@INGAME_ROOT: Id:INGAME_ROOT - Delegate:IngameChromeDelegate + Logic:IngameChromeLogic Children: WorldInteractionController: Id:INTERACTION_CONTROLLER @@ -93,7 +93,7 @@ Container@INGAME_ROOT: Children: OrderButton@SELL: Id:SELL - Delegate:OrderButtonsChromeDelegate + Logic:OrderButtonsChromeLogic X:3 Y:0 Width:30 @@ -103,7 +103,7 @@ Container@INGAME_ROOT: LongDesc:Sell buildings, reclaiming a \nproportion of their build cost OrderButton@POWER_DOWN: Id:POWER_DOWN - Delegate:OrderButtonsChromeDelegate + Logic:OrderButtonsChromeLogic X:39 Y:0 Width:30 @@ -113,7 +113,7 @@ Container@INGAME_ROOT: LongDesc:Disable unneeded structures so their \npower can be used elsewhere OrderButton@REPAIR: Id:REPAIR - Delegate:OrderButtonsChromeDelegate + Logic:OrderButtonsChromeLogic X:75 Y:0 Width:30 @@ -189,7 +189,7 @@ Container@INGAME_ROOT: Font:Bold Background@DIPLOMACY_BG: Id:DIPLOMACY_BG - Delegate:DiplomacyDelegate + Logic:DiplomacyLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:450 @@ -223,7 +223,7 @@ Container@INGAME_ROOT: UseContrast: yes Background@DEVELOPERMODE_BG: Id:DEVELOPERMODE_BG - Delegate:DeveloperModeDelegate + Logic:DeveloperModeLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:350 @@ -305,7 +305,7 @@ Container@INGAME_ROOT: ClickThrough:true Id:PERF_BG Background:dialog4 - Delegate:PerfDebugDelegate + Logic:PerfDebugLogic X:10 Y:WINDOW_BOTTOM - 250 Width: 210 @@ -326,7 +326,7 @@ Container@INGAME_ROOT: Container@OBSERVER_ROOT: Id:OBSERVER_ROOT Visible:true - Delegate:IngameObserverChromeDelegate + Logic:IngameObserverChromeLogic Children: WorldInteractionController: X:0 @@ -455,7 +455,7 @@ Container@OBSERVER_ROOT: ClickThrough:true Id:PERF_BG Background:dialog4 - Delegate:PerfDebugDelegate + Logic:PerfDebugLogic X:10 Y:WINDOW_BOTTOM - 250 Width: 210 diff --git a/mods/ra/chrome/mainmenu.yaml b/mods/ra/chrome/mainmenu.yaml index e7e308e4a2..6880a379cb 100644 --- a/mods/ra/chrome/mainmenu.yaml +++ b/mods/ra/chrome/mainmenu.yaml @@ -5,7 +5,7 @@ Background@MAINMENU_BG: Width:250 Height:330 Visible:true - Delegate:MainMenuButtonsDelegate + Logic:MainMenuButtonsLogic Children: Label@MAINMENU_LABEL_TITLE: Id:MAINMENU_LABEL_TITLE @@ -99,7 +99,7 @@ Background@PERF_BG: ClickThrough:true Id:PERF_BG Background:dialog4 - Delegate:PerfDebugDelegate + Logic:PerfDebugLogic X:10 Y:WINDOW_BOTTOM - 250 Width: 210 @@ -119,7 +119,7 @@ Background@PERF_BG: Height:40 Background@MUSIC_MENU: Id:MUSIC_MENU - Delegate:MusicPlayerDelegate + Logic:MusicPlayerLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width: 450 diff --git a/mods/ra/chrome/replaybrowser.yaml b/mods/ra/chrome/replaybrowser.yaml index 2260aaa2f3..3a01308eae 100644 --- a/mods/ra/chrome/replaybrowser.yaml +++ b/mods/ra/chrome/replaybrowser.yaml @@ -1,6 +1,6 @@ Background@REPLAYBROWSER_BG: Id:REPLAYBROWSER_BG - Delegate:ReplayBrowserDelegate + Logic:ReplayBrowserLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:700 diff --git a/mods/ra/chrome/serverbrowser.yaml b/mods/ra/chrome/serverbrowser.yaml index 81e13e9eaf..1f5509d321 100644 --- a/mods/ra/chrome/serverbrowser.yaml +++ b/mods/ra/chrome/serverbrowser.yaml @@ -1,6 +1,6 @@ Background@CREATESERVER_BG: Id:CREATESERVER_BG - Delegate:CreateServerMenuDelegate + Logic:CreateServerMenuLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:400 @@ -87,7 +87,7 @@ Background@CREATESERVER_BG: Font:Bold Background@JOINSERVER_BG: Id:JOINSERVER_BG - Delegate:ServerBrowserDelegate + Logic:ServerBrowserLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:700 @@ -242,7 +242,7 @@ Background@JOINSERVER_BG: Font:Bold Background@DIRECTCONNECT_BG: Id:DIRECTCONNECT_BG - Delegate:DirectConnectDelegate + Logic:DirectConnectLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:400 @@ -290,7 +290,7 @@ Background@DIRECTCONNECT_BG: Font:Bold Background@CONNECTION_FAILED_BG: Id:CONNECTION_FAILED_BG - Delegate:ConnectionFailedDelegate + Logic:ConnectionFailedLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:450 @@ -331,7 +331,7 @@ Background@CONNECTION_FAILED_BG: Font:Bold Background@CONNECTING_BG: Id:CONNECTING_BG - Delegate:ConnectionDialogsDelegate + Logic:ConnectionDialogsLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM - HEIGHT)/2 Width:450 diff --git a/mods/ra/chrome/settings.yaml b/mods/ra/chrome/settings.yaml index ceffb7b40a..af48b33659 100644 --- a/mods/ra/chrome/settings.yaml +++ b/mods/ra/chrome/settings.yaml @@ -1,6 +1,6 @@ Background@SETTINGS_MENU: Id:SETTINGS_MENU - Delegate:SettingsMenuDelegate + Logic:SettingsMenuLogic X:(WINDOW_RIGHT - WIDTH)/2 Y:(WINDOW_BOTTOM- HEIGHT)/2 Width: 450