diff --git a/Eve-O-Preview/Presentation/IThumbnailManager.cs b/Eve-O-Preview/Presentation/IThumbnailManager.cs index d1e4f0c..24ffea0 100644 --- a/Eve-O-Preview/Presentation/IThumbnailManager.cs +++ b/Eve-O-Preview/Presentation/IThumbnailManager.cs @@ -14,9 +14,9 @@ namespace EveOPreview.UI void RefreshThumbnails(); void SetupThumbnailFrames(); - event Action> ThumbnailsAdded; - event Action> ThumbnailsUpdated; - event Action> ThumbnailsRemoved; - event Action ThumbnailSizeChanged; + Action> ThumbnailsAdded { get; set; } + Action> ThumbnailsUpdated { get; set; } + Action> ThumbnailsRemoved { get; set; } + Action ThumbnailSizeChanged { get; set; } } } \ No newline at end of file diff --git a/Eve-O-Preview/Presentation/MainPresenter.cs b/Eve-O-Preview/Presentation/MainPresenter.cs index 1cc598a..e027465 100644 --- a/Eve-O-Preview/Presentation/MainPresenter.cs +++ b/Eve-O-Preview/Presentation/MainPresenter.cs @@ -35,19 +35,19 @@ namespace EveOPreview.UI this._thumbnailDescriptionViews = new Dictionary(); this._exitApplication = false; - this.View.FormActivated += Activate; - this.View.FormMinimized += Minimize; - this.View.FormCloseRequested += Close; - this.View.ApplicationSettingsChanged += SaveApplicationSettings; - this.View.ThumbnailsSizeChanged += UpdateThumbnailsSize; - this.View.ThumbnailStateChanged += UpdateThumbnailState; - this.View.ForumUrlLinkActivated += OpenForumUrlLink; - this.View.ApplicationExitRequested += ExitApplication; + this.View.FormActivated = this.Activate; + this.View.FormMinimized = this.Minimize; + this.View.FormCloseRequested = this.Close; + this.View.ApplicationSettingsChanged = this.SaveApplicationSettings; + this.View.ThumbnailsSizeChanged = this.UpdateThumbnailsSize; + this.View.ThumbnailStateChanged = this.UpdateThumbnailState; + this.View.ForumUrlLinkActivated = this.OpenForumUrlLink; + this.View.ApplicationExitRequested = this.ExitApplication; - this._thumbnailManager.ThumbnailsAdded += ThumbnailsAdded; - this._thumbnailManager.ThumbnailsUpdated += ThumbnailsUpdated; - this._thumbnailManager.ThumbnailsRemoved += ThumbnailsRemoved; - this._thumbnailManager.ThumbnailSizeChanged += ThumbnailSizeChanged; + this._thumbnailManager.ThumbnailsAdded = this.ThumbnailsAdded; + this._thumbnailManager.ThumbnailsUpdated = this.ThumbnailsUpdated; + this._thumbnailManager.ThumbnailsRemoved = this.ThumbnailsRemoved; + this._thumbnailManager.ThumbnailSizeChanged = this.ThumbnailSizeChanged; } private void Activate() diff --git a/Eve-O-Preview/Presentation/ThumbnailManager.cs b/Eve-O-Preview/Presentation/ThumbnailManager.cs index 83bff7d..08bb055 100644 --- a/Eve-O-Preview/Presentation/ThumbnailManager.cs +++ b/Eve-O-Preview/Presentation/ThumbnailManager.cs @@ -47,10 +47,13 @@ namespace EveOPreview.UI this._thumbnailUpdateTimer.Interval = new TimeSpan(0, 0, 0, 0, configuration.ThumbnailRefreshPeriod); } - public event Action> ThumbnailsAdded; - public event Action> ThumbnailsUpdated; - public event Action> ThumbnailsRemoved; - public event Action ThumbnailSizeChanged; + public Action> ThumbnailsAdded { get; set; } + + public Action> ThumbnailsUpdated { get; set; } + + public Action> ThumbnailsRemoved { get; set; } + + public Action ThumbnailSizeChanged { get; set; } public void Activate() { @@ -206,11 +209,11 @@ namespace EveOPreview.UI view.SetWindowFrames(this._configuration.ShowThumbnailFrames); view.Location = this._configuration.GetThumbnailLocation(processTitle, this._activeClientTitle, view.Location); - view.ThumbnailResized += ThumbnailViewResized; - view.ThumbnailMoved += ThumbnailViewMoved; - view.ThumbnailFocused += ThumbnailViewFocused; - view.ThumbnailLostFocus += ThumbnailViewLostFocus; - view.ThumbnailActivated += ThumbnailActivated; + view.ThumbnailResized = this.ThumbnailViewResized; + view.ThumbnailMoved = this.ThumbnailViewMoved; + view.ThumbnailFocused = this.ThumbnailViewFocused; + view.ThumbnailLostFocus = this.ThumbnailViewLostFocus; + view.ThumbnailActivated = this.ThumbnailActivated; this._thumbnailViews.Add(processHandle, view); @@ -259,11 +262,11 @@ namespace EveOPreview.UI this._thumbnailViews.Remove(processHandle); // TODO Remove hotkey here - view.ThumbnailResized -= ThumbnailViewResized; - view.ThumbnailMoved -= ThumbnailViewMoved; - view.ThumbnailFocused -= ThumbnailViewFocused; - view.ThumbnailLostFocus -= ThumbnailViewLostFocus; - view.ThumbnailActivated -= ThumbnailActivated; + view.ThumbnailResized = null; + view.ThumbnailMoved = null; + view.ThumbnailFocused = null; + view.ThumbnailLostFocus = null; + view.ThumbnailActivated = null; view.Close(); diff --git a/Eve-O-Preview/UI/Implementation/MainForm.cs b/Eve-O-Preview/UI/Implementation/MainForm.cs index 9234c16..7476960 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.cs +++ b/Eve-O-Preview/UI/Implementation/MainForm.cs @@ -295,14 +295,21 @@ namespace EveOPreview.UI this.ZoomAnchorPanel.Enabled = enableControls; } - public event Action ApplicationExitRequested; - public event Action FormActivated; - public event Action FormMinimized; - public event Action FormCloseRequested; - public event Action ApplicationSettingsChanged; - public event Action ThumbnailsSizeChanged; - public event Action ThumbnailStateChanged; - public event Action ForumUrlLinkActivated; + public Action ApplicationExitRequested { get; set; } + + public Action FormActivated { get; set; } + + public Action FormMinimized { get; set; } + + public Action FormCloseRequested { get; set; } + + public Action ApplicationSettingsChanged { get; set; } + + public Action ThumbnailsSizeChanged { get; set; } + + public Action ThumbnailStateChanged { get; set; } + + public Action ForumUrlLinkActivated { get; set; } #region UI events private void OptionChanged_Handler(object sender, EventArgs e) diff --git a/Eve-O-Preview/UI/Implementation/ThumbnailView.cs b/Eve-O-Preview/UI/Implementation/ThumbnailView.cs index 08b9b88..9c7357c 100644 --- a/Eve-O-Preview/UI/Implementation/ThumbnailView.cs +++ b/Eve-O-Preview/UI/Implementation/ThumbnailView.cs @@ -82,15 +82,15 @@ namespace EveOPreview.UI } } - public event Action ThumbnailResized; + public Action ThumbnailResized { get; set; } - public event Action ThumbnailMoved; + public Action ThumbnailMoved { get; set; } - public event Action ThumbnailFocused; + public Action ThumbnailFocused { get; set; } - public event Action ThumbnailLostFocus; + public Action ThumbnailLostFocus { get; set; } - public event Action ThumbnailActivated; + public Action ThumbnailActivated { get; set; } public new void Show() { diff --git a/Eve-O-Preview/UI/Interface/IMainView.cs b/Eve-O-Preview/UI/Interface/IMainView.cs index 10c62ca..27dca96 100644 --- a/Eve-O-Preview/UI/Interface/IMainView.cs +++ b/Eve-O-Preview/UI/Interface/IMainView.cs @@ -40,13 +40,13 @@ namespace EveOPreview.UI void RemoveThumbnails(IList thumbnails); void RefreshZoomSettings(); - event Action ApplicationExitRequested; - event Action FormActivated; - event Action FormMinimized; - event Action FormCloseRequested; - event Action ApplicationSettingsChanged; - event Action ThumbnailsSizeChanged; - event Action ThumbnailStateChanged; - event Action ForumUrlLinkActivated; + Action ApplicationExitRequested { get; set; } + Action FormActivated { get; set; } + Action FormMinimized { get; set; } + Action FormCloseRequested { get; set; } + Action ApplicationSettingsChanged { get; set; } + Action ThumbnailsSizeChanged { get; set; } + Action ThumbnailStateChanged { get; set; } + Action ForumUrlLinkActivated { get; set; } } } \ No newline at end of file diff --git a/Eve-O-Preview/UI/Interface/IThumbnailView.cs b/Eve-O-Preview/UI/Interface/IThumbnailView.cs index 5aa2400..8ce7129 100644 --- a/Eve-O-Preview/UI/Interface/IThumbnailView.cs +++ b/Eve-O-Preview/UI/Interface/IThumbnailView.cs @@ -26,10 +26,10 @@ namespace EveOPreview.UI void Refresh(); - event Action ThumbnailResized; - event Action ThumbnailMoved; - event Action ThumbnailFocused; - event Action ThumbnailLostFocus; - event Action ThumbnailActivated; + Action ThumbnailResized { get; set; } + Action ThumbnailMoved { get; set; } + Action ThumbnailFocused { get; set; } + Action ThumbnailLostFocus { get; set; } + Action ThumbnailActivated { get; set; } } } \ No newline at end of file