diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs
index 890cc2d43..6962c2abd 100644
--- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs
+++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.Designer.cs
@@ -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;
}
}
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
index a3f2414eb..b8758375c 100644
--- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
+++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs
@@ -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);
diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx
index 32e5987a6..c9ee18e33 100644
--- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx
+++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.resx
@@ -148,167 +148,11 @@
$this
- 7
+ 8
Top, Left, Right
-
- lblFont
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 0
-
-
- cbFonts
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 1
-
-
- lblTextSize
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 2
-
-
- nudTextSize
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 3
-
-
- btnTextColor
-
-
- ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null
-
-
- flpProperties
-
-
- 4
-
-
- btnGradient
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 5
-
-
- cbBold
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 6
-
-
- cbItalic
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 7
-
-
- cbUnderline
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 8
-
-
- btnAlignmentHorizontal
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 9
-
-
- btnAlignmentVertical
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- flpProperties
-
-
- 10
-
-
- 8, 5
-
-
- 518, 32
-
-
- 1
-
-
- False
-
-
- flpProperties
-
-
- System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 6
-
Left
@@ -432,9 +276,6 @@
3
-
- 493, 17
-
Left
@@ -453,6 +294,9 @@
MiddleLeft
+
+ 493, 17
+
Text color
@@ -460,7 +304,7 @@
btnTextColor
- ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null
+ ShareX.HelpersLib.ColorButton, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null
flpProperties
@@ -468,9 +312,6 @@
4
-
- 493, 17
-
NoControl
@@ -657,6 +498,30 @@
10
+
+ 8, 5
+
+
+ 518, 32
+
+
+ 1
+
+
+ False
+
+
+ flpProperties
+
+
+ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 7
+
Bottom, Right
@@ -685,20 +550,11 @@
$this
- 5
+ 6
17, 17
-
- 110, 70
-
-
- cmsAlignmentHorizontal
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
109, 22
@@ -717,18 +573,18 @@
Right
+
+ 110, 70
+
+
+ cmsAlignmentHorizontal
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
203, 17
-
- 115, 70
-
-
- cmsAlignmentVertical
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
114, 22
@@ -747,6 +603,15 @@
Bottom
+
+ 115, 70
+
+
+ cmsAlignmentVertical
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
Bottom, Left
@@ -757,17 +622,14 @@
NoControl
- 5, 334
+ 37, 334
- 106, 13
+ 0, 13
4
-
- New line: Ctrl + Enter
-
lblTip
@@ -778,7 +640,7 @@
$this
- 4
+ 5
Bottom, Right
@@ -808,13 +670,55 @@
$this
- 3
+ 4
373, 17
+
+ 175, 22
+
+
+ Enable gradient
+
+
+ 175, 22
+
+
+ Second text color...
+
+
+ 174, 22
+
+
+ Horizontal
+
+
+ 174, 22
+
+
+ Vertical
+
+
+ 174, 22
+
+
+ Forward diagonal
+
+
+ 174, 22
+
+
+ Backward diagonal
+
+
+ 175, 22
+
+
+ Gradient mode
+
- 175, 70
+ 176, 70
cmsGradient
@@ -822,51 +726,27 @@
System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 174, 22
+
+ 8, 328
-
- Enable gradient
+
+ 24, 24
-
- 174, 22
+
+ 5
-
- Second text color...
+
+ btnSwapEnterKey
-
- 174, 22
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Gradient mode
+
+ $this
-
- 180, 22
+
+ 3
-
- Horizontal
-
-
- 180, 22
-
-
- Vertical
-
-
- 180, 22
-
-
- Forward diagonal
-
-
- 180, 22
-
-
- Backward diagonal
-
-
- 493, 17
-
True
@@ -940,25 +820,25 @@
tsrbmiGradientHorizontal
- ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null
+ ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null
tsrbmiGradientVertical
- ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null
+ ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null
tsrbmiGradientForwardDiagonal
- ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null
+ ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null
tsrbmiGradientBackwardDiagonal
- ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null
+ ShareX.HelpersLib.ToolStripRadioButtonMenuItem, ShareX.HelpersLib, Version=13.2.2.0, Culture=neutral, PublicKeyToken=null
ttTextInput
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
index c4f4bff2f..90ef19351 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
@@ -711,6 +711,16 @@ internal static string ImageEffects {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap keyboard_enter {
+ get {
+ object obj = ResourceManager.GetObject("keyboard-enter", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx
index efbb17e23..b38becf4f 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx
@@ -136,6 +136,12 @@
..\Resources\layer-shape-ellipse-region.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Switch to drawing tool after shape selection
+
..\Resources\image-resize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -160,9 +166,6 @@
Use letters
-
- Value of first step:
-
Image size...
@@ -172,21 +175,27 @@
Apply changes & continue task (Enter)
+
+ ..\Resources\gradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\layer-shape-region.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Open keybinds web page...
+
..\Resources\arrow-circle-double.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-outline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Edit
-
- ..\Resources\layout-center.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Auto close editor on task
@@ -202,8 +211,8 @@
..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\disks-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Drop shadow
..\Resources\edit-alignment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -226,9 +235,18 @@
Shape options
+
+ ..\Resources\edit-vertical-alignment-top-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\monitor-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\image-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\edit-italic-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Fixed size region mode
@@ -301,6 +319,9 @@
..\Resources\layer--minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Close (Esc)
+
..\Resources\layer-flip-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -313,6 +334,12 @@
..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Magnify strength:
+
+
+ ..\Resources\layout-split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Copy image to clipboard (Ctrl + Shift + C)
@@ -322,36 +349,45 @@
Show FPS
-
- Switch to drawing tool after shape selection
-
-
- Switch to selection tool after shape drawing
-
Quality:
..\Resources\edit-underline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\magnifier-zoom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Cursor type:
Browse for ffmpeg.exe
-
- Drop shadow
+
+ ..\Resources\layer-flip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\openhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
Square shape magnifier
+
+ ..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Bitrate: {0}k
+
+ ..\Resources\edit-vertical-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\image-empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-bold-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Editor start mode:
@@ -379,9 +415,15 @@
Save image (Ctrl + S)
+
+ ..\Resources\grid-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
New image...
+
+ ..\Resources\disks-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -391,6 +433,12 @@
..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-vertical-alignment-middle-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\stamp-cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Enable animations
@@ -406,8 +454,8 @@
Height:
-
- ..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Add image effects...
Fill color...
@@ -415,12 +463,18 @@
Save image as... (Ctrl + Shift + S)
+
+ ..\Resources\smiley-yell.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Continue task (Space or right click)
Canvas size...
+
+ ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Successfully downloaded FFmpeg.
@@ -436,12 +490,18 @@
Auto crop image...
+
+ ..\Resources\layout-center.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\monitor-window.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-alignment-right-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\image--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -449,8 +509,8 @@
There are unsaved changes.
Would you like to close image editor?
-
- ..\Resources\layout-split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Drop shadow color...
..\Resources\drive-globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -458,14 +518,17 @@ Would you like to close image editor?
..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\layer-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Bring to front
Rotate 180°
-
- Capture last region
+
+ Use light resize nodes
Insert image from screen...
@@ -479,6 +542,9 @@ Would you like to close image editor?
Delete all
+
+ ..\Resources\closedhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
..\Resources\edit-alignment-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -497,6 +563,9 @@ Would you like to close image editor?
..\Resources\layer_fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\layout-split-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Border color...
@@ -506,8 +575,8 @@ Would you like to close image editor?
Show magnifier
-
- ..\Resources\edit-shade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Value of first step:
ShareX - Image editor
@@ -515,6 +584,12 @@ Would you like to close image editor?
..\Resources\arrow-circle-225-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ This window will close before opening the keybinds web page. Do you want to continue?
+
+
+ Switch to selection tool after shape drawing
+
..\Resources\layer-shape-ellipse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -524,12 +599,6 @@ Would you like to close image editor?
Rectangle capture transparent
-
- ..\Resources\layer-flip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Download of FFmpeg failed.
-
..\Resources\image--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -545,12 +614,18 @@ Would you like to close image editor?
Stop capture
-
- ..\Resources\layout-split-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Download of FFmpeg failed.
Show screen wide crosshair
+
+ ..\Resources\edit-shade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\edit-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Image
@@ -569,6 +644,9 @@ X: {4} Y: {5}
..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\edit-underline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Font size:
@@ -608,109 +686,34 @@ X: {4} Y: {5}
..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\image-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Capture last region
+
+
+ ..\Resources\edit-alignment-center-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\edit-vertical-alignment-middle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Pixel size:
-
-
- ..\Resources\layer-shape-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\gradient.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\smiley-cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\smiley-yell.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Use light resize nodes
-
-
- Open keybinds web page...
-
-
- This window will close before opening the keybinds web page. Do you want to continue?
-
-
- Drop shadow color...
-
-
- Add image effects...
-
-
- ..\Resources\stamp-cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\magnifier-zoom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Magnify strength:
-
-
- Close (Esc)
-
-
- ..\Resources\edit-outline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\edit-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\grid-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\layer-shade-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\layer-shape-arrow-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\layer-shape-line-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\edit-alignment-center-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\smiley-cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\edit-alignment-right-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Pixel size:
-
- ..\Resources\edit-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\layer-shape-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\edit-bold-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\edit-italic-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\edit-underline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\edit-vertical-alignment-middle-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\edit-vertical-alignment-top-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\edit-vertical-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\closedhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- ..\Resources\openhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- ..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\keyboard-enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/Resources/keyboard-enter.png b/ShareX.ScreenCaptureLib/Resources/keyboard-enter.png
new file mode 100644
index 000000000..6b5e8bb8f
Binary files /dev/null and b/ShareX.ScreenCaptureLib/Resources/keyboard-enter.png differ
diff --git a/ShareX.ScreenCaptureLib/Shapes/TextDrawingOptions.cs b/ShareX.ScreenCaptureLib/Shapes/TextDrawingOptions.cs
index 9ba33decc..71d740611 100644
--- a/ShareX.ScreenCaptureLib/Shapes/TextDrawingOptions.cs
+++ b/ShareX.ScreenCaptureLib/Shapes/TextDrawingOptions.cs
@@ -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;
}
}
\ No newline at end of file
diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
index afbf72db9..1474dcd03 100644
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@@ -236,6 +236,7 @@
+