Merge pull request #5091 from Jaex/master

fixed #4452: Added option to swap enter key behavior in input box
This commit is contained in:
Jaex 2020-10-01 16:07:49 +03:00 committed by GitHub
commit cb28d27720
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 287 additions and 357 deletions

View file

@ -63,6 +63,7 @@ private void InitializeComponent()
this.tsrbmiGradientForwardDiagonal = new ShareX.HelpersLib.ToolStripRadioButtonMenuItem();
this.tsrbmiGradientBackwardDiagonal = new ShareX.HelpersLib.ToolStripRadioButtonMenuItem();
this.ttTextInput = new System.Windows.Forms.ToolTip(this.components);
this.btnSwapEnterKey = new System.Windows.Forms.Button();
this.flpProperties.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudTextSize)).BeginInit();
this.cmsAlignmentHorizontal.SuspendLayout();
@ -337,12 +338,21 @@ private void InitializeComponent()
this.ttTextInput.InitialDelay = 200;
this.ttTextInput.ReshowDelay = 100;
//
// btnSwapEnterKey
//
this.btnSwapEnterKey.Image = global::ShareX.ScreenCaptureLib.Properties.Resources.keyboard_enter;
resources.ApplyResources(this.btnSwapEnterKey, "btnSwapEnterKey");
this.btnSwapEnterKey.Name = "btnSwapEnterKey";
this.btnSwapEnterKey.UseVisualStyleBackColor = true;
this.btnSwapEnterKey.Click += new System.EventHandler(this.btnSwapEnterKey_Click);
//
// TextDrawingInputBox
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.CancelButton = this.btnCancel;
this.Controls.Add(this.btnSwapEnterKey);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.lblTip);
this.Controls.Add(this.btnOK);
@ -399,5 +409,6 @@ private void InitializeComponent()
private HelpersLib.ToolStripRadioButtonMenuItem tsrbmiGradientForwardDiagonal;
private HelpersLib.ToolStripRadioButtonMenuItem tsrbmiGradientBackwardDiagonal;
private System.Windows.Forms.ToolTip ttTextInput;
private System.Windows.Forms.Button btnSwapEnterKey;
}
}

View file

