diff --git a/ObservatoryBotanist/ObservatoryBotanist.csproj b/ObservatoryBotanist/ObservatoryBotanist.csproj index b7dcb13..6ca2774 100644 --- a/ObservatoryBotanist/ObservatoryBotanist.csproj +++ b/ObservatoryBotanist/ObservatoryBotanist.csproj @@ -23,7 +23,7 @@ - + diff --git a/ObservatoryCore/App.config b/ObservatoryCore/App.config index 6a8c1b6..b69fc93 100644 --- a/ObservatoryCore/App.config +++ b/ObservatoryCore/App.config @@ -70,6 +70,12 @@ False + + Dark + + + + \ No newline at end of file diff --git a/ObservatoryCore/Assets/Resources.Designer.cs b/ObservatoryCore/Assets/Resources.Designer.cs new file mode 100644 index 0000000..9013041 --- /dev/null +++ b/ObservatoryCore/Assets/Resources.Designer.cs @@ -0,0 +1,73 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Observatory.Assets { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Observatory.Assets.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon EOCIcon_Presized { + get { + object obj = ResourceManager.GetObject("EOCIcon_Presized", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + } +} diff --git a/ObservatoryCore/Assets/Resources.resx b/ObservatoryCore/Assets/Resources.resx new file mode 100644 index 0000000..e07a181 --- /dev/null +++ b/ObservatoryCore/Assets/Resources.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + EOCIcon-Presized.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/ObservatoryCore/NativeNotification/NativePopup.cs b/ObservatoryCore/NativeNotification/NativePopup.cs index eff794e..9f35b74 100644 --- a/ObservatoryCore/NativeNotification/NativePopup.cs +++ b/ObservatoryCore/NativeNotification/NativePopup.cs @@ -1,5 +1,6 @@ using Observatory.Framework; using Observatory.UI; +using System; namespace Observatory.NativeNotification { @@ -21,6 +22,11 @@ namespace Observatory.NativeNotification notification.FormClosed += NotifyWindow_Closed; + foreach(var notificationForm in notifications) + { + notificationForm.Value.AdjustOffset(true); + } + notifications.Add(notificationGuid, notification); notification.Show(); }); @@ -34,6 +40,11 @@ namespace Observatory.NativeNotification { var currentNotification = (NotificationForm)sender; + foreach (var notification in notifications.Where(n => n.Value.CreationTime < currentNotification.CreationTime)) + { + notification.Value.AdjustOffset(false); + } + if (notifications.ContainsKey(currentNotification.Guid)) { notifications.Remove(currentNotification.Guid); diff --git a/ObservatoryCore/NativeNotification/NativeVoice.cs b/ObservatoryCore/NativeNotification/NativeVoice.cs index 9a21fa4..fd14368 100644 --- a/ObservatoryCore/NativeNotification/NativeVoice.cs +++ b/ObservatoryCore/NativeNotification/NativeVoice.cs @@ -10,7 +10,7 @@ namespace Observatory.NativeNotification { public class NativeVoice { - private Queue notificationEvents; + private readonly Queue notificationEvents; private bool processing; public NativeVoice() @@ -83,20 +83,24 @@ namespace Observatory.NativeNotification processing = false; } - private string AddVoiceToSsml(string ssml, string voiceName) + private static string AddVoiceToSsml(string ssml, string voiceName) { XmlDocument ssmlDoc = new(); ssmlDoc.LoadXml(ssml); - var ssmlNamespace = ssmlDoc.DocumentElement.NamespaceURI; + var ssmlNamespace = ssmlDoc.DocumentElement?.NamespaceURI; XmlNamespaceManager ssmlNs = new(ssmlDoc.NameTable); - ssmlNs.AddNamespace("ssml", ssmlNamespace); + ssmlNs.AddNamespace("ssml", ssmlNamespace ?? string.Empty); var voiceNode = ssmlDoc.SelectSingleNode("/ssml:speak/ssml:voice", ssmlNs); - voiceNode.Attributes.GetNamedItem("name").Value = voiceName; - + var voiceNameNode = voiceNode?.Attributes?.GetNamedItem("name"); + if (voiceNameNode != null) + { + voiceNameNode.Value = voiceName; + } + return ssmlDoc.OuterXml; } } diff --git a/ObservatoryCore/ObservatoryCore.csproj b/ObservatoryCore/ObservatoryCore.csproj index 6bd0e88..68c5174 100644 --- a/ObservatoryCore/ObservatoryCore.csproj +++ b/ObservatoryCore/ObservatoryCore.csproj @@ -22,8 +22,9 @@ - - + + + @@ -33,6 +34,11 @@ + + True + True + Resources.resx + True True @@ -46,6 +52,10 @@ + + ResXFileCodeGenerator + Resources.Designer.cs + ResXFileCodeGenerator Resources.Designer.cs @@ -58,6 +68,10 @@ Core.Designer.cs + + + + diff --git a/ObservatoryCore/PluginManagement/PluginCore.cs b/ObservatoryCore/PluginManagement/PluginCore.cs index 97773c2..05f1e47 100644 --- a/ObservatoryCore/PluginManagement/PluginCore.cs +++ b/ObservatoryCore/PluginManagement/PluginCore.cs @@ -14,11 +14,15 @@ namespace Observatory.PluginManagement private readonly NativeVoice NativeVoice; private readonly NativePopup NativePopup; - - public PluginCore() + private bool OverridePopup; + private bool OverrideAudio; + + public PluginCore(bool OverridePopup = false, bool OverrideAudio = false) { NativeVoice = new(); NativePopup = new(); + this.OverridePopup = OverridePopup; + this.OverrideAudio = OverrideAudio; } public string Version => System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "0"; @@ -31,11 +35,8 @@ namespace Observatory.PluginManagement }; } - public Status GetStatus() - { - throw new NotImplementedException(); - } - + public Status GetStatus() => LogMonitor.GetInstance.Status; + public Guid SendNotification(string title, string text) { return SendNotification(new NotificationArgs() { Title = title, Detail = text }); @@ -53,12 +54,12 @@ namespace Observatory.PluginManagement handler?.Invoke(this, notificationArgs); } - if (Properties.Core.Default.NativeNotify && notificationArgs.Rendering.HasFlag(NotificationRendering.NativeVisual)) + if (!OverridePopup && Properties.Core.Default.NativeNotify && notificationArgs.Rendering.HasFlag(NotificationRendering.NativeVisual)) { guid = NativePopup.InvokeNativeNotification(notificationArgs); } - if (Properties.Core.Default.VoiceNotify && notificationArgs.Rendering.HasFlag(NotificationRendering.NativeVocal)) + if (!OverrideAudio && Properties.Core.Default.VoiceNotify && notificationArgs.Rendering.HasFlag(NotificationRendering.NativeVocal)) { NativeVoice.EnqueueAndAnnounce(notificationArgs); } @@ -69,14 +70,13 @@ namespace Observatory.PluginManagement public void CancelNotification(Guid id) { - NativePopup.CloseNotification(id); + ExecuteOnUIThread(() => NativePopup.CloseNotification(id)); } public void UpdateNotification(Guid id, NotificationArgs notificationArgs) { if (!IsLogMonitorBatchReading) { - if (notificationArgs.Rendering.HasFlag(NotificationRendering.PluginNotifier)) { var handler = Notification; @@ -140,6 +140,8 @@ namespace Observatory.PluginManagement public event EventHandler Notification; + internal event EventHandler PluginMessage; + public string PluginStorageFolder { get @@ -161,25 +163,19 @@ namespace Observatory.PluginManagement } } + public async Task PlayAudioFile(string filePath) + { + await AudioHandler.PlayFile(filePath); + } + + public void SendPluginMessage(IObservatoryPlugin plugin, object message) + { + PluginMessage?.Invoke(this, new PluginMessageArgs(plugin.Name, plugin.Version, message)); + } + internal void Shutdown() { NativePopup.CloseAll(); } - - private static bool FirstRowIsAllNull(IObservatoryWorker worker) - { - bool allNull = true; - Type itemType = worker.PluginUI.DataGrid[0].GetType(); - foreach (var property in itemType.GetProperties()) - { - if (property.GetValue(worker.PluginUI.DataGrid[0], null) != null) - { - allNull = false; - break; - } - } - - return allNull; - } } } diff --git a/ObservatoryCore/PluginManagement/PluginEventHandler.cs b/ObservatoryCore/PluginManagement/PluginEventHandler.cs index 44eab77..3292896 100644 --- a/ObservatoryCore/PluginManagement/PluginEventHandler.cs +++ b/ObservatoryCore/PluginManagement/PluginEventHandler.cs @@ -110,6 +110,14 @@ namespace Observatory.PluginManagement } } + public void OnPluginMessageEvent(object _, PluginMessageArgs messageArgs) + { + foreach (var plugin in observatoryNotifiers.Cast().Concat(observatoryWorkers)) + { + plugin.HandlePluginMessage(messageArgs.SourceName, messageArgs.SourceVersion, messageArgs.Message); + } + } + private void ResetTimer() { timer.Stop(); @@ -146,4 +154,18 @@ namespace Observatory.PluginManagement } } } + + internal class PluginMessageArgs + { + internal string SourceName; + internal string SourceVersion; + internal object Message; + + internal PluginMessageArgs(string sourceName, string sourceVersion, object message) + { + SourceName = sourceName; + SourceVersion = sourceVersion; + Message = message; + } + } } diff --git a/ObservatoryCore/PluginManagement/PluginManager.cs b/ObservatoryCore/PluginManagement/PluginManager.cs index 2df6441..f9878bc 100644 --- a/ObservatoryCore/PluginManagement/PluginManager.cs +++ b/ObservatoryCore/PluginManagement/PluginManager.cs @@ -50,7 +50,10 @@ namespace Observatory.PluginManagement logMonitor.StatusUpdate += pluginHandler.OnStatusUpdate; logMonitor.LogMonitorStateChanged += pluginHandler.OnLogMonitorStateChanged; - core = new PluginCore(); + var ovPopup = notifyPlugins.Any(n => n.plugin.OverridePopupNotifications); + var ovAudio = notifyPlugins.Any(n => n.plugin.OverrideAudioNotifications); + + core = new PluginCore(ovPopup, ovAudio); List errorPlugins = new(); @@ -97,6 +100,7 @@ namespace Observatory.PluginManagement notifyPlugins.RemoveAll(n => errorPlugins.Contains(n.plugin)); core.Notification += pluginHandler.OnNotificationEvent; + core.PluginMessage += pluginHandler.OnPluginMessageEvent; if (errorList.Any()) ErrorReporter.ShowErrorPopup("Plugin Load Error" + (errorList.Count > 1 ? "s" : String.Empty), errorList); @@ -114,7 +118,15 @@ namespace Observatory.PluginManagement if (!String.IsNullOrWhiteSpace(savedSettings)) { - pluginSettings = JsonSerializer.Deserialize>(savedSettings); + var settings = JsonSerializer.Deserialize>(savedSettings); + if (settings != null) + { + pluginSettings = settings; + } + else + { + pluginSettings = new(); + } } else { @@ -138,7 +150,7 @@ namespace Observatory.PluginManagement var properties = settings.GetType().GetProperties(); foreach (var property in properties) { - var attrib = property.GetCustomAttribute(); + var attrib = property.GetCustomAttribute(); if (attrib == null) { settingNames.Add(property, property.Name); @@ -396,7 +408,7 @@ namespace Observatory.PluginManagement if (constructor != null) { object instance = constructor.Invoke(Array.Empty()); - notifiers.Add(((instance as IObservatoryNotifier)!, PluginStatus.Signed)); + notifiers.Add(((instance as IObservatoryNotifier)!, pluginStatus)); pluginCount++; } } diff --git a/ObservatoryCore/Properties/Core.Designer.cs b/ObservatoryCore/Properties/Core.Designer.cs index dd4d677..e421d71 100644 --- a/ObservatoryCore/Properties/Core.Designer.cs +++ b/ObservatoryCore/Properties/Core.Designer.cs @@ -12,7 +12,7 @@ namespace Observatory.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")] internal sealed partial class Core : global::System.Configuration.ApplicationSettingsBase { private static Core defaultInstance = ((Core)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Core()))); @@ -285,5 +285,29 @@ namespace Observatory.Properties { this["UnsignedAllowed"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Dark")] + public string Theme { + get { + return ((string)(this["Theme"])); + } + set { + this["Theme"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string ColumnSizing { + get { + return ((string)(this["ColumnSizing"])); + } + set { + this["ColumnSizing"] = value; + } + } } } diff --git a/ObservatoryCore/Properties/Core.settings b/ObservatoryCore/Properties/Core.settings index 41dcaac..da57358 100644 --- a/ObservatoryCore/Properties/Core.settings +++ b/ObservatoryCore/Properties/Core.settings @@ -68,5 +68,11 @@ + + Dark + + + + \ No newline at end of file diff --git a/ObservatoryCore/Resources/ObservatoryCoreIcon.ico b/ObservatoryCore/Resources/ObservatoryCoreIcon.ico new file mode 100644 index 0000000..5d06b9f Binary files /dev/null and b/ObservatoryCore/Resources/ObservatoryCoreIcon.ico differ diff --git a/ObservatoryCore/UI/ColumnSizing.cs b/ObservatoryCore/UI/ColumnSizing.cs new file mode 100644 index 0000000..1385dae --- /dev/null +++ b/ObservatoryCore/UI/ColumnSizing.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.UI +{ + public class ColumnSizing + { + public string PluginName { get; set; } + public string PluginVersion { get; set; } + public Dictionary ColumnWidth + { + get + { + _columnWidth ??= new Dictionary(); + + return _columnWidth; + } + + set => _columnWidth = value; + } + + private Dictionary? _columnWidth; + } +} diff --git a/ObservatoryCore/UI/CoreForm.Designer.cs b/ObservatoryCore/UI/CoreForm.Designer.cs index 5258cbf..7d04d49 100644 --- a/ObservatoryCore/UI/CoreForm.Designer.cs +++ b/ObservatoryCore/UI/CoreForm.Designer.cs @@ -28,634 +28,577 @@ /// private void InitializeComponent() { + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CoreForm)); - this.CoreMenu = new System.Windows.Forms.MenuStrip(); - this.coreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.CorePanel = new System.Windows.Forms.Panel(); - this.VoiceSettingsPanel = new System.Windows.Forms.Panel(); - this.VoiceSpeedSlider = new System.Windows.Forms.TrackBar(); - this.VoiceVolumeSlider = new System.Windows.Forms.TrackBar(); - this.VoiceTestButton = new System.Windows.Forms.Button(); - this.VoiceCheckbox = new System.Windows.Forms.CheckBox(); - this.VoiceDropdown = new System.Windows.Forms.ComboBox(); - this.VoiceLabel = new System.Windows.Forms.Label(); - this.VoiceSpeedLabel = new System.Windows.Forms.Label(); - this.VoiceVolumeLabel = new System.Windows.Forms.Label(); - this.VoiceNotificationLabel = new System.Windows.Forms.Label(); - this.PopupSettingsPanel = new System.Windows.Forms.Panel(); - this.DurationSpinner = new System.Windows.Forms.NumericUpDown(); - this.ScaleSpinner = new System.Windows.Forms.NumericUpDown(); - this.LabelColour = new System.Windows.Forms.Label(); - this.TestButton = new System.Windows.Forms.Button(); - this.ColourButton = new System.Windows.Forms.Button(); - this.PopupCheckbox = new System.Windows.Forms.CheckBox(); - this.LabelDuration = new System.Windows.Forms.Label(); - this.LabelScale = new System.Windows.Forms.Label(); - this.FontDropdown = new System.Windows.Forms.ComboBox(); - this.LabelFont = new System.Windows.Forms.Label(); - this.CornerDropdown = new System.Windows.Forms.ComboBox(); - this.DisplayDropdown = new System.Windows.Forms.ComboBox(); - this.CornerLabel = new System.Windows.Forms.Label(); - this.DisplayLabel = new System.Windows.Forms.Label(); - this.PopupNotificationLabel = new System.Windows.Forms.Label(); - this.PluginFolderButton = new System.Windows.Forms.Button(); - this.PluginList = new System.Windows.Forms.ListView(); - this.NameColumn = new System.Windows.Forms.ColumnHeader(); - this.TypeColumn = new System.Windows.Forms.ColumnHeader(); - this.VersionColumn = new System.Windows.Forms.ColumnHeader(); - this.StatusColumn = new System.Windows.Forms.ColumnHeader(); - this.ReadAllButton = new System.Windows.Forms.Button(); - this.ToggleMonitorButton = new System.Windows.Forms.Button(); - this.ClearButton = new System.Windows.Forms.Button(); - this.ExportButton = new System.Windows.Forms.Button(); - this.GithubLink = new System.Windows.Forms.LinkLabel(); - this.DonateLink = new System.Windows.Forms.LinkLabel(); - this.PopupColour = new System.Windows.Forms.ColorDialog(); - this.CoreMenu.SuspendLayout(); - this.CorePanel.SuspendLayout(); - this.VoiceSettingsPanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.VoiceSpeedSlider)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.VoiceVolumeSlider)).BeginInit(); - this.PopupSettingsPanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.DurationSpinner)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ScaleSpinner)).BeginInit(); - this.SuspendLayout(); + CoreMenu = new MenuStrip(); + coreToolStripMenuItem = new ToolStripMenuItem(); + toolStripMenuItem1 = new ToolStripMenuItem(); + CorePanel = new Panel(); + ThemeLabel = new Label(); + PluginSettingsButton = new Button(); + VoiceSettingsPanel = new Panel(); + VoiceSpeedSlider = new TrackBar(); + VoiceVolumeSlider = new TrackBar(); + VoiceTestButton = new Button(); + VoiceCheckbox = new CheckBox(); + VoiceDropdown = new ComboBox(); + VoiceLabel = new Label(); + VoiceSpeedLabel = new Label(); + VoiceVolumeLabel = new Label(); + VoiceNotificationLabel = new Label(); + PopupSettingsPanel = new Panel(); + DurationSpinner = new NumericUpDown(); + ScaleSpinner = new NumericUpDown(); + LabelColour = new Label(); + TestButton = new Button(); + ColourButton = new Button(); + PopupCheckbox = new CheckBox(); + LabelDuration = new Label(); + LabelScale = new Label(); + FontDropdown = new ComboBox(); + LabelFont = new Label(); + CornerDropdown = new ComboBox(); + DisplayDropdown = new ComboBox(); + CornerLabel = new Label(); + DisplayLabel = new Label(); + PopupNotificationLabel = new Label(); + PluginFolderButton = new Button(); + PluginList = new ListView(); + NameColumn = new ColumnHeader(); + TypeColumn = new ColumnHeader(); + VersionColumn = new ColumnHeader(); + StatusColumn = new ColumnHeader(); + ReadAllButton = new Button(); + ToggleMonitorButton = new Button(); + ClearButton = new Button(); + ExportButton = new Button(); + GithubLink = new LinkLabel(); + DonateLink = new LinkLabel(); + PopupColour = new ColorDialog(); + OverrideTooltip = new ToolTip(components); + CoreMenu.SuspendLayout(); + CorePanel.SuspendLayout(); + VoiceSettingsPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)VoiceSpeedSlider).BeginInit(); + ((System.ComponentModel.ISupportInitialize)VoiceVolumeSlider).BeginInit(); + PopupSettingsPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)DurationSpinner).BeginInit(); + ((System.ComponentModel.ISupportInitialize)ScaleSpinner).BeginInit(); + SuspendLayout(); // // CoreMenu // - this.CoreMenu.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.CoreMenu.AutoSize = false; - this.CoreMenu.BackColor = System.Drawing.Color.Black; - this.CoreMenu.Dock = System.Windows.Forms.DockStyle.None; - this.CoreMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.coreToolStripMenuItem, - this.toolStripMenuItem1}); - this.CoreMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; - this.CoreMenu.Location = new System.Drawing.Point(0, 0); - this.CoreMenu.Name = "CoreMenu"; - this.CoreMenu.Size = new System.Drawing.Size(120, 691); - this.CoreMenu.TabIndex = 0; + CoreMenu.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left; + CoreMenu.AutoSize = false; + CoreMenu.Dock = DockStyle.None; + CoreMenu.Items.AddRange(new ToolStripItem[] { coreToolStripMenuItem, toolStripMenuItem1 }); + CoreMenu.LayoutStyle = ToolStripLayoutStyle.VerticalStackWithOverflow; + CoreMenu.Location = new Point(0, 0); + CoreMenu.Name = "CoreMenu"; + CoreMenu.Size = new Size(120, 691); + CoreMenu.TabIndex = 0; // // coreToolStripMenuItem // - this.coreToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.coreToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.coreToolStripMenuItem.Name = "coreToolStripMenuItem"; - this.coreToolStripMenuItem.Size = new System.Drawing.Size(113, 36); - this.coreToolStripMenuItem.Text = "Core"; - this.coreToolStripMenuItem.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + coreToolStripMenuItem.Font = new Font("Segoe UI", 18F, FontStyle.Regular, GraphicsUnit.Point); + coreToolStripMenuItem.Name = "coreToolStripMenuItem"; + coreToolStripMenuItem.Size = new Size(113, 36); + coreToolStripMenuItem.Text = "Core"; + coreToolStripMenuItem.TextAlign = ContentAlignment.MiddleLeft; // // toolStripMenuItem1 // - this.toolStripMenuItem1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripMenuItem1.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.toolStripMenuItem1.ForeColor = System.Drawing.Color.Gainsboro; - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(113, 36); - this.toolStripMenuItem1.Text = "<"; - this.toolStripMenuItem1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + toolStripMenuItem1.Alignment = ToolStripItemAlignment.Right; + toolStripMenuItem1.Font = new Font("Segoe UI", 18F, FontStyle.Regular, GraphicsUnit.Point); + toolStripMenuItem1.Name = "toolStripMenuItem1"; + toolStripMenuItem1.Size = new Size(113, 36); + toolStripMenuItem1.Text = "<"; + toolStripMenuItem1.TextAlign = ContentAlignment.MiddleLeft; // // CorePanel // - this.CorePanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.CorePanel.AutoScroll = true; - this.CorePanel.Controls.Add(this.VoiceSettingsPanel); - this.CorePanel.Controls.Add(this.VoiceNotificationLabel); - this.CorePanel.Controls.Add(this.PopupSettingsPanel); - this.CorePanel.Controls.Add(this.PopupNotificationLabel); - this.CorePanel.Controls.Add(this.PluginFolderButton); - this.CorePanel.Controls.Add(this.PluginList); - this.CorePanel.Location = new System.Drawing.Point(123, 12); - this.CorePanel.Name = "CorePanel"; - this.CorePanel.Size = new System.Drawing.Size(665, 679); - this.CorePanel.TabIndex = 1; + CorePanel.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + CorePanel.AutoScroll = true; + CorePanel.Controls.Add(ThemeLabel); + CorePanel.Controls.Add(PluginSettingsButton); + CorePanel.Controls.Add(VoiceSettingsPanel); + CorePanel.Controls.Add(VoiceNotificationLabel); + CorePanel.Controls.Add(PopupSettingsPanel); + CorePanel.Controls.Add(PopupNotificationLabel); + CorePanel.Controls.Add(PluginFolderButton); + CorePanel.Controls.Add(PluginList); + CorePanel.Location = new Point(123, 12); + CorePanel.Name = "CorePanel"; + CorePanel.Size = new Size(665, 679); + CorePanel.TabIndex = 1; + // + // ThemeLabel + // + ThemeLabel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + ThemeLabel.BorderStyle = BorderStyle.FixedSingle; + ThemeLabel.Location = new Point(3, 603); + ThemeLabel.Name = "ThemeLabel"; + ThemeLabel.Size = new Size(659, 23); + ThemeLabel.TabIndex = 7; + ThemeLabel.Text = "❯ Theme"; + ThemeLabel.TextAlign = ContentAlignment.MiddleLeft; + // + // PluginSettingsButton + // + PluginSettingsButton.Anchor = AnchorStyles.Top | AnchorStyles.Right; + PluginSettingsButton.FlatAppearance.BorderSize = 0; + PluginSettingsButton.FlatStyle = FlatStyle.Flat; + PluginSettingsButton.Location = new Point(396, 140); + PluginSettingsButton.Name = "PluginSettingsButton"; + PluginSettingsButton.Size = new Size(130, 23); + PluginSettingsButton.TabIndex = 6; + PluginSettingsButton.Text = "Plugin Settings"; + PluginSettingsButton.UseVisualStyleBackColor = false; + PluginSettingsButton.Click += PluginSettingsButton_Click; // // VoiceSettingsPanel // - this.VoiceSettingsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.VoiceSettingsPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.VoiceSettingsPanel.Controls.Add(this.VoiceSpeedSlider); - this.VoiceSettingsPanel.Controls.Add(this.VoiceVolumeSlider); - this.VoiceSettingsPanel.Controls.Add(this.VoiceTestButton); - this.VoiceSettingsPanel.Controls.Add(this.VoiceCheckbox); - this.VoiceSettingsPanel.Controls.Add(this.VoiceDropdown); - this.VoiceSettingsPanel.Controls.Add(this.VoiceLabel); - this.VoiceSettingsPanel.Controls.Add(this.VoiceSpeedLabel); - this.VoiceSettingsPanel.Controls.Add(this.VoiceVolumeLabel); - this.VoiceSettingsPanel.Location = new System.Drawing.Point(3, 426); - this.VoiceSettingsPanel.Name = "VoiceSettingsPanel"; - this.VoiceSettingsPanel.Size = new System.Drawing.Size(659, 177); - this.VoiceSettingsPanel.TabIndex = 5; - this.VoiceSettingsPanel.Visible = false; + VoiceSettingsPanel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + VoiceSettingsPanel.Controls.Add(VoiceSpeedSlider); + VoiceSettingsPanel.Controls.Add(VoiceVolumeSlider); + VoiceSettingsPanel.Controls.Add(VoiceTestButton); + VoiceSettingsPanel.Controls.Add(VoiceCheckbox); + VoiceSettingsPanel.Controls.Add(VoiceDropdown); + VoiceSettingsPanel.Controls.Add(VoiceLabel); + VoiceSettingsPanel.Controls.Add(VoiceSpeedLabel); + VoiceSettingsPanel.Controls.Add(VoiceVolumeLabel); + VoiceSettingsPanel.Location = new Point(3, 426); + VoiceSettingsPanel.Name = "VoiceSettingsPanel"; + VoiceSettingsPanel.Size = new Size(659, 177); + VoiceSettingsPanel.TabIndex = 5; + VoiceSettingsPanel.Visible = false; // // VoiceSpeedSlider // - this.VoiceSpeedSlider.Location = new System.Drawing.Point(121, 51); - this.VoiceSpeedSlider.Maximum = 100; - this.VoiceSpeedSlider.Name = "VoiceSpeedSlider"; - this.VoiceSpeedSlider.Size = new System.Drawing.Size(120, 45); - this.VoiceSpeedSlider.TabIndex = 15; - this.VoiceSpeedSlider.TickFrequency = 10; - this.VoiceSpeedSlider.TickStyle = System.Windows.Forms.TickStyle.Both; - this.VoiceSpeedSlider.Value = 50; - this.VoiceSpeedSlider.Scroll += new System.EventHandler(this.VoiceSpeedSlider_Scroll); + VoiceSpeedSlider.Location = new Point(121, 51); + VoiceSpeedSlider.Maximum = 100; + VoiceSpeedSlider.Name = "VoiceSpeedSlider"; + VoiceSpeedSlider.Size = new Size(120, 45); + VoiceSpeedSlider.TabIndex = 15; + VoiceSpeedSlider.TickFrequency = 10; + VoiceSpeedSlider.TickStyle = TickStyle.Both; + VoiceSpeedSlider.Value = 50; + VoiceSpeedSlider.Scroll += VoiceSpeedSlider_Scroll; // // VoiceVolumeSlider // - this.VoiceVolumeSlider.LargeChange = 10; - this.VoiceVolumeSlider.Location = new System.Drawing.Point(120, 0); - this.VoiceVolumeSlider.Maximum = 100; - this.VoiceVolumeSlider.Name = "VoiceVolumeSlider"; - this.VoiceVolumeSlider.Size = new System.Drawing.Size(121, 45); - this.VoiceVolumeSlider.TabIndex = 14; - this.VoiceVolumeSlider.TickFrequency = 10; - this.VoiceVolumeSlider.TickStyle = System.Windows.Forms.TickStyle.Both; - this.VoiceVolumeSlider.Value = 100; - this.VoiceVolumeSlider.Scroll += new System.EventHandler(this.VoiceVolumeSlider_Scroll); + VoiceVolumeSlider.LargeChange = 10; + VoiceVolumeSlider.Location = new Point(120, 0); + VoiceVolumeSlider.Maximum = 100; + VoiceVolumeSlider.Name = "VoiceVolumeSlider"; + VoiceVolumeSlider.Size = new Size(121, 45); + VoiceVolumeSlider.TabIndex = 14; + VoiceVolumeSlider.TickFrequency = 10; + VoiceVolumeSlider.TickStyle = TickStyle.Both; + VoiceVolumeSlider.Value = 100; + VoiceVolumeSlider.Scroll += VoiceVolumeSlider_Scroll; // // VoiceTestButton // - this.VoiceTestButton.BackColor = System.Drawing.Color.DimGray; - this.VoiceTestButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.VoiceTestButton.ForeColor = System.Drawing.Color.WhiteSmoke; - this.VoiceTestButton.Location = new System.Drawing.Point(190, 131); - this.VoiceTestButton.Name = "VoiceTestButton"; - this.VoiceTestButton.Size = new System.Drawing.Size(51, 23); - this.VoiceTestButton.TabIndex = 13; - this.VoiceTestButton.Text = "Test"; - this.VoiceTestButton.UseVisualStyleBackColor = false; + VoiceTestButton.FlatStyle = FlatStyle.Flat; + VoiceTestButton.Location = new Point(190, 131); + VoiceTestButton.Name = "VoiceTestButton"; + VoiceTestButton.Size = new Size(51, 23); + VoiceTestButton.TabIndex = 13; + VoiceTestButton.Text = "Test"; + VoiceTestButton.UseVisualStyleBackColor = false; // // VoiceCheckbox // - this.VoiceCheckbox.AutoSize = true; - this.VoiceCheckbox.ForeColor = System.Drawing.Color.Gainsboro; - this.VoiceCheckbox.Location = new System.Drawing.Point(120, 134); - this.VoiceCheckbox.Name = "VoiceCheckbox"; - this.VoiceCheckbox.Size = new System.Drawing.Size(68, 19); - this.VoiceCheckbox.TabIndex = 11; - this.VoiceCheckbox.Text = "Enabled"; - this.VoiceCheckbox.UseVisualStyleBackColor = true; - this.VoiceCheckbox.CheckedChanged += new System.EventHandler(this.VoiceCheckbox_CheckedChanged); + VoiceCheckbox.AutoSize = true; + VoiceCheckbox.Location = new Point(120, 134); + VoiceCheckbox.Name = "VoiceCheckbox"; + VoiceCheckbox.Size = new Size(68, 19); + VoiceCheckbox.TabIndex = 11; + VoiceCheckbox.Text = "Enabled"; + VoiceCheckbox.UseVisualStyleBackColor = true; + VoiceCheckbox.CheckedChanged += VoiceCheckbox_CheckedChanged; // // VoiceDropdown // - this.VoiceDropdown.FormattingEnabled = true; - this.VoiceDropdown.Location = new System.Drawing.Point(121, 102); - this.VoiceDropdown.Name = "VoiceDropdown"; - this.VoiceDropdown.Size = new System.Drawing.Size(121, 23); - this.VoiceDropdown.TabIndex = 5; - this.VoiceDropdown.SelectedIndexChanged += new System.EventHandler(this.VoiceDropdown_SelectedIndexChanged); + VoiceDropdown.FormattingEnabled = true; + VoiceDropdown.Location = new Point(121, 102); + VoiceDropdown.Name = "VoiceDropdown"; + VoiceDropdown.Size = new Size(121, 23); + VoiceDropdown.TabIndex = 5; + VoiceDropdown.SelectedIndexChanged += VoiceDropdown_SelectedIndexChanged; // // VoiceLabel // - this.VoiceLabel.AutoSize = true; - this.VoiceLabel.ForeColor = System.Drawing.Color.Gainsboro; - this.VoiceLabel.Location = new System.Drawing.Point(77, 105); - this.VoiceLabel.Name = "VoiceLabel"; - this.VoiceLabel.Size = new System.Drawing.Size(38, 15); - this.VoiceLabel.TabIndex = 4; - this.VoiceLabel.Text = "Voice:"; - this.VoiceLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + VoiceLabel.AutoSize = true; + VoiceLabel.Location = new Point(77, 105); + VoiceLabel.Name = "VoiceLabel"; + VoiceLabel.Size = new Size(38, 15); + VoiceLabel.TabIndex = 4; + VoiceLabel.Text = "Voice:"; + VoiceLabel.TextAlign = ContentAlignment.MiddleRight; // // VoiceSpeedLabel // - this.VoiceSpeedLabel.AutoSize = true; - this.VoiceSpeedLabel.ForeColor = System.Drawing.Color.Gainsboro; - this.VoiceSpeedLabel.Location = new System.Drawing.Point(73, 63); - this.VoiceSpeedLabel.Name = "VoiceSpeedLabel"; - this.VoiceSpeedLabel.Size = new System.Drawing.Size(42, 15); - this.VoiceSpeedLabel.TabIndex = 1; - this.VoiceSpeedLabel.Text = "Speed:"; - this.VoiceSpeedLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + VoiceSpeedLabel.AutoSize = true; + VoiceSpeedLabel.Location = new Point(73, 63); + VoiceSpeedLabel.Name = "VoiceSpeedLabel"; + VoiceSpeedLabel.Size = new Size(42, 15); + VoiceSpeedLabel.TabIndex = 1; + VoiceSpeedLabel.Text = "Speed:"; + VoiceSpeedLabel.TextAlign = ContentAlignment.MiddleRight; // // VoiceVolumeLabel // - this.VoiceVolumeLabel.AutoSize = true; - this.VoiceVolumeLabel.ForeColor = System.Drawing.Color.Gainsboro; - this.VoiceVolumeLabel.Location = new System.Drawing.Point(64, 12); - this.VoiceVolumeLabel.Name = "VoiceVolumeLabel"; - this.VoiceVolumeLabel.Size = new System.Drawing.Size(50, 15); - this.VoiceVolumeLabel.TabIndex = 0; - this.VoiceVolumeLabel.Text = "Volume:"; - this.VoiceVolumeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + VoiceVolumeLabel.AutoSize = true; + VoiceVolumeLabel.Location = new Point(64, 12); + VoiceVolumeLabel.Name = "VoiceVolumeLabel"; + VoiceVolumeLabel.Size = new Size(50, 15); + VoiceVolumeLabel.TabIndex = 0; + VoiceVolumeLabel.Text = "Volume:"; + VoiceVolumeLabel.TextAlign = ContentAlignment.MiddleRight; // // VoiceNotificationLabel // - this.VoiceNotificationLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.VoiceNotificationLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.VoiceNotificationLabel.ForeColor = System.Drawing.Color.LightGray; - this.VoiceNotificationLabel.Location = new System.Drawing.Point(3, 403); - this.VoiceNotificationLabel.Name = "VoiceNotificationLabel"; - this.VoiceNotificationLabel.Size = new System.Drawing.Size(659, 23); - this.VoiceNotificationLabel.TabIndex = 4; - this.VoiceNotificationLabel.Text = "❯ Voice Notifications"; - this.VoiceNotificationLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.VoiceNotificationLabel.Click += new System.EventHandler(this.VoiceNotificationLabel_Click); + VoiceNotificationLabel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + VoiceNotificationLabel.BorderStyle = BorderStyle.FixedSingle; + VoiceNotificationLabel.Location = new Point(3, 403); + VoiceNotificationLabel.Name = "VoiceNotificationLabel"; + VoiceNotificationLabel.Size = new Size(659, 23); + VoiceNotificationLabel.TabIndex = 4; + VoiceNotificationLabel.Text = "❯ Voice Notifications"; + VoiceNotificationLabel.TextAlign = ContentAlignment.MiddleLeft; + VoiceNotificationLabel.Click += VoiceNotificationLabel_Click; // // PopupSettingsPanel // - this.PopupSettingsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.PopupSettingsPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.PopupSettingsPanel.Controls.Add(this.DurationSpinner); - this.PopupSettingsPanel.Controls.Add(this.ScaleSpinner); - this.PopupSettingsPanel.Controls.Add(this.LabelColour); - this.PopupSettingsPanel.Controls.Add(this.TestButton); - this.PopupSettingsPanel.Controls.Add(this.ColourButton); - this.PopupSettingsPanel.Controls.Add(this.PopupCheckbox); - this.PopupSettingsPanel.Controls.Add(this.LabelDuration); - this.PopupSettingsPanel.Controls.Add(this.LabelScale); - this.PopupSettingsPanel.Controls.Add(this.FontDropdown); - this.PopupSettingsPanel.Controls.Add(this.LabelFont); - this.PopupSettingsPanel.Controls.Add(this.CornerDropdown); - this.PopupSettingsPanel.Controls.Add(this.DisplayDropdown); - this.PopupSettingsPanel.Controls.Add(this.CornerLabel); - this.PopupSettingsPanel.Controls.Add(this.DisplayLabel); - this.PopupSettingsPanel.Location = new System.Drawing.Point(3, 195); - this.PopupSettingsPanel.Name = "PopupSettingsPanel"; - this.PopupSettingsPanel.Size = new System.Drawing.Size(659, 208); - this.PopupSettingsPanel.TabIndex = 3; - this.PopupSettingsPanel.Visible = false; + PopupSettingsPanel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + PopupSettingsPanel.Controls.Add(DurationSpinner); + PopupSettingsPanel.Controls.Add(ScaleSpinner); + PopupSettingsPanel.Controls.Add(LabelColour); + PopupSettingsPanel.Controls.Add(TestButton); + PopupSettingsPanel.Controls.Add(ColourButton); + PopupSettingsPanel.Controls.Add(PopupCheckbox); + PopupSettingsPanel.Controls.Add(LabelDuration); + PopupSettingsPanel.Controls.Add(LabelScale); + PopupSettingsPanel.Controls.Add(FontDropdown); + PopupSettingsPanel.Controls.Add(LabelFont); + PopupSettingsPanel.Controls.Add(CornerDropdown); + PopupSettingsPanel.Controls.Add(DisplayDropdown); + PopupSettingsPanel.Controls.Add(CornerLabel); + PopupSettingsPanel.Controls.Add(DisplayLabel); + PopupSettingsPanel.Location = new Point(3, 195); + PopupSettingsPanel.Name = "PopupSettingsPanel"; + PopupSettingsPanel.Size = new Size(659, 208); + PopupSettingsPanel.TabIndex = 3; + PopupSettingsPanel.Visible = false; // // DurationSpinner // - this.DurationSpinner.BackColor = System.Drawing.Color.DimGray; - this.DurationSpinner.ForeColor = System.Drawing.Color.Gainsboro; - this.DurationSpinner.Increment = new decimal(new int[] { - 25, - 0, - 0, - 0}); - this.DurationSpinner.Location = new System.Drawing.Point(121, 119); - this.DurationSpinner.Maximum = new decimal(new int[] { - 60000, - 0, - 0, - 0}); - this.DurationSpinner.Minimum = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.DurationSpinner.Name = "DurationSpinner"; - this.DurationSpinner.Size = new System.Drawing.Size(120, 23); - this.DurationSpinner.TabIndex = 15; - this.DurationSpinner.Value = new decimal(new int[] { - 8000, - 0, - 0, - 0}); - this.DurationSpinner.ValueChanged += new System.EventHandler(this.DurationSpinner_ValueChanged); + DurationSpinner.Increment = new decimal(new int[] { 25, 0, 0, 0 }); + DurationSpinner.Location = new Point(121, 119); + DurationSpinner.Maximum = new decimal(new int[] { 60000, 0, 0, 0 }); + DurationSpinner.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + DurationSpinner.Name = "DurationSpinner"; + DurationSpinner.Size = new Size(120, 23); + DurationSpinner.TabIndex = 15; + DurationSpinner.Value = new decimal(new int[] { 8000, 0, 0, 0 }); + DurationSpinner.ValueChanged += DurationSpinner_ValueChanged; // // ScaleSpinner // - this.ScaleSpinner.BackColor = System.Drawing.Color.DimGray; - this.ScaleSpinner.ForeColor = System.Drawing.Color.Gainsboro; - this.ScaleSpinner.Location = new System.Drawing.Point(121, 90); - this.ScaleSpinner.Maximum = new decimal(new int[] { - 500, - 0, - 0, - 0}); - this.ScaleSpinner.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.ScaleSpinner.Name = "ScaleSpinner"; - this.ScaleSpinner.Size = new System.Drawing.Size(120, 23); - this.ScaleSpinner.TabIndex = 14; - this.ScaleSpinner.Value = new decimal(new int[] { - 100, - 0, - 0, - 0}); - this.ScaleSpinner.ValueChanged += new System.EventHandler(this.ScaleSpinner_ValueChanged); + ScaleSpinner.Location = new Point(121, 90); + ScaleSpinner.Maximum = new decimal(new int[] { 500, 0, 0, 0 }); + ScaleSpinner.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + ScaleSpinner.Name = "ScaleSpinner"; + ScaleSpinner.Size = new Size(120, 23); + ScaleSpinner.TabIndex = 14; + ScaleSpinner.Value = new decimal(new int[] { 100, 0, 0, 0 }); + ScaleSpinner.ValueChanged += ScaleSpinner_ValueChanged; // // LabelColour // - this.LabelColour.AutoSize = true; - this.LabelColour.ForeColor = System.Drawing.Color.Gainsboro; - this.LabelColour.Location = new System.Drawing.Point(68, 152); - this.LabelColour.Name = "LabelColour"; - this.LabelColour.Size = new System.Drawing.Size(46, 15); - this.LabelColour.TabIndex = 13; - this.LabelColour.Text = "Colour:"; - this.LabelColour.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + LabelColour.AutoSize = true; + LabelColour.Location = new Point(68, 152); + LabelColour.Name = "LabelColour"; + LabelColour.Size = new Size(46, 15); + LabelColour.TabIndex = 13; + LabelColour.Text = "Colour:"; + LabelColour.TextAlign = ContentAlignment.MiddleRight; // // TestButton // - this.TestButton.BackColor = System.Drawing.Color.DimGray; - this.TestButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.TestButton.ForeColor = System.Drawing.Color.WhiteSmoke; - this.TestButton.Location = new System.Drawing.Point(190, 148); - this.TestButton.Name = "TestButton"; - this.TestButton.Size = new System.Drawing.Size(51, 23); - this.TestButton.TabIndex = 12; - this.TestButton.Text = "Test"; - this.TestButton.UseVisualStyleBackColor = false; - this.TestButton.Click += new System.EventHandler(this.TestButton_Click); + TestButton.FlatStyle = FlatStyle.Flat; + TestButton.Location = new Point(190, 148); + TestButton.Name = "TestButton"; + TestButton.Size = new Size(51, 23); + TestButton.TabIndex = 12; + TestButton.Text = "Test"; + TestButton.UseVisualStyleBackColor = false; + TestButton.Click += TestButton_Click; // // ColourButton // - this.ColourButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ColourButton.Location = new System.Drawing.Point(121, 148); - this.ColourButton.Name = "ColourButton"; - this.ColourButton.Size = new System.Drawing.Size(51, 23); - this.ColourButton.TabIndex = 11; - this.ColourButton.UseVisualStyleBackColor = true; - this.ColourButton.Click += new System.EventHandler(this.ColourButton_Click); + ColourButton.FlatStyle = FlatStyle.Flat; + ColourButton.Location = new Point(121, 148); + ColourButton.Name = "ColourButton"; + ColourButton.Size = new Size(51, 23); + ColourButton.TabIndex = 11; + ColourButton.UseVisualStyleBackColor = true; + ColourButton.Click += ColourButton_Click; // // PopupCheckbox // - this.PopupCheckbox.AutoSize = true; - this.PopupCheckbox.ForeColor = System.Drawing.Color.Gainsboro; - this.PopupCheckbox.Location = new System.Drawing.Point(120, 177); - this.PopupCheckbox.Name = "PopupCheckbox"; - this.PopupCheckbox.Size = new System.Drawing.Size(68, 19); - this.PopupCheckbox.TabIndex = 10; - this.PopupCheckbox.Text = "Enabled"; - this.PopupCheckbox.UseVisualStyleBackColor = true; - this.PopupCheckbox.CheckedChanged += new System.EventHandler(this.PopupCheckbox_CheckedChanged); + PopupCheckbox.AutoSize = true; + PopupCheckbox.Location = new Point(120, 177); + PopupCheckbox.Name = "PopupCheckbox"; + PopupCheckbox.Size = new Size(68, 19); + PopupCheckbox.TabIndex = 10; + PopupCheckbox.Text = "Enabled"; + PopupCheckbox.UseVisualStyleBackColor = true; + PopupCheckbox.CheckedChanged += PopupCheckbox_CheckedChanged; // // LabelDuration // - this.LabelDuration.AutoSize = true; - this.LabelDuration.ForeColor = System.Drawing.Color.Gainsboro; - this.LabelDuration.Location = new System.Drawing.Point(32, 121); - this.LabelDuration.Name = "LabelDuration"; - this.LabelDuration.Size = new System.Drawing.Size(83, 15); - this.LabelDuration.TabIndex = 9; - this.LabelDuration.Text = "Duration (ms):"; - this.LabelDuration.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + LabelDuration.AutoSize = true; + LabelDuration.Location = new Point(32, 121); + LabelDuration.Name = "LabelDuration"; + LabelDuration.Size = new Size(83, 15); + LabelDuration.TabIndex = 9; + LabelDuration.Text = "Duration (ms):"; + LabelDuration.TextAlign = ContentAlignment.MiddleRight; // // LabelScale // - this.LabelScale.AutoSize = true; - this.LabelScale.ForeColor = System.Drawing.Color.Gainsboro; - this.LabelScale.Location = new System.Drawing.Point(57, 92); - this.LabelScale.Name = "LabelScale"; - this.LabelScale.Size = new System.Drawing.Size(58, 15); - this.LabelScale.TabIndex = 7; - this.LabelScale.Text = "Scale (%):"; - this.LabelScale.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + LabelScale.AutoSize = true; + LabelScale.Location = new Point(57, 92); + LabelScale.Name = "LabelScale"; + LabelScale.Size = new Size(58, 15); + LabelScale.TabIndex = 7; + LabelScale.Text = "Scale (%):"; + LabelScale.TextAlign = ContentAlignment.MiddleRight; // // FontDropdown // - this.FontDropdown.FormattingEnabled = true; - this.FontDropdown.Location = new System.Drawing.Point(120, 61); - this.FontDropdown.Name = "FontDropdown"; - this.FontDropdown.Size = new System.Drawing.Size(121, 23); - this.FontDropdown.TabIndex = 5; - this.FontDropdown.SelectedIndexChanged += new System.EventHandler(this.FontDropdown_SelectedIndexChanged); + FontDropdown.FormattingEnabled = true; + FontDropdown.Location = new Point(120, 61); + FontDropdown.Name = "FontDropdown"; + FontDropdown.Size = new Size(121, 23); + FontDropdown.TabIndex = 5; + FontDropdown.SelectedIndexChanged += FontDropdown_SelectedIndexChanged; // // LabelFont // - this.LabelFont.AutoSize = true; - this.LabelFont.ForeColor = System.Drawing.Color.Gainsboro; - this.LabelFont.Location = new System.Drawing.Point(80, 64); - this.LabelFont.Name = "LabelFont"; - this.LabelFont.Size = new System.Drawing.Size(34, 15); - this.LabelFont.TabIndex = 4; - this.LabelFont.Text = "Font:"; - this.LabelFont.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + LabelFont.AutoSize = true; + LabelFont.Location = new Point(80, 64); + LabelFont.Name = "LabelFont"; + LabelFont.Size = new Size(34, 15); + LabelFont.TabIndex = 4; + LabelFont.Text = "Font:"; + LabelFont.TextAlign = ContentAlignment.MiddleRight; // // CornerDropdown // - this.CornerDropdown.FormattingEnabled = true; - this.CornerDropdown.Items.AddRange(new object[] { - "Bottom-Right", - "Bottom-Left", - "Top-Right", - "Top-Left"}); - this.CornerDropdown.Location = new System.Drawing.Point(120, 32); - this.CornerDropdown.Name = "CornerDropdown"; - this.CornerDropdown.Size = new System.Drawing.Size(121, 23); - this.CornerDropdown.TabIndex = 3; - this.CornerDropdown.SelectedIndexChanged += new System.EventHandler(this.CornerDropdown_SelectedIndexChanged); + CornerDropdown.FormattingEnabled = true; + CornerDropdown.Items.AddRange(new object[] { "Bottom-Right", "Bottom-Left", "Top-Right", "Top-Left" }); + CornerDropdown.Location = new Point(120, 32); + CornerDropdown.Name = "CornerDropdown"; + CornerDropdown.Size = new Size(121, 23); + CornerDropdown.TabIndex = 3; + CornerDropdown.SelectedIndexChanged += CornerDropdown_SelectedIndexChanged; // // DisplayDropdown // - this.DisplayDropdown.FormattingEnabled = true; - this.DisplayDropdown.Location = new System.Drawing.Point(120, 3); - this.DisplayDropdown.Name = "DisplayDropdown"; - this.DisplayDropdown.Size = new System.Drawing.Size(121, 23); - this.DisplayDropdown.TabIndex = 2; - this.DisplayDropdown.SelectedIndexChanged += new System.EventHandler(this.DisplayDropdown_SelectedIndexChanged); + DisplayDropdown.FormattingEnabled = true; + DisplayDropdown.Location = new Point(120, 3); + DisplayDropdown.Name = "DisplayDropdown"; + DisplayDropdown.Size = new Size(121, 23); + DisplayDropdown.TabIndex = 2; + DisplayDropdown.SelectedIndexChanged += DisplayDropdown_SelectedIndexChanged; // // CornerLabel // - this.CornerLabel.AutoSize = true; - this.CornerLabel.ForeColor = System.Drawing.Color.Gainsboro; - this.CornerLabel.Location = new System.Drawing.Point(68, 35); - this.CornerLabel.Name = "CornerLabel"; - this.CornerLabel.Size = new System.Drawing.Size(46, 15); - this.CornerLabel.TabIndex = 1; - this.CornerLabel.Text = "Corner:"; - this.CornerLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + CornerLabel.AutoSize = true; + CornerLabel.Location = new Point(68, 35); + CornerLabel.Name = "CornerLabel"; + CornerLabel.Size = new Size(46, 15); + CornerLabel.TabIndex = 1; + CornerLabel.Text = "Corner:"; + CornerLabel.TextAlign = ContentAlignment.MiddleRight; // // DisplayLabel // - this.DisplayLabel.AutoSize = true; - this.DisplayLabel.ForeColor = System.Drawing.Color.Gainsboro; - this.DisplayLabel.Location = new System.Drawing.Point(66, 6); - this.DisplayLabel.Name = "DisplayLabel"; - this.DisplayLabel.Size = new System.Drawing.Size(48, 15); - this.DisplayLabel.TabIndex = 0; - this.DisplayLabel.Text = "Display:"; - this.DisplayLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + DisplayLabel.AutoSize = true; + DisplayLabel.Location = new Point(66, 6); + DisplayLabel.Name = "DisplayLabel"; + DisplayLabel.Size = new Size(48, 15); + DisplayLabel.TabIndex = 0; + DisplayLabel.Text = "Display:"; + DisplayLabel.TextAlign = ContentAlignment.MiddleRight; // // PopupNotificationLabel // - this.PopupNotificationLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.PopupNotificationLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PopupNotificationLabel.ForeColor = System.Drawing.Color.LightGray; - this.PopupNotificationLabel.Location = new System.Drawing.Point(3, 172); - this.PopupNotificationLabel.Name = "PopupNotificationLabel"; - this.PopupNotificationLabel.Size = new System.Drawing.Size(659, 23); - this.PopupNotificationLabel.TabIndex = 2; - this.PopupNotificationLabel.Text = "❯ Popup Notifications"; - this.PopupNotificationLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.PopupNotificationLabel.Click += new System.EventHandler(this.PopupNotificationLabel_Click); + PopupNotificationLabel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + PopupNotificationLabel.BorderStyle = BorderStyle.FixedSingle; + PopupNotificationLabel.Location = new Point(3, 172); + PopupNotificationLabel.Name = "PopupNotificationLabel"; + PopupNotificationLabel.Size = new Size(659, 23); + PopupNotificationLabel.TabIndex = 2; + PopupNotificationLabel.Text = "❯ Popup Notifications"; + PopupNotificationLabel.TextAlign = ContentAlignment.MiddleLeft; + PopupNotificationLabel.Click += PopupNotificationLabel_Click; // // PluginFolderButton // - this.PluginFolderButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PluginFolderButton.BackColor = System.Drawing.Color.DimGray; - this.PluginFolderButton.FlatAppearance.BorderSize = 0; - this.PluginFolderButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.PluginFolderButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.PluginFolderButton.Location = new System.Drawing.Point(532, 140); - this.PluginFolderButton.Name = "PluginFolderButton"; - this.PluginFolderButton.Size = new System.Drawing.Size(130, 23); - this.PluginFolderButton.TabIndex = 1; - this.PluginFolderButton.Text = "Open Plugin Folder"; - this.PluginFolderButton.UseVisualStyleBackColor = false; + PluginFolderButton.Anchor = AnchorStyles.Top | AnchorStyles.Right; + PluginFolderButton.FlatAppearance.BorderSize = 0; + PluginFolderButton.FlatStyle = FlatStyle.Flat; + PluginFolderButton.Location = new Point(532, 140); + PluginFolderButton.Name = "PluginFolderButton"; + PluginFolderButton.Size = new Size(130, 23); + PluginFolderButton.TabIndex = 1; + PluginFolderButton.Text = "Open Plugin Folder"; + PluginFolderButton.UseVisualStyleBackColor = false; // // PluginList // - this.PluginList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.PluginList.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.PluginList.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.PluginList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.NameColumn, - this.TypeColumn, - this.VersionColumn, - this.StatusColumn}); - this.PluginList.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.PluginList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.PluginList.Location = new System.Drawing.Point(3, 3); - this.PluginList.MultiSelect = false; - this.PluginList.Name = "PluginList"; - this.PluginList.OwnerDraw = true; - this.PluginList.Scrollable = false; - this.PluginList.Size = new System.Drawing.Size(659, 137); - this.PluginList.TabIndex = 0; - this.PluginList.UseCompatibleStateImageBehavior = false; - this.PluginList.View = System.Windows.Forms.View.Details; - this.PluginList.Resize += new System.EventHandler(this.PluginList_Resize); + PluginList.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + PluginList.BorderStyle = BorderStyle.None; + PluginList.Columns.AddRange(new ColumnHeader[] { NameColumn, TypeColumn, VersionColumn, StatusColumn }); + PluginList.HeaderStyle = ColumnHeaderStyle.Nonclickable; + PluginList.ImeMode = ImeMode.NoControl; + PluginList.Location = new Point(3, 3); + PluginList.MultiSelect = false; + PluginList.Name = "PluginList"; + PluginList.OwnerDraw = true; + PluginList.Scrollable = false; + PluginList.Size = new Size(659, 137); + PluginList.TabIndex = 0; + PluginList.UseCompatibleStateImageBehavior = false; + PluginList.View = View.Details; + PluginList.Resize += PluginList_Resize; // // NameColumn // - this.NameColumn.Text = "Plugin"; - this.NameColumn.Width = 180; + NameColumn.Text = "Plugin"; + NameColumn.Width = 180; // // TypeColumn // - this.TypeColumn.Text = "Type"; - this.TypeColumn.Width = 120; + TypeColumn.Text = "Type"; + TypeColumn.Width = 120; // // VersionColumn // - this.VersionColumn.Text = "Version"; - this.VersionColumn.Width = 120; + VersionColumn.Text = "Version"; + VersionColumn.Width = 120; // // StatusColumn // - this.StatusColumn.Text = "Status"; + StatusColumn.Text = "Status"; // // ReadAllButton // - this.ReadAllButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ReadAllButton.BackColor = System.Drawing.Color.DimGray; - this.ReadAllButton.FlatAppearance.BorderSize = 0; - this.ReadAllButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ReadAllButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.ReadAllButton.Location = new System.Drawing.Point(713, 698); - this.ReadAllButton.Name = "ReadAllButton"; - this.ReadAllButton.Size = new System.Drawing.Size(75, 23); - this.ReadAllButton.TabIndex = 2; - this.ReadAllButton.Text = "Read All"; - this.ReadAllButton.UseVisualStyleBackColor = false; - this.ReadAllButton.Click += new System.EventHandler(this.ReadAllButton_Click); + ReadAllButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + ReadAllButton.FlatAppearance.BorderSize = 0; + ReadAllButton.FlatStyle = FlatStyle.Flat; + ReadAllButton.Location = new Point(713, 698); + ReadAllButton.Name = "ReadAllButton"; + ReadAllButton.Size = new Size(75, 23); + ReadAllButton.TabIndex = 2; + ReadAllButton.Text = "Read All"; + ReadAllButton.UseVisualStyleBackColor = false; + ReadAllButton.Click += ReadAllButton_Click; // // ToggleMonitorButton // - this.ToggleMonitorButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ToggleMonitorButton.BackColor = System.Drawing.Color.DimGray; - this.ToggleMonitorButton.FlatAppearance.BorderSize = 0; - this.ToggleMonitorButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ToggleMonitorButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.ToggleMonitorButton.Location = new System.Drawing.Point(610, 698); - this.ToggleMonitorButton.Name = "ToggleMonitorButton"; - this.ToggleMonitorButton.Size = new System.Drawing.Size(97, 23); - this.ToggleMonitorButton.TabIndex = 3; - this.ToggleMonitorButton.Text = "Start Monitor"; - this.ToggleMonitorButton.UseVisualStyleBackColor = false; - this.ToggleMonitorButton.Click += new System.EventHandler(this.ToggleMonitorButton_Click); + ToggleMonitorButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + ToggleMonitorButton.FlatAppearance.BorderSize = 0; + ToggleMonitorButton.FlatStyle = FlatStyle.Flat; + ToggleMonitorButton.Location = new Point(610, 698); + ToggleMonitorButton.Name = "ToggleMonitorButton"; + ToggleMonitorButton.Size = new Size(97, 23); + ToggleMonitorButton.TabIndex = 3; + ToggleMonitorButton.Text = "Start Monitor"; + ToggleMonitorButton.UseVisualStyleBackColor = false; + ToggleMonitorButton.Click += ToggleMonitorButton_Click; // // ClearButton // - this.ClearButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ClearButton.BackColor = System.Drawing.Color.DimGray; - this.ClearButton.FlatAppearance.BorderSize = 0; - this.ClearButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ClearButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.ClearButton.Location = new System.Drawing.Point(529, 698); - this.ClearButton.Name = "ClearButton"; - this.ClearButton.Size = new System.Drawing.Size(75, 23); - this.ClearButton.TabIndex = 4; - this.ClearButton.Text = "Clear"; - this.ClearButton.UseVisualStyleBackColor = false; + ClearButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + ClearButton.FlatAppearance.BorderSize = 0; + ClearButton.FlatStyle = FlatStyle.Flat; + ClearButton.Location = new Point(529, 698); + ClearButton.Name = "ClearButton"; + ClearButton.Size = new Size(75, 23); + ClearButton.TabIndex = 4; + ClearButton.Text = "Clear"; + ClearButton.UseVisualStyleBackColor = false; // // ExportButton // - this.ExportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ExportButton.BackColor = System.Drawing.Color.DimGray; - this.ExportButton.FlatAppearance.BorderSize = 0; - this.ExportButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ExportButton.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.ExportButton.Location = new System.Drawing.Point(448, 698); - this.ExportButton.Name = "ExportButton"; - this.ExportButton.Size = new System.Drawing.Size(75, 23); - this.ExportButton.TabIndex = 5; - this.ExportButton.Text = "Export"; - this.ExportButton.UseVisualStyleBackColor = false; + ExportButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + ExportButton.FlatAppearance.BorderSize = 0; + ExportButton.FlatStyle = FlatStyle.Flat; + ExportButton.Location = new Point(448, 698); + ExportButton.Name = "ExportButton"; + ExportButton.Size = new Size(75, 23); + ExportButton.TabIndex = 5; + ExportButton.Text = "Export"; + ExportButton.UseVisualStyleBackColor = false; // // GithubLink // - this.GithubLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.GithubLink.AutoSize = true; - this.GithubLink.LinkColor = System.Drawing.Color.White; - this.GithubLink.Location = new System.Drawing.Point(12, 694); - this.GithubLink.Name = "GithubLink"; - this.GithubLink.Size = new System.Drawing.Size(42, 15); - this.GithubLink.TabIndex = 6; - this.GithubLink.TabStop = true; - this.GithubLink.Text = "github"; + GithubLink.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + GithubLink.AutoSize = true; + GithubLink.Location = new Point(12, 694); + GithubLink.Name = "GithubLink"; + GithubLink.Size = new Size(42, 15); + GithubLink.TabIndex = 6; + GithubLink.TabStop = true; + GithubLink.Text = "github"; // // DonateLink // - this.DonateLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.DonateLink.AutoSize = true; - this.DonateLink.LinkColor = System.Drawing.Color.White; - this.DonateLink.Location = new System.Drawing.Point(12, 709); - this.DonateLink.Name = "DonateLink"; - this.DonateLink.Size = new System.Drawing.Size(45, 15); - this.DonateLink.TabIndex = 7; - this.DonateLink.TabStop = true; - this.DonateLink.Text = "Donate"; + DonateLink.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + DonateLink.AutoSize = true; + DonateLink.Location = new Point(12, 709); + DonateLink.Name = "DonateLink"; + DonateLink.Size = new Size(45, 15); + DonateLink.TabIndex = 7; + DonateLink.TabStop = true; + DonateLink.Text = "Donate"; // // CoreForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.ClientSize = new System.Drawing.Size(800, 733); - this.Controls.Add(this.DonateLink); - this.Controls.Add(this.GithubLink); - this.Controls.Add(this.ExportButton); - this.Controls.Add(this.ClearButton); - this.Controls.Add(this.ToggleMonitorButton); - this.Controls.Add(this.ReadAllButton); - this.Controls.Add(this.CorePanel); - this.Controls.Add(this.CoreMenu); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.CoreMenu; - this.Name = "CoreForm"; - this.Text = "Elite Observatory Core"; - this.CoreMenu.ResumeLayout(false); - this.CoreMenu.PerformLayout(); - this.CorePanel.ResumeLayout(false); - this.VoiceSettingsPanel.ResumeLayout(false); - this.VoiceSettingsPanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.VoiceSpeedSlider)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.VoiceVolumeSlider)).EndInit(); - this.PopupSettingsPanel.ResumeLayout(false); - this.PopupSettingsPanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.DurationSpinner)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ScaleSpinner)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 733); + Controls.Add(DonateLink); + Controls.Add(GithubLink); + Controls.Add(ExportButton); + Controls.Add(ClearButton); + Controls.Add(ToggleMonitorButton); + Controls.Add(ReadAllButton); + Controls.Add(CorePanel); + Controls.Add(CoreMenu); + Icon = (Icon)resources.GetObject("$this.Icon"); + MainMenuStrip = CoreMenu; + Name = "CoreForm"; + Text = "Elite Observatory Core"; + CoreMenu.ResumeLayout(false); + CoreMenu.PerformLayout(); + CorePanel.ResumeLayout(false); + VoiceSettingsPanel.ResumeLayout(false); + VoiceSettingsPanel.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)VoiceSpeedSlider).EndInit(); + ((System.ComponentModel.ISupportInitialize)VoiceVolumeSlider).EndInit(); + PopupSettingsPanel.ResumeLayout(false); + PopupSettingsPanel.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)DurationSpinner).EndInit(); + ((System.ComponentModel.ISupportInitialize)ScaleSpinner).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion @@ -703,5 +646,8 @@ private Label VoiceSpeedLabel; private Label VoiceVolumeLabel; private Label VoiceNotificationLabel; + private Button PluginSettingsButton; + private Label ThemeLabel; + private ToolTip OverrideTooltip; } } \ No newline at end of file diff --git a/ObservatoryCore/UI/CoreForm.Plugins.cs b/ObservatoryCore/UI/CoreForm.Plugins.cs index 6b76cfa..cd7d73a 100644 --- a/ObservatoryCore/UI/CoreForm.Plugins.cs +++ b/ObservatoryCore/UI/CoreForm.Plugins.cs @@ -1,31 +1,34 @@ using Observatory.PluginManagement; using Observatory.Framework.Interfaces; +using System.Linq; namespace Observatory.UI { partial class CoreForm { + private Dictionary? ListedPlugins; private void PopulatePluginList() { - List uniquePlugins = new(); + ListedPlugins = new(); foreach (var (plugin, signed) in PluginManager.GetInstance.workerPlugins) { - if (!uniquePlugins.Contains(plugin)) + if (!ListedPlugins.ContainsValue(plugin)) { - uniquePlugins.Add(plugin); + ListViewItem item = new ListViewItem(new[] { plugin.Name, "Worker", plugin.Version, PluginStatusString(signed) }); + ListedPlugins.Add(item, plugin); PluginList.Items.Add(item); } } foreach (var (plugin, signed) in PluginManager.GetInstance.notifyPlugins) { - if (!uniquePlugins.Contains(plugin)) + if (!ListedPlugins.ContainsValue(plugin)) { - uniquePlugins.Add(plugin); ListViewItem item = new ListViewItem(new[] { plugin.Name, "Notifier", plugin.Version, PluginStatusString(signed) }); + ListedPlugins.Add(item, plugin); PluginList.Items.Add(item); } } @@ -71,39 +74,87 @@ namespace Observatory.UI { pluginList.Add(item.Text, item); } + + CoreMenu.Width = GetExpandedMenuWidth(); } - private void CreatePluginSettings() + private void DisableOverriddenNotification() { - foreach (var plugin in PluginManager.GetInstance.workerPlugins) + var notifyPlugins = PluginManager.GetInstance.notifyPlugins; + + var ovPopupPlugins = notifyPlugins.Where(n => n.plugin.OverridePopupNotifications); + + if (ovPopupPlugins.Any()) { - var pluginSettingsPanel = new SettingsPanel(plugin.plugin, AdjustPanelsBelow); - AddSettingsPanel(pluginSettingsPanel); + PopupCheckbox.Checked = false; + PopupCheckbox.Enabled = false; + DisplayDropdown.Enabled = false; + CornerDropdown.Enabled = false; + FontDropdown.Enabled = false; + ScaleSpinner.Enabled = false; + DurationSpinner.Enabled = false; + ColourButton.Enabled = false; + TestButton.Enabled = false; + + var pluginNames = string.Join(", ", ovPopupPlugins.Select(o => o.plugin.ShortName)); + + PopupSettingsPanel.MouseMove += (_, _) => + { + OverrideTooltip.SetToolTip(PopupSettingsPanel, "Disabled by plugin: " + pluginNames); + }; } - foreach (var plugin in PluginManager.GetInstance.notifyPlugins) + + var ovAudioPlugins = notifyPlugins.Where(n => n.plugin.OverrideAudioNotifications); + + if (ovAudioPlugins.Any()) { - var pluginSettingsPanel = new SettingsPanel(plugin.plugin, AdjustPanelsBelow); - AddSettingsPanel(pluginSettingsPanel); + VoiceCheckbox.Checked = false; + VoiceCheckbox.Enabled = false; + VoiceVolumeSlider.Enabled = false; + VoiceSpeedSlider.Enabled = false; + VoiceDropdown.Enabled = false; + VoiceTestButton.Enabled = false; + + var pluginNames = string.Join(", ", ovAudioPlugins.Select(o => o.plugin.ShortName)); + + VoiceSettingsPanel.MouseMove += (_, _) => + { + OverrideTooltip.SetToolTip(VoiceSettingsPanel, "Disabled by plugin: " + pluginNames); + }; } } - private void AddSettingsPanel(SettingsPanel panel) + private int GetExpandedMenuWidth() { - int lowestPoint = 0; - foreach (Control control in CorePanel.Controls) + int maxWidth = 0; + foreach (ToolStripMenuItem item in CoreMenu.Items) { - if (control.Location.Y + control.Height > lowestPoint) - lowestPoint = control.Location.Y + control.Height; + var itemWidth = TextRenderer.MeasureText(item.Text, item.Font); + maxWidth = itemWidth.Width > maxWidth ? itemWidth.Width : maxWidth; } - DuplicateControlVisuals(PopupNotificationLabel, panel.Header); - panel.Header.TextAlign = PopupNotificationLabel.TextAlign; - panel.Header.Location = new Point(PopupNotificationLabel.Location.X, lowestPoint); - DuplicateControlVisuals(PopupSettingsPanel, panel, false); - panel.Location = new Point(PopupSettingsPanel.Location.X, lowestPoint + panel.Header.Height); - panel.Visible = false; - CorePanel.Controls.Add(panel.Header); - CorePanel.Controls.Add(panel); + return maxWidth + 5; } + + private void PluginSettingsButton_Click(object sender, EventArgs e) + { + if (ListedPlugins != null && PluginList.SelectedItems.Count != 0) + { + var plugin = ListedPlugins[PluginList.SelectedItems[0]]; + if (SettingsForms.ContainsKey(plugin)) + { + SettingsForms[plugin].Activate(); + } + else + { + SettingsForm settingsForm = new(plugin); + SettingsForms.Add(plugin, settingsForm); + settingsForm.FormClosed += (_, _) => SettingsForms.Remove(plugin); + settingsForm.Show(); + } + } + } + + private Dictionary SettingsForms = new(); } } \ No newline at end of file diff --git a/ObservatoryCore/UI/CoreForm.cs b/ObservatoryCore/UI/CoreForm.cs index 03aefe9..9698031 100644 --- a/ObservatoryCore/UI/CoreForm.cs +++ b/ObservatoryCore/UI/CoreForm.cs @@ -2,6 +2,7 @@ using Observatory.Framework.Interfaces; using Observatory.PluginManagement; using Observatory.Utils; +using System.Runtime.InteropServices; using System.Text; using System.Windows.Forms; @@ -9,10 +10,25 @@ namespace Observatory.UI { public partial class CoreForm : Form { - private Dictionary uiPanels; + private readonly Dictionary uiPanels; + + [DllImport("user32.dll")] + private static extern int SendMessage(IntPtr hWnd, Int32 wMsg, bool wParam, Int32 lParam); + private const int WM_SETREDRAW = 11; + private static void SuspendDrawing(Control control) + { + SendMessage(control.Handle, WM_SETREDRAW, false, 0); + } + + private static void ResumeDrawing(Control control) + { + SendMessage(control.Handle, WM_SETREDRAW, true, 0); + control.Refresh(); + } public CoreForm() { + DoubleBuffered = true; InitializeComponent(); PopulateDropdownOptions(); @@ -24,14 +40,20 @@ namespace Observatory.UI string version = System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "0"; Text += $" - v{version}"; CoreMenu.SizeChanged += CoreMenu_SizeChanged; - uiPanels = new(); - uiPanels.Add(coreToolStripMenuItem, CorePanel); + uiPanels = new() + { + { coreToolStripMenuItem, CorePanel } + }; + + pluginList = new Dictionary(); CreatePluginTabs(); - CreatePluginSettings(); + DisableOverriddenNotification(); CoreMenu.ItemClicked += CoreMenu_ItemClicked; PreCollapsePanels(); + + ThemeManager.GetInstance.RegisterControl(this); } private void PreCollapsePanels() @@ -47,17 +69,7 @@ namespace Observatory.UI } - private Dictionary pluginList; - - private static void DuplicateControlVisuals(Control source, Control target, bool applyHeight = true) - { - if (applyHeight) target.Height = source.Height; - target.Width = source.Width; - target.Font = source.Font; - target.ForeColor = source.ForeColor; - target.BackColor = source.BackColor; - target.Anchor = source.Anchor; - } + private readonly Dictionary pluginList; private void ToggleMonitorButton_Click(object sender, EventArgs e) { @@ -73,9 +85,25 @@ namespace Observatory.UI } } - private void CoreMenu_ItemClicked(object? _, ToolStripItemClickedEventArgs e) + private void ResizePanels(Point location, int widthChange) { + CorePanel.Location = location; + CorePanel.Width += widthChange; + foreach (var panel in uiPanels) + { + if (Controls.Contains(panel.Value)) + { + panel.Value.Location = CorePanel.Location; + panel.Value.Size = CorePanel.Size; + } + } + + } + + private void CoreMenu_ItemClicked(object? _, ToolStripItemClickedEventArgs e) + { + SuspendDrawing(this); if (e.ClickedItem.Text == "<") { foreach (KeyValuePair menuItem in pluginList) @@ -86,8 +114,7 @@ namespace Observatory.UI menuItem.Value.Text = menuItem.Key[..1]; } CoreMenu.Width = 40; - CorePanel.Location = new Point(43, 12); - // CorePanel.Width += 40; + ResizePanels(new Point(43, 12), 0); } else if (e.ClickedItem.Text == ">") { @@ -98,9 +125,8 @@ namespace Observatory.UI else menuItem.Value.Text = menuItem.Key; } - CoreMenu.Width = 120; - CorePanel.Location = new Point(123, 12); - // CorePanel.Width -= 40; + CoreMenu.Width = GetExpandedMenuWidth(); + ResizePanels(new Point(CoreMenu.Width + 3, 12), 0); } else { @@ -114,26 +140,38 @@ namespace Observatory.UI uiPanels[e.ClickedItem].Location = CorePanel.Location; uiPanels[e.ClickedItem].Size = CorePanel.Size; uiPanels[e.ClickedItem].BackColor = CorePanel.BackColor; + uiPanels[e.ClickedItem].Parent = CorePanel.Parent; Controls.Add(uiPanels[e.ClickedItem]); } uiPanels[e.ClickedItem].Visible = true; + + SetClickedItem(e.ClickedItem); + } + ResumeDrawing(this); + } + + private void SetClickedItem(ToolStripItem item) + { + foreach (ToolStripItem menuItem in CoreMenu.Items) + { + bool bold = menuItem == item; + menuItem.Font = new Font(menuItem.Font, bold ? FontStyle.Bold : FontStyle.Regular); } - } private static void ColourListHeader(ref ListView list, Color backColor, Color foreColor) { list.OwnerDraw = true; - + list.DrawColumnHeader += new DrawListViewColumnHeaderEventHandler ( - (sender, e) => headerDraw(sender, e, backColor, foreColor) + (sender, e) => HeaderDraw(sender, e, backColor, foreColor) ); - list.DrawItem += new DrawListViewItemEventHandler(bodyDraw); + list.DrawItem += new DrawListViewItemEventHandler(BodyDraw); } - private static void headerDraw(object? _, DrawListViewColumnHeaderEventArgs e, Color backColor, Color foreColor) + private static void HeaderDraw(object? _, DrawListViewColumnHeaderEventArgs e, Color backColor, Color foreColor) { using (SolidBrush backBrush = new(backColor)) { @@ -149,17 +187,19 @@ namespace Observatory.UI if (e.Font != null && e.Header != null) using (SolidBrush foreBrush = new(foreColor)) { - var format = new StringFormat(); - format.Alignment = (StringAlignment)e.Header.TextAlign; - format.LineAlignment = StringAlignment.Center; - + var format = new StringFormat + { + Alignment = (StringAlignment)e.Header.TextAlign, + LineAlignment = StringAlignment.Center + }; + var paddedBounds = new Rectangle(e.Bounds.X + 2, e.Bounds.Y + 2, e.Bounds.Width - 4, e.Bounds.Height - 4); e.Graphics.DrawString(e.Header?.Text, e.Font, foreBrush, paddedBounds, format); } } - private static void bodyDraw(object? _, DrawListViewItemEventArgs e) + private static void BodyDraw(object? _, DrawListViewItemEventArgs e) { e.DrawDefault = true; } @@ -180,7 +220,11 @@ namespace Observatory.UI private void ReadAllButton_Click(object sender, EventArgs e) { - LogMonitor.GetInstance.ReadAllJournals(); + var readAllDialogue = new ReadAllForm(); + ThemeManager.GetInstance.RegisterControl(readAllDialogue); + readAllDialogue.StartPosition = FormStartPosition.Manual; + readAllDialogue.Location = Point.Add(Location, new Size(100,100)); + readAllDialogue.ShowDialog(); } private void PopupNotificationLabel_Click(object _, EventArgs e) @@ -238,6 +282,8 @@ namespace Observatory.UI Up, Down } + private Observatory.NativeNotification.NativePopup? nativePopup; + private void TestButton_Click(object sender, EventArgs e) { NotificationArgs args = new() @@ -245,9 +291,10 @@ namespace Observatory.UI Title = "Test Notification", Detail = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec at elit maximus, ornare dui nec, accumsan velit. Vestibulum fringilla elit." }; - var testNotify = new NotificationForm(new Guid(), args); - testNotify.Show(); + nativePopup ??= new Observatory.NativeNotification.NativePopup(); + + nativePopup.InvokeNativeNotification(args); } } } \ No newline at end of file diff --git a/ObservatoryCore/UI/CoreForm.resx b/ObservatoryCore/UI/CoreForm.resx index 7843956..fa8ebb1 100644 --- a/ObservatoryCore/UI/CoreForm.resx +++ b/ObservatoryCore/UI/CoreForm.resx @@ -1,4 +1,64 @@ - + + + @@ -63,6 +123,9 @@ 126, 17 + + 251, 17 + diff --git a/ObservatoryCore/UI/NotificationForm.Designer.cs b/ObservatoryCore/UI/NotificationForm.Designer.cs index 444350b..f6cbb0c 100644 --- a/ObservatoryCore/UI/NotificationForm.Designer.cs +++ b/ObservatoryCore/UI/NotificationForm.Designer.cs @@ -28,55 +28,54 @@ /// private void InitializeComponent() { - this.Title = new System.Windows.Forms.Label(); - this.Body = new System.Windows.Forms.Label(); - this.SuspendLayout(); + Title = new Label(); + Body = new Label(); + SuspendLayout(); // // Title // - this.Title.Font = new System.Drawing.Font("Segoe UI", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.Title.ForeColor = System.Drawing.Color.OrangeRed; - this.Title.Location = new System.Drawing.Point(5, 5); - this.Title.MaximumSize = new System.Drawing.Size(355, 0); - this.Title.Name = "Title"; - this.Title.Size = new System.Drawing.Size(338, 45); - this.Title.TabIndex = 0; - this.Title.Text = "Title"; + Title.Font = new Font("Segoe UI", 24F, FontStyle.Regular, GraphicsUnit.Point); + Title.ForeColor = Color.OrangeRed; + Title.Location = new Point(5, 5); + Title.MaximumSize = new Size(355, 0); + Title.Name = "Title"; + Title.Size = new Size(338, 45); + Title.TabIndex = 0; + Title.Text = "Title"; // // Body // - this.Body.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.Body.AutoSize = true; - this.Body.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.Body.ForeColor = System.Drawing.Color.OrangeRed; - this.Body.Location = new System.Drawing.Point(12, 45); - this.Body.MaximumSize = new System.Drawing.Size(320, 85); - this.Body.Name = "Body"; - this.Body.Size = new System.Drawing.Size(51, 31); - this.Body.TabIndex = 1; - this.Body.Text = "Body"; - this.Body.UseCompatibleTextRendering = true; + Body.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + Body.AutoSize = true; + Body.Font = new Font("Segoe UI", 14.25F, FontStyle.Regular, GraphicsUnit.Point); + Body.ForeColor = Color.OrangeRed; + Body.Location = new Point(12, 45); + Body.MaximumSize = new Size(320, 85); + Body.Name = "Body"; + Body.Size = new Size(51, 31); + Body.TabIndex = 1; + Body.Text = "Body"; + Body.UseCompatibleTextRendering = true; // // NotificationForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.ClientSize = new System.Drawing.Size(355, 145); - this.ControlBox = false; - this.Controls.Add(this.Body); - this.Controls.Add(this.Title); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "NotificationForm"; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.Text = "NotificationForm"; - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.FromArgb(64, 64, 64); + ClientSize = new Size(355, 145); + ControlBox = false; + Controls.Add(Body); + Controls.Add(Title); + Enabled = false; + FormBorderStyle = FormBorderStyle.None; + MaximizeBox = false; + MinimizeBox = false; + Name = "NotificationForm"; + ShowIcon = false; + ShowInTaskbar = false; + Text = "NotificationForm"; + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/ObservatoryCore/UI/NotificationForm.cs b/ObservatoryCore/UI/NotificationForm.cs index dee4e2e..27c0b7b 100644 --- a/ObservatoryCore/UI/NotificationForm.cs +++ b/ObservatoryCore/UI/NotificationForm.cs @@ -23,7 +23,7 @@ namespace Observatory.UI protected override bool ShowWithoutActivation => true; protected override CreateParams CreateParams - { + { get { CreateParams cp = base.CreateParams; @@ -31,11 +31,12 @@ namespace Observatory.UI return cp; } } - + public NotificationForm(Guid guid, NotificationArgs args) { _guid = guid; _color = Color.FromArgb((int)Properties.Core.Default.NativeNotifyColour); + CreationTime = DateTime.Now; InitializeComponent(); Title.Paint += DrawText; @@ -65,8 +66,8 @@ namespace Observatory.UI Body.ForeColor = _color; Body.Text = args.Detail; Body.Font = new Font(Properties.Core.Default.NativeNotifyFont, 14); - this.Paint += DrawBorder; - + Paint += DrawBorder; + AdjustPosition(args.XPos / 100, args.YPos / 100); _timer = new(); @@ -78,10 +79,36 @@ namespace Observatory.UI } } + private void NotificationForm_FormClosed(object? sender, FormClosedEventArgs e) + { + throw new NotImplementedException(); + } + + public DateTime CreationTime { get; private init; } + public void Update(NotificationArgs notificationArgs) { - Title.Text = notificationArgs.Title; - Body.Text = notificationArgs.Detail; + // Catch Cross-thread access and invoke + try + { + Title.Text = notificationArgs.Title; + Body.Text = notificationArgs.Detail; + } + catch + { + try + { + Invoke(() => + { + Title.Text = notificationArgs.Title; + Body.Text = notificationArgs.Detail; + }); + } + catch (Exception ex) + { + throw new Exception("Notification Update Failure, please inform Vithigar. Details: " + ex.Message); + } + } } private void AdjustPosition(double x = -1.0, double y = -1.0) @@ -90,7 +117,6 @@ namespace Observatory.UI int corner = Properties.Core.Default.NativeNotifyCorner; Rectangle screenBounds; - if (screen == -1 || screen > Screen.AllScreens.Length) if (Screen.AllScreens.Length == 1) screenBounds = Screen.GetBounds(this); @@ -115,7 +141,7 @@ namespace Observatory.UI case 0: Location = Point.Add( new Point(screenBounds.Right, screenBounds.Bottom), - new Size(-(Width+50), -(Height+50))); + new Size(-(Width + 50), -(Height + 50))); break; case 1: Location = Point.Add( @@ -151,7 +177,7 @@ namespace Observatory.UI protected override void WndProc(ref Message m) { - + switch (m.Msg) { case DwmHelper.WM_DWMCOMPOSITIONCHANGED: @@ -190,13 +216,29 @@ namespace Observatory.UI public Guid Guid { get => _guid; } - private void AdjustText() + public void AdjustOffset(bool increase) { + if (_defaultPosition) + { + if (increase || Location != _originalLocation) + { + var corner = Properties.Core.Default.NativeNotifyCorner; + if ((corner >= 2 && increase) || (corner <= 1 && !increase)) + { + Location = new Point(Location.X, Location.Y + Height); + } + else + { + Location = new Point(Location.X, Location.Y - Height); + } + } + } } private void CloseNotification(object? sender, System.Timers.ElapsedEventArgs e) { + // Catch Cross-thread access and invoke try { Close(); @@ -205,14 +247,14 @@ namespace Observatory.UI { try { - this.Invoke(() => Close()); + Invoke(() => Close()); } - catch + catch (Exception ex) { - throw new Exception("blah"); + throw new Exception("Notification Close Failure, please inform Vithigar. Details: " + ex.Message); } } - + _timer.Stop(); _timer.Dispose(); } diff --git a/ObservatoryCore/UI/NotificationForm.resx b/ObservatoryCore/UI/NotificationForm.resx index f298a7b..af32865 100644 --- a/ObservatoryCore/UI/NotificationForm.resx +++ b/ObservatoryCore/UI/NotificationForm.resx @@ -1,4 +1,64 @@ - + + + diff --git a/ObservatoryCore/UI/PluginHelper.cs b/ObservatoryCore/UI/PluginHelper.cs index cb0fc56..a9ad8f7 100644 --- a/ObservatoryCore/UI/PluginHelper.cs +++ b/ObservatoryCore/UI/PluginHelper.cs @@ -1,7 +1,14 @@ using Observatory.Framework.Interfaces; +using Observatory.Framework; using System.Collections; using Observatory.PluginManagement; using Observatory.Utils; +using System.Text.RegularExpressions; +using System.Collections.Generic; +using System.Reflection; +using System.Text.Json; +using System.Data.Common; +using System.ComponentModel.Design.Serialization; namespace Observatory.UI { @@ -39,6 +46,7 @@ namespace Observatory.UI Font = menu.Items[0].Font, TextAlign = menu.Items[0].TextAlign }; + ThemeManager.GetInstance.RegisterControl(newItem); menu.Items.Add(newItem); if (plugin.PluginUI.PluginUIType == Framework.PluginUI.UIType.Basic) @@ -49,7 +57,10 @@ namespace Observatory.UI private static Panel CreateBasicUI(IObservatoryPlugin plugin) { - Panel panel = new(); + Panel panel = new() + { + Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top + }; IObservatoryComparer columnSorter; if (plugin.ColumnSorter != null) @@ -57,7 +68,7 @@ namespace Observatory.UI else columnSorter = new DefaultSorter(); - ListView listView = new() + PluginListView listView = new() { View = View.Details, Location = new Point(0, 0), @@ -65,16 +76,120 @@ namespace Observatory.UI Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top, BackColor = Color.FromArgb(64, 64, 64), ForeColor = Color.LightGray, - GridLines = true, ListViewItemSorter = columnSorter, Font = new Font(new FontFamily("Segoe UI"), 10, FontStyle.Regular) }; - foreach (var property in plugin.PluginUI.DataGrid.First().GetType().GetProperties()) + string colSize = Properties.Core.Default.ColumnSizing; + List? columnSizing = null; + if (!string.IsNullOrWhiteSpace(colSize)) { - listView.Columns.Add(property.Name); + try + { + columnSizing = JsonSerializer.Deserialize>(colSize); + } + catch + { + // Failed deserialization means bad value, blow it away. + Properties.Core.Default.ColumnSizing = string.Empty; + Properties.Core.Default.Save(); + } } + columnSizing ??= new List(); + // Is losing column sizes between versions acceptable? + ColumnSizing pluginColumnSizing = columnSizing + .Where(c => c.PluginName == plugin.Name && c.PluginVersion == plugin.Version) + .FirstOrDefault(new ColumnSizing() { PluginName = plugin.Name, PluginVersion = plugin.Version }); + + if (!columnSizing.Contains(pluginColumnSizing)) + { + columnSizing.Add(pluginColumnSizing); + } + + foreach (var property in plugin.PluginUI.DataGrid.First().GetType().GetProperties()) + { + // https://stackoverflow.com/questions/5796383/insert-spaces-between-words-on-a-camel-cased-token + string columnLabel = Regex.Replace( + Regex.Replace( + property.Name, + @"(\P{Ll})(\P{Ll}\p{Ll})", + "$1 $2" + ), + @"(\p{Ll})(\P{Ll})", + "$1 $2" + ); + + int width; + + if (pluginColumnSizing.ColumnWidth.ContainsKey(columnLabel)) + { + width = pluginColumnSizing.ColumnWidth[columnLabel]; + } + else + { + var widthAttrib = property.GetCustomAttribute(); + + width = widthAttrib == null + // Rough approximation of width by label length if none specified. + ? columnLabel.Length * 10 + : widthAttrib.Width; + + pluginColumnSizing.ColumnWidth.Add(columnLabel, width); + } + + listView.Columns.Add(columnLabel, width); + + } + + Properties.Core.Default.ColumnSizing = JsonSerializer.Serialize(columnSizing); + Properties.Core.Default.Save(); + + // Oddly, the listview resize event often fires after the column size change but + // with stale (default?!) column width values. + // Still need a resize handler to avoid the ugliness of the rightmost column + // leaving gaps, but preventing saving the width changes there should stop the + // stale resize event from overwriting with bad data. + // Using a higher-order function here to create two different versions of the + // event handler for these purposes. + var handleColSize = (bool saveProps) => + (object? sender, EventArgs e) => + { + int colTotalWidth = 0; + ColumnHeader? rightmost = null; + foreach (ColumnHeader column in listView.Columns) + { + colTotalWidth += column.Width; + if (rightmost == null || column.DisplayIndex > rightmost.DisplayIndex) + rightmost = column; + + if (saveProps) + { + if (pluginColumnSizing.ColumnWidth.ContainsKey(column.Text)) + pluginColumnSizing.ColumnWidth[column.Text] = column.Width; + else + pluginColumnSizing.ColumnWidth.Add(column.Text, column.Width); + } + } + + if (rightmost != null && colTotalWidth < listView.Width) + { + rightmost.Width = listView.Width - (colTotalWidth - rightmost.Width); + + if (saveProps) + pluginColumnSizing.ColumnWidth[rightmost.Text] = rightmost.Width; + } + + if (saveProps) + { + Properties.Core.Default.ColumnSizing = JsonSerializer.Serialize(columnSizing); + Properties.Core.Default.Save(); + } + }; + + listView.ColumnWidthChanged += handleColSize(true).Invoke; + listView.Resize += handleColSize(false).Invoke; + listView.ColumnClick += (sender, e) => { if (e.Column == columnSorter.SortColumn) @@ -99,10 +214,10 @@ namespace Observatory.UI }; panel.Controls.Add(listView); - + plugin.PluginUI.DataGrid.CollectionChanged += (sender, e) => { - listView.Invoke(() => + var updateGrid = () => { if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add && e.NewItems != null) @@ -153,7 +268,16 @@ namespace Observatory.UI listView.Items.Add(listItem); } } - }); + }; + + if (listView.Created) + { + listView.Invoke(updateGrid); + } + else + { + updateGrid(); + } }; return panel; diff --git a/ObservatoryCore/UI/PluginListView.cs b/ObservatoryCore/UI/PluginListView.cs new file mode 100644 index 0000000..3897123 --- /dev/null +++ b/ObservatoryCore/UI/PluginListView.cs @@ -0,0 +1,113 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Security.Permissions; +using System.Text; +using System.Threading.Tasks; + +namespace Observatory.UI +{ + internal class PluginListView : ListView + { + [DllImport("user32.dll")] + private static extern int SendMessage(IntPtr hWnd, int wMsg, bool wParam, int lParam); + + private const int WM_SETREDRAW = 11; + + public PluginListView() + { + OwnerDraw = true; + GridLines = false; + DrawItem += PluginListView_DrawItem; + DrawSubItem += PluginListView_DrawSubItem; + DrawColumnHeader += PluginListView_DrawColumnHeader; + + + DoubleBuffered = true; + base.GridLines = false;//We should prevent the default drawing of gridlines. + } + + private static void DrawBorder(Graphics graphics, Pen pen, Rectangle bounds, bool header = false) + { + + Point topRight = new(bounds.Right, bounds.Top); + Point bottomRight = new(bounds.Right, bounds.Bottom); + + graphics.DrawLine(pen, topRight, bottomRight); + + if (header) + { + Point bottomLeft = new(bounds.Left, bounds.Bottom); + // Point topLeft = new(bounds.Left, bounds.Top); + // graphics.DrawLine(pen, topLeft, topRight); + // graphics.DrawLine(pen, topLeft, bottomLeft); + graphics.DrawLine(pen, bottomLeft, bottomRight); + } + } + + private void PluginListView_DrawColumnHeader(object? sender, DrawListViewColumnHeaderEventArgs e) + { + using (var g = e.Graphics) + if (g != null) + { + g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; + Pen pen = new(new SolidBrush(Color.LightGray)); + DrawBorder(g, pen, e.Bounds); + using (var font = new Font(this.Font, FontStyle.Bold)) + { + Brush textBrush = new SolidBrush(ForeColor); + g.DrawString(e.Header?.Text, font, textBrush, e.Bounds); + } + } + } + + private void PluginListView_DrawSubItem(object? sender, DrawListViewSubItemEventArgs e) + { + using (var g = e.Graphics) + if (g != null) + { + g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; + Pen pen = new(new SolidBrush(Color.LightGray)); + DrawBorder(g, pen, e.Bounds, false); + + e.DrawText(); + } + } + + private void PluginListView_DrawItem(object? sender, DrawListViewItemEventArgs e) + { + var offsetColor = (int value) => + { + if (value > 127) + { + return value - 20; + } + else + { + return value + 20; + } + }; + + using (var g = e.Graphics) + { + if (e.ItemIndex % 2 == 0) + { + e.Item.BackColor = BackColor; + } + else + { + e.Item.BackColor = Color.FromArgb(offsetColor(BackColor.R), offsetColor(BackColor.G), offsetColor(BackColor.B)); + } + + if (g != null) + { + g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; + Pen pen = new(new SolidBrush(Color.LightGray)); + e.DrawBackground(); + } + } + + } + } +} diff --git a/ObservatoryCore/UI/ReadAllProgress.Designer.cs b/ObservatoryCore/UI/ReadAllProgress.Designer.cs new file mode 100644 index 0000000..dcdbb18 --- /dev/null +++ b/ObservatoryCore/UI/ReadAllProgress.Designer.cs @@ -0,0 +1,84 @@ +namespace Observatory.UI +{ + partial class ReadAllForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + ReadAllProgress = new ProgressBar(); + JournalLabel = new Label(); + CancelButton = new Button(); + SuspendLayout(); + // + // ReadAllProgress + // + ReadAllProgress.Location = new Point(12, 27); + ReadAllProgress.Name = "ReadAllProgress"; + ReadAllProgress.Size = new Size(371, 23); + ReadAllProgress.Step = 1; + ReadAllProgress.TabIndex = 0; + // + // JournalLabel + // + JournalLabel.AutoSize = true; + JournalLabel.Location = new Point(12, 9); + JournalLabel.Name = "JournalLabel"; + JournalLabel.Size = new Size(45, 15); + JournalLabel.TabIndex = 1; + JournalLabel.Text = "foo.log"; + // + // CancelButton + // + CancelButton.Location = new Point(308, 56); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(75, 23); + CancelButton.TabIndex = 2; + CancelButton.Text = "Cancel"; + CancelButton.UseVisualStyleBackColor = true; + CancelButton.Click += CancelButton_Click; + // + // ReadAllForm + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(395, 86); + Controls.Add(CancelButton); + Controls.Add(JournalLabel); + Controls.Add(ReadAllProgress); + FormBorderStyle = FormBorderStyle.FixedDialog; + Name = "ReadAllForm"; + Text = "Read All In Progress..."; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private ProgressBar ReadAllProgress; + private Label JournalLabel; + private Button CancelButton; + } +} \ No newline at end of file diff --git a/ObservatoryCore/UI/ReadAllProgress.cs b/ObservatoryCore/UI/ReadAllProgress.cs new file mode 100644 index 0000000..f42becd --- /dev/null +++ b/ObservatoryCore/UI/ReadAllProgress.cs @@ -0,0 +1,52 @@ +using Observatory.Utils; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Observatory.UI +{ + public partial class ReadAllForm : Form + { + private CancellationTokenSource ReadAllCancel; + + public ReadAllForm() + { + InitializeComponent(); + + var ReadAllJournals = LogMonitor.GetInstance.ReadAllGenerator(out int fileCount); + int progressCount = 0; + ReadAllCancel = new CancellationTokenSource(); + HandleCreated += (_,_) => + Task.Run(() => + { + foreach (var journal in ReadAllJournals()) + { + if (ReadAllCancel.IsCancellationRequested) + { + break; + } + + progressCount++; + Invoke(() => + { + JournalLabel.Text = journal.ToString(); + ReadAllProgress.Value = (progressCount * 100) / fileCount; + }); + } + Invoke(()=>Close()); + }); + + } + + private void CancelButton_Click(object sender, EventArgs e) + { + ReadAllCancel.Cancel(); + } + } +} diff --git a/ObservatoryCore/UI/ReadAllProgress.resx b/ObservatoryCore/UI/ReadAllProgress.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ObservatoryCore/UI/ReadAllProgress.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ObservatoryCore/UI/SettingsForm.Designer.cs b/ObservatoryCore/UI/SettingsForm.Designer.cs new file mode 100644 index 0000000..b661275 --- /dev/null +++ b/ObservatoryCore/UI/SettingsForm.Designer.cs @@ -0,0 +1,61 @@ +namespace Observatory.UI +{ + partial class SettingsForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + PluginSettingsCloseButton = new Button(); + SuspendLayout(); + // + // PluginSettingsCloseButton + // + PluginSettingsCloseButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + PluginSettingsCloseButton.Location = new Point(339, 5); + PluginSettingsCloseButton.Name = "PluginSettingsCloseButton"; + PluginSettingsCloseButton.Size = new Size(75, 23); + PluginSettingsCloseButton.TabIndex = 0; + PluginSettingsCloseButton.Text = "Close"; + PluginSettingsCloseButton.UseVisualStyleBackColor = true; + PluginSettingsCloseButton.Click += PluginSettingsCloseButton_Click; + // + // SettingsForm + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(426, 40); + Controls.Add(PluginSettingsCloseButton); + FormBorderStyle = FormBorderStyle.FixedSingle; + Name = "SettingsForm"; + Text = "SettingsForm"; + ResumeLayout(false); + } + + #endregion + + private Button PluginSettingsCloseButton; + } +} \ No newline at end of file diff --git a/ObservatoryCore/UI/SettingsForm.cs b/ObservatoryCore/UI/SettingsForm.cs new file mode 100644 index 0000000..20a74f4 --- /dev/null +++ b/ObservatoryCore/UI/SettingsForm.cs @@ -0,0 +1,367 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Observatory.Assets; +using Observatory.Framework; +using Observatory.Framework.Interfaces; + +namespace Observatory.UI +{ + public partial class SettingsForm : Form + { + private readonly IObservatoryPlugin _plugin; + private readonly List _colHeight = new List(); + + public SettingsForm(IObservatoryPlugin plugin) + { + InitializeComponent(); + _plugin = plugin; + + // Filtered to only settings without SettingIgnore attribute + var settings = PluginManagement.PluginManager.GetSettingDisplayNames(plugin.Settings).Where(s => !Attribute.IsDefined(s.Key, typeof(SettingIgnore))); + CreateControls(settings); + + + Text = plugin.Name + " Settings"; + Icon = Resources.EOCIcon_Presized; + ThemeManager.GetInstance.RegisterControl(this); + } + + private void CreateControls(IEnumerable> settings) + { + bool recentHalfCol = false; + + int settingsHeight = 0; + + var trackBottomEdge = (Control control) => + { + var controlBottom = control.Location.Y + control.Height; + if (controlBottom > settingsHeight) + settingsHeight = controlBottom; + }; + + + foreach (var setting in settings) + { + // Reset the column tracking for checkboxes if this isn't a checkbox + if (setting.Key.PropertyType.Name != "Boolean") + recentHalfCol = false; + + int addedHeight = 29; + + switch (setting.Key.GetValue(_plugin.Settings)) + { + case bool: + var checkBox = CreateBoolSetting(setting); + addedHeight = recentHalfCol ? 0 : addedHeight; + checkBox.Location = GetSettingPosition(recentHalfCol); + + recentHalfCol = !recentHalfCol; + + Controls.Add(checkBox); + trackBottomEdge(checkBox); + break; + case string: + var stringLabel = CreateSettingLabel(setting.Value); + var textBox = CreateStringSetting(setting.Key); + stringLabel.Location = GetSettingPosition(); + textBox.Location = GetSettingPosition(true); + + Controls.Add(stringLabel); + Controls.Add(textBox); + trackBottomEdge(textBox); + break; + case FileInfo: + var fileLabel = CreateSettingLabel(setting.Value); + var pathTextBox = CreateFilePathSetting(setting.Key); + var pathButton = CreateFileBrowseSetting(setting.Key, pathTextBox); + + fileLabel.Location = GetSettingPosition(); + pathTextBox.Location = GetSettingPosition(true); + _colHeight.Add(addedHeight); + pathButton.Location = GetSettingPosition(true); + + Controls.Add(fileLabel); + Controls.Add(pathTextBox); + Controls.Add(pathButton); + trackBottomEdge(pathButton); + break; + case int: + // We have two options for integer values: + // 1) A slider (explicit by way of the SettingIntegerUseSlider attribute and bounded to 0..100 by default) + // 2) A numeric up/down (default otherwise, and is unbounded by default). + // Bounds for both can be set via the SettingNumericBounds attribute, only the up/down uses Increment. + var intLabel = CreateSettingLabel(setting.Value); + Control intControl; + if (Attribute.IsDefined(setting.Key, typeof(SettingNumericUseSlider))) + { + intControl = CreateSettingTrackbar(setting.Key); + } + else + { + intControl = CreateSettingNumericUpDown(setting.Key); + } + intLabel.Location = GetSettingPosition(); + intControl.Location = GetSettingPosition(true); + + addedHeight = intControl.Height; + intLabel.Height = intControl.Height; + intLabel.TextAlign = ContentAlignment.MiddleRight; + + Controls.Add(intLabel); + Controls.Add(intControl); + trackBottomEdge(intControl); + break; + case Action action: + var button = CreateSettingButton(setting.Value, action); + + button.Location = GetSettingPosition(); + + Controls.Add(button); + trackBottomEdge(button); + break; + case Dictionary dictSetting: + var dictLabel = CreateSettingLabel(setting.Value); + var dropdown = CreateSettingDropdown(setting.Key, dictSetting); + + dictLabel.Location = GetSettingPosition(); + dropdown.Location = GetSettingPosition(true); + Controls.Add(dictLabel); + Controls.Add(dropdown); + trackBottomEdge(dropdown); + break; + default: + break; + } + _colHeight.Add(addedHeight); + } + Height = settingsHeight + 80; + } + + private Point GetSettingPosition(bool secondCol = false) + { + return new Point(10 + (secondCol ? 200 : 0), -26 + _colHeight.Sum()); + } + + + private Label CreateSettingLabel(string settingName) + { + Label label = new() + { + Text = settingName + ": ", + TextAlign = System.Drawing.ContentAlignment.MiddleRight, + Width = 200, + ForeColor = Color.LightGray + }; + + return label; + } + + private ComboBox CreateSettingDropdown(PropertyInfo setting, Dictionary dropdownItems) + { + var backingValueName = (SettingBackingValue?)Attribute.GetCustomAttribute(setting, typeof(SettingBackingValue)); + + var backingValue = from s in PluginManagement.PluginManager.GetSettingDisplayNames(_plugin.Settings) + where s.Value == backingValueName?.BackingProperty + select s.Key; + + if (backingValue.Count() != 1) + throw new($"{_plugin.ShortName}: Dictionary settings must have exactly one backing value."); + + ComboBox comboBox = new() + { + Width = 200, + DropDownStyle = ComboBoxStyle.DropDownList + }; + + comboBox.Items.AddRange(dropdownItems.OrderBy(s => s.Key).Select(s => s.Key).ToArray()); + + string? currentSelection = backingValue.First().GetValue(_plugin.Settings)?.ToString(); + + if (currentSelection?.Length > 0) + { + comboBox.SelectedItem = currentSelection; + } + + comboBox.SelectedValueChanged += (sender, e) => + { + backingValue.First().SetValue(_plugin.Settings, comboBox.SelectedItem.ToString()); + SaveSettings(); + }; + + return comboBox; + } + + private Button CreateSettingButton(string settingName, Action action) + { + Button button = new() + { + Text = settingName + }; + + button.Click += (sender, e) => + { + action.Invoke(); + SaveSettings(); + }; + + return button; + } + + private TrackBar CreateSettingTrackbar(PropertyInfo setting) + { + SettingNumericBounds? bounds = (SettingNumericBounds?)System.Attribute.GetCustomAttribute(setting, typeof(SettingNumericBounds)); + + var minBound = Convert.ToInt32(bounds?.Minimum ?? 0); + var maxBound = Convert.ToInt32(bounds?.Maximum ?? 100); + + var tickFrequency = maxBound - minBound >= 20 ? (maxBound - minBound) / 10 : 1; + + TrackBar trackBar = new() + { + Orientation = Orientation.Horizontal, + TickStyle = TickStyle.Both, + TickFrequency = tickFrequency, + Width = 200, + Minimum = minBound, + Maximum = maxBound, + }; + + trackBar.Value = (int?)setting.GetValue(_plugin.Settings) ?? 0; + + trackBar.ValueChanged += (sender, e) => + { + setting.SetValue(_plugin.Settings, trackBar.Value); + SaveSettings(); + }; + + return trackBar; + } + + private NumericUpDown CreateSettingNumericUpDown(PropertyInfo setting) + { + SettingNumericBounds? bounds = (SettingNumericBounds?)System.Attribute.GetCustomAttribute(setting, typeof(SettingNumericBounds)); + NumericUpDown numericUpDown = new() + { + + Width = 200, + Minimum = Convert.ToInt32(bounds?.Minimum ?? Int32.MinValue), + Maximum = Convert.ToInt32(bounds?.Maximum ?? Int32.MaxValue), + Increment = Convert.ToInt32(bounds?.Increment ?? 1) + }; + + numericUpDown.Value = (int?)setting.GetValue(_plugin.Settings) ?? 0; + + numericUpDown.ValueChanged += (sender, e) => + { + setting.SetValue(_plugin.Settings, numericUpDown.Value); + SaveSettings(); + }; + + return numericUpDown; + } + + private CheckBox CreateBoolSetting(KeyValuePair setting) + { + CheckBox checkBox = new() + { + Text = setting.Value, + TextAlign = System.Drawing.ContentAlignment.MiddleLeft, + Checked = (bool?)setting.Key.GetValue(_plugin.Settings) ?? false, + Width = 200, + ForeColor = Color.LightGray + }; + + checkBox.CheckedChanged += (sender, e) => + { + setting.Key.SetValue(_plugin.Settings, checkBox.Checked); + SaveSettings(); + }; + + return checkBox; + } + + private TextBox CreateStringSetting(PropertyInfo setting) + { + TextBox textBox = new() + { + Text = (setting.GetValue(_plugin.Settings) ?? String.Empty).ToString(), + Width = 200 + }; + + textBox.TextChanged += (object? sender, EventArgs e) => + { + setting.SetValue(_plugin.Settings, textBox.Text); + SaveSettings(); + }; + + return textBox; + } + + private TextBox CreateFilePathSetting(PropertyInfo setting) + { + var fileInfo = (FileInfo?)setting.GetValue(_plugin.Settings); + + TextBox textBox = new() + { + Text = fileInfo?.FullName ?? string.Empty, + Width = 200 + }; + + textBox.TextChanged += (object? sender, EventArgs e) => + { + setting.SetValue(_plugin.Settings, new FileInfo(textBox.Text)); + SaveSettings(); + }; + + return textBox; + } + + private Button CreateFileBrowseSetting(PropertyInfo setting, TextBox textBox) + { + Button button = new() + { + Text = "Browse" + }; + + button.Click += (object? sender, EventArgs e) => + { + var currentDir = ((FileInfo?)setting.GetValue(_plugin.Settings))?.DirectoryName; + + OpenFileDialog ofd = new OpenFileDialog() + { + Title = "Select File...", + Filter = "Lua files (*.lua)|*.lua|All files (*.*)|*.*", + FilterIndex = 0, + InitialDirectory = currentDir ?? Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + }; + + var browseResult = ofd.ShowDialog(); + + if (browseResult == DialogResult.OK) + { + textBox.Text = ofd.FileName; + } + }; + + return button; + } + + private void SaveSettings() + { + PluginManagement.PluginManager.GetInstance.SaveSettings(_plugin, _plugin.Settings); + } + + private void PluginSettingsCloseButton_Click(object sender, EventArgs e) + { + Close(); + } + } +} diff --git a/ObservatoryCore/UI/SettingsForm.resx b/ObservatoryCore/UI/SettingsForm.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ObservatoryCore/UI/SettingsForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ObservatoryCore/UI/ThemeManager.cs b/ObservatoryCore/UI/ThemeManager.cs new file mode 100644 index 0000000..c6460ca --- /dev/null +++ b/ObservatoryCore/UI/ThemeManager.cs @@ -0,0 +1,158 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Observatory.UI +{ + internal class ThemeManager + { + public static ThemeManager GetInstance + { + get + { + return _instance.Value; + } + } + private static readonly Lazy _instance = new(() => new ThemeManager()); + private bool _init; + + private ThemeManager() + { + _init = true; + controls = new List(); + Themes = new() + { + { "Dark", DarkTheme }, + { "Light", LightTheme } + }; + SelectedTheme = "Dark"; + } + + private readonly List controls; + + public List GetThemes + { + get => Themes.Keys.ToList(); + } + + public string CurrentTheme + { + get => SelectedTheme; + + set + { + if (Themes.ContainsKey(value)) + { + SelectedTheme = value; + foreach (var control in controls) + { + ApplyTheme(control); + } + } + } + } + + public void RegisterControl(Control control) + { + // First time registering a control, build the "light" theme based + // on defaults. + if (_init) + { + SaveTheme(control, LightTheme); + _init = false; + } + + controls.Add(control); + ApplyTheme(control); + if (control.HasChildren) + foreach (Control child in control.Controls) + { + RegisterControl(child); + } + } + + // This doesn't inherit from Control? Seriously? + public void RegisterControl(ToolStripMenuItem toolStripMenuItem) + { + ApplyTheme(toolStripMenuItem); + } + + private void SaveTheme(Control control, Dictionary theme) + { + Control rootControl = control; + while (rootControl.Parent != null) + { + rootControl = rootControl.Parent; + } + + SaveThemeControl(rootControl, theme); + var themeJson = System.Text.Json.JsonSerializer.Serialize(DarkTheme); + } + + private void SaveThemeControl(Control control, Dictionary theme) + { + var properties = control.GetType().GetProperties(); + var colorProperties = properties.Where(p => p.PropertyType == typeof(Color)); + + foreach (var colorProperty in colorProperties) + { + string controlKey = control.GetType().Name + "." + colorProperty.Name; + if (!theme.ContainsKey(controlKey)) + { + theme.Add(controlKey, (Color)colorProperty.GetValue(control)!); + } + } + + foreach (Control child in control.Controls) + { + SaveThemeControl(child, theme); + } + } + + public void DeRegisterControl(Control control) + { + if (control.HasChildren) + foreach (Control child in control.Controls) + { + DeRegisterControl(child); + } + controls.Remove(control); + } + + private void ApplyTheme(Object control) + { + var controlType = control.GetType(); + + var theme = Themes.ContainsKey(SelectedTheme) + ? Themes[SelectedTheme] : Themes["Light"]; + + foreach (var property in controlType.GetProperties().Where(p => p.PropertyType == typeof(Color))) + { + string themeControl = Themes[SelectedTheme].ContainsKey(controlType.Name + "." + property.Name) + ? controlType.Name + : "Default"; + + if (Themes[SelectedTheme].ContainsKey(themeControl + "." + property.Name)) + property.SetValue(control, Themes[SelectedTheme][themeControl + "." + property.Name]); + } + + } + + private Dictionary> Themes; + + private string SelectedTheme; + + private Dictionary LightTheme = new Dictionary(); + + static private Dictionary DarkTheme = new Dictionary + { + {"Default.ForeColor", Color.LightGray }, + {"Default.BackColor", Color.Black }, + {"Button.ForeColor", Color.LightGray }, + {"Button.BackColor", Color.DimGray } + }; + } +} diff --git a/ObservatoryCore/Utils/AudioHandler.cs b/ObservatoryCore/Utils/AudioHandler.cs new file mode 100644 index 0000000..f6fd2ed --- /dev/null +++ b/ObservatoryCore/Utils/AudioHandler.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using NAudio.Wave; + +namespace Observatory.Utils +{ + internal static class AudioHandler + { + internal static async Task PlayFile(string filePath) + { + await Task.Run(() => + { + using (var file = new AudioFileReader(filePath)) + using (var output = new WaveOutEvent()) + { + output.Init(file); + output.Play(); + + while (output.PlaybackState == PlaybackState.Playing) + { + Thread.Sleep(250); + } + }; + }); + } + } +} diff --git a/ObservatoryCore/Utils/LogMonitor.cs b/ObservatoryCore/Utils/LogMonitor.cs index 45fb68f..878c4ff 100644 --- a/ObservatoryCore/Utils/LogMonitor.cs +++ b/ObservatoryCore/Utils/LogMonitor.cs @@ -22,7 +22,7 @@ namespace Observatory.Utils } } - private static readonly Lazy _instance = new Lazy(NewLogMonitor); + private static readonly Lazy _instance = new(NewLogMonitor); private static LogMonitor NewLogMonitor() { @@ -44,6 +44,9 @@ namespace Observatory.Utils { get => currentState; } + + public Status Status { get; private set; } + #endregion #region Public Methods @@ -87,28 +90,31 @@ namespace Observatory.Utils return LogMonitorStateChangedEventArgs.IsBatchRead(currentState); } - public void ReadAllJournals() - { - ReadAllJournals(string.Empty); - } - - public void ReadAllJournals(string path) + public Func> ReadAllGenerator(out int fileCount) { // Prevent pre-reading when starting monitoring after reading all. firstStartMonitor = false; SetLogMonitorState(currentState | LogMonitorState.Batch); - DirectoryInfo logDirectory = GetJournalFolder(path); + DirectoryInfo logDirectory = GetJournalFolder(); var files = GetJournalFilesOrdered(logDirectory); - var readErrors = new List<(Exception ex, string file, string line)>(); - foreach (var file in files) - { - readErrors.AddRange( - ProcessLines(ReadAllLines(file.FullName), file.Name)); - } + fileCount = files.Count(); - ReportErrors(readErrors); - SetLogMonitorState(currentState & ~LogMonitorState.Batch); + IEnumerable ReadAllJournals() + { + var readErrors = new List<(Exception ex, string file, string line)>(); + foreach (var file in files) + { + yield return file.Name; + readErrors.AddRange( + ProcessLines(ReadAllLines(file.FullName), file.Name)); + } + + ReportErrors(readErrors); + SetLogMonitorState(currentState & ~LogMonitorState.Batch); + }; + + return ReadAllJournals; } public void PrereadJournals() @@ -187,13 +193,13 @@ namespace Observatory.Utils #region Private Fields - private FileSystemWatcher journalWatcher; - private FileSystemWatcher statusWatcher; - private Dictionary journalTypes; - private Dictionary currentLine; + private FileSystemWatcher? journalWatcher; + private FileSystemWatcher? statusWatcher; + private readonly Dictionary journalTypes; + private readonly Dictionary currentLine; private LogMonitorState currentState = LogMonitorState.Idle; // Change via #SetLogMonitorState private bool firstStartMonitor = true; - private string[] EventsWithAncillaryFile = new string[] + private readonly string[] EventsWithAncillaryFile = new string[] { "Cargo", "NavRoute", @@ -242,7 +248,7 @@ namespace Observatory.Utils statusWatcher.Changed += StatusUpdateEvent; } - private DirectoryInfo GetJournalFolder(string path = "") + private static DirectoryInfo GetJournalFolder(string path = "") { DirectoryInfo logDirectory; @@ -370,7 +376,7 @@ namespace Observatory.Utils } } - private void ReportErrors(List<(Exception ex, string file, string line)> readErrors) + private static void ReportErrors(List<(Exception ex, string file, string line)> readErrors) { if (readErrors.Any()) { @@ -410,24 +416,22 @@ namespace Observatory.Utils } catch (Exception ex) { - ReportErrors(new List<(Exception ex, string file, string line)>() { (ex, eventArgs.Name, line) }); + ReportErrors(new List<(Exception ex, string file, string line)>() { (ex, eventArgs.Name ?? string.Empty, line) }); } } currentLine[eventArgs.FullPath] = fileContent.Count; } - private List ReadAllLines(string path) + private static List ReadAllLines(string path) { var lines = new List(); try { - using (StreamReader file = new StreamReader(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))) + using StreamReader file = new(File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)); + while (!file.EndOfStream) { - while (!file.EndOfStream) - { - lines.Add(file.ReadLine()); - } + lines.Add(file.ReadLine() ?? string.Empty); } } catch (IOException ioEx) @@ -450,6 +454,7 @@ namespace Observatory.Utils if (statusLines.Count > 0) { var status = JournalReader.ObservatoryDeserializer(statusLines[0]); + Status = status; handler?.Invoke(this, new JournalEventArgs() { journalType = typeof(Status), journalEvent = status }); } } @@ -486,9 +491,9 @@ namespace Observatory.Utils IntPtr pathPtr = IntPtr.Zero; try { - Guid FolderSavedGames = new Guid("4C5C32FF-BB9D-43b0-B5B4-2D72E54EAAA4"); + Guid FolderSavedGames = new ("4C5C32FF-BB9D-43b0-B5B4-2D72E54EAAA4"); SHGetKnownFolderPath(ref FolderSavedGames, 0, IntPtr.Zero, out pathPtr); - return Marshal.PtrToStringUni(pathPtr); + return Marshal.PtrToStringUni(pathPtr) ?? string.Empty; } finally { @@ -496,7 +501,7 @@ namespace Observatory.Utils } } - private IEnumerable GetJournalFilesOrdered(DirectoryInfo journalFolder) + private static IEnumerable GetJournalFilesOrdered(DirectoryInfo journalFolder) { return from file in journalFolder.GetFiles("Journal.*.??.log") orderby file.LastWriteTime diff --git a/ObservatoryExplorer/ExplorerUIResults.cs b/ObservatoryExplorer/ExplorerUIResults.cs index 142b9e8..945bfd6 100644 --- a/ObservatoryExplorer/ExplorerUIResults.cs +++ b/ObservatoryExplorer/ExplorerUIResults.cs @@ -1,16 +1,19 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Observatory.Framework; namespace Observatory.Explorer { public class ExplorerUIResults { + [ColumnSuggestedWidth(150)] public string Time { get; set; } + + [ColumnSuggestedWidth(150)] public string BodyName { get; set; } + + [ColumnSuggestedWidth(200)] public string Description { get; set; } + + [ColumnSuggestedWidth(200)] public string Details { get; set; } } } diff --git a/ObservatoryExplorer/ObservatoryExplorer.csproj b/ObservatoryExplorer/ObservatoryExplorer.csproj index 0dac63d..93576f7 100644 --- a/ObservatoryExplorer/ObservatoryExplorer.csproj +++ b/ObservatoryExplorer/ObservatoryExplorer.csproj @@ -33,7 +33,7 @@ - + diff --git a/ObservatoryFramework/Attributes.cs b/ObservatoryFramework/Attributes.cs index 05bf691..8bfd806 100644 --- a/ObservatoryFramework/Attributes.cs +++ b/ObservatoryFramework/Attributes.cs @@ -33,6 +33,20 @@ namespace Observatory.Framework } } + /// + /// Suggests default column width when building basic UI + /// + [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)] + public class ColumnSuggestedWidth : Attribute + { + public ColumnSuggestedWidth(int width) + { + Width = width; + } + + public int Width { get; } + } + /// /// Indicates that the property should not be displayed to the user in the UI. /// diff --git a/ObservatoryFramework/Files/Converters/ThargoidWarRemainingTimeConverter.cs b/ObservatoryFramework/Files/Converters/ThargoidWarRemainingTimeConverter.cs new file mode 100644 index 0000000..f4a6795 --- /dev/null +++ b/ObservatoryFramework/Files/Converters/ThargoidWarRemainingTimeConverter.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.Json.Serialization; +using System.Text.Json; +using System.Threading.Tasks; +using System.Reflection.Metadata.Ecma335; + +namespace Observatory.Framework.Files.Converters +{ + class ThargoidWarRemainingTimeConverter : JsonConverter + { + public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType == JsonTokenType.String) + { + string value = reader.GetString(); + + int dayCount = Int32.TryParse(value.Split(' ')[0], out int days) + ? days + : 0; + + return dayCount; + } + else + return reader.GetInt32(); + } + + public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options) + { + writer.WriteStringValue(value.ToString() + " Days"); + } + } +} diff --git a/ObservatoryFramework/Files/Journal/Combat/Bounty.cs b/ObservatoryFramework/Files/Journal/Combat/Bounty.cs index 54c4470..13e8a12 100644 --- a/ObservatoryFramework/Files/Journal/Combat/Bounty.cs +++ b/ObservatoryFramework/Files/Journal/Combat/Bounty.cs @@ -6,6 +6,8 @@ namespace Observatory.Framework.Files.Journal public class Bounty : JournalBase { public ImmutableList Rewards { get; init; } + public string PilotName { get; set; } + public string PilotName_Localised { get; set; } public string Target { get; init; } public string Target_Localised { get; init; } public string Faction { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs b/ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs index c917d3b..2648d25 100644 --- a/ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs +++ b/ObservatoryFramework/Files/Journal/Combat/EscapeInterdiction.cs @@ -4,5 +4,6 @@ { public string Interdictor { get; init; } public bool IsPlayer { get; init; } + public bool IsThargoid { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Combat/Interdicted.cs b/ObservatoryFramework/Files/Journal/Combat/Interdicted.cs index 17b6121..f0cb0b9 100644 --- a/ObservatoryFramework/Files/Journal/Combat/Interdicted.cs +++ b/ObservatoryFramework/Files/Journal/Combat/Interdicted.cs @@ -9,5 +9,6 @@ public int CombatRank { get; init; } public string Faction { get; init; } public string Power { get; init; } + public bool IsThargoid { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs b/ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs index 2ced548..21ed41c 100644 --- a/ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs +++ b/ObservatoryFramework/Files/Journal/Exploration/FSSSignalDiscovered.cs @@ -14,6 +14,10 @@ /// public string SignalName_Localised { get; init; } /// + /// Type of signal location. + /// + public string SignalType { get; init; } + /// /// Faction state or circumstance that caused this signal to appear. /// public string SpawningState { get; init; } diff --git a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs index 4e39831..9ecc398 100644 --- a/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs +++ b/ObservatoryFramework/Files/Journal/FleetCarrier/CarrierJump.cs @@ -8,6 +8,10 @@ namespace Observatory.Framework.Files.Journal public class CarrierJump : FSDJump { public bool Docked { get; init; } + public bool OnFoot { get; init; } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StationType { get; init; } public ulong MarketID { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs b/ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs index 6ee667c..508cc48 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/Disembark.cs @@ -18,6 +18,9 @@ namespace Observatory.Framework.Files.Journal public int BodyID { get; init; } public bool OnStation { get; init; } public bool OnPlanet { get; init; } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StationType { get; init; } public ulong MarketID { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs b/ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs index 7237f07..766a5e6 100644 --- a/ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs +++ b/ObservatoryFramework/Files/Journal/Odyssey/ScanOrganic.cs @@ -11,6 +11,8 @@ namespace Observatory.Framework.Files.Journal public string Genus_Localised { get; init; } public string Species { get; init; } public string Species_Localised { get; init; } + public string Variant { get; init; } + public string Variant_Localised { get; init; } public ulong SystemAddress { get; init; } public int Body { get; init; } } diff --git a/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs index 6ebb960..65b8a3c 100644 --- a/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs +++ b/ObservatoryFramework/Files/Journal/Other/ApproachSettlement.cs @@ -1,4 +1,9 @@ -namespace Observatory.Framework.Files.Journal +using Observatory.Framework.Files.Converters; +using Observatory.Framework.Files.ParameterTypes; +using System.Collections.Immutable; +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.Journal { public class ApproachSettlement : JournalBase { @@ -10,5 +15,13 @@ public float Longitude { get; init; } public int BodyID { get; init; } public string BodyName { get; init; } + public ImmutableList StationEconomies { get; init; } + public string StationEconomy { get; init; } + public string StationEconomy_Localised { get; init; } + public Faction StationFaction { get; init; } + public string StationGovernment { get; init; } + public string StationGovernment_Localised { get; init; } + [JsonConverter(typeof(StationServiceConverter))] + public StationService StationServices { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Startup/Passengers.cs b/ObservatoryFramework/Files/Journal/Startup/Passengers.cs index 830e74b..eb61b94 100644 --- a/ObservatoryFramework/Files/Journal/Startup/Passengers.cs +++ b/ObservatoryFramework/Files/Journal/Startup/Passengers.cs @@ -1,11 +1,27 @@ using Observatory.Framework.Files.ParameterTypes; using System.Collections.Immutable; +using System.Text.Json.Serialization; namespace Observatory.Framework.Files.Journal { public class Passengers : JournalBase { - public ImmutableList Manifest { get; init; } + [JsonPropertyName("Passengers_Missions_Accepted")] + public int PassengersMissionsAccepted { get; init; } + [JsonPropertyName("Passengers_Missions_Bulk")] + public int PassengersMissionsBulk { get; init; } + + [JsonPropertyName("Passengers_Missions_Delivered")] + public int PassengersMissionsDelivered { get; init; } + + [JsonPropertyName("Passengers_Missions_Disgruntled")] + public int PassengersMissionsDisgruntled { get; init; } + + [JsonPropertyName("Passengers_Missions_Ejected")] + public int PassengersMissionsEjected { get; init; } + + [JsonPropertyName("Passengers_Missions_VIP")] + public int PassengersMissionsVip { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Startup/Statistics.cs b/ObservatoryFramework/Files/Journal/Startup/Statistics.cs index 1b26b88..da6ed6f 100644 --- a/ObservatoryFramework/Files/Journal/Startup/Statistics.cs +++ b/ObservatoryFramework/Files/Journal/Startup/Statistics.cs @@ -27,5 +27,6 @@ namespace Observatory.Framework.Files.Journal public CQC CQC { get; init; } [JsonPropertyName("FLEETCARRIER")] public FleetCarrier FleetCarrier { get; init; } + public Exobiology Exobiology { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/ClearImpound.cs b/ObservatoryFramework/Files/Journal/StationServices/ClearImpound.cs new file mode 100644 index 0000000..9951e05 --- /dev/null +++ b/ObservatoryFramework/Files/Journal/StationServices/ClearImpound.cs @@ -0,0 +1,11 @@ +namespace Observatory.Framework.Files.Journal +{ + public class ClearImpound : JournalBase + { + public string ShipType { get; init; } + public string ShipType_Localised { get; init; } + public ulong ShipID { get; init; } + public ulong ShipMarketID { get; init; } + public ulong MarketID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/StationServices/Market.cs b/ObservatoryFramework/Files/Journal/StationServices/Market.cs index 2b80fa3..de87e41 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/Market.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/Market.cs @@ -7,6 +7,9 @@ namespace Observatory.Framework.Files.Journal public class Market : JournalBase { public ulong MarketID { get; init; } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StationType { get; init; } public string StarSystem { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs b/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs index b406b8d..57a989a 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/MassModuleStore.cs @@ -5,7 +5,7 @@ namespace Observatory.Framework.Files.Journal { public class MassModuleStore : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Ship { get; init; } public ulong ShipID { get; init; } public ImmutableList Items { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs b/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs index bfb406e..43765b4 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/Outfitting.cs @@ -3,6 +3,9 @@ public class Outfitting : JournalBase { public ulong MarketID { get; init; } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StarSystem { get; init; } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs b/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs index 8fa1b67..34457f3 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/Shipyard.cs @@ -3,6 +3,9 @@ public class Shipyard : JournalBase { public ulong MarketID { get; init; } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StarSystem { get; init; } } diff --git a/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs b/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs index 6567717..646baac 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredModules.cs @@ -6,6 +6,9 @@ namespace Observatory.Framework.Files.Journal public class StoredModules : JournalBase { public string StarSystem { get; init; } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public ulong MarketID { get; init; } public ImmutableList Items { get; init; } diff --git a/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs index 55fda63..e7294ac 100644 --- a/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs +++ b/ObservatoryFramework/Files/Journal/StationServices/StoredShips.cs @@ -6,6 +6,9 @@ namespace Observatory.Framework.Files.Journal public class StoredShips : JournalBase { public ulong MarketID { get; init; } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StarSystem { get; init; } public ImmutableList ShipsHere { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Trade/MarketBuy.cs b/ObservatoryFramework/Files/Journal/Trade/MarketBuy.cs index 23254db..ad9bf75 100644 --- a/ObservatoryFramework/Files/Journal/Trade/MarketBuy.cs +++ b/ObservatoryFramework/Files/Journal/Trade/MarketBuy.cs @@ -2,7 +2,7 @@ { public class MarketBuy : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Type { get; init; } public string Type_Localised { get; init; } public int Count { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Trade/MarketSell.cs b/ObservatoryFramework/Files/Journal/Trade/MarketSell.cs index 8d479be..276be75 100644 --- a/ObservatoryFramework/Files/Journal/Trade/MarketSell.cs +++ b/ObservatoryFramework/Files/Journal/Trade/MarketSell.cs @@ -2,7 +2,7 @@ { public class MarketSell : JournalBase { - public long MarketID { get; init; } + public ulong MarketID { get; init; } public string Type { get; init; } public string Type_Localised { get; init; } public int Count { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Travel/Docked.cs b/ObservatoryFramework/Files/Journal/Travel/Docked.cs index 1fa7299..93a7a4d 100644 --- a/ObservatoryFramework/Files/Journal/Travel/Docked.cs +++ b/ObservatoryFramework/Files/Journal/Travel/Docked.cs @@ -7,12 +7,14 @@ namespace Observatory.Framework.Files.Journal { public class Docked : JournalBase { - + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StationType { get; init; } public string StarSystem { get; init; } public ulong SystemAddress { get; init; } - public long MarketID { get; init; } + public ulong MarketID { get; init; } [JsonConverter(typeof(Converters.LegacyFactionConverter))] public Faction StationFaction { get; init; } diff --git a/ObservatoryFramework/Files/Journal/Travel/DockingRequested.cs b/ObservatoryFramework/Files/Journal/Travel/DockingRequested.cs index 07f19dc..8eb6a79 100644 --- a/ObservatoryFramework/Files/Journal/Travel/DockingRequested.cs +++ b/ObservatoryFramework/Files/Journal/Travel/DockingRequested.cs @@ -4,9 +4,12 @@ namespace Observatory.Framework.Files.Journal { public class DockingRequested : JournalBase { + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StationType { get; init; } - public long MarketID { get; init; } + public ulong MarketID { get; init; } public LandingPads LandingPads { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs b/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs index 0a83152..ae4da99 100644 --- a/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs +++ b/ObservatoryFramework/Files/Journal/Travel/FSDJump.cs @@ -49,5 +49,6 @@ namespace Observatory.Framework.Files.Journal public string PowerplayState { get; init; } public bool Taxi { get; init; } public bool Multicrew { get; init; } + public ThargoidWar ThargoidWar { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Travel/Location.cs b/ObservatoryFramework/Files/Journal/Travel/Location.cs index f771569..c401fbc 100644 --- a/ObservatoryFramework/Files/Journal/Travel/Location.cs +++ b/ObservatoryFramework/Files/Journal/Travel/Location.cs @@ -24,11 +24,14 @@ namespace Observatory.Framework.Files.Journal //Stale Data, discard } } + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StationType { get; init; } public float Longitude { get; init; } public float Latitude { get; init; } - public long MarketID { get; init; } + public ulong MarketID { get; init; } [JsonConverter(typeof(LegacyFactionConverter))] public Faction StationFaction { get; init; } @@ -68,5 +71,6 @@ namespace Observatory.Framework.Files.Journal public bool Multicrew { get; init; } public bool OnFoot { get; init; } public bool InSRV { get; init; } + public ThargoidWar ThargoidWar { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Travel/StartJump.cs b/ObservatoryFramework/Files/Journal/Travel/StartJump.cs index b09297b..5c24c4a 100644 --- a/ObservatoryFramework/Files/Journal/Travel/StartJump.cs +++ b/ObservatoryFramework/Files/Journal/Travel/StartJump.cs @@ -6,5 +6,6 @@ public string StarSystem { get; init; } public ulong SystemAddress { get; init; } public string StarClass { get; init; } + public bool Taxi { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Travel/SupercruiseDestinationDrop.cs b/ObservatoryFramework/Files/Journal/Travel/SupercruiseDestinationDrop.cs new file mode 100644 index 0000000..245eefc --- /dev/null +++ b/ObservatoryFramework/Files/Journal/Travel/SupercruiseDestinationDrop.cs @@ -0,0 +1,9 @@ +namespace Observatory.Framework.Files.Journal +{ + public class SupercruiseDestinationDrop : JournalBase + { + public string Type { get; init; } + public int Threat { get; init; } + public ulong MarketID { get; init; } + } +} diff --git a/ObservatoryFramework/Files/Journal/Travel/SupercruiseEntry.cs b/ObservatoryFramework/Files/Journal/Travel/SupercruiseEntry.cs index f5c1cc5..442a47f 100644 --- a/ObservatoryFramework/Files/Journal/Travel/SupercruiseEntry.cs +++ b/ObservatoryFramework/Files/Journal/Travel/SupercruiseEntry.cs @@ -6,5 +6,6 @@ public ulong SystemAddress { get; init; } public bool Taxi { get; init; } public bool Multicrew { get; init; } + public bool? Wanted { get; init; } } } diff --git a/ObservatoryFramework/Files/Journal/Travel/Undocked.cs b/ObservatoryFramework/Files/Journal/Travel/Undocked.cs index 747e0d7..435fca2 100644 --- a/ObservatoryFramework/Files/Journal/Travel/Undocked.cs +++ b/ObservatoryFramework/Files/Journal/Travel/Undocked.cs @@ -2,6 +2,9 @@ { public class Undocked : JournalBase { + /// + /// Name of the station at which this event occurred. + /// public string StationName { get; init; } public string StationType { get; init; } public ulong MarketID { get; init; } diff --git a/ObservatoryFramework/Files/MarketFile.cs b/ObservatoryFramework/Files/MarketFile.cs index fb22d0b..edbe655 100644 --- a/ObservatoryFramework/Files/MarketFile.cs +++ b/ObservatoryFramework/Files/MarketFile.cs @@ -11,7 +11,7 @@ namespace Observatory.Framework.Files /// /// Unique ID of current market. /// - public long MarketID { get; init; } + public ulong MarketID { get; init; } /// /// Name of the station where the market is located. /// diff --git a/ObservatoryFramework/Files/OutfittingFile.cs b/ObservatoryFramework/Files/OutfittingFile.cs index 40600c2..7c23398 100644 --- a/ObservatoryFramework/Files/OutfittingFile.cs +++ b/ObservatoryFramework/Files/OutfittingFile.cs @@ -11,7 +11,7 @@ namespace Observatory.Framework.Files /// /// Unique ID of current market. /// - public long MarketID { get; init; } + public ulong MarketID { get; init; } /// /// Name of the station where the market is located. /// diff --git a/ObservatoryFramework/Files/ParameterTypes/BankAccount.cs b/ObservatoryFramework/Files/ParameterTypes/BankAccount.cs index ca98037..ecf2841 100644 --- a/ObservatoryFramework/Files/ParameterTypes/BankAccount.cs +++ b/ObservatoryFramework/Files/ParameterTypes/BankAccount.cs @@ -27,5 +27,21 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("Spent_On_Insurance")] public long SpentOnInsurance { get; init; } + [JsonPropertyName("Owned_Ship_Count")] + public int OwnedShipCount { get; init; } + [JsonPropertyName("Premium_Stock_Bought")] + public int PremiumStockBought { get; init; } + [JsonPropertyName("Spent_On_Premium_Stock")] + public long SpentOnPremiumStock { get; init; } + [JsonPropertyName("Spent_On_Suit_Consumables")] + public long SpentOnSuitConsumables { get; init; } + [JsonPropertyName("Spent_On_Suits")] + public long SpentOnSuits { get; init; } + [JsonPropertyName("Spent_On_Weapons")] + public long SpentOnWeapons { get; init; } + [JsonPropertyName("Suits_Owned")] + public int SuitsOwned { get; init; } + [JsonPropertyName("Weapons_Owned")] + public int WeaponsOwned { get; init; } } } diff --git a/ObservatoryFramework/Files/ParameterTypes/BioData.cs b/ObservatoryFramework/Files/ParameterTypes/BioData.cs index 50dbfd4..9dd5694 100644 --- a/ObservatoryFramework/Files/ParameterTypes/BioData.cs +++ b/ObservatoryFramework/Files/ParameterTypes/BioData.cs @@ -6,6 +6,8 @@ public string Genus_Localised { get; init; } public string Species { get; init; } public string Species_Localised { get; init; } + public string Variant { get; init; } + public string Variant_Localised { get; init; } public int Value { get; init; } public int Bonus { get; init; } } diff --git a/ObservatoryFramework/Files/ParameterTypes/Combat.cs b/ObservatoryFramework/Files/ParameterTypes/Combat.cs index 39ddeea..27c0572 100644 --- a/ObservatoryFramework/Files/ParameterTypes/Combat.cs +++ b/ObservatoryFramework/Files/ParameterTypes/Combat.cs @@ -26,5 +26,37 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("Skimmers_Killed")] public int SkimmersKilled { get; init; } + [JsonPropertyName("ConflictZone_High")] + public int ConflictZoneHigh { get; init; } + [JsonPropertyName("ConflictZone_High_Wins")] + public int ConflictZoneHighWins { get; init; } + [JsonPropertyName("ConflictZone_Low")] + public int ConflictZoneLow { get; init; } + [JsonPropertyName("ConflictZone_Low_Wins")] + public int ConflictZoneLowWins { get; init; } + [JsonPropertyName("ConflictZone_Medium")] + public int ConflictZoneMedium { get; init; } + [JsonPropertyName("ConflictZone_Medium_Wins")] + public int ConflictZoneMediumWins { get; init; } + [JsonPropertyName("ConflictZone_Total")] + public int ConflictZoneTotal { get; init; } + [JsonPropertyName("ConflictZone_Total_Wins")] + public int ConflictZoneTotalWins { get; init; } + [JsonPropertyName("OnFoot_Combat_Bonds")] + public int OnFootCombatBonds { get; init; } + [JsonPropertyName("OnFoot_Combat_Bonds_Profits")] + public int OnFootCombatBondsProfits { get; init; } + [JsonPropertyName("OnFoot_Scavs_Killed")] + public int OnFootScavsKilled { get; init; } + [JsonPropertyName("OnFoot_Ships_Destroyed")] + public int OnFootShipsDestroyed { get; init; } + [JsonPropertyName("OnFoot_Skimmers_Killed")] + public int OnFootSkimmersKilled { get; init; } + [JsonPropertyName("OnFoot_Vehicles_Destroyed")] + public int OnFootVehiclesDestroyed { get; init; } + [JsonPropertyName("Settlement_Conquered")] + public int SettlementConquered { get; init; } + [JsonPropertyName("Settlement_Defended")] + public int SettlementDefended { get; init; } } } diff --git a/ObservatoryFramework/Files/ParameterTypes/Crafting.cs b/ObservatoryFramework/Files/ParameterTypes/Crafting.cs index 2903945..b545084 100644 --- a/ObservatoryFramework/Files/ParameterTypes/Crafting.cs +++ b/ObservatoryFramework/Files/ParameterTypes/Crafting.cs @@ -29,6 +29,30 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("Recipes_Generated_Rank_5")] public int RecipesGeneratedRank5 { get; init; } + [JsonPropertyName("Suit_Mods_Applied")] + public int SuitModsApplied { get; init; } + + [JsonPropertyName("Suit_Mods_Applied_Full")] + public int SuitModsAppliedFull { get; init; } + + [JsonPropertyName("Suits_Upgraded")] + public int SuitsUpgraded { get; init; } + + [JsonPropertyName("Suits_Upgraded_Full")] + public int SuitsUpgradedFull { get; init; } + + [JsonPropertyName("Weapon_Mods_Applied")] + public int WeaponModsApplied { get; init; } + + [JsonPropertyName("Weapon_Mods_Applied_Full")] + public int WeaponModsAppliedFull { get; init; } + + [JsonPropertyName("Weapons_Upgraded")] + public int WeaponsUpgraded { get; init; } + + [JsonPropertyName("Weapons_Upgraded_Full")] + public int WeaponsUpgradedFull { get; init; } + [JsonPropertyName("Recipes_Applied"), Obsolete(JournalUtilities.ObsoleteMessage)] public int RecipesApplied { get; init; } diff --git a/ObservatoryFramework/Files/ParameterTypes/Crime.cs b/ObservatoryFramework/Files/ParameterTypes/Crime.cs index d3c4982..e7ff2e2 100644 --- a/ObservatoryFramework/Files/ParameterTypes/Crime.cs +++ b/ObservatoryFramework/Files/ParameterTypes/Crime.cs @@ -19,5 +19,56 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("Highest_Bounty")] public decimal HighestBounty { get; init; } + + [JsonPropertyName("Citizens_Murdered")] + public int CitizensMurdered { get; init; } + + [JsonPropertyName("Data_Stolen")] + public int DataStolen { get; init; } + + [JsonPropertyName("Goods_Stolen")] + public int GoodsStolen { get; init; } + + [JsonPropertyName("Guards_Murdered")] + public int GuardsMurdered { get; init; } + + [JsonPropertyName("Malware_Uploaded")] + public int MalwareUploaded { get; init; } + + [JsonPropertyName("Omnipol_Murdered")] + public int OmnipolMurdered { get; init; } + + [JsonPropertyName("Production_Sabotage")] + public int ProductionSabotage { get; init; } + + [JsonPropertyName("Production_Theft")] + public int ProductionTheft { get; init; } + + [JsonPropertyName("Profiles_Cloned")] + public int ProfilesCloned { get; init; } + + [JsonPropertyName("Sample_Stolen")] + public int SampleStolen { get; init; } + + [JsonPropertyName("Settlements_State_Shutdown")] + public int SettlementsStateShutdown { get; init; } + + [JsonPropertyName("Total_Murders")] + public int TotalMurders { get; init; } + + [JsonPropertyName("Total_Stolen")] + public int TotalStolen { get; init; } + + [JsonPropertyName("Turrets_Destroyed")] + public int TurretsDestroyed { get; init; } + + [JsonPropertyName("Turrets_Overloaded")] + public int TurretsOverloaded { get; init; } + + [JsonPropertyName("Turrets_Total")] + public int TurretsTotal { get; init; } + + [JsonPropertyName("Value_Stolen_StateChange")] + public int ValueStolenStatechange { get; init; } } } diff --git a/ObservatoryFramework/Files/ParameterTypes/Exobiology.cs b/ObservatoryFramework/Files/ParameterTypes/Exobiology.cs new file mode 100644 index 0000000..9920ebe --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/Exobiology.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.Json.Serialization; +using System.Threading.Tasks; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class Exobiology + { + [JsonPropertyName("First_Logged")] + public int FirstLogged { get; init; } + + [JsonPropertyName("First_Logged_Profits")] + public long FirstLoggedProfits { get; init; } + + [JsonPropertyName("Organic_Data")] + public int OrganicData { get; init; } + + [JsonPropertyName("Organic_Data_Profits")] + public long OrganicDataProfits { get; init; } + + [JsonPropertyName("Organic_Genus")] + public int OrganicGenus { get; init; } + + [JsonPropertyName("Organic_Genus_Encountered")] + public int OrganicGenusEncountered { get; init; } + + [JsonPropertyName("Organic_Planets")] + public int OrganicPlanets { get; init; } + + [JsonPropertyName("Organic_Species")] + public int OrganicSpecies { get; init; } + + [JsonPropertyName("Organic_Species_Encountered")] + public int OrganicSpeciesEncountered { get; init; } + + [JsonPropertyName("Organic_Systems")] + public int OrganicSystems { get; init; } + + [JsonPropertyName("Organic_Variant_Encountered")] + public int OrganicVariantEncountered { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Exploration.cs b/ObservatoryFramework/Files/ParameterTypes/Exploration.cs index df7fa01..c457526 100644 --- a/ObservatoryFramework/Files/ParameterTypes/Exploration.cs +++ b/ObservatoryFramework/Files/ParameterTypes/Exploration.cs @@ -40,5 +40,26 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("Efficient_Scans")] public int EfficientScans { get; init; } + + [JsonPropertyName("First_Footfalls")] + public int FirstFootfalls { get; init; } + + [JsonPropertyName("OnFoot_Distance_Travelled")] + public long OnFootDistanceTravelled { get; init; } + + [JsonPropertyName("Planet_Footfalls")] + public int PlanetFootfalls { get; init; } + + [JsonPropertyName("Settlements_Visited")] + public int SettlementsVisited { get; init; } + + [JsonPropertyName("Shuttle_Distance_Travelled")] + public double ShuttleDistanceTravelled { get; init; } + + [JsonPropertyName("Shuttle_Journeys")] + public int ShuttleJourneys { get; init; } + + [JsonPropertyName("Spent_On_Shuttles")] + public long SpentOnShuttles { get; init; } } } diff --git a/ObservatoryFramework/Files/ParameterTypes/MaterialTrader.cs b/ObservatoryFramework/Files/ParameterTypes/MaterialTrader.cs index 8186c75..0c4c4f6 100644 --- a/ObservatoryFramework/Files/ParameterTypes/MaterialTrader.cs +++ b/ObservatoryFramework/Files/ParameterTypes/MaterialTrader.cs @@ -4,6 +4,12 @@ namespace Observatory.Framework.Files.ParameterTypes { public class MaterialTrader { + [JsonPropertyName("Assets_Traded_In")] + public int AssetsTradedIn { get; init; } + + [JsonPropertyName("Assets_Traded_Out")] + public int AssetsTradedOut { get; init; } + [JsonPropertyName("Trades_Completed")] public int TradesCompleted { get; init; } diff --git a/ObservatoryFramework/Files/ParameterTypes/SearchAndRescue.cs b/ObservatoryFramework/Files/ParameterTypes/SearchAndRescue.cs index a3e27e4..8dce88c 100644 --- a/ObservatoryFramework/Files/ParameterTypes/SearchAndRescue.cs +++ b/ObservatoryFramework/Files/ParameterTypes/SearchAndRescue.cs @@ -12,5 +12,29 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("SearchRescue_Count")] public int Count { get; init; } + + [JsonPropertyName("Maglocks_Opened")] + public int MaglocksOpened { get; init; } + + [JsonPropertyName("Panels_Opened")] + public int PanelsOpened { get; init; } + + [JsonPropertyName("Salvage_Illegal_POI")] + public int SalvageIllegalPoi { get; init; } + + [JsonPropertyName("Salvage_Illegal_Settlements")] + public int SalvageIllegalSettlements { get; init; } + + [JsonPropertyName("Salvage_Legal_POI")] + public int SalvageLegalPoi { get; init; } + + [JsonPropertyName("Salvage_Legal_Settlements")] + public int SalvageLegalSettlements { get; init; } + + [JsonPropertyName("Settlements_State_FireOut")] + public int SettlementsStateFireOut { get; init; } + + [JsonPropertyName("Settlements_State_Reboot")] + public int SettlementsStateReboot { get; init; } } } diff --git a/ObservatoryFramework/Files/ParameterTypes/Thargoid.cs b/ObservatoryFramework/Files/ParameterTypes/Thargoid.cs index 1cb7806..3805a1e 100644 --- a/ObservatoryFramework/Files/ParameterTypes/Thargoid.cs +++ b/ObservatoryFramework/Files/ParameterTypes/Thargoid.cs @@ -4,6 +4,9 @@ namespace Observatory.Framework.Files.ParameterTypes { public class Thargoid { + [JsonPropertyName("TG_ENCOUNTER_KILLED")] + public int EncounterKilled { get; init; } + [JsonPropertyName("TG_ENCOUNTER_WAKES")] public int EncounterWakes { get; init; } @@ -18,8 +21,5 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("TG_ENCOUNTER_TOTAL_LAST_SHIP")] public string LastShip { get; init; } - - [JsonPropertyName("TG_SCOUT_COUNT")] - public int ScoutCount { get; init; } } } diff --git a/ObservatoryFramework/Files/ParameterTypes/ThargoidWar.cs b/ObservatoryFramework/Files/ParameterTypes/ThargoidWar.cs new file mode 100644 index 0000000..05fbc76 --- /dev/null +++ b/ObservatoryFramework/Files/ParameterTypes/ThargoidWar.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; + +namespace Observatory.Framework.Files.ParameterTypes +{ + public class ThargoidWar + { + public string CurrentState { get; init; } + public string NextStateSuccess { get; init; } + public string NextStateFailure { get; init; } + public bool SuccessStateReached { get; init; } + public double WarProgress { get; init; } + public int RemainingPorts { get; init; } + [JsonConverter(typeof(Converters.ThargoidWarRemainingTimeConverter))] + public int EstimatedRemainingTime { get; init; } + } +} diff --git a/ObservatoryFramework/Files/ParameterTypes/Trading.cs b/ObservatoryFramework/Files/ParameterTypes/Trading.cs index f15d5ef..b347cb4 100644 --- a/ObservatoryFramework/Files/ParameterTypes/Trading.cs +++ b/ObservatoryFramework/Files/ParameterTypes/Trading.cs @@ -18,5 +18,14 @@ namespace Observatory.Framework.Files.ParameterTypes [JsonPropertyName("Highest_Single_Transaction")] public long HighestSingleTransaction { get; init; } + + [JsonPropertyName("Assets_Sold")] + public int AssetsSold { get; init; } + + [JsonPropertyName("Data_Sold")] + public int DataSold { get; init; } + + [JsonPropertyName("Goods_Sold")] + public int GoodsSold { get; init; } } } diff --git a/ObservatoryFramework/Interfaces.cs b/ObservatoryFramework/Interfaces.cs index 27ee27b..e595679 100644 --- a/ObservatoryFramework/Interfaces.cs +++ b/ObservatoryFramework/Interfaces.cs @@ -1,6 +1,5 @@ using Observatory.Framework.Files; using Observatory.Framework.Files.Journal; -using System.Xml.XPath; namespace Observatory.Framework.Interfaces { @@ -51,11 +50,16 @@ namespace Observatory.Framework.Interfaces /// /// Plugin-specific object implementing the IComparer interface which is used to sort columns in the basic UI datagrid. - /// If omitted a basic numeric compare sorter is used. + /// If omitted a natural sort order is used. /// public IObservatoryComparer ColumnSorter { get => null; } + /// + /// Receives data sent by other plugins. + /// + public void HandlePluginMessage(string sourceName, string sourceVersion, object messageArgs) + { } } /// @@ -94,7 +98,7 @@ namespace Observatory.Framework.Interfaces /// Used to track if a "Read All" operation is in progress or not to avoid unnecessary processing or notifications.
/// Can be omitted for plugins which do not require the distinction. /// - [Obsolete] // Replaced by LogMonitorStateChanged + [Obsolete("Deprecated in favour of LogMonitorStateChanged")] public void ReadAllStarted() { } @@ -103,7 +107,7 @@ namespace Observatory.Framework.Interfaces /// Used to track if a "Read All" operation is in progress or not to avoid unnecessary processing or notifications.
/// Can be omitted for plugins which do not require the distinction. /// - [Obsolete] // Replaced by LogMonitorStateChanged + [Obsolete("Deprecated in favour of LogMonitorStateChanged")] public void ReadAllFinished() { } } @@ -120,6 +124,20 @@ namespace Observatory.Framework.Interfaces /// /// Details of the notification as sent from the originating worker plugin. public void OnNotificationEvent(NotificationArgs notificationEventArgs); + + /// + /// Property set by notification plugins to indicate to Core + /// that native audio notifications should be disabled/suppressed. + /// + public bool OverrideAudioNotifications + { get => false; } + + /// + /// Property set by notification plugins to indicate to Core + /// that native popup notifications should be disabled/suppressed. + /// + public bool OverridePopupNotifications + { get => false; } } /// @@ -219,6 +237,17 @@ namespace Observatory.Framework.Interfaces /// Retrieves and ensures creation of a location which can be used by the plugin to store persistent data. /// public string PluginStorageFolder { get; } + + /// + /// Plays audio file using default audio device. + /// + /// Absolute path to audio file. + public Task PlayAudioFile(string filePath); + + /// + /// Sends arbitrary data to all other plugins. The full name and version of the sending plugin will be used to identify the sender to any recipients. + /// + public void SendPluginMessage(IObservatoryPlugin plugin, object message); } /// diff --git a/ObservatoryFramework/ObservatoryFramework.xml b/ObservatoryFramework/ObservatoryFramework.xml index 2b3a07a..c65f353 100644 --- a/ObservatoryFramework/ObservatoryFramework.xml +++ b/ObservatoryFramework/ObservatoryFramework.xml @@ -20,6 +20,11 @@ Accessor to get/set displayed name. + + + Suggests default column width when building basic UI + + Indicates that the property should not be displayed to the user in the UI. @@ -489,6 +494,11 @@ Localised name of the signal type. + + + Type of signal location. + + Faction state or circumstance that caused this signal to appear. @@ -1005,6 +1015,61 @@ Total amount made from selling data. + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + + + + Name of the station at which this event occurred. + + Elite Dangerous cargo.json file. Describes the current cargo carried above the player's ship. @@ -1352,8 +1417,13 @@ - Plugin-specific object implementing the IComparer interface which is used to sort columns in the basic UI datagrid. - If omitted a basic string compare sorter is used. + Plugin-specific object implementing the IComparer interface which is used to sort columns in the basic UI datagrid. + If omitted a natural sort order is used. + + + + + Receives data sent by other plugins. @@ -1412,6 +1482,18 @@ Details of the notification as sent from the originating worker plugin. + + + Property set by notification plugins to indicate to Core + that native audio notifications should be disabled/suppressed. + + + + + Property set by notification plugins to indicate to Core + that native popup notifications should be disabled/suppressed. + + Interface passed by Observatory Core to plugins. Primarily used for sending notifications and UI updates back to Core. @@ -1510,6 +1592,17 @@ Retrieves and ensures creation of a location which can be used by the plugin to store persistent data. + + + Plays audio file using default audio device. + + Absolute path to audio file. + + + + Sends arbitrary data to all other plugins. The full name and version of the sending plugin will be used to identify the sender to any recipients. + + Extends the base IComparer interface with exposed values for the column ID and sort order to use. diff --git a/ObservatoryHerald/HeraldNotifier.cs b/ObservatoryHerald/HeraldNotifier.cs index 8c84548..a66fa28 100644 --- a/ObservatoryHerald/HeraldNotifier.cs +++ b/ObservatoryHerald/HeraldNotifier.cs @@ -28,6 +28,8 @@ namespace Observatory.Herald public string ShortName => "Herald"; + public bool OverrideAudioNotifications => true; + public string Version => typeof(HeraldNotifier).Assembly.GetName().Version.ToString(); public PluginUI PluginUI => new (PluginUI.UIType.None, null); @@ -55,7 +57,7 @@ namespace Observatory.Herald { var speechManager = new SpeechRequestManager( heraldSettings, observatoryCore.HttpClient, observatoryCore.PluginStorageFolder, observatoryCore.GetPluginErrorLogger(this)); - heraldSpeech = new HeraldQueue(speechManager, observatoryCore.GetPluginErrorLogger(this)); + heraldSpeech = new HeraldQueue(speechManager, observatoryCore.GetPluginErrorLogger(this), observatoryCore); heraldSettings.Test = TestVoice; } diff --git a/ObservatoryHerald/HeraldQueue.cs b/ObservatoryHerald/HeraldQueue.cs index b0256c2..ae4dc4b 100644 --- a/ObservatoryHerald/HeraldQueue.cs +++ b/ObservatoryHerald/HeraldQueue.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Threading.Tasks; using System.Linq; -using NetCoreAudio; using System.Threading; using System; using System.Diagnostics; +using Observatory.Framework.Interfaces; namespace Observatory.Herald { @@ -18,15 +18,15 @@ namespace Observatory.Herald private string rate; private byte volume; private SpeechRequestManager speechManager; - private Player audioPlayer; private Action ErrorLogger; + private IObservatoryCore core; - public HeraldQueue(SpeechRequestManager speechManager, Action errorLogger) + public HeraldQueue(SpeechRequestManager speechManager, Action errorLogger, IObservatoryCore core) { this.speechManager = speechManager; + this.core = core; processing = false; notifications = new(); - audioPlayer = new(); ErrorLogger = errorLogger; } @@ -74,7 +74,7 @@ namespace Observatory.Herald { while (notifications.Any()) { - audioPlayer.SetVolume(volume).Wait(); + // audioPlayer.SetVolume(volume).Wait(); notification = notifications.Dequeue(); Debug.WriteLine("Processing notification: {0} - {1}", notification.Title, notification.Detail); @@ -118,7 +118,7 @@ namespace Observatory.Herald return await speechManager.GetAudioFileFromSsml(ssml, voice, style, rate); } - private void PlayAudioRequestsSequentially(List> requestTasks) + private async void PlayAudioRequestsSequentially(List> requestTasks) { foreach (var request in requestTasks) { @@ -126,19 +126,20 @@ namespace Observatory.Herald try { Debug.WriteLine($"Playing audio file: {file}"); - audioPlayer.Play(file).Wait(); + await core.PlayAudioFile(file); + // audioPlayer.Play(file).Wait(); } catch (Exception ex) { Debug.WriteLine($"Failed to play {file}: {ex.Message}"); ErrorLogger(ex, $"while playing: {file}"); } - while (audioPlayer.Playing) - Thread.Sleep(50); + //while (audioPlayer.Playing) + // Thread.Sleep(50); - // Explicit stop to ensure device is ready for next file. - // ...hopefully. - audioPlayer.Stop(true).Wait(); + //// Explicit stop to ensure device is ready for next file. + //// ...hopefully. + //audioPlayer.Stop(true).Wait(); } speechManager.CommitCache(); diff --git a/ObservatoryHerald/NetCoreAudio/Interfaces/IPlayer.cs b/ObservatoryHerald/NetCoreAudio/Interfaces/IPlayer.cs deleted file mode 100644 index ed38bdb..0000000 --- a/ObservatoryHerald/NetCoreAudio/Interfaces/IPlayer.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Threading.Tasks; - -namespace NetCoreAudio.Interfaces -{ - public interface IPlayer : IDisposable - { - event EventHandler PlaybackFinished; - - bool Playing { get; } - bool Paused { get; } - - Task Play(string fileName); - Task Pause(); - Task Resume(); - Task Stop(bool force); - Task SetVolume(byte percent); - } -} diff --git a/ObservatoryHerald/NetCoreAudio/Player.cs b/ObservatoryHerald/NetCoreAudio/Player.cs deleted file mode 100644 index f38707c..0000000 --- a/ObservatoryHerald/NetCoreAudio/Player.cs +++ /dev/null @@ -1,98 +0,0 @@ -using NetCoreAudio.Interfaces; -using NetCoreAudio.Players; -using System; -using System.Runtime.InteropServices; -using System.Threading.Tasks; - -namespace NetCoreAudio -{ - public class Player : IPlayer - { - private readonly IPlayer _internalPlayer; - - /// - /// Internally, sets Playing flag to false. Additional handlers can be attached to it to handle any custom logic. - /// - public event EventHandler PlaybackFinished; - - /// - /// Indicates that the audio is currently playing. - /// - public bool Playing => _internalPlayer.Playing; - - /// - /// Indicates that the audio playback is currently paused. - /// - public bool Paused => _internalPlayer.Paused; - - public Player() - { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - _internalPlayer = new WindowsPlayer(); - else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - _internalPlayer = new LinuxPlayer(); - else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - _internalPlayer = new MacPlayer(); - else - throw new Exception("No implementation exist for the current OS"); - - _internalPlayer.PlaybackFinished += OnPlaybackFinished; - } - - /// - /// Will stop any current playback and will start playing the specified audio file. The fileName parameter can be an absolute path or a path relative to the directory where the library is located. Sets Playing flag to true. Sets Paused flag to false. - /// - /// - /// - public async Task Play(string fileName) - { - await _internalPlayer.Play(fileName); - } - - /// - /// Pauses any ongong playback. Sets Paused flag to true. Doesn't modify Playing flag. - /// - /// - public async Task Pause() - { - await _internalPlayer.Pause(); - } - - /// - /// Resumes any paused playback. Sets Paused flag to false. Doesn't modify Playing flag. - /// - /// - public async Task Resume() - { - await _internalPlayer.Resume(); - } - - /// - /// Stops any current playback and clears the buffer. Sets Playing and Paused flags to false. - /// - /// - public async Task Stop(bool force = false) - { - await _internalPlayer.Stop(force); - } - - private void OnPlaybackFinished(object sender, EventArgs e) - { - PlaybackFinished?.Invoke(this, e); - } - - /// - /// Sets the playing volume as percent - /// - /// - public async Task SetVolume(byte percent) - { - await _internalPlayer.SetVolume(percent); - } - - public void Dispose() - { - _internalPlayer.Dispose(); - } - } -} diff --git a/ObservatoryHerald/NetCoreAudio/Players/LinuxPlayer.cs b/ObservatoryHerald/NetCoreAudio/Players/LinuxPlayer.cs deleted file mode 100644 index 425b0e4..0000000 --- a/ObservatoryHerald/NetCoreAudio/Players/LinuxPlayer.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.IO; -using System.Threading.Tasks; -using NetCoreAudio.Interfaces; - -namespace NetCoreAudio.Players -{ - internal class LinuxPlayer : UnixPlayerBase, IPlayer - { - protected override string GetBashCommand(string fileName) - { - if (Path.GetExtension(fileName).ToLower().Equals(".mp3")) - { - return "mpg123 -q"; - } - else - { - return "aplay -q"; - } - } - - public override Task SetVolume(byte percent) - { - if (percent > 100) - throw new ArgumentOutOfRangeException(nameof(percent), "Percent can't exceed 100"); - - var tempProcess = StartBashProcess($"amixer -M set 'Master' {percent}%"); - tempProcess.WaitForExit(); - - return Task.CompletedTask; - } - } -} diff --git a/ObservatoryHerald/NetCoreAudio/Players/MacPlayer.cs b/ObservatoryHerald/NetCoreAudio/Players/MacPlayer.cs deleted file mode 100644 index 708c8bc..0000000 --- a/ObservatoryHerald/NetCoreAudio/Players/MacPlayer.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Threading.Tasks; -using NetCoreAudio.Interfaces; - -namespace NetCoreAudio.Players -{ - internal class MacPlayer : UnixPlayerBase, IPlayer - { - protected override string GetBashCommand(string fileName) - { - return "afplay"; - } - - public override Task SetVolume(byte percent) - { - if (percent > 100) - throw new ArgumentOutOfRangeException(nameof(percent), "Percent can't exceed 100"); - - var tempProcess = StartBashProcess($"osascript -e \"set volume output volume {percent}\""); - tempProcess.WaitForExit(); - - return Task.CompletedTask; - } - } -} diff --git a/ObservatoryHerald/NetCoreAudio/Players/UnixPlayerBase.cs b/ObservatoryHerald/NetCoreAudio/Players/UnixPlayerBase.cs deleted file mode 100644 index 32ce4cf..0000000 --- a/ObservatoryHerald/NetCoreAudio/Players/UnixPlayerBase.cs +++ /dev/null @@ -1,110 +0,0 @@ -using NetCoreAudio.Interfaces; -using System; -using System.Diagnostics; -using System.Threading.Tasks; - -namespace NetCoreAudio.Players -{ - internal abstract class UnixPlayerBase : IPlayer - { - private Process _process = null; - - internal const string PauseProcessCommand = "kill -STOP {0}"; - internal const string ResumeProcessCommand = "kill -CONT {0}"; - - public event EventHandler PlaybackFinished; - - public bool Playing { get; private set; } - - public bool Paused { get; private set; } - - protected abstract string GetBashCommand(string fileName); - - public async Task Play(string fileName) - { - await Stop(); - var BashToolName = GetBashCommand(fileName); - _process = StartBashProcess($"{BashToolName} '{fileName}'"); - _process.EnableRaisingEvents = true; - _process.Exited += HandlePlaybackFinished; - _process.ErrorDataReceived += HandlePlaybackFinished; - _process.Disposed += HandlePlaybackFinished; - Playing = true; - } - - public Task Pause() - { - if (Playing && !Paused && _process != null) - { - var tempProcess = StartBashProcess(string.Format(PauseProcessCommand, _process.Id)); - tempProcess.WaitForExit(); - Paused = true; - } - - return Task.CompletedTask; - } - - public Task Resume() - { - if (Playing && Paused && _process != null) - { - var tempProcess = StartBashProcess(string.Format(ResumeProcessCommand, _process.Id)); - tempProcess.WaitForExit(); - Paused = false; - } - - return Task.CompletedTask; - } - - public Task Stop(bool force = false) - { - if (_process != null) - { - _process.Kill(); - _process.Dispose(); - _process = null; - } - - Playing = false; - Paused = false; - - return Task.CompletedTask; - } - - protected Process StartBashProcess(string command) - { - var escapedArgs = command.Replace("\"", "\\\""); - - var process = new Process() - { - StartInfo = new ProcessStartInfo - { - FileName = "/bin/bash", - Arguments = $"-c \"{escapedArgs}\"", - RedirectStandardOutput = true, - RedirectStandardInput = true, - UseShellExecute = false, - CreateNoWindow = true, - } - }; - process.Start(); - return process; - } - - internal void HandlePlaybackFinished(object sender, EventArgs e) - { - if (Playing) - { - Playing = false; - PlaybackFinished?.Invoke(this, e); - } - } - - public abstract Task SetVolume(byte percent); - - public void Dispose() - { - Stop().Wait(); - } - } -} diff --git a/ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs b/ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs deleted file mode 100644 index c92c1ed..0000000 --- a/ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs +++ /dev/null @@ -1,141 +0,0 @@ -using NetCoreAudio.Interfaces; -using System; -using System.Diagnostics; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; -using System.Timers; - -namespace NetCoreAudio.Players -{ - internal class WindowsPlayer : IPlayer - { - [DllImport("winmm.dll")] - private static extern int mciSendString(string command, StringBuilder stringReturn, int returnLength, IntPtr hwndCallback); - - [DllImport("winmm.dll")] - private static extern int mciGetErrorString(int errorCode, StringBuilder errorText, int errorTextSize); - - [DllImport("winmm.dll")] - public static extern int waveOutSetVolume(IntPtr hwo, uint dwVolume); - - private System.Timers.Timer _playbackTimer; - private Stopwatch _playStopwatch; - - private string _fileName; - - public event EventHandler PlaybackFinished; - - public bool Playing { get; private set; } - public bool Paused { get; private set; } - - public Task Play(string fileName) - { - _fileName = $"\"{fileName}\""; - _playbackTimer = new System.Timers.Timer - { - AutoReset = false - }; - _playStopwatch = new Stopwatch(); - - ExecuteMciCommand($"Status {_fileName} Length"); - ExecuteMciCommand($"Play {_fileName}"); - Paused = false; - Playing = true; - _playbackTimer.Elapsed += HandlePlaybackFinished; - _playbackTimer.Start(); - _playStopwatch.Start(); - - return Task.CompletedTask; - } - - public Task Pause() - { - if (Playing && !Paused) - { - ExecuteMciCommand($"Pause {_fileName}"); - Paused = true; - _playbackTimer.Stop(); - _playStopwatch.Stop(); - _playbackTimer.Interval -= _playStopwatch.ElapsedMilliseconds; - } - - return Task.CompletedTask; - } - - public Task Resume() - { - if (Playing && Paused) - { - ExecuteMciCommand($"Resume {_fileName}"); - Paused = false; - _playbackTimer.Start(); - _playStopwatch.Reset(); - _playStopwatch.Start(); - } - return Task.CompletedTask; - } - - public Task Stop(bool force = false) - { - if (Playing || force) - { - ExecuteMciCommand($"Stop {_fileName}"); - Playing = false; - Paused = false; - _playbackTimer?.Stop(); - _playStopwatch?.Stop(); - } - return Task.CompletedTask; - } - - private void HandlePlaybackFinished(object sender, ElapsedEventArgs e) - { - Playing = false; - PlaybackFinished?.Invoke(this, e); - _playbackTimer?.Dispose(); - _playbackTimer = null; - } - - private Task ExecuteMciCommand(string commandString) - { - var sb = new StringBuilder(); - - var result = mciSendString(commandString, sb, 1024 * 1024, IntPtr.Zero); - - if (result != 0) - { - var errorSb = new StringBuilder($"Error executing MCI command '{commandString}'. Error code: {result}."); - var sb2 = new StringBuilder(128); - - mciGetErrorString(result, sb2, 128); - errorSb.Append($" Message: {sb2}"); - - throw new Exception(errorSb.ToString()); - } - - if (commandString.ToLower().StartsWith("status") && int.TryParse(sb.ToString(), out var length)) - _playbackTimer.Interval = length + 75; - - return Task.CompletedTask; - } - - public Task SetVolume(byte percent) - { - // Calculate the volume that's being set - int NewVolume = ushort.MaxValue / 100 * percent; - // Set the same volume for both the left and the right channels - uint NewVolumeAllChannels = ((uint)NewVolume & 0x0000ffff) | ((uint)NewVolume << 16); - // Set the volume - waveOutSetVolume(IntPtr.Zero, NewVolumeAllChannels); - - return Task.CompletedTask; - } - - public void Dispose() - { - Stop().Wait(); - ExecuteMciCommand("Close All"); - } - } -} diff --git a/ObservatoryHerald/ObservatoryHerald.csproj b/ObservatoryHerald/ObservatoryHerald.csproj index 312ef56..71c8d2b 100644 --- a/ObservatoryHerald/ObservatoryHerald.csproj +++ b/ObservatoryHerald/ObservatoryHerald.csproj @@ -37,12 +37,8 @@ - - - - - + diff --git a/README.md b/README.md index e86f21d..b6198c8 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ # Elite Observatory *Core* -Tool for reading/monitoring Elite Dangerous journals for interesting objects. Successor to the original Elite Observatory, rewritten from scratch using .NET 6.0 and AvaloniaUI. +Tool for reading/monitoring Elite Dangerous journals for interesting objects. Successor to the original Elite Observatory, rewritten from scratch using .NET 6.0. ## *IMPORTANT* -Observatory Core and it's associated plugins are currently in an alpha state and are neither feature-complete nor using a finalised UI. A major update to the UI is expected soon, which will likely break compatibility with all current plugins. +Observatory Core and it's associated plugins are currently in a state of ongoing development and are neither feature-complete nor using a finalised UI. Omissions to current functionality include: * Integration with Frontier's Companion API * Data submission to IGAU -* Sortable columns in plugin data grids * Non-grid plugin UI options * Light mode * *And more...* @@ -32,8 +31,9 @@ If you want to chat or collaborate with other users of Observatory you can find For information on how to create a plugin, refer to this article about [ObservatoryFramework](https://github.com/Xjph/ObservatoryCore/wiki/Framework). ## Prerequisites for use -.NET 6, and by extension one of its [supported OSes](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md). -(This will be installed automatically by the Observatory Core installer.) +All you need is .NET 6, which should be installed automatically by the Observatory Core installer. + +The portable build has no prerequisites due to bundling the .NET runtime along with the program, though this does make the exe commensurately larger. ## Prerequisites for building -C# 9.0, .NET 6.0, [AvaloniaUI ~~0.10.3~~](https://github.com/AvaloniaUI/Avalonia) (specific version in flux during UI rewrite), and of course [ObservatoryFramework](https://github.com/Xjph/ObservatoryFramework). +C# 9.0, .NET 6.0, and [ObservatoryFramework](https://github.com/Xjph/ObservatoryFramework). diff --git a/SignObservatory.ps1 b/SignObservatory.ps1 new file mode 100644 index 0000000..b9cab31 --- /dev/null +++ b/SignObservatory.ps1 @@ -0,0 +1,39 @@ +$cert = Get-ChildItem Cert:\LocalMachine\My -CodeSigningCert +Set-AuthenticodeSignature -FilePath ./ObservatoryCore/bin/Release/net6.0-windows/ObservatoryCore.exe -Certificate $cert +Set-AuthenticodeSignature -FilePath ./ObservatoryCore/bin/Release/net6.0-windows/plugins/ObservatoryExplorer.dll -Certificate $cert +Set-AuthenticodeSignature -FilePath ./ObservatoryCore/bin/Release/net6.0-windows/plugins/ObservatoryBotanist.dll -Certificate $cert +Set-AuthenticodeSignature -FilePath ./ObservatoryCore/bin/Release/net6.0-windows/plugins/ObservatoryHerald.dll -Certificate $cert +# SIG # Begin signature block +# MIIF0AYJKoZIhvcNAQcCoIIFwTCCBb0CAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB +# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR +# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUjqIsfdT62QvQPP+a5YOXVRCf +# 3o6gggNKMIIDRjCCAi6gAwIBAgIQQbRFPs6oPodFBj0fsFanmzANBgkqhkiG9w0B +# AQsFADA7MRgwFgYDVQQDDA9Kb25hdGhhbiBNaWxsZXIxHzAdBgkqhkiG9w0BCQEW +# EGptaWxsZXJAeGpwaC5uZXQwHhcNMjMwMzI4MTgxNTM3WhcNMjQwMzI4MTgzNTM3 +# WjA7MRgwFgYDVQQDDA9Kb25hdGhhbiBNaWxsZXIxHzAdBgkqhkiG9w0BCQEWEGpt +# aWxsZXJAeGpwaC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv +# eeKY2sY4SAMLgjE+sm1lj8Tje5QArsuSqLFC0gpWzHFq2HZYHLGR5l9Kz1Jm4iNm +# bdkQiEtt5o6e48L2GLqftM0XklmkNVzyuj6SqL99K1JCuO/kLRVorqRV/88NpOOe +# Bpn1W5FTA7m1PVCYXbz3a6l93hNY6mI4yb9MV8nKFDnmmAtiwIsKgXuNf81sU8bg +# 4A7mB9A7Jgvx1/Gs7rFu0m1qWIGpfhsh8EQtpJaiVvzCBqdpIvDEnMwlVd6S0nkj +# jCCB7s12oiXKYjBS1Vm1YfwoaPkHe9E+z7zgHnhZ5hrTt8g/TZM+cS2o+5JQYTr9 +# RZUjQ3EmsUfZMAuSekERAgMBAAGjRjBEMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUE +# DDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUCeFpbq5cQi1Z5DQydkmiF8MIfyMwDQYJ +# KoZIhvcNAQELBQADggEBAHF/lRtemEggwTFiwTI01Z3erV6YGNT2miD4NrUrnQEe +# kI+Ezh/MLj2vRmqeVz7XX1ePZX0sd7sViRMnPm+LTl8UltZqhTWV/h7qmi/2Vf74 +# QHLE/Ht3olWBdGOVzeeP5XLMBqqg7HWPHGpTA8lx0ApI4YhYu7w/SgwzYUj2NF2O +# GRmV78kcHeYf+h5lZzAKjc+dgH+ucsqpKgDxCk8lBhUkd102YGMUZophz0L8RTD4 +# k/CAliVZo3m8ENsR6pMnjsgifeZ8Q9ydpBXawIdcqW9xtZanvYN9+GAHMYeFWWBf +# 0fBcoPAy4X5bcvQmK/0d7znpgDmgm4jYywF5ptHXoAIxggHwMIIB7AIBATBPMDsx +# GDAWBgNVBAMMD0pvbmF0aGFuIE1pbGxlcjEfMB0GCSqGSIb3DQEJARYQam1pbGxl +# ckB4anBoLm5ldAIQQbRFPs6oPodFBj0fsFanmzAJBgUrDgMCGgUAoHgwGAYKKwYB +# BAGCNwIBDDEKMAigAoAAoQKAADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAc +# BgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQUfXa2 +# HgFmPrFbD6PqO1Z7s6yzLkowDQYJKoZIhvcNAQEBBQAEggEASEcYW2MnOLX+dMin +# lEVxL8fTOrf/XuE05QwqQSHOBqqO4GMuR+IeBjE2R4EjxQsZMQVok1dK302ByHA9 +# OVv37xG4exqP/vkP3NX/z2s1Cl2PE1gzxVNgdGlbkzIQF9EiMXr9P/QGifCg2TLV +# 2mk4Vt+mA1/tU066tNXahbL9N9b+yLcB3VNfru/SnvO/ZPzKCmjNZW54mnNKnRCE +# PJDVKEKla/ufh8iMR+SiIaaXrwypvdz8CYK9OSs9qr0Cjp9jY1TXLxgNZiTenUoY +# n+sVQzv+N1PAy2nvSXlnesbxlO3T2XPp6fYkpj1uYCoun3Ztpr2MoKRKBgzybo7Z +# GYn3QA== +# SIG # End signature block diff --git a/buildAllComponents b/buildAllComponents deleted file mode 100755 index dfe5b86..0000000 --- a/buildAllComponents +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -dotnet build ./ObservatoryFramework/ObservatoryFramework.csproj "$@" -dotnet build ./ObservatoryExplorer/ObservatoryExplorer.csproj "$@" -dotnet build ./ObservatoryBotanist/ObservatoryBotanist.csproj "$@" -if [ -f ../NetCoreAudio/NetCoreAudio/NetCoreAudio.csproj ]; then - dotnet build ../NetCoreAudio/NetCoreAudio/NetCoreAudio.csproj -c Release - dotnet build ./ObservatoryHerald/ObservatoryHerald.csproj "$@" -fi diff --git a/buildAllComponents.cmd b/buildAllComponents.cmd deleted file mode 100644 index 0102a06..0000000 --- a/buildAllComponents.cmd +++ /dev/null @@ -1,7 +0,0 @@ -dotnet build ./ObservatoryFramework/ObservatoryFramework.csproj %* -dotnet build ./ObservatoryExplorer/ObservatoryExplorer.csproj %* -dotnet build ./ObservatoryBotanist/ObservatoryBotanist.csproj %* -IF EXIST ..\NetCoreAudio\NetCoreAudio\NetCoreAudio.csproj ( - dotnet build ../NetCoreAudio/NetCoreAudio/NetCoreAudio.csproj -c Release - dotnet build ./ObservatoryHerald/ObservatoryHerald.csproj %* -)