source/Dtos/SavedOptions.cs

@@ -4,16 +4,11 @@
     {
         public int Version { get; set; } = 1;
 
-        public string Format { get; set; } = "suzumagnifier";
-
-        public bool ReadOnly { get; set; } = false;
-
-
         public bool AutoStart { get; set; }
 
         public bool HighQuality { get; set; }
 
-        public decimal ZoomFactor { get; set; }
+        public int ZoomFactor { get; set; }
 
         public int UpdateFrequency { get; set; }
 
@@ -21,9 +16,7 @@
 
         public int CrosshairSize { get; set; }
 
-        public string? CrosshairColour { get; set; }
+        public Color CrosshairColour { get; set; }
-
-        public bool ShowAlwaysOnTop { get; set; }
 
     }
 }

source/Form1.Designer.cs

@@ -44,6 +44,8 @@
             toolStripSeparator3 = new ToolStripSeparator();
             resetToolStripMenuItem = new ToolStripMenuItem();
             toolStripMenuItem9 = new ToolStripMenuItem();
+            showToolStripMenuItem = new ToolStripMenuItem();
+            toolStripSeparator5 = new ToolStripSeparator();
             sizeToolStripMenuItem = new ToolStripMenuItem();
             smallToolStripMenuItem = new ToolStripMenuItem();
             mediumToolStripMenuItem = new ToolStripMenuItem();
@@ -60,13 +62,7 @@
             toolStripMenuItem5 = new ToolStripMenuItem();
             toolStripMenuItem3 = new ToolStripMenuItem();
             toolStripSeparator1 = new ToolStripSeparator();
-            toolStripMenuItem10 = new ToolStripMenuItem();
-            viewHelpToolStripMenuItem = new ToolStripMenuItem();
-            aboutToolStripMenuItem = new ToolStripMenuItem();
-            toolStripSeparator6 = new ToolStripSeparator();
             exitiToolStripMenuItem = new ToolStripMenuItem();
-            toolStripMenuItem11 = new ToolStripMenuItem();
-            toolStripSeparator7 = new ToolStripSeparator();
             contextMenuStrip1.SuspendLayout();
             SuspendLayout();
             // 
@@ -79,14 +75,13 @@
             // 
             // contextMenuStrip1
             // 
-            contextMenuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, toolStripMenuItem2, toolStripSeparator2, toolStripMenuItem4, toolStripMenuItem6, toolStripMenuItem9, toolStripSeparator4, toolStripMenuItem5, toolStripMenuItem3, toolStripSeparator1, toolStripMenuItem10, toolStripSeparator6, exitiToolStripMenuItem });
+            contextMenuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, toolStripMenuItem2, toolStripSeparator2, toolStripMenuItem4, toolStripMenuItem6, toolStripMenuItem9, toolStripSeparator4, toolStripMenuItem5, toolStripMenuItem3, toolStripSeparator1, exitiToolStripMenuItem });
             contextMenuStrip1.Name = "contextMenuStrip1";
-            contextMenuStrip1.Size = new Size(205, 248);
+            contextMenuStrip1.Size = new Size(205, 198);
             contextMenuStrip1.Opening += contextMenuStrip1_Opening;
             // 
             // toolStripMenuItem1
             // 
-            toolStripMenuItem1.Image = Resource1.play;
             toolStripMenuItem1.Name = "toolStripMenuItem1";
             toolStripMenuItem1.Size = new Size(204, 22);
             toolStripMenuItem1.Text = "&Start";
@@ -94,7 +89,6 @@
             // 
             // toolStripMenuItem2
             // 
-            toolStripMenuItem2.Image = Resource1.pause;
             toolStripMenuItem2.Name = "toolStripMenuItem2";
             toolStripMenuItem2.Size = new Size(204, 22);
             toolStripMenuItem2.Text = "Sto&p";
@@ -129,7 +123,6 @@
             // toolStripMenuItem6
             // 
             toolStripMenuItem6.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItem7, toolStripMenuItem8, toolStripSeparator3, resetToolStripMenuItem });
-            toolStripMenuItem6.Image = Resource1.search;
             toolStripMenuItem6.Name = "toolStripMenuItem6";
             toolStripMenuItem6.Size = new Size(204, 22);
             toolStripMenuItem6.Text = "Zoom";
