mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 17:56:51 +13:00
Added edit button near each hotkey setting control to make it obvious that it is possible to edit task settings of hotkey
This commit is contained in:
Jaex
parent
e7be822974
commit
0661f2ae51
5 changed files with 137 additions and 94 deletions
11
ShareX/Controls/HotkeySelectionControl.Designer.cs
generated
11
ShareX/Controls/HotkeySelectionControl.Designer.cs
generated
|
|
@ -32,6 +32,7 @@ private void InitializeComponent()
|
|||
this.lblHotkeyStatus = new System.Windows.Forms.Label();
|
||||
this.lblHotkeyDescription = new ShareX.HelpersLib.LabelNoCopy();
|
||||
this.btnHotkey = new System.Windows.Forms.Button();
|
||||
this.btnEdit = new System.Windows.Forms.Button();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// lblHotkeyStatus
|
||||
|
|
@ -64,10 +65,19 @@ private void InitializeComponent()
|
|||
this.btnHotkey.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnHotkey_MouseClick);
|
||||
this.btnHotkey.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.btnHotkey_PreviewKeyDown);
|
||||
//
|
||||
// btnEdit
|
||||
//
|
||||
this.btnEdit.Image = global::ShareX.Properties.Resources.gear;
|
||||
resources.ApplyResources(this.btnEdit, "btnEdit");
|
||||
this.btnEdit.Name = "btnEdit";
|
||||
this.btnEdit.UseVisualStyleBackColor = true;
|
||||
this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
|
||||
//
|
||||
// HotkeySelectionControl
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.btnEdit);
|
||||
this.Controls.Add(this.btnHotkey);
|
||||
this.Controls.Add(this.lblHotkeyStatus);
|
||||
this.Controls.Add(this.lblHotkeyDescription);
|
||||
|
|
@ -81,5 +91,6 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.Label lblHotkeyStatus;
|
||||
private ShareX.HelpersLib.LabelNoCopy lblHotkeyDescription;
|
||||
private System.Windows.Forms.Button btnHotkey;
|
||||
private System.Windows.Forms.Button btnEdit;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public partial class HotkeySelectionControl : UserControl
|
|||
{
|
||||
public event EventHandler HotkeyChanged;
|
||||
public event EventHandler SelectedChanged;
|
||||
public event EventHandler LabelDoubleClick;
|
||||
public event EventHandler EditRequested;
|
||||
|
||||
public HotkeySettings Setting { get; set; }
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ public bool Selected
|
|||
}
|
||||
}
|
||||
|
||||
public bool Editing { get; private set; }
|
||||
public bool EditingHotkey { get; private set; }
|
||||
|
||||
public HotkeySelectionControl(HotkeySettings setting)
|
||||
{
|
||||
|
|
@ -110,7 +110,7 @@ private void UpdateHotkeyStatus()
|
|||
|
||||
private void btnHotkey_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
|
||||
{
|
||||
if (Editing)
|
||||
if (EditingHotkey)
|
||||
{
|
||||
// For handle Tab key etc.
|
||||
e.IsInputKey = true;
|
||||
|
|
@ -121,7 +121,7 @@ private void btnHotkey_KeyDown(object sender, KeyEventArgs e)
|
|||
{
|
||||
e.SuppressKeyPress = true;
|
||||
|
||||
if (Editing)
|
||||
if (EditingHotkey)
|
||||
{
|
||||
if (e.KeyData == Keys.Escape)
|
||||
{
|
||||
|
|
@ -150,7 +150,7 @@ private void btnHotkey_KeyUp(object sender, KeyEventArgs e)
|
|||
{
|
||||
e.SuppressKeyPress = true;
|
||||
|
||||
if (Editing)
|
||||
if (EditingHotkey)
|
||||
{
|
||||
// PrintScreen not trigger KeyDown event
|
||||
if (e.KeyCode == Keys.PrintScreen)
|
||||
|
|
@ -163,7 +163,7 @@ private void btnHotkey_KeyUp(object sender, KeyEventArgs e)
|
|||
|
||||
private void btnHotkey_MouseClick(object sender, MouseEventArgs e)
|
||||
{
|
||||
if (Editing)
|
||||
if (EditingHotkey)
|
||||
{
|
||||
StopEditing();
|
||||
}
|
||||
|
|
@ -175,7 +175,7 @@ private void btnHotkey_MouseClick(object sender, MouseEventArgs e)
|
|||
|
||||
private void btnHotkey_Leave(object sender, EventArgs e)
|
||||
{
|
||||
if (Editing)
|
||||
if (EditingHotkey)
|
||||
{
|
||||
StopEditing();
|
||||
}
|
||||
|
|
@ -183,7 +183,7 @@ private void btnHotkey_Leave(object sender, EventArgs e)
|
|||
|
||||
private void StartEditing()
|
||||
{
|
||||
Editing = true;
|
||||
EditingHotkey = true;
|
||||
|
||||
Program.HotkeyManager.IgnoreHotkeys = true;
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ private void StartEditing()
|
|||
|
||||
private void StopEditing()
|
||||
{
|
||||
Editing = false;
|
||||
EditingHotkey = false;
|
||||
|
||||
Program.HotkeyManager.IgnoreHotkeys = false;
|
||||
|
||||
|
|
@ -231,14 +231,19 @@ protected void OnSelectedChanged()
|
|||
}
|
||||
}
|
||||
|
||||
protected void OnLabelDoubleClick()
|
||||
protected void OnEditRequested()
|
||||
{
|
||||
if (LabelDoubleClick != null)
|
||||
if (EditRequested != null)
|
||||
{
|
||||
LabelDoubleClick(this, EventArgs.Empty);
|
||||
EditRequested(this, EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
private void btnEdit_Click(object sender, EventArgs e)
|
||||
{
|
||||
OnEditRequested();
|
||||
}
|
||||
|
||||
private void lblHotkeyDescription_MouseEnter(object sender, EventArgs e)
|
||||
{
|
||||
if (!Selected)
|
||||
|
|
@ -269,7 +274,7 @@ private void lblHotkeyDescription_MouseDoubleClick(object sender, MouseEventArgs
|
|||
{
|
||||
if (e.Button == MouseButtons.Left)
|
||||
{
|
||||
OnLabelDoubleClick();
|
||||
OnEditRequested();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,92 +117,77 @@
|
|||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name=">>lblHotkeyDescription.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="lblHotkeyStatus.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Right</value>
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
|
||||
<value>6, 13</value>
|
||||
</data>
|
||||
<data name=">>btnHotkey.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.Text" xml:space="preserve">
|
||||
<value>Description</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyStatus.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>HotkeySelectionControl</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>254, 21</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="lblHotkeyStatus.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name=">>btnHotkey.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyDescription.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>btnHotkey.Name" xml:space="preserve">
|
||||
<value>btnHotkey</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyStatus.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="lblHotkeyStatus.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>456, 1</value>
|
||||
</data>
|
||||
<data name="lblHotkeyStatus.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>24, 21</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="lblHotkeyStatus.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyStatus.Name" xml:space="preserve">
|
||||
<value>lblHotkeyStatus</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleRight</value>
|
||||
</data>
|
||||
<data name=">>btnHotkey.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="btnHotkey.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Right</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
<data name=">>lblHotkeyStatus.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyStatus.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name="btnHotkey.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>259, 0</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 1</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
</data>
|
||||
<data name="lblHotkeyStatus.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Right</value>
|
||||
<data name=">>lblHotkeyStatus.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Left, Right</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleRight</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>29, 1</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>227, 21</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.Text" xml:space="preserve">
|
||||
<value>Description</value>
|
||||
</data>
|
||||
<data name="lblHotkeyDescription.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyDescription.Name" xml:space="preserve">
|
||||
<value>lblHotkeyDescription</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyDescription.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.LabelNoCopy, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyDescription.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyDescription.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="btnHotkey.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Right</value>
|
||||
</data>
|
||||
<data name="btnHotkey.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>261, 0</value>
|
||||
</data>
|
||||
<data name="btnHotkey.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>190, 23</value>
|
||||
</data>
|
||||
<data name="btnHotkey.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
|
|
@ -210,16 +195,58 @@
|
|||
<data name="btnHotkey.Text" xml:space="preserve">
|
||||
<value>Hotkey</value>
|
||||
</data>
|
||||
<data name=">>lblHotkeyDescription.Name" xml:space="preserve">
|
||||
<value>lblHotkeyDescription</value>
|
||||
<data name=">>btnHotkey.Name" xml:space="preserve">
|
||||
<value>btnHotkey</value>
|
||||
</data>
|
||||
<data name="btnHotkey.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>192, 23</value>
|
||||
<data name=">>btnHotkey.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>480, 23</value>
|
||||
<data name=">>btnHotkey.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnHotkey.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="btnEdit.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>24, 23</value>
|
||||
</data>
|
||||
<data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name=">>btnEdit.Name" xml:space="preserve">
|
||||
<value>btnEdit</value>
|
||||
</data>
|
||||
<data name=">>btnEdit.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>btnEdit.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnEdit.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
|
||||
<value>6, 13</value>
|
||||
</data>
|
||||
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>0, 0, 0, 0</value>
|
||||
</data>
|
||||
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>480, 23</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>HotkeySelectionControl</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -109,7 +109,7 @@ private HotkeySelectionControl AddHotkeySelectionControl(HotkeySettings hotkeySe
|
|||
control.Margin = new Padding(0, 0, 0, 2);
|
||||
control.SelectedChanged += control_SelectedChanged;
|
||||
control.HotkeyChanged += control_HotkeyChanged;
|
||||
control.LabelDoubleClick += control_LabelDoubleClick;
|
||||
control.EditRequested += control_EditRequested;
|
||||
flpHotkeys.Controls.Add(control);
|
||||
return control;
|
||||
}
|
||||
|
|
@ -123,7 +123,7 @@ private void Edit(HotkeySelectionControl selectionControl)
|
|||
}
|
||||
}
|
||||
|
||||
private void control_LabelDoubleClick(object sender, EventArgs e)
|
||||
private void control_EditRequested(object sender, EventArgs e)
|
||||
{
|
||||
Edit((HotkeySelectionControl)sender);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -127,10 +127,10 @@
|
|||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>224, 8</value>
|
||||
<value>248, 8</value>
|
||||
</data>
|
||||
<data name="btnDuplicate.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>72, 23</value>
|
||||
<value>80, 23</value>
|
||||
</data>
|
||||
<data name="btnDuplicate.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
|
|
@ -220,10 +220,10 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>80, 8</value>
|
||||
<value>88, 8</value>
|
||||
</data>
|
||||
<data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>72, 23</value>
|
||||
<value>80, 23</value>
|
||||
</data>
|
||||
<data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
|
|
@ -250,10 +250,10 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>152, 8</value>
|
||||
<value>168, 8</value>
|
||||
</data>
|
||||
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>72, 23</value>
|
||||
<value>80, 23</value>
|
||||
</data>
|
||||
<data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
|
|
@ -280,7 +280,7 @@
|
|||
<value>8, 8</value>
|
||||
</data>
|
||||
<data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>72, 23</value>
|
||||
<value>80, 23</value>
|
||||
</data>
|
||||
<data name="btnAdd.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
|
|
|
|||
Loading…
Reference in a new issue