diff --git a/FizzyLauncher.csproj b/FizzyLauncher.csproj
index 573f00a..f5e0bd4 100644
--- a/FizzyLauncher.csproj
+++ b/FizzyLauncher.csproj
@@ -12,9 +12,9 @@
Hi, I'm Ray
Fizzy Launcher
Ray Lam
- 0.2.2.015
- 0.2.2.015
- 0.2.2.015
+ 0.2.2.018
+ 0.2.2.018
+ 0.2.2.018
diff --git a/MainForm.cs b/MainForm.cs
index 1907bab..ce57afc 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -41,6 +41,7 @@ namespace FizzyLauncher
notifyIcon1.Text = Application.ProductName;
+ this.AutoScaleMode = AutoScaleMode.None;
this.StartPosition = FormStartPosition.WindowsDefaultBounds;
this.Visible = false;
}
diff --git a/Resources/UI/circle_menu.png b/Resources/UI/circle_menu.png
new file mode 100644
index 0000000..0ff2962
Binary files /dev/null and b/Resources/UI/circle_menu.png differ
diff --git a/Resources/UI/circle_menu2.png b/Resources/UI/circle_menu2.png
new file mode 100644
index 0000000..2338c18
Binary files /dev/null and b/Resources/UI/circle_menu2.png differ
diff --git a/Resources/UI/icons.svg b/Resources/UI/icons.svg
index 998bbb6..fc6bf20 100644
--- a/Resources/UI/icons.svg
+++ b/Resources/UI/icons.svg
@@ -17,9 +17,9 @@
stroke-width="2"
stroke="currentColor"
fill="none"
- viewBox="0 0 24 24"
- height="24"
- width="24">
+ viewBox="0 0 169.84447 96.385719"
+ height="96.385719"
+ width="169.84447">
@@ -39,9 +39,9 @@
inkscape:window-maximized="1"
inkscape:window-y="845"
inkscape:window-x="1072"
- inkscape:cy="32.669404"
- inkscape:cx="34.52045"
- inkscape:zoom="8.8541667"
+ inkscape:cy="82.547694"
+ inkscape:cx="114.18197"
+ inkscape:zoom="6.2608413"
showgrid="false"
id="namedview10"
inkscape:window-height="1017"
@@ -53,11 +53,16 @@
objecttolerance="10"
borderopacity="1"
bordercolor="#666666"
- pagecolor="#ffffff" />
+ pagecolor="#ffffff"
+ inkscape:document-rotation="0"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ transform="matrix(0.80171614,0,0,0.7982539,-1.6034323,-1.5965078)">
+ transform="matrix(0.65647058,0,0,0.65647058,20,20)">
+ transform="matrix(0.7484492,0,0,0.7484492,19.251551,39.251551)">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Resources/UI/menu.png b/Resources/UI/menu.png
new file mode 100644
index 0000000..9c63469
Binary files /dev/null and b/Resources/UI/menu.png differ
diff --git a/Resources/UI/menu2.png b/Resources/UI/menu2.png
new file mode 100644
index 0000000..2530762
Binary files /dev/null and b/Resources/UI/menu2.png differ
diff --git a/Resources/UI/pencil_line.png b/Resources/UI/pencil_line.png
new file mode 100644
index 0000000..a359edd
Binary files /dev/null and b/Resources/UI/pencil_line.png differ
diff --git a/Resources/UI/pencil_line2.png b/Resources/UI/pencil_line2.png
new file mode 100644
index 0000000..9c30d39
Binary files /dev/null and b/Resources/UI/pencil_line2.png differ
diff --git a/RyzStudio/Windows/ThemedForms/TDialogForm.cs b/RyzStudio/Windows/ThemedForms/TDialogForm.cs
index 05dc0e4..49453dc 100644
--- a/RyzStudio/Windows/ThemedForms/TDialogForm.cs
+++ b/RyzStudio/Windows/ThemedForms/TDialogForm.cs
@@ -20,7 +20,7 @@ namespace RyzStudio.Windows.ThemedForms
this.StartPosition = FormStartPosition.CenterParent;
this.TopMost = true;
this.SizeGripStyle = SizeGripStyle.Hide;
- this.AutoScaleMode = AutoScaleMode.Font;
+ this.AutoScaleMode = AutoScaleMode.None;
}
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/RyzStudio/Windows/ThemedForms/TListBox.cs b/RyzStudio/Windows/ThemedForms/TListBox.cs
index 2ddc41b..ab3fa86 100644
--- a/RyzStudio/Windows/ThemedForms/TListBox.cs
+++ b/RyzStudio/Windows/ThemedForms/TListBox.cs
@@ -22,14 +22,14 @@ namespace RyzStudio.Windows.ThemedForms
listBox1.BorderStyle = BorderStyle.None;
}
- protected override void OnResize(EventArgs e)
- {
- base.OnResize(e);
+ //protected override void OnResize(EventArgs e)
+ //{
+ // base.OnResize(e);
- //int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding;
+ // //int b = (styleActive.BorderWidth + 1) + styleActive.BorderPadding;
- //this.Height = comboBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom);
- }
+ // //this.Height = comboBox1.Height + (b + textboxPadding.Top) + ((b - 1) + textboxPadding.Bottom);
+ //}
protected override void OnGotFocus(EventArgs e)
{
@@ -49,12 +49,10 @@ namespace RyzStudio.Windows.ThemedForms
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public new Padding Margin { get => base.Margin; set => base.Margin = value; }
- [Category("Action")]
- [Browsable(true)]
+ [Browsable(false)]
public event EventHandler OnAdd;
- [Category("Action")]
- [Browsable(true)]
+ [Browsable(false)]
public event EventHandler OnEdit;
protected override void updateBackground(Graphics g, ThemeStyle style)
@@ -88,6 +86,21 @@ namespace RyzStudio.Windows.ThemedForms
///
///
///
+ private void tImageBox1_MouseClick(object sender, MouseEventArgs e)
+ {
+ if (e.Button != MouseButtons.Left)
+ {
+ return;
+ }
+
+ editToolStripMenuItem_Click(sender, e);
+ }
+
+ ///
+ /// Menu
+ ///
+ ///
+ ///
private void imageBox5_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button != MouseButtons.Left)
@@ -95,36 +108,7 @@ namespace RyzStudio.Windows.ThemedForms
return;
}
- this.OnEdit?.Invoke(sender, e);
- }
-
- ///
- /// Remove
- ///
- ///
- ///
- private void imageBox2_MouseClick(object sender, MouseEventArgs e)
- {
- if (e.Button != MouseButtons.Left)
- {
- return;
- }
-
- if (listBox1.SelectedIndex < 0)
- {
- return;
- }
-
- int pos = listBox1.SelectedIndex;
-
- listBox1.Items.RemoveAt(pos);
-
- if (pos > (listBox1.Items.Count - 1))
- {
- pos = (listBox1.Items.Count - 1);
- }
-
- listBox1.SelectedIndex = pos;
+ contextMenuStrip1.Show(Cursor.Position);
}
///
@@ -142,23 +126,7 @@ namespace RyzStudio.Windows.ThemedForms
}
}
- if (listBox1.SelectedIndex <= 0)
- {
- return;
- }
-
- if (listBox1.SelectedItem == null)
- {
- return;
- }
-
- object item = listBox1.SelectedItem;
- int pos = listBox1.SelectedIndex;
-
- listBox1.Items.RemoveAt(pos);
- listBox1.Items.Insert((pos - 1), item);
-
- listBox1.SelectedIndex = (pos - 1);
+ moveUpToolStripMenuItem_Click(sender, e);
}
///
@@ -176,26 +144,13 @@ namespace RyzStudio.Windows.ThemedForms
}
}
- if (listBox1.SelectedIndex >= (listBox1.Items.Count - 1))
- {
- return;
- }
-
- if (listBox1.SelectedItem == null)
- {
- return;
- }
-
- object item = listBox1.SelectedItem;
- int pos = listBox1.SelectedIndex;
-
- listBox1.Items.RemoveAt(pos);
- listBox1.Items.Insert((pos + 1), item);
-
- listBox1.SelectedIndex = (pos + 1);
+ moveDownToolStripMenuItem_Click(sender, e);
}
- private void listBox1_MouseDoubleClick(object sender, MouseEventArgs e) => imageBox5_MouseClick(sender, e);
+ private void listBox1_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+ editToolStripMenuItem_Click(sender, e);
+ }
private void listBox1_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
@@ -229,5 +184,202 @@ namespace RyzStudio.Windows.ThemedForms
}
}
+ #region context menu
+
+ ///
+ /// Add
+ ///
+ ///
+ ///
+ private void addItemToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ this.OnAdd?.Invoke(sender, e);
+ }
+
+ ///
+ /// Copy
+ ///
+ ///
+ ///
+ private void toolStripMenuItem2_Click(object sender, EventArgs e)
+ {
+ if (listBox1.SelectedIndex <= 0)
+ {
+ return;
+ }
+
+ if (listBox1.SelectedItem == null)
+ {
+ return;
+ }
+
+ object item = listBox1.SelectedItem;
+
+ listBox1.Items.Add(item);
+ listBox1.SelectedIndex = (listBox1.Items.Count- 1);
+ }
+
+ ///
+ /// Edit
+ ///
+ ///
+ ///
+ private void editToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (listBox1.SelectedIndex < 0)
+ {
+ return;
+ }
+
+ if (listBox1.SelectedItem == null)
+ {
+ return;
+ }
+
+ this.OnEdit?.Invoke(sender, e);
+ }
+
+ ///
+ /// Remove
+ ///
+ ///
+ ///
+ private void removeToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (listBox1.SelectedIndex < 0)
+ {
+ return;
+ }
+
+ int pos = listBox1.SelectedIndex;
+
+ listBox1.Items.RemoveAt(pos);
+
+ if (pos > (listBox1.Items.Count - 1))
+ {
+ pos = (listBox1.Items.Count - 1);
+ }
+
+ listBox1.SelectedIndex = pos;
+ }
+
+ ///
+ /// Remove all
+ ///
+ ///
+ ///
+ private void toolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ listBox1.Items.Clear();
+ }
+
+ ///
+ /// Move to top
+ ///
+ ///
+ ///
+ private void moveToTopToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (listBox1.SelectedIndex <= 0)
+ {
+ return;
+ }
+
+ if (listBox1.SelectedItem == null)
+ {
+ return;
+ }
+
+ object item = listBox1.SelectedItem;
+ int pos = listBox1.SelectedIndex;
+
+ listBox1.Items.RemoveAt(pos);
+ listBox1.Items.Insert(0, item);
+
+ listBox1.SelectedIndex = 0;
+ }
+
+ ///
+ /// Move up
+ ///
+ ///
+ ///
+ private void moveUpToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (listBox1.SelectedIndex <= 0)
+ {
+ return;
+ }
+
+ if (listBox1.SelectedItem == null)
+ {
+ return;
+ }
+
+ object item = listBox1.SelectedItem;
+ int pos = listBox1.SelectedIndex;
+
+ listBox1.Items.RemoveAt(pos);
+ listBox1.Items.Insert((pos - 1), item);
+
+ listBox1.SelectedIndex = (pos - 1);
+ }
+
+ ///
+ /// Move down
+ ///
+ ///
+ ///
+ private void moveDownToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (listBox1.SelectedIndex >= (listBox1.Items.Count - 1))
+ {
+ return;
+ }
+
+ if (listBox1.SelectedItem == null)
+ {
+ return;
+ }
+
+ object item = listBox1.SelectedItem;
+ int pos = listBox1.SelectedIndex;
+
+ listBox1.Items.RemoveAt(pos);
+ listBox1.Items.Insert((pos + 1), item);
+
+ listBox1.SelectedIndex = (pos + 1);
+ }
+
+ ///
+ /// Move to bottom
+ ///
+ ///
+ ///
+ private void moveToBottomToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ int n = (listBox1.Items.Count - 1);
+
+ if (listBox1.SelectedIndex >= (listBox1.Items.Count - 1))
+ {
+ return;
+ }
+
+ if (listBox1.SelectedItem == null)
+ {
+ return;
+ }
+
+ object item = listBox1.SelectedItem;
+ int pos = listBox1.SelectedIndex;
+
+ listBox1.Items.RemoveAt(pos);
+ listBox1.Items.Insert(n, item);
+
+ listBox1.SelectedIndex = n;
+ }
+
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs
index a81e57f..e45fa50 100644
--- a/RyzStudio/Windows/ThemedForms/TListBox.designer.cs
+++ b/RyzStudio/Windows/ThemedForms/TListBox.designer.cs
@@ -35,14 +35,28 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox5 = new RyzStudio.Windows.Forms.TImageBox();
this.imageBox4 = new RyzStudio.Windows.Forms.TImageBox();
this.imageBox3 = new RyzStudio.Windows.Forms.TImageBox();
- this.imageBox2 = new RyzStudio.Windows.Forms.TImageBox();
this.imageBox1 = new RyzStudio.Windows.Forms.TImageBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+ this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.addItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.moveToTopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.moveUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.moveDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.moveToBottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.tImageBox1 = new RyzStudio.Windows.Forms.TImageBox();
((System.ComponentModel.ISupportInitialize)(this.imageBox5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageBox4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageBox3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.imageBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.imageBox1)).BeginInit();
+ this.contextMenuStrip1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).BeginInit();
this.SuspendLayout();
//
// listBox1
@@ -50,12 +64,12 @@ namespace RyzStudio.Windows.ThemedForms
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.FromKnownColor(KnownColor.Window);
+ this.listBox1.BackColor = System.Drawing.SystemColors.Window;
this.listBox1.FormattingEnabled = true;
this.listBox1.ItemHeight = 15;
this.listBox1.Location = new System.Drawing.Point(4, 4);
this.listBox1.Name = "listBox1";
- this.listBox1.Size = new System.Drawing.Size(98, 109);
+ this.listBox1.Size = new System.Drawing.Size(98, 214);
this.listBox1.TabIndex = 0;
this.listBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listBox1_MouseDoubleClick);
this.listBox1.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.listBox1_PreviewKeyDown);
@@ -69,22 +83,22 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox5.BackColorSelected = System.Drawing.Color.Transparent;
this.imageBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.imageBox5.ErrorImage = null;
- this.imageBox5.HoverImage = global::FizzyLauncher.UIResource.edit2;
- this.imageBox5.Image = global::FizzyLauncher.UIResource.edit;
- this.imageBox5.ImageHover = global::FizzyLauncher.UIResource.edit2;
- this.imageBox5.ImageNormal = global::FizzyLauncher.UIResource.edit;
+ this.imageBox5.HoverImage = global::FizzyLauncher.UIResource.circle_menu2;
+ this.imageBox5.Image = global::FizzyLauncher.UIResource.circle_menu;
+ this.imageBox5.ImageHover = global::FizzyLauncher.UIResource.circle_menu2;
+ this.imageBox5.ImageNormal = global::FizzyLauncher.UIResource.circle_menu;
this.imageBox5.ImageSelected = null;
this.imageBox5.InitialImage = null;
this.imageBox5.IsSelected = false;
- this.imageBox5.Location = new System.Drawing.Point(106, 24);
+ this.imageBox5.Location = new System.Drawing.Point(106, 48);
this.imageBox5.Name = "imageBox5";
- this.imageBox5.NormalImage = global::FizzyLauncher.UIResource.edit;
+ this.imageBox5.NormalImage = global::FizzyLauncher.UIResource.circle_menu;
this.imageBox5.SelectedImage = null;
this.imageBox5.Size = new System.Drawing.Size(18, 18);
this.imageBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.imageBox5.TabIndex = 6;
this.imageBox5.TabStop = false;
- this.toolTip1.SetToolTip(this.imageBox5, "Edit Item");
+ this.toolTip1.SetToolTip(this.imageBox5, "Menu");
this.imageBox5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick);
this.imageBox5.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox5_MouseClick);
//
@@ -112,7 +126,7 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.imageBox4.TabIndex = 5;
this.imageBox4.TabStop = false;
- this.toolTip1.SetToolTip(this.imageBox4, "Move Bottom");
+ this.toolTip1.SetToolTip(this.imageBox4, "Move Down");
this.imageBox4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox4_MouseClick);
this.imageBox4.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox4_MouseClick);
//
@@ -144,34 +158,6 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox3_MouseClick);
this.imageBox3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox3_MouseClick);
//
- // imageBox2
- //
- this.imageBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.imageBox2.BackColor = System.Drawing.Color.Transparent;
- this.imageBox2.BackColorHover = System.Drawing.Color.Transparent;
- this.imageBox2.BackColorNormal = System.Drawing.Color.Transparent;
- this.imageBox2.BackColorSelected = System.Drawing.Color.Transparent;
- this.imageBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
- this.imageBox2.ErrorImage = null;
- this.imageBox2.HoverImage = global::FizzyLauncher.UIResource.minus2;
- this.imageBox2.Image = global::FizzyLauncher.UIResource.minus;
- this.imageBox2.ImageHover = global::FizzyLauncher.UIResource.minus2;
- this.imageBox2.ImageNormal = global::FizzyLauncher.UIResource.minus;
- this.imageBox2.ImageSelected = null;
- this.imageBox2.InitialImage = null;
- this.imageBox2.IsSelected = false;
- this.imageBox2.Location = new System.Drawing.Point(106, 48);
- this.imageBox2.Name = "imageBox2";
- this.imageBox2.NormalImage = global::FizzyLauncher.UIResource.minus;
- this.imageBox2.SelectedImage = null;
- this.imageBox2.Size = new System.Drawing.Size(18, 18);
- this.imageBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
- this.imageBox2.TabIndex = 3;
- this.imageBox2.TabStop = false;
- this.toolTip1.SetToolTip(this.imageBox2, "Remove Item");
- this.imageBox2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox2_MouseClick);
- this.imageBox2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox2_MouseClick);
- //
// imageBox1
//
this.imageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -196,27 +182,152 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.imageBox1.TabIndex = 2;
this.imageBox1.TabStop = false;
- this.toolTip1.SetToolTip(this.imageBox1, "Add Item");
+ this.toolTip1.SetToolTip(this.imageBox1, "Add");
this.imageBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick);
this.imageBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.imageBox1_MouseClick);
//
+ // contextMenuStrip1
+ //
+ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.addItemToolStripMenuItem,
+ this.toolStripMenuItem2,
+ this.toolStripSeparator3,
+ this.editToolStripMenuItem,
+ this.toolStripSeparator2,
+ this.removeToolStripMenuItem,
+ this.toolStripMenuItem1,
+ this.toolStripSeparator1,
+ this.moveToTopToolStripMenuItem,
+ this.moveUpToolStripMenuItem,
+ this.moveDownToolStripMenuItem,
+ this.moveToBottomToolStripMenuItem});
+ this.contextMenuStrip1.Name = "contextMenuStrip1";
+ this.contextMenuStrip1.Size = new System.Drawing.Size(163, 220);
+ //
+ // addItemToolStripMenuItem
+ //
+ this.addItemToolStripMenuItem.Name = "addItemToolStripMenuItem";
+ this.addItemToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.addItemToolStripMenuItem.Text = "&Add";
+ this.addItemToolStripMenuItem.Click += new System.EventHandler(this.addItemToolStripMenuItem_Click);
+ //
+ // toolStripMenuItem2
+ //
+ this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(162, 22);
+ this.toolStripMenuItem2.Text = "&Copy";
+ this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(159, 6);
+ //
+ // editToolStripMenuItem
+ //
+ this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+ this.editToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.editToolStripMenuItem.Text = "&Edit";
+ this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(159, 6);
+ //
+ // removeToolStripMenuItem
+ //
+ this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
+ this.removeToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.removeToolStripMenuItem.Text = "&Remove";
+ this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click);
+ //
+ // toolStripMenuItem1
+ //
+ this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(162, 22);
+ this.toolStripMenuItem1.Text = "Remove A&ll";
+ this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(159, 6);
+ //
+ // moveToTopToolStripMenuItem
+ //
+ this.moveToTopToolStripMenuItem.Name = "moveToTopToolStripMenuItem";
+ this.moveToTopToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.moveToTopToolStripMenuItem.Text = "Move To &Top";
+ this.moveToTopToolStripMenuItem.Click += new System.EventHandler(this.moveToTopToolStripMenuItem_Click);
+ //
+ // moveUpToolStripMenuItem
+ //
+ this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem";
+ this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.moveUpToolStripMenuItem.Text = "Move &Up";
+ this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click);
+ //
+ // moveDownToolStripMenuItem
+ //
+ this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem";
+ this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.moveDownToolStripMenuItem.Text = "Move &Down";
+ this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click);
+ //
+ // moveToBottomToolStripMenuItem
+ //
+ this.moveToBottomToolStripMenuItem.Name = "moveToBottomToolStripMenuItem";
+ this.moveToBottomToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
+ this.moveToBottomToolStripMenuItem.Text = "Move To &Bottom";
+ this.moveToBottomToolStripMenuItem.Click += new System.EventHandler(this.moveToBottomToolStripMenuItem_Click);
+ //
+ // tImageBox1
+ //
+ this.tImageBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.tImageBox1.BackColor = System.Drawing.Color.Transparent;
+ this.tImageBox1.BackColorHover = System.Drawing.Color.Transparent;
+ this.tImageBox1.BackColorNormal = System.Drawing.Color.Transparent;
+ this.tImageBox1.BackColorSelected = System.Drawing.Color.Transparent;
+ this.tImageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+ this.tImageBox1.ErrorImage = null;
+ this.tImageBox1.HoverImage = global::FizzyLauncher.UIResource.edit2;
+ this.tImageBox1.Image = global::FizzyLauncher.UIResource.edit;
+ this.tImageBox1.ImageHover = global::FizzyLauncher.UIResource.edit2;
+ this.tImageBox1.ImageNormal = global::FizzyLauncher.UIResource.edit;
+ this.tImageBox1.ImageSelected = null;
+ this.tImageBox1.InitialImage = null;
+ this.tImageBox1.IsSelected = false;
+ this.tImageBox1.Location = new System.Drawing.Point(106, 24);
+ this.tImageBox1.Name = "tImageBox1";
+ this.tImageBox1.NormalImage = global::FizzyLauncher.UIResource.edit;
+ this.tImageBox1.SelectedImage = null;
+ this.tImageBox1.Size = new System.Drawing.Size(18, 18);
+ this.tImageBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+ this.tImageBox1.TabIndex = 7;
+ this.tImageBox1.TabStop = false;
+ this.toolTip1.SetToolTip(this.tImageBox1, "Edit");
+ this.tImageBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.tImageBox1_MouseClick);
+ this.tImageBox1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.tImageBox1_MouseClick);
+ //
// TListBox
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+ this.Controls.Add(this.tImageBox1);
this.Controls.Add(this.imageBox5);
this.Controls.Add(this.imageBox4);
this.Controls.Add(this.imageBox3);
- this.Controls.Add(this.imageBox2);
this.Controls.Add(this.imageBox1);
this.Controls.Add(this.listBox1);
this.Name = "TListBox";
this.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
- this.Size = new System.Drawing.Size(128, 120);
+ this.Size = new System.Drawing.Size(128, 225);
((System.ComponentModel.ISupportInitialize)(this.imageBox5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.imageBox4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.imageBox3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.imageBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.imageBox1)).EndInit();
+ this.contextMenuStrip1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).EndInit();
this.ResumeLayout(false);
}
@@ -225,10 +336,23 @@ namespace RyzStudio.Windows.ThemedForms
private System.Windows.Forms.ListBox listBox1;
private Forms.TImageBox imageBox1;
- private Forms.TImageBox imageBox2;
private Forms.TImageBox imageBox3;
private Forms.TImageBox imageBox4;
private Forms.TImageBox imageBox5;
private System.Windows.Forms.ToolTip toolTip1;
+ private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem addItemToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem removeToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripMenuItem moveToTopToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem moveUpToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem moveDownToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem moveToBottomToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+ private Forms.TImageBox tImageBox1;
}
}
diff --git a/RyzStudio/Windows/ThemedForms/TListBox.resx b/RyzStudio/Windows/ThemedForms/TListBox.resx
index 57523cc..34628c2 100644
--- a/RyzStudio/Windows/ThemedForms/TListBox.resx
+++ b/RyzStudio/Windows/ThemedForms/TListBox.resx
@@ -60,4 +60,10 @@
17, 17
+
+ 17, 17
+
+
+ 114, 17
+
\ No newline at end of file
diff --git a/UIResource.Designer.cs b/UIResource.Designer.cs
index 90f6194..d8654e6 100644
--- a/UIResource.Designer.cs
+++ b/UIResource.Designer.cs
@@ -100,6 +100,26 @@ namespace FizzyLauncher {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap circle_menu {
+ get {
+ object obj = ResourceManager.GetObject("circle_menu", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap circle_menu2 {
+ get {
+ object obj = ResourceManager.GetObject("circle_menu2", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -240,26 +260,6 @@ namespace FizzyLauncher {
}
}
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap minus {
- get {
- object obj = ResourceManager.GetObject("minus", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- internal static System.Drawing.Bitmap minus2 {
- get {
- object obj = ResourceManager.GetObject("minus2", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/UIResource.resx b/UIResource.resx
index 03adecf..20df970 100644
--- a/UIResource.resx
+++ b/UIResource.resx
@@ -130,6 +130,12 @@
Resources\UI\arrow_up2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Resources\UI\circle_menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\UI\circle_menu2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Resources\UI\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -172,12 +178,6 @@
Resources\UI\help2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Resources\UI\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\UI\minus2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Resources\UI\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/Windows/Forms/EditTileFolderForm.cs b/Windows/Forms/EditTileFolderForm.cs
index 3fdf26a..459b35f 100644
--- a/Windows/Forms/EditTileFolderForm.cs
+++ b/Windows/Forms/EditTileFolderForm.cs
@@ -317,6 +317,11 @@ namespace FizzyLauncher.Windows.Forms
return;
}
+ if (listBox1.ListBox.SelectedItem == null)
+ {
+ return;
+ }
+
EditTileForm.ShowEditDialog(listBox1);
}
diff --git a/installer-64.iss b/installer-64.iss
index 3d50fd2..96c5186 100644
--- a/installer-64.iss
+++ b/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.015"
+#define MyAppVersion "0.2.2.018"
#define MyAppPublisher "Hi, I'm Ray"
#define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
#define MyAppExeName "fizzylauncher.exe"
diff --git a/installer-86.iss b/installer-86.iss
index 0e8e430..4a3e61b 100644
--- a/installer-86.iss
+++ b/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.015"
+#define MyAppVersion "0.2.2.018"
#define MyAppPublisher "Hi, I'm Ray"
#define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
#define MyAppExeName "fizzylauncher.exe"