@@ -165,37 +158,48 @@
             // 
             // toolStripMenuItem9
             // 
-            toolStripMenuItem9.DropDownItems.AddRange(new ToolStripItem[] { sizeToolStripMenuItem, colourToolStripMenuItem });
+            toolStripMenuItem9.DropDownItems.AddRange(new ToolStripItem[] { showToolStripMenuItem, toolStripSeparator5, sizeToolStripMenuItem, colourToolStripMenuItem });
-            toolStripMenuItem9.Image = Resource1.crosshair;
             toolStripMenuItem9.Name = "toolStripMenuItem9";
             toolStripMenuItem9.Size = new Size(204, 22);
             toolStripMenuItem9.Text = "Crosshair";
             // 
+            // showToolStripMenuItem
+            // 
+            showToolStripMenuItem.Name = "showToolStripMenuItem";
+            showToolStripMenuItem.Size = new Size(110, 22);
+            showToolStripMenuItem.Text = "Show";
+            showToolStripMenuItem.Click += showToolStripMenuItem_Click;
+            // 
+            // toolStripSeparator5
+            // 
+            toolStripSeparator5.Name = "toolStripSeparator5";
+            toolStripSeparator5.Size = new Size(107, 6);
+            // 
             // sizeToolStripMenuItem
             // 
-            sizeToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItem11, toolStripSeparator7, smallToolStripMenuItem, mediumToolStripMenuItem, largeToolStripMenuItem });
+            sizeToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { smallToolStripMenuItem, mediumToolStripMenuItem, largeToolStripMenuItem });
             sizeToolStripMenuItem.Name = "sizeToolStripMenuItem";
-            sizeToolStripMenuItem.Size = new Size(180, 22);
+            sizeToolStripMenuItem.Size = new Size(110, 22);
             sizeToolStripMenuItem.Text = "Size";
             // 
             // smallToolStripMenuItem
             // 
             smallToolStripMenuItem.Name = "smallToolStripMenuItem";
-            smallToolStripMenuItem.Size = new Size(180, 22);
+            smallToolStripMenuItem.Size = new Size(119, 22);
             smallToolStripMenuItem.Text = "Small";
             smallToolStripMenuItem.Click += smallToolStripMenuItem_Click;
             // 
             // mediumToolStripMenuItem
             // 
             mediumToolStripMenuItem.Name = "mediumToolStripMenuItem";
-            mediumToolStripMenuItem.Size = new Size(180, 22);
+            mediumToolStripMenuItem.Size = new Size(119, 22);
             mediumToolStripMenuItem.Text = "Medium";
             mediumToolStripMenuItem.Click += mediumToolStripMenuItem_Click;
             // 
             // largeToolStripMenuItem
             // 
             largeToolStripMenuItem.Name = "largeToolStripMenuItem";
-            largeToolStripMenuItem.Size = new Size(180, 22);
+            largeToolStripMenuItem.Size = new Size(119, 22);
             largeToolStripMenuItem.Text = "Large";
             largeToolStripMenuItem.Click += largeToolStripMenuItem_Click;
             // 
@@ -203,7 +207,7 @@
             // 
             colourToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { agentaToolStripMenuItem, cyanToolStripMenuItem, yellowToolStripMenuItem, greenToolStripMenuItem, redToolStripMenuItem, blackToolStripMenuItem, whiteToolStripMenuItem });
             colourToolStripMenuItem.Name = "colourToolStripMenuItem";
-            colourToolStripMenuItem.Size = new Size(180, 22);
+            colourToolStripMenuItem.Size = new Size(110, 22);
             colourToolStripMenuItem.Text = "Colour";
             // 
             // agentaToolStripMenuItem
@@ -270,7 +274,6 @@
             // 
             // toolStripMenuItem3
             // 
-            toolStripMenuItem3.Image = Resource1.fullscreen;
             toolStripMenuItem3.Name = "toolStripMenuItem3";
             toolStripMenuItem3.ShortcutKeys = Keys.F11;
             toolStripMenuItem3.Size = new Size(204, 22);
@@ -282,34 +285,6 @@
             toolStripSeparator1.Name = "toolStripSeparator1";
             toolStripSeparator1.Size = new Size(201, 6);
             // 
