mirror of
https://github.com/9ParsonsB/Pulsar.git
synced 2025-04-05 17:39:39 -04:00
Merge branch 'master' of https://github.com/Xjph/ObservatoryCore
This commit is contained in:
commit
e4f90d5a62
@ -38,6 +38,13 @@ namespace Observatory
|
||||
|
||||
#endregion
|
||||
|
||||
#region Public properties
|
||||
public LogMonitorState CurrentState
|
||||
{
|
||||
get => currentState;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Public Methods
|
||||
|
||||
public void Start()
|
||||
|
@ -11,7 +11,6 @@ namespace Observatory.PluginManagement
|
||||
|
||||
private readonly NativeVoice NativeVoice;
|
||||
private readonly NativePopup NativePopup;
|
||||
private LogMonitorState currentLogMonitorState = LogMonitorState.Idle;
|
||||
|
||||
public PluginCore()
|
||||
{
|
||||
@ -19,11 +18,6 @@ namespace Observatory.PluginManagement
|
||||
NativePopup = new();
|
||||
}
|
||||
|
||||
internal void OnLogMonitorStateChanged(object sender, LogMonitorStateChangedEventArgs e)
|
||||
{
|
||||
currentLogMonitorState = e.NewState;
|
||||
}
|
||||
|
||||
public string Version => System.Reflection.Assembly.GetEntryAssembly().GetName().Version.ToString();
|
||||
|
||||
public Status GetStatus()
|
||||
@ -142,12 +136,12 @@ namespace Observatory.PluginManagement
|
||||
|
||||
public LogMonitorState CurrentLogMonitorState
|
||||
{
|
||||
get => currentLogMonitorState;
|
||||
get => LogMonitor.GetInstance.CurrentState;
|
||||
}
|
||||
|
||||
public bool IsLogMonitorBatchReading
|
||||
{
|
||||
get => LogMonitorStateChangedEventArgs.IsBatchRead(currentLogMonitorState);
|
||||
get => LogMonitorStateChangedEventArgs.IsBatchRead(LogMonitor.GetInstance.CurrentState);
|
||||
}
|
||||
|
||||
public event EventHandler<NotificationArgs> Notification;
|
||||
|
@ -49,7 +49,6 @@ namespace Observatory.PluginManagement
|
||||
logMonitor.LogMonitorStateChanged += pluginHandler.OnLogMonitorStateChanged;
|
||||
|
||||
var core = new PluginCore();
|
||||
logMonitor.LogMonitorStateChanged += core.OnLogMonitorStateChanged;
|
||||
|
||||
List<IObservatoryPlugin> errorPlugins = new();
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user