@ -99,6 +99,7 @@ public TextDrawingInputBox(string text, TextDrawingOptions options, bool support
cbUnderline.Checked = Options.Underline;
UpdateButtonImages();
UpdateEnterTip();
txtInput.SupportSelectAll();
}
@ -115,6 +116,19 @@ private void Close(DialogResult result)
Close();
}
private void UpdateEnterTip()
{
// TODO: Translate
if (Options.EnterKeyNewLine)
{
lblTip.Text = "New line: Enter, OK: Ctrl + Enter";
}
else
{
lblTip.Text = "New line: Ctrl + Enter, OK: Enter";
}
}
private void TextDrawingInputBox_Shown(object sender, EventArgs e)
{
this.ForceActivate();
@ -245,6 +259,8 @@ private void tsmiAlignmentBottom_Click(object sender, EventArgs e)
private void txtInput_KeyDown(object sender, KeyEventArgs e)
{
Keys keyOK = Options.EnterKeyNewLine ? Keys.Control | Keys.Enter : Keys.Enter;
// If we get VK_PROCESSKEY, the next KeyUp event will be fired by the IME
// we should ignore these when checking if enter is pressed (GH-3621)
if (e.KeyCode == Keys.ProcessKey)
@ -252,7 +268,7 @@ private void txtInput_KeyDown(object sender, KeyEventArgs e)
processKeyCount += 1;
}
if (e.KeyData == Keys.Enter || e.KeyData == Keys.Escape)
if (e.KeyData == keyOK || e.KeyData == Keys.Escape)
{
e.SuppressKeyPress = true;
}
@ -264,7 +280,9 @@ private void txtInput_KeyUp(object sender, KeyEventArgs e)
// IME suggestion box, not by the user intentionally pressing Enter
if (processKeyCount == 0)
{
if (e.KeyData == Keys.Enter)
Keys keyOK = Options.EnterKeyNewLine ? Keys.Control | Keys.Enter : Keys.Enter;
if (e.KeyData == keyOK)
{
Close(DialogResult.OK);
}
@ -277,6 +295,12 @@ private void txtInput_KeyUp(object sender, KeyEventArgs e)
processKeyCount = Math.Max(0, processKeyCount - 1);
}
private void btnSwapEnterKey_Click(object sender, EventArgs e)
{
Options.EnterKeyNewLine = !Options.EnterKeyNewLine;
UpdateEnterTip();
}
private void btnOK_Click(object sender, EventArgs e)
{
Close(DialogResult.OK);

View file

@ -148,167 +148,11 @@
<value>$this</value>
</data>
<data name="&gt;&gt;txtInput.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="flpProperties.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="&gt;&gt;lblFont.Name" xml:space="preserve">
<value>lblFont</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;lblFont.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;lblFont.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;cbFonts.Name" xml:space="preserve">
<value>cbFonts</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;cbFonts.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;cbFonts.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;lblTextSize.Name" xml:space="preserve">
<value>lblTextSize</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;lblTextSize.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;lblTextSize.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;nudTextSize.Name" xml:space="preserve">
<value>nudTextSize</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;nudTextSize.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;nudTextSize.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;btnTextColor.Name" xml:space="preserve">
<value>btnTextColor</value>
</data>
<data name="&gt;&gt;btnTextColor.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnTextColor.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;btnTextColor.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;btnGradient.Name" xml:space="preserve">
<value>btnGradient</value>
</data>
<data name="&gt;&gt;btnGradient.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="&gt;&gt;btnGradient.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;btnGradient.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;cbBold.Name" xml:space="preserve">
<value>cbBold</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;cbBold.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;cbBold.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;cbItalic.Name" xml:space="preserve">
<value>cbItalic</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;cbItalic.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;cbItalic.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;cbUnderline.Name" xml:space="preserve">
<value>cbUnderline</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;cbUnderline.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;cbUnderline.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;btnAlignmentHorizontal.Name" xml:space="preserve">
<value>btnAlignmentHorizontal</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;btnAlignmentHorizontal.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;btnAlignmentHorizontal.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="&gt;&gt;btnAlignmentVertical.Name" xml:space="preserve">
<value>btnAlignmentVertical</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;btnAlignmentVertical.Parent" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;btnAlignmentVertical.ZOrder" xml:space="preserve">
<value>10</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="&gt;&gt;flpProperties.Name" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;flpProperties.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;flpProperties.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="lblFont.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
@ -432,9 +276,6 @@
<data name="&gt;&gt;nudTextSize.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<metadata name="ttTextInput.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>493, 17</value>
</metadata>
<data name="btnTextColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
@ -453,6 +294,9 @@
<data name="btnTextColor.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<metadata name="ttTextInput.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>493, 17</value>
</metadata>
<data name="btnTextColor.ToolTip" xml:space="preserve">
<value>Text color</value>
</data>
@ -460,7 +304,7 @@
<value>btnTextColor</value>
</data>
<data name="&gt;&gt;btnTextColor.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnTextColor.Parent" xml:space="preserve">
<value>flpProperties</value>
@ -468,9 +312,6 @@
<data name="&gt;&gt;btnTextColor.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<metadata name="ttTextInput.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>493, 17</value>
</metadata>
<data name="btnGradient.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -657,6 +498,30 @@
<data name="&gt;&gt;btnAlignmentVertical.ZOrder" xml:space="preserve">
<value>10</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="&gt;&gt;flpProperties.Name" xml:space="preserve">
<value>flpProperties</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;flpProperties.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;flpProperties.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
@ -685,20 +550,11 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</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="&gt;&gt;cmsAlignmentHorizontal.Name" xml:space="preserve">
<value>cmsAlignmentHorizontal</value>
</data>
<data name="&gt;&gt;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>
@ -717,18 +573,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="&gt;&gt;cmsAlignmentHorizontal.Name" xml:space="preserve">
<value>cmsAlignmentHorizontal</value>
</data>
<data name="&gt;&gt;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="&gt;&gt;cmsAlignmentVertical.Name" xml:space="preserve">
<value>cmsAlignmentVertical</value>
</data>
<data name="&gt;&gt;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>
@ -747,6 +603,15 @@
<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="&gt;&gt;cmsAlignmentVertical.Name" xml:space="preserve">
<value>cmsAlignmentVertical</value>
</data>
<data name="&gt;&gt;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.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
@ -757,17 +622,14 @@
<value>NoControl</value>
</data>
<data name="lblTip.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 334</value>
<value>37, 334</value>
</data>
<data name="lblTip.Size" type="System.Drawing.Size, System.Drawing">
<value>106, 13</value>
<value>0, 13</value>
</data>
<data name="lblTip.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="lblTip.Text" xml:space="preserve">
<value>New line: Ctrl + Enter</value>
</data>
<data name="&gt;&gt;lblTip.Name" xml:space="preserve">
<value>lblTip</value>
</data>
@ -778,7 +640,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblTip.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@ -808,13 +670,55 @@
<value>$this</value>
</data>
<data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<metadata name="cmsGradient.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>373, 17</value>
</metadata>
<data name="tsmiEnableGradient.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 22</value>
</data>
<data name="tsmiEnableGradient.Text" xml:space="preserve">
<value>Enable gradient</value>
</data>
<data name="tsmiSecondColor.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 22</value>
</data>
<data name="tsmiSecondColor.Text" xml:space="preserve">
<value>Second text color...</value>
</data>
<data name="tsrbmiGradientHorizontal.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
</data>
<data name="tsrbmiGradientHorizontal.Text" xml:space="preserve">
<value>Horizontal</value>
</data>
<data name="tsrbmiGradientVertical.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
</data>
<data name="tsrbmiGradientVertical.Text" xml:space="preserve">
<value>Vertical</value>
</data>
<data name="tsrbmiGradientForwardDiagonal.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
</data>
<data name="tsrbmiGradientForwardDiagonal.Text" xml:space="preserve">
<value>Forward diagonal</value>
</data>
<data name="tsrbmiGradientBackwardDiagonal.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
</data>
<data name="tsrbmiGradientBackwardDiagonal.Text" xml:space="preserve">
<value>Backward diagonal</value>
</data>
<data name="tsmiGradientMode.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 22</value>
</data>
<data name="tsmiGradientMode.Text" xml:space="preserve">
<value>Gradient mode</value>
</data>
<data name="cmsGradient.Size" type="System.Drawing.Size, System.Drawing">
<value>175, 70</value>
<value>176, 70</value>
</data>
<data name="&gt;&gt;cmsGradient.Name" xml:space="preserve">
<value>cmsGradient</value>
@ -822,51 +726,27 @@
<data name="&gt;&gt;cmsGradient.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="tsmiEnableGradient.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
<data name="btnSwapEnterKey.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 328</value>
</data>
<data name="tsmiEnableGradient.Text" xml:space="preserve">
<value>Enable gradient</value>
<data name="btnSwapEnterKey.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 24</value>
</data>
<data name="tsmiSecondColor.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
<data name="btnSwapEnterKey.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="tsmiSecondColor.Text" xml:space="preserve">
<value>Second text color...</value>
<data name="&gt;&gt;btnSwapEnterKey.Name" xml:space="preserve">
<value>btnSwapEnterKey</value>
</data>
<data name="tsmiGradientMode.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 22</value>
<data name="&gt;&gt;btnSwapEnterKey.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="tsmiGradientMode.Text" xml:space="preserve">
<value>Gradient mode</value>
<data name="&gt;&gt;btnSwapEnterKey.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="tsrbmiGradientHorizontal.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<data name="&gt;&gt;btnSwapEnterKey.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="tsrbmiGradientHorizontal.Text" xml:space="preserve">
<value>Horizontal</value>
</data>
<data name="tsrbmiGradientVertical.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="tsrbmiGradientVertical.Text" xml:space="preserve">
<value>Vertical</value>
</data>
<data name="tsrbmiGradientForwardDiagonal.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="tsrbmiGradientForwardDiagonal.Text" xml:space="preserve">
<value>Forward diagonal</value>
</data>
<data name="tsrbmiGradientBackwardDiagonal.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="tsrbmiGradientBackwardDiagonal.Text" xml:space="preserve">
<value>Backward diagonal</value>
</data>
<metadata name="ttTextInput.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>493, 17</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -940,25 +820,25 @@
<value>tsrbmiGradientHorizontal</value>
</data>
<data name="&gt;&gt;tsrbmiGradientHorizontal.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsrbmiGradientVertical.Name" xml:space="preserve">
<value>tsrbmiGradientVertical</value>
</data>
<data name="&gt;&gt;tsrbmiGradientVertical.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsrbmiGradientForwardDiagonal.Name" xml:space="preserve">
<value>tsrbmiGradientForwardDiagonal</value>
</data>
<data name="&gt;&gt;tsrbmiGradientForwardDiagonal.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsrbmiGradientBackwardDiagonal.Name" xml:space="preserve">
<value>tsrbmiGradientBackwardDiagonal</value>
</data>
<data name="&gt;&gt;tsrbmiGradientBackwardDiagonal.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ttTextInput.Name" xml:space="preserve">
<value>ttTextInput</value>

View file

@ -711,6 +711,16 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap keyboard_enter {
get {
object obj = ResourceManager.GetObject("keyboard-enter", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View file

@ -136,6 +136,12 @@
<data name="layer_shape_ellipse_region" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-ellipse-region.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_shade_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateContextMenu_SwitchToDrawingToolAfterSelection" xml:space="preserve">
<value>Switch to drawing tool after shape selection</value>
</data>
<data name="image_resize" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-resize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -160,9 +166,6 @@
<data name="ShapeManager_CreateToolbar_UseLetters" xml:space="preserve">
<value>Use letters</value>
</data>
<data name="ShapeManager_CreateToolbar_StartingStepValue" xml:space="preserve">
<value>Value of first step:</value>
</data>
<data name="ShapeManager_CreateToolbar_ImageSize" xml:space="preserve">
<value>Image size...</value>
</data>
@ -172,21 +175,27 @@
<data name="ShapeManager_CreateToolbar_ApplyChangesContinueTaskEnter" xml:space="preserve">
<value>Apply changes &amp; continue task (Enter)</value>
</data>
<data name="gradient" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer_shape_region" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-region.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="OpenKeybindsPage" xml:space="preserve">
<value>Open keybinds web page...</value>
</data>
<data name="arrow_circle_double" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-circle-double.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_outline_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-outline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="exclamation_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_Edit" xml:space="preserve">
<value>Edit</value>
</data>
<data name="layout_center" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-center.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_AutoCloseEditorOnTask" xml:space="preserve">
<value>Auto close editor on task</value>
</data>
@ -202,8 +211,8 @@
<data name="folder_open_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="disks_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disks-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ShapeManager_CreateToolbar_DropShadow" xml:space="preserve">
<value>Drop shadow</value>
</data>
<data name="edit_alignment" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -226,9 +235,18 @@
<data name="ShapeManager_CreateToolbar_ShapeOptions" xml:space="preserve">
<value>Shape options</value>
</data>
<data name="edit_vertical_alignment_top_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-vertical-alignment-top-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="monitor_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_italic_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-italic-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateContextMenu_Fixed_size_region_mode" xml:space="preserve">
<value>Fixed size region mode</value>
</data>
@ -301,6 +319,9 @@
<data name="layer__minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CloseEsc" xml:space="preserve">
<value>Close (Esc)</value>
</data>
<data name="layer_flip_vertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-flip-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -313,6 +334,12 @@
<data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MagnifyStrength" xml:space="preserve">
<value>Magnify strength:</value>
</data>
<data name="layout_split" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_CopyImageToClipboard" xml:space="preserve">
<value>Copy image to clipboard (Ctrl + Shift + C)</value>
</data>
@ -322,36 +349,45 @@
<data name="ShapeManager_CreateContextMenu_Show_FPS" xml:space="preserve">
<value>Show FPS</value>
</data>
<data name="ShapeManager_CreateContextMenu_SwitchToDrawingToolAfterSelection" xml:space="preserve">
<value>Switch to drawing tool after shape selection</value>
</data>
<data name="ShapeManager_CreateContextMenu_SwitchToSelectionToolAfterDrawing" xml:space="preserve">
<value>Switch to selection tool after shape drawing</value>
</data>
<data name="FFmpegOptionsForm_UpdateUI_Quality_" xml:space="preserve">
<value>Quality:</value>
</data>
<data name="edit_underline" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-underline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="magnifier_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\magnifier-zoom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CursorType" xml:space="preserve">
<value>Cursor type:</value>
</data>
<data name="FFmpegOptionsForm_buttonFFmpegBrowse_Click_Browse_for_ffmpeg_exe" xml:space="preserve">
<value>Browse for ffmpeg.exe</value>
</data>
<data name="ShapeManager_CreateToolbar_DropShadow" xml:space="preserve">
<value>Drop shadow</value>
<data name="layer_flip" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-flip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="openhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\openhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ShapeManager_CreateContextMenu_Square_shape_magnifier" xml:space="preserve">
<value>Square shape magnifier</value>
</data>
<data name="document_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FFmpegOptionsForm_UpdateUI_Bitrate___0_k" xml:space="preserve">
<value>Bitrate: {0}k</value>
</data>
<data name="edit_vertical_alignment_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-vertical-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_bold_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-bold-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_EditorStartMode" xml:space="preserve">
<value>Editor start mode:</value>
</data>
@ -379,9 +415,15 @@
<data name="ShapeManager_CreateToolbar_SaveImage" xml:space="preserve">
<value>Save image (Ctrl + S)</value>
</data>
<data name="grid_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\grid-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_NewImage" xml:space="preserve">
<value>New image...</value>
</data>
<data name="disks_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disks-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layers_stack_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -391,6 +433,12 @@
<data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_vertical_alignment_middle_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-vertical-alignment-middle-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="stamp_cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\stamp-cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateContextMenu_EnableAnimations" xml:space="preserve">
<value>Enable animations</value>
</data>
@ -406,8 +454,8 @@
<data name="ShapeManager_CreateContextMenu_Height_" xml:space="preserve">
<value>Height:</value>
</data>
<data name="layers_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ImageEffects" xml:space="preserve">
<value>Add image effects...</value>
</data>
<data name="ShapeManager_CreateContextMenu_Fill_color___" xml:space="preserve">
<value>Fill color...</value>
@ -415,12 +463,18 @@
<data name="ShapeManager_CreateToolbar_SaveImageAs" xml:space="preserve">
<value>Save image as... (Ctrl + Shift + S)</value>
</data>
<data name="smiley_yell" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\smiley-yell.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_ContinueTaskSpaceOrRightClick" xml:space="preserve">
<value>Continue task (Space or right click)</value>
</data>
<data name="ShapeManager_CreateToolbar_CanvasSize" xml:space="preserve">
<value>Canvas size...</value>
</data>
<data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FFmpegOptionsForm_DownloaderForm_InstallRequested_Successfully_downloaded_FFmpeg_" xml:space="preserve">
<value>Successfully downloaded FFmpeg.</value>
</data>
@ -436,12 +490,18 @@
<data name="ShapeManager_CreateToolbar_AutoCropImage" xml:space="preserve">
<value>Auto crop image...</value>
</data>
<data name="layout_center" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-center.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="monitor_window" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor-window.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_alignment_right_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment-right-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -449,8 +509,8 @@
<value>There are unsaved changes.
Would you like to close image editor?</value>
</data>
<data name="layout_split" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="DropShadowColor" xml:space="preserve">
<value>Drop shadow color...</value>
</data>
<data name="drive_globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive-globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -458,14 +518,17 @@ Would you like to close image editor?</value>
<data name="wrench_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer_shade_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_BringToFront" xml:space="preserve">
<value>Bring to front</value>
</data>
<data name="ShapeManager_CreateToolbar_Rotate180" xml:space="preserve">
<value>Rotate 180°</value>
</data>
<data name="ShapeManager_CreateToolbar_LastRegion" xml:space="preserve">
<value>Capture last region</value>
<data name="LightResizeNodes" xml:space="preserve">
<value>Use light resize nodes</value>
</data>
<data name="ShapeManager_CreateToolbar_InsertImageFromScreen" xml:space="preserve">
<value>Insert image from screen...</value>
@ -479,6 +542,9 @@ Would you like to close image editor?</value>
<data name="ShapeManager_CreateToolbar_DeleteAll" xml:space="preserve">
<value>Delete all</value>
</data>
<data name="closedhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\closedhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="edit_alignment_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -497,6 +563,9 @@ Would you like to close image editor?</value>
<data name="layer_fullscreen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer_fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layout_split_vertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-split-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateContextMenu_Border_color___" xml:space="preserve">
<value>Border color...</value>
</data>
@ -506,8 +575,8 @@ Would you like to close image editor?</value>
<data name="ShapeManager_CreateContextMenu_Show_magnifier" xml:space="preserve">
<value>Show magnifier</value>
</data>
<data name="edit_shade" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-shade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ShapeManager_CreateToolbar_StartingStepValue" xml:space="preserve">
<value>Value of first step:</value>
</data>
<data name="RegionCaptureForm_ShowExitConfirmation_ShareXImageEditor" xml:space="preserve">
<value>ShareX - Image editor</value>
@ -515,6 +584,12 @@ Would you like to close image editor?</value>
<data name="arrow_circle_225_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-circle-225-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ThisWindowWillCloseBeforeOpeningKeybindsPageWantContinue" xml:space="preserve">
<value>This window will close before opening the keybinds web page. Do you want to continue?</value>
</data>
<data name="ShapeManager_CreateContextMenu_SwitchToSelectionToolAfterDrawing" xml:space="preserve">
<value>Switch to selection tool after shape drawing</value>
</data>
<data name="layer_shape_ellipse" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-ellipse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -524,12 +599,6 @@ Would you like to close image editor?</value>
<data name="RectangleTransparent_RectangleTransparent_Rectangle_capture_transparent" xml:space="preserve">
<value>Rectangle capture transparent</value>
</data>
<data name="layer_flip" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-flip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FFmpegOptionsForm_DownloaderForm_InstallRequested_Download_of_FFmpeg_failed_" xml:space="preserve">
<value>Download of FFmpeg failed.</value>
</data>
<data name="image__plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -545,12 +614,18 @@ Would you like to close image editor?</value>
<data name="ScrollingCaptureForm_StartCapture_Stop_capture" xml:space="preserve">
<value>Stop capture</value>
</data>
<data name="layout_split_vertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-split-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="FFmpegOptionsForm_DownloaderForm_InstallRequested_Download_of_FFmpeg_failed_" xml:space="preserve">
<value>Download of FFmpeg failed.</value>
</data>
<data name="ShapeManager_CreateContextMenu_Show_screen_wide_crosshair" xml:space="preserve">
<value>Show screen wide crosshair</value>
</data>
<data name="edit_shade" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-shade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_alignment_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_Image" xml:space="preserve">
<value>Image</value>
</data>
@ -569,6 +644,9 @@ X: {4} Y: {5}</value>
<data name="layer_shape" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_underline_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-underline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateToolbar_FontSize" xml:space="preserve">
<value>Font size:</value>
</data>
@ -608,109 +686,34 @@ X: {4} Y: {5}</value>
<data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="layers_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ShapeManager_CreateToolbar_LastRegion" xml:space="preserve">
<value>Capture last region</value>
</data>
<data name="edit_alignment_center_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment-center-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_vertical_alignment_middle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-vertical-alignment-middle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShapeManager_CreateContextMenu_Pixel_size_" xml:space="preserve">
<value>Pixel size:</value>
</data>
<data name="layer_shape_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="gradient" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="smiley_cool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\smiley-cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="smiley_yell" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\smiley-yell.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="LightResizeNodes" xml:space="preserve">
<value>Use light resize nodes</value>
</data>
<data name="OpenKeybindsPage" xml:space="preserve">
<value>Open keybinds web page...</value>
</data>
<data name="ThisWindowWillCloseBeforeOpeningKeybindsPageWantContinue" xml:space="preserve">
<value>This window will close before opening the keybinds web page. Do you want to continue?</value>
</data>
<data name="DropShadowColor" xml:space="preserve">
<value>Drop shadow color...</value>
</data>
<data name="ImageEffects" xml:space="preserve">
<value>Add image effects...</value>
</data>
<data name="stamp_cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\stamp-cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="magnifier_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\magnifier-zoom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MagnifyStrength" xml:space="preserve">
<value>Magnify strength:</value>
</data>
<data name="CloseEsc" xml:space="preserve">
<value>Close (Esc)</value>
</data>
<data name="edit_outline_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-outline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_shade_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="grid_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\grid-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer_shade_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer_shape_arrow_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-arrow-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer_shape_line_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-line-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_alignment_center_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment-center-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="smiley_cool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\smiley-cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_alignment_right_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment-right-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ShapeManager_CreateContextMenu_Pixel_size_" xml:space="preserve">
<value>Pixel size:</value>
</data>
<data name="edit_alignment_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="layer_shape_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_bold_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-bold-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_italic_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-italic-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_underline_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-underline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_vertical_alignment_middle_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-vertical-alignment-middle-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_vertical_alignment_top_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-vertical-alignment-top-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit_vertical_alignment_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-vertical-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="closedhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\closedhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="openhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\openhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="document_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="keyboard-enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\keyboard-enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 477 B

View file

@ -67,5 +67,6 @@ public FontStyle Style
public bool Gradient { get; set; } = false;
public Color Color2 { get; set; } = Color.FromArgb(240, 240, 240);
public LinearGradientMode GradientMode { get; set; } = LinearGradientMode.Vertical;
public bool EnterKeyNewLine { get; set; } = false;
}
}

View file

@ -236,6 +236,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\keyboard-enter.png" />
<None Include="Resources\document-copy.png" />
<None Include="Resources\openhand.cur" />
<None Include="Resources\edit-vertical-alignment-white.png" />