CopyToTileForm.cs

@@ -5,7 +5,7 @@ using System.Windows.Forms;
 using RyzStudio.Windows.Forms;
 using RyzStudio.Windows.ThemedForms;
 
-namespace RokettoLaunch.Forms
+namespace RokettoLaunch
 {
     public class CopyToTileForm : Form
     {

EditFolderForm.cs

@@ -5,12 +5,12 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using RokettoLaunch.DTOs.SaveFile;
+using RokettoLaunch.Models.SaveFile;
 using RyzStudio.Windows.Forms;
 using RyzStudio.Windows.ThemedForms;
 using RyzStudio.Windows.ThemedForms.ButtonTextBox;
 
-namespace RokettoLaunch.Forms
+namespace RokettoLaunch
 {
     public class EditFolderForm : Form
     {

EditGroupForm.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Windows.Forms;
-using RokettoLaunch.DTOs.SaveFile;
+using RokettoLaunch.Models.SaveFile;
 using RokettoLaunch.Windows.Forms;
 using RyzStudio.Windows.Forms;
 using RyzStudio.Windows.ThemedForms.ButtonTextBox;
 using RyzStudio.Windows.ThemedForms.PickerBox;
 
-namespace RokettoLaunch.Forms
+namespace RokettoLaunch
 {
     public class EditGroupForm : Form
     {

EditTileForm.cs

@@ -2,13 +2,13 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
-using RokettoLaunch.DTOs.SaveFile;
+using RokettoLaunch.Models.SaveFile;
 using RyzStudio.Windows.Forms;
 using RyzStudio.Windows.ThemedForms;
 using RyzStudio.Windows.ThemedForms.ButtonTextBox;
 using RyzStudio.Windows.ThemedForms.PickerBox;
 
-namespace RokettoLaunch.Forms
+namespace RokettoLaunch
 {
     public class EditTileForm : Form
     {

LoadingForm.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using RokettoLaunch.DTOs.SaveFile;
+using RokettoLaunch.Models.SaveFile;
 using RyzStudio.Windows.Forms;
 
-namespace RokettoLaunch.Forms
+namespace RokettoLaunch
 {
     public class LoadingForm : Form
     {

MainForm.cs

@@ -6,8 +6,8 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using RokettoLaunch.DTOs.SaveFile;
-using RokettoLaunch.Forms;
+using Microsoft.Extensions.DependencyInjection;
+using RokettoLaunch.Models.SaveFile;
 using RokettoLaunch.Windows.Forms;
 using RyzStudio;
 using RyzStudio.Windows.Forms;
@@ -18,11 +18,11 @@ namespace RokettoLaunch
 {
     public partial class MainForm : Form
     {
+        private readonly IServiceProvider _provider;
         private readonly IFileSessionManager _fileSessionManager;
 
-        private App4Options currentSession = null;
-        private bool isBusy = false;
-        private bool requestExit = false;
+        private bool _isBusy = false;
+        private bool _requestExit = false;
 
 
         public MainForm()
@@ -30,10 +30,22 @@ namespace RokettoLaunch
             InitializeComponent();
 
             this.AutoScaleMode = AutoScaleMode.None;
-            this.StartPosition = FormStartPosition.WindowsDefaultLocation;
             this.Text = Application.ProductName;
 
-            _fileSessionManager = new FileSessionManager();
+            this.CurrentSession = new App4Options();
+
+//#if DEBUG
+            //flowLayoutPanel1.BackColor = Color.LightGreen;
+//#endif
+
+            notifyIcon1.Text = Application.ProductName;
+        }
+
+        public MainForm(IServiceProvider provider, IFileSessionManager fileSessionManager) : this()
+        {
+            _provider = provider;
+            _fileSessionManager = fileSessionManager;
+
             _fileSessionManager.OpenFileDialog = openFileDialog1;
             _fileSessionManager.SaveFileDialog = saveFileDialog1;
             _fileSessionManager.OnNewing += fileSessionManager_OnNewSession;
@@ -41,8 +53,6 @@ namespace RokettoLaunch
             _fileSessionManager.OnSaving += fileSessionManager_OnSaveSession;
             _fileSessionManager.OnClearing += fileSessionManager_OnClearSession;
             _fileSessionManager.OnFilenameChanged += fileSessionManager_OnFilenameChanged;
-
-            notifyIcon1.Text = Application.ProductName;
         }
 
         protected async override void OnShown(EventArgs e)
@@ -78,7 +88,7 @@ namespace RokettoLaunch
                 this.CurrentSession = new App4Options();
             }
 
-            if (this.CurrentSession.HideOnClose && !requestExit)
+            if (this.CurrentSession.HideOnClose && !_requestExit)
             {
                 this.Hide();
 
@@ -86,7 +96,7 @@ namespace RokettoLaunch
                 return;
             }
 
-            requestExit = false;
+            _requestExit = false;
 
             var result = await _fileSessionManager.CloseSession();
             if (!result)
@@ -115,7 +125,7 @@ namespace RokettoLaunch
 
                     break;
                 case RyzStudio.Runtime.InteropServices.User32.WM_QUERYENDSESSION:
-                    requestExit = true;
+                    _requestExit = true;
 
                     Application.Exit();
 
@@ -129,19 +139,8 @@ namespace RokettoLaunch
 
 
         [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public App4Options CurrentSession
-        {
-            get
-            {
-                if (currentSession == null)
-                {
-                    currentSession = new App4Options();
-                }
+        public App4Options CurrentSession { get; set; } = null;
 
-                return currentSession;
-            }
-            set => currentSession = value;
-        }
 
         private void InvalidateOptions(bool resize)
         {
@@ -206,7 +205,7 @@ namespace RokettoLaunch
         /// <param name="e"></param>
         private async void NewToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (isBusy)
+            if (_isBusy)
             {
                 return;
             }
@@ -221,7 +220,7 @@ namespace RokettoLaunch
         /// <param name="e"></param>
         private async void OpenToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (isBusy)
+            if (_isBusy)
             {
                 return;
             }
@@ -236,7 +235,7 @@ namespace RokettoLaunch
         /// <param name="e"></param>
         private async void CloseToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (isBusy)
+            if (_isBusy)
             {
                 return;
             }
@@ -251,7 +250,7 @@ namespace RokettoLaunch
         /// <param name="e"></param>
         private async void SaveToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (isBusy)
+            if (_isBusy)
             {
                 return;
             }
@@ -266,7 +265,7 @@ namespace RokettoLaunch
         /// <param name="e"></param>
         private async void SaveAsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (isBusy)
+            if (_isBusy)
             {
                 return;
             }
@@ -281,12 +280,12 @@ namespace RokettoLaunch
         /// <param name="e"></param>
         private void ExitToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (isBusy)
+            if (_isBusy)
             {
                 return;
             }
 
-            requestExit = true;
+            _requestExit = true;
 
             this.Close();
         }
@@ -405,12 +404,12 @@ namespace RokettoLaunch
 
         private void NotifyExitToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (isBusy)
+            if (_isBusy)
             {
                 return;
             }
 
-            requestExit = true;
+            _requestExit = true;
 
             this.Close();
         }
@@ -436,7 +435,8 @@ namespace RokettoLaunch
 
         private async Task<bool> fileSessionManager_OnLoadSession(FileSessionManager sender, string filename, int formatType)
         {
-            var loadingForm = new LoadingForm();
+            // Progress indicator
+            var loadingForm = _provider.GetRequiredService<LoadingForm>();
             var result = await loadingForm.ShowDialog(filename);
             if (result != DialogResult.OK)
             {
@@ -473,12 +473,12 @@ namespace RokettoLaunch
 
             return await Task.Run(async () =>
             {
-                if (isBusy)
+                if (_isBusy)
                 {
                     return false;
                 }
 
-                isBusy = true;
+                _isBusy = true;
 
                 // update session
                 if (this.CurrentSession == null)
@@ -530,7 +530,7 @@ namespace RokettoLaunch
                     }
                 }
 
-                isBusy = false;
+                _isBusy = false;
 
                 return result.IsSuccess;
             });
@@ -724,7 +724,7 @@ namespace RokettoLaunch
                 return;
             }
 
-            isBusy = true;
+            _isBusy = true;
 
             await Task.Run(() =>
             {
@@ -735,7 +735,7 @@ namespace RokettoLaunch
             });
 
             _fileSessionManager.HasChanged = true;
-            isBusy = false;
+            _isBusy = false;
         }
 
         /// <summary>

Models/NewFormModel.cs

@@ -0,0 +1,10 @@
+namespace RokettoLaunch.Models
+{
+    public class NewFormModel
+    {
+        public int ColumnCount { get; set; } = 8;
+
+        public int GroupCount { get; set; } = 1;
+
+    }
+}

Models/SaveFile/App3Options.cs

@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Text.Json.Serialization;
 
-namespace RokettoLaunch.DTOs.SaveFile
+namespace RokettoLaunch.Models.SaveFile
 {
     public class App3Options : AppOptionsBase
     {

Models/SaveFile/App4Options.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace RokettoLaunch.DTOs.SaveFile
+namespace RokettoLaunch.Models.SaveFile
 {
     public class App4Options : AppOptionsBase
     {

Models/SaveFile/AppOptionsBase.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace RokettoLaunch.DTOs.SaveFile
+namespace RokettoLaunch.Models.SaveFile
 {
     public class AppOptionsBase
     {

OptionsForm.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Windows.Forms;
-using RokettoLaunch.DTOs.SaveFile;
+using RokettoLaunch.Models.SaveFile;
 using RyzStudio.Windows.Forms;
 using RyzStudio.Windows.ThemedForms;
 using RyzStudio.Windows.ThemedForms.ButtonTextBox;
 using RyzStudio.Windows.ThemedForms.PickerBox;
 
-namespace RokettoLaunch.Forms
+namespace RokettoLaunch
 {
     public class OptionsForm : Form
     {

Program.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Windows.Forms;
+using Microsoft.Extensions.DependencyInjection;
+using RyzStudio.Windows.Forms;
 
 namespace RokettoLaunch
 {
@@ -11,10 +13,19 @@ namespace RokettoLaunch
         [STAThread]
         static void Main()
         {
+            var services = new ServiceCollection();
+            services.AddSingleton<IFileSessionManager, FileSessionManager>();
+            services.AddTransient<MainForm>();
+            services.AddTransient<LoadingForm>();
+
+            var provider = services.BuildServiceProvider();
+
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
+            //Application.Run(new MainForm());
+
+            Application.Run(provider.GetRequiredService<MainForm>());
         }
     }
 }

Resources/MainMenu/folder-minus.svg

@@ -0,0 +1,54 @@
+<?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="feather feather-folder-minus"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="folder-minus.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   inkscape:export-filename="N:\D\folder-minus.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="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="17.333333"
+     inkscape:cx="-3.4903846"
+     inkscape:cy="17.509615"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"
+     id="path2"
+     style="stroke:#808080;stroke-opacity:1" />
+  <line
+     x1="2.9674475"
+     y1="10"
+     x2="21.155149"
+     y2="10"
+     id="line4"
+     style="stroke-width:2;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke:#808080;stroke-opacity:1" />
+</svg>

Resources/MainMenu/help-circle.svg

@@ -0,0 +1,60 @@
+<?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="feather feather-help-circle"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="help-circle.svg"
+   inkscape:export-filename="N:\D\help-circle.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="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="24.513035"
+     inkscape:cx="9.1583926"
+     inkscape:cy="15.318381"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <circle
+     cx="12"
+     cy="12"
+     r="10"
+     id="circle2"
+     style="stroke:#808080;stroke-opacity:1" />
+  <path
+     d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"
+     id="path4"
+     style="stroke:#808080;stroke-opacity:1" />
+  <line
+     x1="12"
+     y1="17"
+     x2="12.01"
+     y2="17"
+     id="line6"
+     style="stroke:#808080;stroke-opacity:1" />
+</svg>

Resources/MainMenu/plus.svg

@@ -0,0 +1,57 @@
+<?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="feather feather-plus"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="plus.svg"
+   inkscape:export-filename="N:\D\plus.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" />
+  <line
+     x1="12"
+     y1="5"
+     x2="12"
+     y2="19"
+     id="line2"
+     style="stroke:#808080;stroke-opacity:1" />
+  <line
+     x1="5"
+     y1="12"
+     x2="19"
+     y2="12"
+     id="line4"
+     style="stroke:#808080;stroke-opacity:1" />
+</svg>

Resources/MainMenu/save.svg

@@ -0,0 +1,55 @@
+<?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="feather feather-save"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="save.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   inkscape:export-filename="N:\D\save.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="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     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="svg8" />
+  <path
+     d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"
+     id="path2"
+     style="stroke:#808080;stroke-opacity:1" />
+  <polyline
+     points="17 21 17 13 7 13 7 21"
+     id="polyline4"
+     style="stroke:#808080;stroke-opacity:1" />
+  <polyline
+     points="7 3 7 8 15 8"
+     id="polyline6"
+     style="stroke:#808080;stroke-opacity:1" />
+</svg>

Resources/MainMenu/settings.svg

@@ -0,0 +1,53 @@
+<?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="feather feather-settings"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="settings.svg"
+   inkscape:export-filename="N:\D\settings.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" />
+  <circle
+     cx="12"
+     cy="12"
+     r="3"
+     id="circle2"
+     style="stroke:#808080;stroke-opacity:1" />
+  <path
+     d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"
+     id="path4"
+     style="stroke:#808080;stroke-opacity:1" />
+</svg>

Resources/MainMenu/trash-2.svg

@@ -0,0 +1,65 @@
+<?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="feather feather-trash-2"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="trash-2.svg"
+   inkscape:export-filename="N:\D\trash-2.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="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     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="svg10" />
+  <polyline
+     points="3 6 5 6 21 6"
+     id="polyline2"
+     style="stroke:#808080;stroke-opacity:1" />
+  <path
+     d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"
+     id="path4"
+     style="stroke:#808080;stroke-opacity:1" />
+  <line
+     x1="10"
+     y1="11"
+     x2="10"
+     y2="17"
+     id="line6"
+     style="stroke:#808080;stroke-opacity:1" />
+  <line
+     x1="14"
+     y1="11"
+     x2="14"
+     y2="17"
+     id="line8"
+     style="stroke:#808080;stroke-opacity:1" />
+</svg>

RokettoLaunch.csproj

@@ -14,7 +14,7 @@
     <Copyright>Ray Lam</Copyright>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
-    <Version>0.4.1.0217</Version>
+    <Version>0.4.1.0202</Version>
     <EnableNETAnalyzers>False</EnableNETAnalyzers>
     <PlatformTarget>x64</PlatformTarget>
     <PackageIcon>icon-128.png</PackageIcon>
@@ -31,15 +31,15 @@
 
   <ItemGroup>
     <Compile Remove="#\**" />
-    <Compile Remove="Resources\**" />
+    <Compile Remove="Resources\UI\**" />
     <Compile Remove="RyzStudio\**" />
     <Compile Remove="Text\**" />
     <EmbeddedResource Remove="#\**" />
-    <EmbeddedResource Remove="Resources\**" />
+    <EmbeddedResource Remove="Resources\UI\**" />
     <EmbeddedResource Remove="RyzStudio\**" />
     <EmbeddedResource Remove="Text\**" />
     <None Remove="#\**" />
-    <None Remove="Resources\**" />
+    <None Remove="Resources\UI\**" />
     <None Remove="RyzStudio\**" />
     <None Remove="Text\**" />
   </ItemGroup>
@@ -79,6 +79,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
     <PackageReference Include="RyzStudio" Version="10.1.0.128" />
     <PackageReference Include="RyzStudio.Windows.Forms" Version="10.1.0.140" />
   </ItemGroup>
@@ -88,10 +89,10 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>AppResource.resx</DependentUpon>
     </Compile>
-    <Compile Update="Forms\CopyToTileForm.cs">
+    <Compile Update="CopyToTileForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="Forms\LoadingForm.cs">
+    <Compile Update="LoadingForm.cs">
       <SubType>Form</SubType>
     </Compile>
   </ItemGroup>
@@ -103,4 +104,11 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Resources\icon-128.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>

build.bat

@@ -8,7 +8,7 @@ dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfC
 
 "C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss"
 
-"C:\B\Portable Files\7-Zip (Portable)\25.01\App\7-Zip64\7z.exe" a -t7z "bin\rokettolaunch.7z" ".\bin\rokettolaunch.exe" -mx9
+"C:\B\Portable Files\7-Zip (Portable)\23.01\App\7-Zip64\7z.exe" a -t7z "bin\rokettolaunch.7z" ".\bin\rokettolaunch.exe" -mx9
 
 RMDIR /s /q "bin\debug"
 RMDIR /s /q "bin\release"