-            // toolStripMenuItem10
-            // 
-            toolStripMenuItem10.DropDownItems.AddRange(new ToolStripItem[] { viewHelpToolStripMenuItem, aboutToolStripMenuItem });
-            toolStripMenuItem10.Name = "toolStripMenuItem10";
-            toolStripMenuItem10.Size = new Size(204, 22);
-            toolStripMenuItem10.Text = "&Help";
-            // 
-            // viewHelpToolStripMenuItem
-            // 
-            viewHelpToolStripMenuItem.Image = Resource1.help_circle;
-            viewHelpToolStripMenuItem.Name = "viewHelpToolStripMenuItem";
-            viewHelpToolStripMenuItem.ShortcutKeys = Keys.F1;
-            viewHelpToolStripMenuItem.Size = new Size(146, 22);
-            viewHelpToolStripMenuItem.Text = "View &Help";
-            viewHelpToolStripMenuItem.Click += viewHelpToolStripMenuItem_Click;
-            // 
-            // aboutToolStripMenuItem
-            // 
-            aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            aboutToolStripMenuItem.Size = new Size(146, 22);
-            aboutToolStripMenuItem.Text = "&About";
-            aboutToolStripMenuItem.Click += aboutToolStripMenuItem_Click;
-            // 
-            // toolStripSeparator6
-            // 
-            toolStripSeparator6.Name = "toolStripSeparator6";
-            toolStripSeparator6.Size = new Size(201, 6);
-            // 
             // exitiToolStripMenuItem
             // 
             exitiToolStripMenuItem.Name = "exitiToolStripMenuItem";
@@ -317,18 +292,6 @@
             exitiToolStripMenuItem.Text = "E&xit";
             exitiToolStripMenuItem.Click += exitiToolStripMenuItem_Click;
             // 
-            // toolStripMenuItem11
-            // 
-            toolStripMenuItem11.Name = "toolStripMenuItem11";
-            toolStripMenuItem11.Size = new Size(180, 22);
-            toolStripMenuItem11.Text = "None";
-            toolStripMenuItem11.Click += toolStripMenuItem11_Click;
-            // 
-            // toolStripSeparator7
-            // 
-            toolStripSeparator7.Name = "toolStripSeparator7";
-            toolStripSeparator7.Size = new Size(177, 6);
-            // 
             // Form1
             // 
             AutoScaleDimensions = new SizeF(96F, 96F);
@@ -364,8 +327,10 @@
         private ToolStripMenuItem resetToolStripMenuItem;
         private ToolStripSeparator toolStripSeparator4;
         private ToolStripMenuItem toolStripMenuItem9;
+        private ToolStripMenuItem showToolStripMenuItem;
         private ToolStripMenuItem sizeToolStripMenuItem;
         private ToolStripMenuItem colourToolStripMenuItem;
+        private ToolStripSeparator toolStripSeparator5;
         private ToolStripMenuItem smallToolStripMenuItem;
         private ToolStripMenuItem mediumToolStripMenuItem;
         private ToolStripMenuItem largeToolStripMenuItem;
@@ -376,11 +341,5 @@
         private ToolStripMenuItem redToolStripMenuItem;
         private ToolStripMenuItem blackToolStripMenuItem;
         private ToolStripMenuItem whiteToolStripMenuItem;
-        private ToolStripMenuItem toolStripMenuItem10;
-        private ToolStripMenuItem viewHelpToolStripMenuItem;
-        private ToolStripMenuItem aboutToolStripMenuItem;
-        private ToolStripSeparator toolStripSeparator6;
-        private ToolStripMenuItem toolStripMenuItem11;
-        private ToolStripSeparator toolStripSeparator7;
     }
 }

source/Form1.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing.Drawing2D;
 using System.Runtime.InteropServices;
 using SuzuMagnifier.Dtos;
@@ -28,7 +27,7 @@ namespace SuzuMagnifier
 
         private readonly System.Windows.Forms.Timer _timer = new();
         private Bitmap? _bitmap;
-        private string _jsonfigFilename;
+        private string jsonfigFilename;
 
 
         public Form1()
@@ -53,31 +52,26 @@ namespace SuzuMagnifier
 
             var args = GetCommandLine()!;
 
