Merge branch 'release/0.2.2.015' into 'master'
Release/0.2.2.015 See merge request SympatheticFire/linear-app-launcher!26
This commit is contained in:
commit
a09c42e817
@ -12,9 +12,9 @@
|
||||
<Company>Hi, I'm Ray</Company>
|
||||
<Product>Fizzy Launcher</Product>
|
||||
<Copyright>Ray Lam</Copyright>
|
||||
<AssemblyVersion>0.2.2.004</AssemblyVersion>
|
||||
<FileVersion>0.2.2.004</FileVersion>
|
||||
<Version>0.2.2.004</Version>
|
||||
<AssemblyVersion>0.2.2.015</AssemblyVersion>
|
||||
<FileVersion>0.2.2.015</FileVersion>
|
||||
<Version>0.2.2.015</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
5
MainForm.Designer.cs
generated
5
MainForm.Designer.cs
generated
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -63,10 +63,10 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.tHorizontalSeparator1 = new RyzStudio.Windows.Forms.THorizontalSeparator();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
//
|
||||
// textBox1
|
||||
//
|
||||
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
//
|
||||
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.textBox1.BackColor = System.Drawing.Color.Transparent;
|
||||
this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||
@ -78,9 +78,9 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.textBox1.SubmitButton = null;
|
||||
this.textBox1.TabIndex = 152;
|
||||
this.textBox1.UseSystemPasswordChar = false;
|
||||
//
|
||||
//
|
||||
// label1
|
||||
//
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.BackColor = System.Drawing.Color.Transparent;
|
||||
this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||
@ -92,9 +92,9 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.label1.TabIndex = 153;
|
||||
this.label1.Text = "Title";
|
||||
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
//
|
||||
// button1
|
||||
//
|
||||
//
|
||||
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.button1.BackColor = System.Drawing.Color.Transparent;
|
||||
this.button1.DefaultImage = null;
|
||||
@ -109,10 +109,10 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.button1.Size = new System.Drawing.Size(128, 32);
|
||||
this.button1.TabIndex = 173;
|
||||
this.button1.Click += new System.EventHandler(this.button1_Click);
|
||||
//
|
||||
//
|
||||
// horizontalSeparator2
|
||||
//
|
||||
this.horizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
//
|
||||
this.horizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.horizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0);
|
||||
this.horizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
|
||||
@ -125,12 +125,12 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.horizontalSeparator2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
|
||||
this.horizontalSeparator2.Size = new System.Drawing.Size(364, 22);
|
||||
this.horizontalSeparator2.TabIndex = 177;
|
||||
//
|
||||
//
|
||||
// listBox1
|
||||
//
|
||||
//
|
||||
this.listBox1.AllowDrop = true;
|
||||
this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.listBox1.BackColor = System.Drawing.Color.Transparent;
|
||||
this.listBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
|
||||
@ -145,9 +145,9 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.listBox1.OnEdit += new System.EventHandler(this.listBox1_OnEdit);
|
||||
this.listBox1.DragDrop += new System.Windows.Forms.DragEventHandler(this.listBox1_DragDrop);
|
||||
this.listBox1.DragOver += new System.Windows.Forms.DragEventHandler(this.listBox1_DragOver);
|
||||
//
|
||||
//
|
||||
// label2
|
||||
//
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.BackColor = System.Drawing.Color.Transparent;
|
||||
this.label2.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||
@ -158,10 +158,10 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.label2.TabIndex = 181;
|
||||
this.label2.Text = "List";
|
||||
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
//
|
||||
// tHorizontalSeparator1
|
||||
//
|
||||
this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
//
|
||||
this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0);
|
||||
this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
|
||||
@ -174,9 +174,9 @@ namespace FizzyLauncher.Windows.Forms
|
||||
this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
|
||||
this.tHorizontalSeparator1.Size = new System.Drawing.Size(364, 22);
|
||||
this.tHorizontalSeparator1.TabIndex = 182;
|
||||
//
|
||||
//
|
||||
// AddTileFolderForm
|
||||
//
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.ClientSize = new System.Drawing.Size(384, 521);
|
||||
this.Controls.Add(this.tHorizontalSeparator1);
|
||||
@ -312,6 +312,11 @@ namespace FizzyLauncher.Windows.Forms
|
||||
return;
|
||||
}
|
||||
|
||||
if (listBox1.ListBox.SelectedIndex < 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
EditTileForm.ShowEditDialog(listBox1);
|
||||
}
|
||||
|
||||
|
@ -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 (model.ProcessAsAdmin) p.Verb = "runas";
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(model.CleanProcessArgument))
|
||||
{
|
||||
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)
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
Reference in New Issue
Block a user