Merge branch 'release/0.2.2.015' into 'master'

Release/0.2.2.015

See merge request SympatheticFire/linear-app-launcher!26

FizzyLauncher.csproj

@@ -12,9 +12,9 @@
     <Company>Hi, I'm Ray</Company>
     <Product>Fizzy Launcher</Product>
     <Copyright>Ray Lam</Copyright>
-    <AssemblyVersion>0.2.2.004</AssemblyVersion>
+    <AssemblyVersion>0.2.2.015</AssemblyVersion>
-    <FileVersion>0.2.2.004</FileVersion>
+    <FileVersion>0.2.2.015</FileVersion>
-    <Version>0.2.2.004</Version>
+    <Version>0.2.2.015</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

MainForm.Designer.cs

@@ -128,6 +128,7 @@
             // 
             this.newToolStripMenuItem.Image = global::FizzyLauncher.UIResource.file2;
             this.newToolStripMenuItem.Name = "newToolStripMenuItem";
+            this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
             this.newToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.newToolStripMenuItem.Text = "&New";
             this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
@@ -136,6 +137,7 @@
             // 
             this.openToolStripMenuItem.Image = global::FizzyLauncher.UIResource.folder2;
             this.openToolStripMenuItem.Name = "openToolStripMenuItem";
+            this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
             this.openToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.openToolStripMenuItem.Text = "&Open";
             this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
@@ -161,6 +163,7 @@
             // 
             this.saveToolStripMenuItem.Image = global::FizzyLauncher.UIResource.disk2;
             this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
             this.saveToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.saveToolStripMenuItem.Text = "&Save";
             this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
@@ -227,6 +230,7 @@
             // 
             this.optionsToolStripMenuItem.Image = global::FizzyLauncher.UIResource.cog2;
             this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
+            this.optionsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F12)));
             this.optionsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.optionsToolStripMenuItem.Text = "&Options";
             this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
@@ -245,6 +249,7 @@
             // 
             this.viewHelpToolStripMenuItem1.Image = global::FizzyLauncher.UIResource.help2;
             this.viewHelpToolStripMenuItem1.Name = "viewHelpToolStripMenuItem1";
+            this.viewHelpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1;
             this.viewHelpToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
             this.viewHelpToolStripMenuItem1.Text = "&View Help";
             this.viewHelpToolStripMenuItem1.Click += new System.EventHandler(this.viewHelpToolStripMenuItem1_Click);

RyzStudio/Windows/ThemedForms/TListBox.designer.cs

@@ -76,7 +76,7 @@ namespace RyzStudio.Windows.ThemedForms
             this.imageBox5.ImageSelected = null;
             this.imageBox5.InitialImage = null;
             this.imageBox5.IsSelected = false;
-            this.imageBox5.Location = new System.Drawing.Point(106, 48);
+            this.imageBox5.Location = new System.Drawing.Point(106, 24);
             this.imageBox5.Name = "imageBox5";
             this.imageBox5.NormalImage = global::FizzyLauncher.UIResource.edit;
             this.imageBox5.SelectedImage = null;
@@ -160,7 +160,7 @@ namespace RyzStudio.Windows.ThemedForms
             this.imageBox2.ImageSelected = null;
             this.imageBox2.InitialImage = null;
             this.imageBox2.IsSelected = false;
-            this.imageBox2.Location = new System.Drawing.Point(106, 24);
+            this.imageBox2.Location = new System.Drawing.Point(106, 48);
             this.imageBox2.Name = "imageBox2";
             this.imageBox2.NormalImage = global::FizzyLauncher.UIResource.minus;
             this.imageBox2.SelectedImage = null;

Windows/Forms/EditTileFolderForm.cs

@@ -312,6 +312,11 @@ namespace FizzyLauncher.Windows.Forms
                 return;
             }
 
+            if (listBox1.ListBox.SelectedIndex < 0)
+            {
+                return;
+            }
+
             EditTileForm.ShowEditDialog(listBox1);
         }
 

Windows/Forms/TilePanel.cs

@@ -105,6 +105,8 @@ namespace FizzyLauncher.Windows.Forms
                 title = value;
 
                 labelRectangle = new Rectangle(labelMargin, labelTop, (this.Width - (labelMargin * 2)), (this.Height - labelTop - 1));
+
+                this.Invalidate();
             }
         }
 
@@ -358,9 +360,22 @@ namespace FizzyLauncher.Windows.Forms
             ProcessStartInfo p = new ProcessStartInfo();
             p.FileName = model.CleanProcessFilename;
             p.WindowStyle = model.ProcessWindowStyle;
-            if (!string.IsNullOrWhiteSpace(model.CleanProcessArgument)) p.Arguments = model.CleanProcessArgument;
+
-            if (!string.IsNullOrWhiteSpace(model.CleanProcessWorkingDirectory)) p.WorkingDirectory = model.CleanProcessWorkingDirectory;
+            if (!string.IsNullOrWhiteSpace(model.CleanProcessArgument))
-            if (model.ProcessAsAdmin) p.Verb = "runas";
+            {
+                p.Arguments = model.CleanProcessArgument;
+            }
+
+            if (!string.IsNullOrWhiteSpace(model.CleanProcessWorkingDirectory))
+            {
+                p.WorkingDirectory = model.CleanProcessWorkingDirectory;
+            }
+
+            if (model.ProcessAsAdmin)
+            {
+                p.UseShellExecute = true;
+                p.Verb = "runas";
+            }
 
             MainForm parentForm = findMainForm();
             if (parentForm != null)

installer-64.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Fizzy Launcher"
-#define MyAppVersion "0.2.2.004"
+#define MyAppVersion "0.2.2.015"
 #define MyAppPublisher "Hi, I'm Ray"
 #define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
 #define MyAppExeName "fizzylauncher.exe"

installer-86.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Fizzy Launcher"
-#define MyAppVersion "0.2.2.004"
+#define MyAppVersion "0.2.2.015"
 #define MyAppPublisher "Hi, I'm Ray"
 #define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
 #define MyAppExeName "fizzylauncher.exe"