diff --git a/src/client/spark/Modules/Support/ActivityLog/ActivityLogWindow.cs b/src/client/spark/Modules/Support/ActivityLog/ActivityLogWindow.cs index b5b5aee35..fce30735f 100644 --- a/src/client/spark/Modules/Support/ActivityLog/ActivityLogWindow.cs +++ b/src/client/spark/Modules/Support/ActivityLog/ActivityLogWindow.cs @@ -1,6 +1,7 @@ using bts.api; using bts.spark; using mbts; +using mbts.ui; using mbts.ui.controls; using System; using System.Collections.Generic; @@ -13,27 +14,34 @@ using System.Windows.Media; namespace bts.shell { - class ActivityLogWindow : SparkWindow { + class ActivityLogWindow : SparkWindow, ISharedWindow { + readonly IObservable _message_src; + readonly LogViewerMessageCollection _messages = new LogViewerMessageCollection(); IDisposable _dispose; - LogViewerMessageCollection _messages = new LogViewerMessageCollection(); - Lazy _content; + LogViewer _content; public ActivityLogWindow(IObservable messages, IBus bus, ActivityWindowFactory isw) : base("Activity Log", bus, isw, SparkCommands.ShowActivityLog.icon) { - _dispose = messages.ObserveOnDispatcher().Subscribe(_messages.AddLog); - _content = new Lazy(() => - new LogViewer { - ItemsSource = _messages, - Categories = ActivityLogCategory.all_categories } - ); + _message_src = messages; } public override ActivityWindowState SaveState => new ActivityWindowState(); - public override UIElement Content => _content.Value; + public override UIElement Content => _content; + + public string thread_id => nameof(ActivityLogWindow); public override void Dispose() { Disposable.dispose(ref _dispose); } + + public void thread_init() { + _dispose = _message_src.ObserveOnDispatcher().Subscribe(_messages.AddLog); + _content = + new LogViewer { + ItemsSource = _messages, + Categories = ActivityLogCategory.all_categories + }; + } } }