diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.Designer.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.Designer.cs index c338406..1652233 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.Designer.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.Designer.cs @@ -43,12 +43,12 @@ this.runAsAdministratorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.globalSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startCodeEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openMicrosoftCopilotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.openLauncherToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openCodeEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openMicrosoftCopilotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -184,11 +184,18 @@ this.startCodeEditorToolStripMenuItem.Text = "Start the code editor..."; this.startCodeEditorToolStripMenuItem.Click += new System.EventHandler(this.startCodeEditorToolStripMenuItem_Click); // + // openMicrosoftCopilotToolStripMenuItem + // + this.openMicrosoftCopilotToolStripMenuItem.Name = "openMicrosoftCopilotToolStripMenuItem"; + this.openMicrosoftCopilotToolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.openMicrosoftCopilotToolStripMenuItem.Text = "Open Microsoft Copilot..."; + this.openMicrosoftCopilotToolStripMenuItem.Click += new System.EventHandler(this.openMicrosoftCopilotToolStripMenuItem_Click); + // // notifyIcon1 // this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1; this.notifyIcon1.Icon = global::WelsonJS.Launcher.Properties.Resources.favicon; - this.notifyIcon1.Text = "notifyIcon1"; + this.notifyIcon1.Text = "WelsonJS Launcher"; // // contextMenuStrip1 // @@ -218,13 +225,6 @@ this.exitToolStripMenuItem.Size = new System.Drawing.Size(198, 22); this.exitToolStripMenuItem.Text = "Exit"; // - // openMicrosoftCopilotToolStripMenuItem - // - this.openMicrosoftCopilotToolStripMenuItem.Name = "openMicrosoftCopilotToolStripMenuItem"; - this.openMicrosoftCopilotToolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.openMicrosoftCopilotToolStripMenuItem.Text = "Open Microsoft Copilot..."; - this.openMicrosoftCopilotToolStripMenuItem.Click += new System.EventHandler(this.openMicrosoftCopilotToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.cs index e6d754a..d9680a3 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/MainForm.cs @@ -5,6 +5,7 @@ using System.IO.Compression; using System.Security.Principal; using System.Threading.Tasks; using System.Windows.Forms; +using WelsonJS.Launcher.Tools; namespace WelsonJS.Launcher { diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs index 28926dd..8ace81e 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Windows.Forms; +using WelsonJS.Launcher.Tools; namespace WelsonJS.Launcher { diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/DnsQuery.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/Tools/DnsQuery.cs similarity index 97% rename from WelsonJS.Toolkit/WelsonJS.Launcher/DnsQuery.cs rename to WelsonJS.Toolkit/WelsonJS.Launcher/Tools/DnsQuery.cs index 31ff7fb..5e16490 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/DnsQuery.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/Tools/DnsQuery.cs @@ -4,10 +4,11 @@ using System.Net; using System.Net.Sockets; using System.Text; -namespace WelsonJS.Launcher +namespace WelsonJS.Launcher.Tools { public class DnsQuery { + private static readonly Random _random = new Random(); private readonly string _dnsServer; private const int DnsPort = 53; private const int Timeout = 5000; @@ -76,11 +77,10 @@ namespace WelsonJS.Launcher private byte[] CreateDnsQuery(string domain, ushort type) { - Random rand = new Random(); byte[] query = new byte[512]; - query[0] = (byte)rand.Next(0, 256); - query[1] = (byte)rand.Next(0, 256); + query[0] = (byte)_random.Next(0, 256); + query[1] = (byte)_random.Next(0, 256); query[2] = 0x01; query[3] = 0x00; query[4] = 0x00; diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/ExecutablesCollector.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/Tools/ExecutablesCollector.cs similarity index 99% rename from WelsonJS.Toolkit/WelsonJS.Launcher/ExecutablesCollector.cs rename to WelsonJS.Toolkit/WelsonJS.Launcher/Tools/ExecutablesCollector.cs index 40b6000..22cb4c2 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/ExecutablesCollector.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/Tools/ExecutablesCollector.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace WelsonJS.Launcher +namespace WelsonJS.Launcher.Tools { public class ExecutablesCollector { diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/ResourceServer.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/Tools/ResourceServer.cs similarity index 99% rename from WelsonJS.Toolkit/WelsonJS.Launcher/ResourceServer.cs rename to WelsonJS.Toolkit/WelsonJS.Launcher/Tools/ResourceServer.cs index 572bfd9..82128cf 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/ResourceServer.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/Tools/ResourceServer.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Xml.Linq; -namespace WelsonJS.Launcher +namespace WelsonJS.Launcher.Tools { public class ResourceServer { diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/WelsonJS.Launcher.csproj b/WelsonJS.Toolkit/WelsonJS.Launcher/WelsonJS.Launcher.csproj index 370ad0a..d037bbf 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/WelsonJS.Launcher.csproj +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/WelsonJS.Launcher.csproj @@ -72,14 +72,14 @@ - + Form EnvForm.cs - + Form @@ -100,7 +100,7 @@ GlobalSettingsForm.cs - + EnvForm.cs