The servers menu has been removed and all servers have been added to …

…the main menu.

DNS on Tray/DNS on Tray.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0-windows</TargetFramework>
-	<Version>0.4.0</Version>
+	<Version>0.5.0</Version>
     <RootNamespace>DNS_on_Tray</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>

DNS on Tray/Form1.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using System.Net;
 using System.Runtime.InteropServices;
 using static DNS_on_Tray.Helper;
 
@@ -33,11 +34,6 @@ private void ShowMainWindow()
             }
         }
 
-        private void btnClear_Click(object sender, EventArgs e)
-        {
-            ClearDNS();
-        }
-
         private void SetupFormStartPosition()
         {
             Rectangle workingArea = Screen.GetWorkingArea(this);
@@ -47,42 +43,98 @@ private void SetupFormStartPosition()
             this.Opacity = 0;
         }
 
-        private void frmMain_Load(object sender, EventArgs e)
+        private void MakeMenuItems()
         {
-            SetupFormStartPosition();
 
-            EnableAddButton();
+            notifyMenu.Items.Clear();
+            lstDNS.Items.Clear();
 
-            if (CanRunAsStartup())
-            {
-                optStartup.Checked = true;
-            }
-            else
-            {
-                optStartup.Checked = false;
-            }
+            lstDNS.Items.Add("Clear");
+
+            ToolStripMenuItem item = new ToolStripMenuItem();
 
             foreach (var dns in DNS.All())
             {
                 lstDNS.Items.Add(dns.Name());
 
-                ToolStripMenuItem item = new ToolStripMenuItem();
                 item = new ToolStripMenuItem();
                 item.Name = "dns" + Convert.ToString(new Random().Next(1, 99999));
                 item.Text = dns.Name();
                 item.Click += new EventHandler(MenuItemClickHandler);
 
-                btnServers.DropDownItems.Add(item);
+                notifyMenu.Items.Add(item);
 
             }
+
+
+            notifyMenu.Items.Add("-");
+
+            string strMenuItemName = "Clear";
+            item = new ToolStripMenuItem();
+            item.Name = strMenuItemName;
+            item.Text = strMenuItemName;
+            item.Click += new EventHandler(MenuItemClickHandler);
+            notifyMenu.Items.Add(item);
+
+            notifyMenu.Items.Add("-");
+
+            strMenuItemName = "Settings";
+            item = new ToolStripMenuItem();
+            item.Name = strMenuItemName;
+            item.Text = strMenuItemName;
+            item.Click += new EventHandler(MenuItemClickHandler);
+            notifyMenu.Items.Add(item);
+
+            notifyMenu.Items.Add("-");
+
+            strMenuItemName = "Exit";
+            item = new ToolStripMenuItem();
+            item.Name = strMenuItemName;
+            item.Text = strMenuItemName;
+            item.Click += new EventHandler(MenuItemClickHandler);
+            notifyMenu.Items.Add(item);
+        }
+
+        private void frmMain_Load(object sender, EventArgs e)
+        {
+            SetupFormStartPosition();
+
+            EnableAddButton();
+
+            if (CanRunAsStartup())
+            {
+                optStartup.Checked = true;
+            }
+            else
+            {
+                optStartup.Checked = false;
+            }
+
+            MakeMenuItems();
         }
 
         private void MenuItemClickHandler(object sender, EventArgs e)
         {
             ToolStripMenuItem clickedItem = (ToolStripMenuItem)sender;
-            string dnsName = clickedItem.Text;
-            DNS dns = new DNS(dnsName);
-            AddDNS(dns.DNS1(), dns.DNS2());
+            string strItem = clickedItem.Text;
+            DNS dns = new DNS(strItem);
+
+            if (strItem != "Exit" & strItem != "Settings" & strItem != "Clear")
+            {
+                AddDNS(dns.DNS1(), dns.DNS2());
+            }
+            else if (strItem.ToString() == "Exit")
+            {
+                System.Windows.Forms.Application.Exit();
+            }
+            else if (strItem.ToString() == "Settings")
+            {
+                ShowMainWindow();
+            }
+            else if (strItem.ToString() == "Clear")
+            {
+                ClearDNS();
+            }
         }
 
         private void EnableAddButton()
@@ -109,6 +161,7 @@ private void btnDNSRemove_Click(object sender, EventArgs e)
                 lstDNS.Items.Remove(strSlelectedItem);
                 DNS dns = new(strSlelectedItem);
                 dns.Remove();
+                MakeMenuItems();
             }
 
         }
@@ -145,6 +198,7 @@ private void btnDNSAdd_Click(object sender, EventArgs e)
                 dns.Save();
 
             ClearForm();
+            MakeMenuItems();
         }
 
         private void txtDNSName_TextChanged(object sender, EventArgs e)
@@ -162,16 +216,6 @@ private void txtDNS2_TextChanged(object sender, EventArgs e)
             EnableAddButton();
         }
 
-        private void btnExit_Click(object sender, EventArgs e)
-        {
-            System.Windows.Forms.Application.Exit();
-        }
-
-        private void btnSettings_Click(object sender, EventArgs e)
-        {
-            ShowMainWindow();
-        }
-
         private void frmMain_Activated(object sender, EventArgs e)
         {
             if (!IsAdministrator)

README.md

@@ -7,7 +7,7 @@ A simple program to easily add, remove or change current DNS of the Windows. Thi
 - This program is currently unsigned. You can download its codes or use unsigned releases.
 
 ## Screenshot
-![Screenshot of DNS on Try program on the system tray.](screenshot.jpg "Screenshot of DNS on Try Program")
+![Screenshot of DNS on Try program on the system tray.](screenshot1.jpg "Screenshot of DNS on Try Program") ![Another screenshot of DNS on Try program on the system tray.](screenshot2.jpg "Another screenshot of DNS on Try Program")
 
 ## Supported DNS Servers by Default
 - Cloudflare