-            _jsonfigFilename = args.Where(x => (x.Key.Equals("o") || x.Key.Equals("open"))).Select(x => x.Value).FirstOrDefault();
+            jsonfigFilename = args.Where(x => (x.Key.Equals("o") || x.Key.Equals("open"))).Select(x => x.Value).FirstOrDefault();
-            if (string.IsNullOrWhiteSpace(_jsonfigFilename))
+            if (string.IsNullOrWhiteSpace(jsonfigFilename))
             {
-                _jsonfigFilename = Path.ChangeExtension(Application.ExecutablePath, "jsonfig");
+                jsonfigFilename = Path.ChangeExtension(Application.ExecutablePath, "jsonfig");
             }
 
-            if (System.IO.File.Exists(_jsonfigFilename))
+            if (System.IO.File.Exists(jsonfigFilename))
             {
-                this.SavedOptions = await LoadSettings(_jsonfigFilename);
+                var newSettings = await LoadSettings(jsonfigFilename);
-
+                if (newSettings == null)
-                this.TopMost = this.SavedOptions!.ShowAlwaysOnTop;
-                this.HighQuality = this.SavedOptions.HighQuality;
-                this.ZoomFactor = this.SavedOptions.ZoomFactor;
-                this.UpdateFrequency = this.SavedOptions.UpdateFrequency;
-                this.CrosshairSize = this.SavedOptions.CrosshairSize;
-
-                if (!string.IsNullOrWhiteSpace(this.SavedOptions.CrosshairColour))
                 {
-                    this.CrosshairColour = ColorTranslator.FromHtml(this.SavedOptions!.CrosshairColour);
+                    newSettings = new SavedOptions();
                 }
 
-                if (this.SavedOptions!.AutoStart)
+                this.HighQuality = newSettings.HighQuality;
-                {
+                this.ZoomFactor = newSettings.ZoomFactor;
-                    _timer.Start();
+                //this.UpdateFrequency = newSettings.UpdateFrequency;
-                }
+                this.ShowCrosshair = newSettings.ShowCrosshair;
+                this.CrosshairSize = newSettings.CrosshairSize;
+                this.CrosshairColour = newSettings.CrosshairColour;
             }
         }
 
@@ -120,7 +114,7 @@ namespace SuzuMagnifier
             g.DrawImage(_bitmap, this.ClientRectangle);
 
             // Draw center crosshair
