Merge branch 'feature/listbox-controls-rethink' into 'release/0.2.2.018'

Changed: circle icons + clean-up

See merge request SympatheticFire/linear-app-launcher!29
This commit is contained in:
Ray committed 2021-07-30 00:24:27 +00:00
commit 3d8e07fc32
19 files changed
+686 -519

No files matched your search

+15
View File
@@ -86,6 +86,21 @@ namespace RyzStudio.Windows.ThemedForms
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void tImageBox1_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button != MouseButtons.Left)
{
return;
}
editToolStripMenuItem_Click(sender, e);
}
/// <summary>
/// Menu
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void imageBox5_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button != MouseButtons.Left)
+126 -93
View File
@@ -39,22 +39,24 @@ namespace RyzStudio.Windows.ThemedForms
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.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
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.imageBox1)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).BeginInit();
this.SuspendLayout();
//
// listBox1
@@ -81,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.menu2;
this.imageBox5.Image = global::FizzyLauncher.UIResource.menu;
this.imageBox5.ImageHover = global::FizzyLauncher.UIResource.menu2;
this.imageBox5.ImageNormal = global::FizzyLauncher.UIResource.menu;
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.menu;
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);
//
@@ -109,16 +111,16 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox4.BackColorSelected = System.Drawing.Color.Transparent;
this.imageBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.imageBox4.ErrorImage = null;
this.imageBox4.HoverImage = global::FizzyLauncher.UIResource.triangle_down2;
this.imageBox4.Image = global::FizzyLauncher.UIResource.triangle_down;
this.imageBox4.ImageHover = global::FizzyLauncher.UIResource.triangle_down2;
this.imageBox4.ImageNormal = global::FizzyLauncher.UIResource.triangle_down;
this.imageBox4.HoverImage = global::FizzyLauncher.UIResource.arrow_down2;
this.imageBox4.Image = global::FizzyLauncher.UIResource.arrow_down;
this.imageBox4.ImageHover = global::FizzyLauncher.UIResource.arrow_down2;
this.imageBox4.ImageNormal = global::FizzyLauncher.UIResource.arrow_down;
this.imageBox4.ImageSelected = null;
this.imageBox4.InitialImage = null;
this.imageBox4.IsSelected = false;
this.imageBox4.Location = new System.Drawing.Point(106, 68);
this.imageBox4.Location = new System.Drawing.Point(106, 92);
this.imageBox4.Name = "imageBox4";
this.imageBox4.NormalImage = global::FizzyLauncher.UIResource.triangle_down;
this.imageBox4.NormalImage = global::FizzyLauncher.UIResource.arrow_down;
this.imageBox4.SelectedImage = null;
this.imageBox4.Size = new System.Drawing.Size(18, 18);
this.imageBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -137,16 +139,16 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox3.BackColorSelected = System.Drawing.Color.Transparent;
this.imageBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.imageBox3.ErrorImage = null;
this.imageBox3.HoverImage = global::FizzyLauncher.UIResource.triangle_up2;
this.imageBox3.Image = global::FizzyLauncher.UIResource.triangle_up;
this.imageBox3.ImageHover = global::FizzyLauncher.UIResource.triangle_up2;
this.imageBox3.ImageNormal = global::FizzyLauncher.UIResource.triangle_up;
this.imageBox3.HoverImage = global::FizzyLauncher.UIResource.arrow_up2;
this.imageBox3.Image = global::FizzyLauncher.UIResource.arrow_up;
this.imageBox3.ImageHover = global::FizzyLauncher.UIResource.arrow_up2;
this.imageBox3.ImageNormal = global::FizzyLauncher.UIResource.arrow_up;
this.imageBox3.ImageSelected = null;
this.imageBox3.InitialImage = null;
this.imageBox3.IsSelected = false;
this.imageBox3.Location = new System.Drawing.Point(106, 48);
this.imageBox3.Location = new System.Drawing.Point(106, 72);
this.imageBox3.Name = "imageBox3";
this.imageBox3.NormalImage = global::FizzyLauncher.UIResource.triangle_up;
this.imageBox3.NormalImage = global::FizzyLauncher.UIResource.arrow_up;
this.imageBox3.SelectedImage = null;
this.imageBox3.Size = new System.Drawing.Size(18, 18);
this.imageBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -165,22 +167,22 @@ namespace RyzStudio.Windows.ThemedForms
this.imageBox1.BackColorSelected = System.Drawing.Color.Transparent;
this.imageBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.imageBox1.ErrorImage = null;
this.imageBox1.HoverImage = global::FizzyLauncher.UIResource.square_plus2;
this.imageBox1.Image = global::FizzyLauncher.UIResource.square_plus;
this.imageBox1.ImageHover = global::FizzyLauncher.UIResource.square_plus2;
this.imageBox1.ImageNormal = global::FizzyLauncher.UIResource.square_plus;
this.imageBox1.HoverImage = global::FizzyLauncher.UIResource.plus2;
this.imageBox1.Image = global::FizzyLauncher.UIResource.plus;
this.imageBox1.ImageHover = global::FizzyLauncher.UIResource.plus2;
this.imageBox1.ImageNormal = global::FizzyLauncher.UIResource.plus;
this.imageBox1.ImageSelected = null;
this.imageBox1.InitialImage = null;
this.imageBox1.IsSelected = false;
this.imageBox1.Location = new System.Drawing.Point(106, 4);
this.imageBox1.Name = "imageBox1";
this.imageBox1.NormalImage = global::FizzyLauncher.UIResource.square_plus;
this.imageBox1.NormalImage = global::FizzyLauncher.UIResource.plus;
this.imageBox1.SelectedImage = null;
this.imageBox1.Size = new System.Drawing.Size(18, 18);
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);
//
@@ -200,89 +202,118 @@ namespace RyzStudio.Windows.ThemedForms
this.moveDownToolStripMenuItem,
this.moveToBottomToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(181, 242);
this.contextMenuStrip1.Size = new System.Drawing.Size(163, 220);
//
// addItemToolStripMenuItem
//
this.addItemToolStripMenuItem.Name = "addItemToolStripMenuItem";
this.addItemToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.addItemToolStripMenuItem.Size = new System.Drawing.Size(162, 22);
this.addItemToolStripMenuItem.Text = "&Add";
this.addItemToolStripMenuItem.Click += new System.EventHandler(this.addItemToolStripMenuItem_Click);
//
// editToolStripMenuItem
//
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.editToolStripMenuItem.Text = "&Edit";
this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click);
//
// removeToolStripMenuItem
//
this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
this.removeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.removeToolStripMenuItem.Text = "&Remove";
this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click);
//
// moveToTopToolStripMenuItem
//
this.moveToTopToolStripMenuItem.Name = "moveToTopToolStripMenuItem";
this.moveToTopToolStripMenuItem.Size = new System.Drawing.Size(180, 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(180, 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(180, 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(180, 22);
this.moveToBottomToolStripMenuItem.Text = "Move To &Bottom";
this.moveToBottomToolStripMenuItem.Click += new System.EventHandler(this.moveToBottomToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem1.Text = "Remove A&ll";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
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(177, 6);
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);
@@ -296,6 +327,7 @@ namespace RyzStudio.Windows.ThemedForms
((System.ComponentModel.ISupportInitialize)(this.imageBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.imageBox1)).EndInit();
this.contextMenuStrip1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tImageBox1)).EndInit();
this.ResumeLayout(false);
}
@@ -321,5 +353,6 @@ namespace RyzStudio.Windows.ThemedForms
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private Forms.TImageBox tImageBox1;
}
}