mirror of
https://github.com/ShareX/ShareX.git
synced 2024-07-02 13:10:22 +12:00
Added cancel button to text input box and escape key will also cancel input
This commit is contained in:
Jaex
parent
7fe3cc777e
commit
5ca3c3c4b5
|
|
@ -52,6 +52,7 @@ private void InitializeComponent()
|
|||
this.tsmiAlignmentMiddle = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tsmiAlignmentBottom = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.lblTip = new System.Windows.Forms.Label();
|
||||
this.btnCancel = new System.Windows.Forms.Button();
|
||||
this.flpProperties.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudTextSize)).BeginInit();
|
||||
this.cmsAlignmentHorizontal.SuspendLayout();
|
||||
|
|
@ -63,7 +64,6 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.txtInput, "txtInput");
|
||||
this.txtInput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtInput.Name = "txtInput";
|
||||
this.txtInput.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
|
||||
this.txtInput.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtInput_KeyDown);
|
||||
this.txtInput.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtInput_KeyUp);
|
||||
//
|
||||
|
|
@ -169,7 +169,7 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.btnOK, "btnOK");
|
||||
this.btnOK.Name = "btnOK";
|
||||
this.btnOK.UseVisualStyleBackColor = true;
|
||||
this.btnOK.Click += new System.EventHandler(this.btnClose_Click);
|
||||
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
|
||||
//
|
||||
// cmsAlignmentHorizontal
|
||||
//
|
||||
|
|
@ -236,11 +236,19 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.lblTip, "lblTip");
|
||||
this.lblTip.Name = "lblTip";
|
||||
//
|
||||
// btnCancel
|
||||
//
|
||||
resources.ApplyResources(this.btnCancel, "btnCancel");
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
this.btnCancel.UseVisualStyleBackColor = true;
|
||||
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
|
||||
//
|
||||
// TextDrawingInputBox
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.Controls.Add(this.btnCancel);
|
||||
this.Controls.Add(this.lblTip);
|
||||
this.Controls.Add(this.btnOK);
|
||||
this.Controls.Add(this.flpProperties);
|
||||
|
|
@ -285,5 +293,6 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.ToolStripMenuItem tsmiAlignmentMiddle;
|
||||
private System.Windows.Forms.ToolStripMenuItem tsmiAlignmentBottom;
|
||||
private System.Windows.Forms.Label lblTip;
|
||||
private System.Windows.Forms.Button btnCancel;
|
||||
}
|
||||
}
|
||||
|
|
@ -73,6 +73,18 @@ public TextDrawingInputBox(string text, TextDrawingOptions options)
|
|||
UpdateVerticalAlignmentImage();
|
||||
}
|
||||
|
||||
private void Close(DialogResult result)
|
||||
{
|
||||
DialogResult = result;
|
||||
|
||||
if (result == DialogResult.OK)
|
||||
{
|
||||
InputText = txtInput.Text;
|
||||
}
|
||||
|
||||
Close();
|
||||
}
|
||||
|
||||
private void TextDrawingInputBox_Shown(object sender, EventArgs e)
|
||||
{
|
||||
this.ForceActivate();
|
||||
|
|
@ -165,7 +177,7 @@ private void tsmiAlignmentBottom_Click(object sender, EventArgs e)
|
|||
|
||||
private void txtInput_KeyDown(object sender, KeyEventArgs e)
|
||||
{
|
||||
if (e.KeyData == Keys.Enter)
|
||||
if (e.KeyData == Keys.Enter || e.KeyData == Keys.Escape)
|
||||
{
|
||||
e.SuppressKeyPress = true;
|
||||
}
|
||||
|
|
@ -175,18 +187,22 @@ private void txtInput_KeyUp(object sender, KeyEventArgs e)
|
|||
{
|
||||
if (e.KeyData == Keys.Enter)
|
||||
{
|
||||
Close();
|
||||
Close(DialogResult.OK);
|
||||
}
|
||||
else if (e.KeyData == Keys.Escape)
|
||||
{
|
||||
Close(DialogResult.Cancel);
|
||||
}
|
||||
}
|
||||
|
||||
private void txtInput_TextChanged(object sender, EventArgs e)
|
||||
private void btnOK_Click(object sender, EventArgs e)
|
||||
{
|
||||
InputText = txtInput.Text;
|
||||
Close(DialogResult.OK);
|
||||
}
|
||||
|
||||
private void btnClose_Click(object sender, EventArgs e)
|
||||
private void btnCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
Close();
|
||||
Close(DialogResult.Cancel);
|
||||
}
|
||||
|
||||
private void UpdateInputBox()
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>txtInput.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="btnTextColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Left</value>
|
||||
|
|
@ -180,6 +180,138 @@
|
|||
<data name="flpProperties.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Left, Right</value>
|
||||
</data>
|
||||
<data name=">>lblFont.Name" xml:space="preserve">
|
||||
<value>lblFont</value>
|
||||
</data>
|
||||
<data name=">>lblFont.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=">>lblFont.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>lblFont.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>cbFonts.Name" xml:space="preserve">
|
||||
<value>cbFonts</value>
|
||||
</data>
|
||||
<data name=">>cbFonts.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>cbFonts.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>cbFonts.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>lblTextSize.Name" xml:space="preserve">
|
||||
<value>lblTextSize</value>
|
||||
</data>
|
||||
<data name=">>lblTextSize.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=">>lblTextSize.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>lblTextSize.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name=">>nudTextSize.Name" xml:space="preserve">
|
||||
<value>nudTextSize</value>
|
||||
</data>
|
||||
<data name=">>nudTextSize.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>nudTextSize.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>nudTextSize.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name=">>cbBold.Name" xml:space="preserve">
|
||||
<value>cbBold</value>
|
||||
</data>
|
||||
<data name=">>cbBold.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>cbBold.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>cbBold.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name=">>cbItalic.Name" xml:space="preserve">
|
||||
<value>cbItalic</value>
|
||||
</data>
|
||||
<data name=">>cbItalic.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>cbItalic.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>cbItalic.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name=">>cbUnderline.Name" xml:space="preserve">
|
||||
<value>cbUnderline</value>
|
||||
</data>
|
||||
<data name=">>cbUnderline.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>cbUnderline.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>cbUnderline.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name=">>btnAlignmentHorizontal.Name" xml:space="preserve">
|
||||
<value>btnAlignmentHorizontal</value>
|
||||
</data>
|
||||
<data name=">>btnAlignmentHorizontal.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=">>btnAlignmentHorizontal.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>btnAlignmentHorizontal.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name=">>btnAlignmentVertical.Name" xml:space="preserve">
|
||||
<value>btnAlignmentVertical</value>
|
||||
</data>
|
||||
<data name=">>btnAlignmentVertical.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=">>btnAlignmentVertical.Parent" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>btnAlignmentVertical.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="flpProperties.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 5</value>
|
||||
</data>
|
||||
<data name="flpProperties.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>518, 32</value>
|
||||
</data>
|
||||
<data name="flpProperties.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="flpProperties.WrapContents" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.Name" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="lblFont.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Left</value>
|
||||
</data>
|
||||
|
|
@ -426,41 +558,17 @@
|
|||
<data name=">>btnAlignmentVertical.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="flpProperties.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 5</value>
|
||||
</data>
|
||||
<data name="flpProperties.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>518, 32</value>
|
||||
</data>
|
||||
<data name="flpProperties.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="flpProperties.WrapContents" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.Name" xml:space="preserve">
|
||||
<value>flpProperties</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>flpProperties.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>422, 327</value>
|
||||
<value>312, 328</value>
|
||||
</data>
|
||||
<data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>104, 26</value>
|
||||
<value>104, 24</value>
|
||||
</data>
|
||||
<data name="btnOK.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="btnOK.Text" xml:space="preserve">
|
||||
<value>OK</value>
|
||||
|
|
@ -475,11 +583,20 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnOK.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<metadata name="cmsAlignmentHorizontal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="cmsAlignmentHorizontal.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>110, 70</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentHorizontal.Name" xml:space="preserve">
|
||||
<value>cmsAlignmentHorizontal</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentHorizontal.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="tsmiAlignmentLeft.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>109, 22</value>
|
||||
</data>
|
||||
|
|
@ -498,18 +615,18 @@
|
|||
<data name="tsmiAlignmentRight.Text" xml:space="preserve">
|
||||
<value>Right</value>
|
||||
</data>
|
||||
<data name="cmsAlignmentHorizontal.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>110, 70</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentHorizontal.Name" xml:space="preserve">
|
||||
<value>cmsAlignmentHorizontal</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentHorizontal.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<metadata name="cmsAlignmentVertical.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>203, 17</value>
|
||||
</metadata>
|
||||
<data name="cmsAlignmentVertical.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>115, 70</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentVertical.Name" xml:space="preserve">
|
||||
<value>cmsAlignmentVertical</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentVertical.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="tsmiAlignmentTop.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>114, 22</value>
|
||||
</data>
|
||||
|
|
@ -528,15 +645,6 @@
|
|||
<data name="tsmiAlignmentBottom.Text" xml:space="preserve">
|
||||
<value>Bottom</value>
|
||||
</data>
|
||||
<data name="cmsAlignmentVertical.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>115, 70</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentVertical.Name" xml:space="preserve">
|
||||
<value>cmsAlignmentVertical</value>
|
||||
</data>
|
||||
<data name=">>cmsAlignmentVertical.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="lblTip.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
|
|
@ -562,6 +670,33 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblTip.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>424, 328</value>
|
||||
</data>
|
||||
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>104, 24</value>
|
||||
</data>
|
||||
<data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="btnCancel.Text" xml:space="preserve">
|
||||
<value>Cancel</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.Name" xml:space="preserve">
|
||||
<value>btnCancel</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.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=">>btnCancel.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.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">
|
||||
|
|
|
|||
Loading…
Reference in a new issue