-            if (this.CrosshairSize > 0)
+            if (this.ShowCrosshair)
             {
                 var cx = Divide(this.Width, 2);
                 var cy = Divide(this.Height, 2);
@@ -185,15 +179,10 @@ namespace SuzuMagnifier
         {
             base.OnFormClosing(e);
 
-            if (this.SavedOptions.ReadOnly)
-            {
-                return;
-            }
-
             var result = MessageBox.Show("Do you want to save settings to file?", "Save Settings?", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
             if (result == DialogResult.Yes)
             {
-                var result2 = await SaveSettings(_jsonfigFilename);
+                var result2 = await SaveSettings(jsonfigFilename);
                 if (result2)
                 {
                     return;
@@ -214,20 +203,58 @@ namespace SuzuMagnifier
         }
 
 
-        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public SavedOptions SavedOptions { get => field ?? new SavedOptions(); private set => field = value; }
-
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public bool HighQuality { get; set; } = false;
 
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public decimal ZoomFactor { get => field; set => field = Math.Clamp(value, 1, 20); } = 2;
+        public int ZoomFactor
+        {
+            get => field;
+            set
+            {
+                if (value < 0)
+                {
+                    field = 1;
+                    return;
+                }
+
+                if (value > 20)
+                {
+                    field = 20;
+                    return;
+                }
+
+                field = value;
+            }
+        } = 2;
 
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public int UpdateFrequency { get; set; } = 33;
 
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public int CrosshairSize { get => field; set => field = Math.Clamp(value, 0, 200); } = 20;
+        public bool ShowCrosshair { get; set; } = true;
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int CrosshairSize
+        {
+            get => field;
+            set
+            {
+                if (value < 5)
+                {
+                    field = 5;
+                    return;
+                }
+
+                if (value > 200)
+                {
+                    field = 200;
+                    return;
+                }
+
+                field = value;
+            }
+        } = 20;
 
         [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public Color CrosshairColour { get; set; } = Color.FromArgb(255, 255, 0);
@@ -240,20 +267,18 @@ namespace SuzuMagnifier
 
             toolStripMenuItem5.Checked = this.TopMost;
 
-            toolStripMenuItem11.Checked = (this.CrosshairSize == 0);
+            showToolStripMenuItem.Checked = this.ShowCrosshair;
             smallToolStripMenuItem.Checked = (this.CrosshairSize == 10);
             mediumToolStripMenuItem.Checked = (this.CrosshairSize == 20);
             largeToolStripMenuItem.Checked = (this.CrosshairSize == 50);
 
-            resetToolStripMenuItem.Checked = (this.ZoomFactor == 1);
+            agentaToolStripMenuItem.Checked = this.CrosshairColour == Color.FromArgb(255, 0, 255);
-
+            cyanToolStripMenuItem.Checked = this.CrosshairColour == Color.FromArgb(0, 255, 255);
-            agentaToolStripMenuItem.Checked = (this.CrosshairColour == Color.FromArgb(255, 0, 255));
+            yellowToolStripMenuItem.Checked = this.CrosshairColour == Color.FromArgb(255, 255, 0);
-            cyanToolStripMenuItem.Checked = (this.CrosshairColour == Color.FromArgb(0, 255, 255));
+            greenToolStripMenuItem.Checked = this.CrosshairColour == Color.FromArgb(0, 255, 0);
-            yellowToolStripMenuItem.Checked = (this.CrosshairColour == Color.FromArgb(255, 255, 0));
+            redToolStripMenuItem.Checked = this.CrosshairColour == Color.FromArgb(255, 0, 0);
-            greenToolStripMenuItem.Checked = (this.CrosshairColour == Color.FromArgb(0, 255, 0));
+            blackToolStripMenuItem.Checked = this.CrosshairColour == Color.FromArgb(0, 0, 0);
-            redToolStripMenuItem.Checked = (this.CrosshairColour == Color.FromArgb(255, 0, 0));
+            whiteToolStripMenuItem.Checked = this.CrosshairColour == Color.FromArgb(255, 255, 255);
-            blackToolStripMenuItem.Checked = (this.CrosshairColour == Color.FromArgb(0, 0, 0));
-            whiteToolStripMenuItem.Checked = (this.CrosshairColour == Color.FromArgb(255, 255, 255));
 
             fasterToolStripMenuItem.Checked = !this.HighQuality;
             fasterToolStripMenuItem.Enabled = this.HighQuality;
@@ -321,7 +346,7 @@ namespace SuzuMagnifier
         /// <param name="e"></param>
         private void toolStripMenuItem7_Click(object sender, EventArgs e)
         {
-            this.ZoomFactor += 0.2m;
+            this.ZoomFactor++;
         }
 
         /// <summary>
@@ -331,7 +356,7 @@ namespace SuzuMagnifier
         /// <param name="e"></param>
         private void toolStripMenuItem8_Click(object sender, EventArgs e)
         {
-            this.ZoomFactor -= 0.2m;
+            this.ZoomFactor--;
         }
 
         /// <summary>
@@ -443,44 +468,6 @@ namespace SuzuMagnifier
             }
         }
 
-
-        /// <summary>
-        /// Help, view help
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void viewHelpToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                Process.Start(new ProcessStartInfo
-                {
-                    FileName = Resource1.AppHelpURL,
-                    UseShellExecute = true
-                });
-            }
-            catch (Exception)
-            {
-            }
-        }
-
-        /// <summary>
-        /// Help, about
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var version = Application.ProductVersion ?? string.Empty;
-            if (version.Contains("+"))
-            {
-                version = version.Substring(0, (version.IndexOf("+")));
-            }
-
-            MessageBox.Show($"{Application.ProductName} v{version}", "About", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-
-
         /// <summary>
         /// Exit
         /// </summary>
@@ -498,17 +485,17 @@ namespace SuzuMagnifier
         }
 
         /// <summary>
-        /// Crosshair, size, off
+        /// Crosshair, toggle
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void toolStripMenuItem11_Click(object sender, EventArgs e)
+        private void showToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            this.CrosshairSize = 0;
+            this.ShowCrosshair = !this.ShowCrosshair;
         }
 
         /// <summary>
