AppResource.Designer.cs

@@ -96,46 +96,6 @@ namespace RokettoLaunch {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap cog2 {
-            get {
-                object obj = ResourceManager.GetObject("cog2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap disk2 {
-            get {
-                object obj = ResourceManager.GetObject("disk2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap file {
-            get {
-                object obj = ResourceManager.GetObject("file", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap folder {
-            get {
-                object obj = ResourceManager.GetObject("folder", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -146,16 +106,6 @@ namespace RokettoLaunch {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap help2 {
-            get {
-                object obj = ResourceManager.GetObject("help2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

AppResource.resx

@@ -130,24 +130,9 @@
     <value>https://www.hiimray.co.uk/software-rokettolaunch</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="cog2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\cog2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="disk2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\disk2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="file" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="folder_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\folder_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="help2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\help2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icon_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\icon-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

EditTileFolderForm.cs

@@ -70,7 +70,7 @@ namespace RokettoLaunch
             textBox1.IconSize = 13F;
             textBox1.Location = new Point(109, 20);
             textBox1.Name = "textBox1";
-            textBox1.Size = new Size(275, 32);
+            textBox1.Size = new Size(260, 32);
             textBox1.TabIndex = 152;
             textBox1.TabStop = false;
             textBox1.UseSystemPasswordChar = false;
@@ -126,6 +126,7 @@ namespace RokettoLaunch
             dialogFooter1.Button1Text = "&Save";
             dialogFooter1.Dialog = this;
             dialogFooter1.Dock = DockStyle.Bottom;
+            dialogFooter1.IsBusy = false;
             dialogFooter1.Location = new Point(0, 437);
             dialogFooter1.Name = "dialogFooter1";
             dialogFooter1.Size = new Size(384, 84);

MainForm.Designer.cs

@@ -139,64 +139,64 @@ namespace RokettoLaunch
             // 
             // newToolStripMenuItem
             // 
-            newToolStripMenuItem.Image = AppResource.file;
+            newToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             newToolStripMenuItem.Name = "newToolStripMenuItem";
             newToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N;
-            newToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            newToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             newToolStripMenuItem.Text = "&New";
             newToolStripMenuItem.Click += newToolStripMenuItem_Click;
             // 
             // openToolStripMenuItem
             // 
-            openToolStripMenuItem.Image = AppResource.folder;
+            openToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             openToolStripMenuItem.Name = "openToolStripMenuItem";
             openToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O;
-            openToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            openToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             openToolStripMenuItem.Text = "&Open";
             openToolStripMenuItem.Click += openToolStripMenuItem_Click;
             // 
             // toolStripMenuItem13
             // 
             toolStripMenuItem13.Name = "toolStripMenuItem13";
-            toolStripMenuItem13.Size = new System.Drawing.Size(143, 6);
+            toolStripMenuItem13.Size = new System.Drawing.Size(177, 6);
             // 
             // closeToolStripMenuItem
             // 
             closeToolStripMenuItem.Name = "closeToolStripMenuItem";
-            closeToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            closeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             closeToolStripMenuItem.Text = "&Close";
             closeToolStripMenuItem.Click += closeToolStripMenuItem_Click;
             // 
             // toolStripMenuItem14
             // 
             toolStripMenuItem14.Name = "toolStripMenuItem14";
-            toolStripMenuItem14.Size = new System.Drawing.Size(143, 6);
+            toolStripMenuItem14.Size = new System.Drawing.Size(177, 6);
             // 
             // saveToolStripMenuItem
             // 
-            saveToolStripMenuItem.Image = AppResource.disk2;
+            saveToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             saveToolStripMenuItem.Name = "saveToolStripMenuItem";
             saveToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S;
-            saveToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             saveToolStripMenuItem.Text = "&Save";
             saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
             // 
             // saveAsToolStripMenuItem
             // 
             saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
-            saveAsToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
+            saveAsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             saveAsToolStripMenuItem.Text = "Save &As...";
             saveAsToolStripMenuItem.Click += saveAsToolStripMenuItem_Click;
             // 
             // toolStripMenuItem15
             // 
             toolStripMenuItem15.Name = "toolStripMenuItem15";
-            toolStripMenuItem15.Size = new System.Drawing.Size(143, 6);
+            toolStripMenuItem15.Size = new System.Drawing.Size(177, 6);
             // 
             // exitToolStripMenuItem2
             // 
             exitToolStripMenuItem2.Name = "exitToolStripMenuItem2";
-            exitToolStripMenuItem2.Size = new System.Drawing.Size(146, 22);
+            exitToolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
             exitToolStripMenuItem2.Text = "E&xit";
             exitToolStripMenuItem2.Click += exitToolStripMenuItem2_Click;
             // 
@@ -210,7 +210,7 @@ namespace RokettoLaunch
             // addGroupToolStripMenuItem
             // 
             addGroupToolStripMenuItem.Name = "addGroupToolStripMenuItem";
-            addGroupToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
+            addGroupToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             addGroupToolStripMenuItem.Text = "&Add Group";
             addGroupToolStripMenuItem.Click += addGroupToolStripMenuItem_Click;
             // 
@@ -224,14 +224,14 @@ namespace RokettoLaunch
             // showBigIconsToolStripMenuItem
             // 
             showBigIconsToolStripMenuItem.Name = "showBigIconsToolStripMenuItem";
-            showBigIconsToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            showBigIconsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             showBigIconsToolStripMenuItem.Text = "Show &Big Icons";
             showBigIconsToolStripMenuItem.Click += showBigIconsToolStripMenuItem_Click;
             // 
             // alwaysOnTopToolStripMenuItem
             // 
             alwaysOnTopToolStripMenuItem.Name = "alwaysOnTopToolStripMenuItem";
-            alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
+            alwaysOnTopToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             alwaysOnTopToolStripMenuItem.Text = "Always On &Top";
             alwaysOnTopToolStripMenuItem.Click += alwaysOnTopToolStripMenuItem_Click;
             // 
@@ -244,10 +244,10 @@ namespace RokettoLaunch
             // 
             // optionsToolStripMenuItem
             // 
-            optionsToolStripMenuItem.Image = AppResource.cog2;
+            optionsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
             optionsToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F12;
-            optionsToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+            optionsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             optionsToolStripMenuItem.Text = "&Options";
             optionsToolStripMenuItem.Click += optionsToolStripMenuItem_Click;
             // 
@@ -260,22 +260,22 @@ namespace RokettoLaunch
             // 
             // viewHelpToolStripMenuItem1
             // 
-            viewHelpToolStripMenuItem1.Image = AppResource.help2;
+            viewHelpToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             viewHelpToolStripMenuItem1.Name = "viewHelpToolStripMenuItem1";
             viewHelpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1;
-            viewHelpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22);
+            viewHelpToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
             viewHelpToolStripMenuItem1.Text = "&View Help";
             viewHelpToolStripMenuItem1.Click += viewHelpToolStripMenuItem1_Click;
             // 
             // toolStripMenuItem16
             // 
             toolStripMenuItem16.Name = "toolStripMenuItem16";
-            toolStripMenuItem16.Size = new System.Drawing.Size(143, 6);
+            toolStripMenuItem16.Size = new System.Drawing.Size(177, 6);
             // 
             // aboutToolStripMenuItem1
             // 
             aboutToolStripMenuItem1.Name = "aboutToolStripMenuItem1";
-            aboutToolStripMenuItem1.Size = new System.Drawing.Size(146, 22);
+            aboutToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
             aboutToolStripMenuItem1.Text = "&About";
             aboutToolStripMenuItem1.Click += aboutToolStripMenuItem1_Click;
             // 

MainForm.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -32,6 +33,12 @@ namespace RokettoLaunch
             this.AutoScaleMode = AutoScaleMode.None;
             this.Text = Application.ProductName;
 
+            newToolStripMenuItem.Image = RyzStudio.Windows.ThemedForms.DefaultVisualStyle.GetImage("a", Color.Black, 2);
+            openToolStripMenuItem.Image = RyzStudio.Windows.ThemedForms.DefaultVisualStyle.GetImage("b", Color.Black, 2);
+            saveToolStripMenuItem.Image = RyzStudio.Windows.ThemedForms.DefaultVisualStyle.GetImage("c", Color.Black, 2);
+            optionsToolStripMenuItem.Image = RyzStudio.Windows.ThemedForms.DefaultVisualStyle.GetImage("i", Color.Black, 2);
+            viewHelpToolStripMenuItem1.Image = RyzStudio.Windows.ThemedForms.DefaultVisualStyle.GetImage("j", Color.Black, 2);
+
             _fileSessionManager = new FileSessionManager();
             _fileSessionManager.OpenFileDialog = openFileDialog1;
             _fileSessionManager.SaveFileDialog = saveFileDialog1;
@@ -150,7 +157,7 @@ namespace RokettoLaunch
         {
             closeToolStripMenuItem.Enabled = (_fileSessionManager.SessionState != FileSessionManager.SessionStateEnum.Close);
 
-            saveToolStripMenuItem.Enabled = (_fileSessionManager.SessionState == FileSessionManager.SessionStateEnum.Open);
+            saveToolStripMenuItem.Enabled = (_fileSessionManager.SessionState == FileSessionManager.SessionStateEnum.Open) && _fileSessionManager.HasChanged;
             saveAsToolStripMenuItem.Enabled = (_fileSessionManager.SessionState != FileSessionManager.SessionStateEnum.Close);
 
             addGroupToolStripMenuItem.Enabled = (_fileSessionManager.SessionState != FileSessionManager.SessionStateEnum.Close);

Models/TileModel.cs

@@ -27,40 +27,76 @@ namespace RokettoLaunch.Models
 
         public List<TileModel> Items { get; set; } = new List<TileModel>();
 
+        public string Version { get; set; }
+
+
         public override string ToString() => this.Title ?? string.Empty;
 
-        public string CleanProcessFilename => (string.IsNullOrWhiteSpace(this.ProcessFilename) ? string.Empty : resolvePath(this.ProcessFilename));
 
-        public string CleanProcessArgument => (string.IsNullOrWhiteSpace(this.ProcessArgument) ? string.Empty : resolvePath(this.ProcessArgument));
+        [JsonIgnore]
-
+        public string CleanProcessFilename
-        public string CleanProcessWorkingDirectory => (string.IsNullOrWhiteSpace(this.ProcessWorkingDirectory) ? string.Empty : resolvePath(this.ProcessWorkingDirectory));
-
-        protected string resolvePath(string value)
         {
-            string rv = Environment.ExpandEnvironmentVariables(value);
+            get
-
+            {
-            rv = resolveFirstPath(rv);
+                return (string.IsNullOrWhiteSpace(this.ProcessFilename) ? string.Empty : ResolvePath(this.ProcessFilename));
-            rv = resolveLastPath(rv);
+            }
-
-            return rv;
         }
 
-        protected string resolveFirstPath(string value)
+        [JsonIgnore]
+        public string CleanProcessArgument
         {
-            const string last = "%FIRST%";
+            get
-            if (!value.Contains(last))
             {
-                return value;
+                return (string.IsNullOrWhiteSpace(this.ProcessArgument) ? string.Empty : ResolvePath(this.ProcessArgument));
+            }
+        }
+
+        [JsonIgnore]
+        public string CleanProcessWorkingDirectory
+        {
+            get
+            {
+                return (string.IsNullOrWhiteSpace(this.ProcessWorkingDirectory) ? string.Empty : ResolvePath(this.ProcessWorkingDirectory));
+            }
+        }
+
+
+        private Tuple<string, string> SplitPath(string path, string needle)
+        {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                return null;
             }
 
-            string head = value.Substring(0, value.IndexOf(last));
+            if (string.IsNullOrWhiteSpace(needle))
-            string tail = value.Substring(value.IndexOf(last) + last.Length);
+            {
+                return null;
+            }
+
+            if (!path.Contains(needle))
+            {
+                return null;
+            }
+
+            string head = path.Substring(0, path.IndexOf(needle));
+            string tail = path.Substring(path.IndexOf(needle) + needle.Length);
+
+            return new Tuple<string, string>(head, tail);
+        }
+
+        private string GetFirstPath(string value)
+        {
+            var parts = SplitPath(value, "%FIRST%");
+            if (parts == null)
+            {
+                return null;
+            }
 
             string[] dirList = new string[0];
 
             try
             {
-                dirList = System.IO.Directory.GetDirectories(head, "*", System.IO.SearchOption.TopDirectoryOnly);
+                dirList = System.IO.Directory.GetDirectories(parts.Item1, "*", System.IO.SearchOption.TopDirectoryOnly);
             }
             catch
             {
@@ -69,28 +105,25 @@ namespace RokettoLaunch.Models
 
             if (dirList.Length <= 0)
             {
-                return value;
+                return null;
             }
 
-            return dirList[0] + tail;
+            return System.IO.Path.GetFileName(dirList[0]);
         }
 
-        protected string resolveLastPath(string value)
+        private string GetLastPath(string value)
         {
-            const string last = "%LAST%";
+            var parts = SplitPath(value, "%LAST%");
-            if (!value.Contains(last))
+            if (parts == null)
             {
-                return value;
+                return null;
             }
 
-            string head = value.Substring(0, value.IndexOf(last));
-            string tail = value.Substring(value.IndexOf(last) + last.Length);
-
             string[] dirList = new string[0];
 
             try
             {
-                dirList = System.IO.Directory.GetDirectories(head, "*", System.IO.SearchOption.TopDirectoryOnly);
+                dirList = System.IO.Directory.GetDirectories(parts.Item1, "*", System.IO.SearchOption.TopDirectoryOnly);
             }
             catch
             {
@@ -98,11 +131,128 @@ namespace RokettoLaunch.Models
             }
 
             if (dirList.Length <= 0)
+            {
+                return null;
+            }
+
+            return System.IO.Path.GetFileName(dirList[(dirList.Length - 1)]);
+        }
+
+        private string ResolvePath(string path)
+        {
+            var result = Environment.ExpandEnvironmentVariables(path);
+
+            if (result.Contains("%FIRST%"))
+            {
+                result = ResolveFirstPath(result);
+            }
+
+            if (result.Contains("%LAST%"))
+            {
+                result = ResolveLastPath(result);
+            }
+
+            return result;
+        }
+
+        private string ResolveFirstPath(string value)
+        {
+            var parts = SplitPath(value, "%FIRST%");
+            if (parts == null)
             {
                 return value;
             }
 
-            return dirList[(dirList.Length - 1)] + tail;
+            try
+            {
+                if (!System.IO.Directory.Exists(parts.Item1))
+                {
+                    return value;
+                }
+            }
+            catch (Exception)
+            {
+                return value;
+            }
+
+            // Try cached version
+            if (!string.IsNullOrWhiteSpace(this.Version))
+            {
+                var filename = parts.Item1 + this.Version + parts.Item2;
+
+                try
+                {
+                    if (System.IO.File.Exists(filename))
+                    {
+                        return filename;
+                    }
+                }
+                catch (Exception)
+                {
+
+                }
+            }
+
+            // Resolve version
+            var version = GetFirstPath(value);
+            if (version == null)
+            {
+                return value;
+            }
+
+            this.Version = version;
+
+            return parts.Item1 + version + parts.Item2;
+        }
+
+        private string ResolveLastPath(string value)
+        {
+            var parts = SplitPath(value, "%LAST%");
+            if (parts == null)
+            {
+                return value;
+            }
+
+            try
+            {
+                if (!System.IO.Directory.Exists(parts.Item1))
+                {
+                    return value;
+                }
+            }
+            catch (Exception)
+            {
+                return value;
+            }
+
+            // Try cached version
+            if (!string.IsNullOrWhiteSpace(this.Version))
+            {
+                var filename = parts.Item1 + this.Version + parts.Item2;
+
+                try
+                {
+                    if (System.IO.File.Exists(filename))
+                    {
+                        return filename;
+                    }
+                }
+                catch (Exception)
+                {
+
+                }
+            }
+
+            // Resolve version
+            var version = GetLastPath(value);
+            if (version == null)
+            {
+                return value;
+            }
+
+            this.Version = version;
+
+            return parts.Item1 + version + parts.Item2;
         }
 
     }

RokettoLaunch.csproj

@@ -14,7 +14,7 @@
     <Copyright>Ray Lam</Copyright>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
-    <Version>0.3.4.164</Version>
+    <Version>0.3.5.0335</Version>
     <EnableNETAnalyzers>False</EnableNETAnalyzers>
     <PlatformTarget>x64</PlatformTarget>
     <PackageIcon>icon-128.png</PackageIcon>
@@ -79,8 +79,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RyzStudio" Version="8.1.2.324" />
+    <PackageReference Include="RyzStudio" Version="8.1.2.366" />
-    <PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.3.632" />
+    <PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.3.689" />
   </ItemGroup>
 
   <ItemGroup>

build-installer.iss

@@ -2,13 +2,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "RokettoLaunch"
-#define MyAppVersion "0.3.4.164"
+#define MyAppVersion "0.3.5.335"
 #define MyAppPublisher "Hi, I'm Ray"
 #define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
 #define MyAppExeName "rokettolaunch.exe"
 
-#define AppSourcePath "L:\gitea-hiimray\linear-app-launcher\bin"
+#define AppSourcePath "L:\gitea-hiimray\roketto-launch\bin"
-#define AppReleasePath "L:\gitea-hiimray\linear-app-launcher\bin"
+#define AppReleasePath "L:\gitea-hiimray\roketto-launch\bin"
 #define AppReleaseName "rokettolaunch-installer"