-        /// Crosshair, size, small
+        /// Croisshair, size, small
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -518,7 +505,7 @@ namespace SuzuMagnifier
         }
 
         /// <summary>
-        /// Crosshair, size, medium
+        /// Croisshair, size, medium
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -528,7 +515,7 @@ namespace SuzuMagnifier
         }
 
         /// <summary>
-        /// Crosshair, size, large
+        /// Croisshair, size, large
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -570,11 +557,6 @@ namespace SuzuMagnifier
             return (int)Math.Floor((decimal)x / y);
         }
 
-        private int Divide(int x, decimal y)
-        {
-            return (int)Math.Floor((decimal)x / y);
-        }
-
         /// <summary>
         /// Get execution arguments.
         /// </summary>
@@ -640,38 +622,31 @@ namespace SuzuMagnifier
                 return null;
             }
 
-            SavedOptions response;
             try
             {
-                response = System.Text.Json.JsonSerializer.Deserialize<SavedOptions>(sourceCode);
+                return System.Text.Json.JsonSerializer.Deserialize<SavedOptions>(sourceCode);
             }
             catch (Exception)
             {
                 return null;
             }
-
-            if (!response!.Format.Equals(Resource1.FileFormat, StringComparison.CurrentCultureIgnoreCase))
-            {
-                return null;
-            }
-
-            return response;
         }
 
         private async Task<bool> SaveSettings(string filename)
         {
-            //_savedOptions.AutoStart = false;
+            var result = new SavedOptions();
-            this.SavedOptions.HighQuality = this.HighQuality;
+            result.AutoStart = false;
-            this.SavedOptions.ZoomFactor = this.ZoomFactor;
+            result.HighQuality = this.HighQuality;
-            this.SavedOptions.UpdateFrequency = this.UpdateFrequency;
+            result.ZoomFactor = this.ZoomFactor;
-            this.SavedOptions.CrosshairSize = this.CrosshairSize;
+            result.UpdateFrequency = this.UpdateFrequency;
-            this.SavedOptions.CrosshairColour = $"#{this.CrosshairColour.R:X2}{this.CrosshairColour.G:X2}{this.CrosshairColour.B:X2}";
+            result.ShowCrosshair = this.ShowCrosshair;
-            this.SavedOptions.ShowAlwaysOnTop = this.TopMost;
+            result.CrosshairSize = this.CrosshairSize;
+            result.CrosshairColour = this.CrosshairColour;
 
             string sourceCode = "";
             try
             {
-                sourceCode = System.Text.Json.JsonSerializer.Serialize(this.SavedOptions);
+                sourceCode = System.Text.Json.JsonSerializer.Serialize(result);
             }
             catch (Exception)
             {

source/Resource1.Designer.cs

@@ -1,141 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     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.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace SuzuMagnifier {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // 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", "18.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resource1 {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resource1() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [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("SuzuMagnifier.Resource1", typeof(Resource1).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to https://www.hiimray.co.uk.
-        /// </summary>
-        internal static string AppHelpURL {
-            get {
-                return ResourceManager.GetString("AppHelpURL", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap crosshair {
-            get {
-                object obj = ResourceManager.GetObject("crosshair", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to suzumagnifier.
-        /// </summary>
-        internal static string FileFormat {
-            get {
-                return ResourceManager.GetString("FileFormat", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap fullscreen {
-            get {
-                object obj = ResourceManager.GetObject("fullscreen", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap help_circle {
-            get {
-                object obj = ResourceManager.GetObject("help_circle", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap pause {
-            get {
-                object obj = ResourceManager.GetObject("pause", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap play {
-            get {
-                object obj = ResourceManager.GetObject("play", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap search {
-            get {
-                object obj = ResourceManager.GetObject("search", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

source/Resource1.resx

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppHelpURL" xml:space="preserve">
-    <value>https://www.hiimray.co.uk</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="crosshair" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\crosshair.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="FileFormat" xml:space="preserve">
-    <value>suzumagnifier</value>
-  </data>
-  <data name="fullscreen" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="help_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\help-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="play" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>

source/Resources/raw/crosshair.svg

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   fill="none"
-   stroke="currentColor"
-   stroke-width="2"
-   stroke-linecap="round"
-   stroke-linejoin="round"
-   class="lucide lucide-crosshair-icon lucide-crosshair"
-   version="1.1"
-   id="svg12"
-   sodipodi:docname="crosshair.svg"
-   inkscape:export-filename="L:\gitea-hiimray\SuzuMagnifier\source\Resources\raw\crosshair.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs16" />
-  <sodipodi:namedview
-     id="namedview14"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="34.666667"
-     inkscape:cx="11.985577"
-     inkscape:cy="12.014423"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg12" />
-  <circle
-     cx="12"
-     cy="12"
-     r="10"
-     id="circle2"
-     style="stroke:#808080;stroke-opacity:1" />
-  <line
-     x1="22"
-     x2="18"
-     y1="12"
-     y2="12"
-     id="line4"
-     style="stroke:#808080;stroke-opacity:1" />
-  <line
-     x1="6"
-     x2="2"
-     y1="12"
-     y2="12"
-     id="line6"
-     style="stroke:#808080;stroke-opacity:1" />
-  <line
-     x1="12"
-     x2="12"
-     y1="6"
-     y2="2"
-     id="line8"
-     style="stroke:#808080;stroke-opacity:1" />
-  <line
-     x1="12"
-     x2="12"
-     y1="22"
-     y2="18"
-     id="line10"
-     style="stroke:#808080;stroke-opacity:1" />
-</svg>

source/Resources/raw/fullscreen.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-fullscreen-icon lucide-fullscreen"><path d="M3 7V5a2 2 0 0 1 2-2h2"/><path d="M17 3h2a2 2 0 0 1 2 2v2"/><path d="M21 17v2a2 2 0 0 1-2 2h-2"/><path d="M7 21H5a2 2 0 0 1-2-2v-2"/><rect width="10" height="8" x="7" y="8" rx="1"/></svg>

source/Resources/raw/pause.svg

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   fill="none"
-   stroke="currentColor"
-   stroke-width="2"
-   stroke-linecap="round"
-   stroke-linejoin="round"
-   class="lucide lucide-pause-icon lucide-pause"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="pause.svg"
-   inkscape:export-filename="L:\gitea-hiimray\SuzuMagnifier\source\Resources\raw\pause.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     id="namedview8"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="34.666667"
-     inkscape:cx="11.985577"
-     inkscape:cy="12.014423"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6" />
-  <rect
-     x="14"
-     y="3"
-     width="5"
-     height="18"
-     rx="1"
-     id="rect2"
-     style="stroke:#808080;stroke-opacity:1" />
-  <rect
-     x="5"
-     y="3"
-     width="5"
-     height="18"
-     rx="1"
-     id="rect4"
-     style="stroke:#808080;stroke-opacity:1" />
-</svg>

source/Resources/raw/play.svg

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   fill="none"
-   stroke="currentColor"
-   stroke-width="2"
-   stroke-linecap="round"
-   stroke-linejoin="round"
-   class="lucide lucide-play-icon lucide-play"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="play.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   inkscape:export-filename="L:\gitea-hiimray\SuzuMagnifier\source\Resources\raw\play.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="34.666667"
-     inkscape:cx="11.985577"
-     inkscape:cy="12.014423"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M5 5a2 2 0 0 1 3.008-1.728l11.997 6.998a2 2 0 0 1 .003 3.458l-12 7A2 2 0 0 1 5 19z"
-     id="path2"
-     style="stroke:#808080;stroke-opacity:1" />
-</svg>

source/SuzuMagnifier.csproj

@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
     <Title>Suzu Magnifier</Title>
-    <Version>0.1.0.214</Version>
+    <Version>0.1.0.145</Version>
     <Product>Suzu Magnifier</Product>
     <Company>Hi, I'm Ray</Company>
     <Authors>Ray Lam</Authors>
@@ -15,11 +15,11 @@
     <NoWin32Manifest>true</NoWin32Manifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>full</DebugType>
+    <DebugType>none</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>full</DebugType>
+    <DebugType>none</DebugType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -33,19 +33,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Resource1.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resource1.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Resource1.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>