diff --git a/ShareX/Forms/ScreenRecordForm.cs b/ShareX/Forms/ScreenRecordForm.cs
index 4aa6d7678..08f042913 100644
--- a/ShareX/Forms/ScreenRecordForm.cs
+++ b/ShareX/Forms/ScreenRecordForm.cs
@@ -56,6 +56,10 @@ public static ScreenRecordForm Instance
private ScreenRecorder screenRecorder;
private ScreenRegionForm regionForm;
+ private ContextMenuStrip cmsMain;
+ private System.ComponentModel.IContainer components;
+ private ToolStripMenuItem tsmiStart;
+ private ToolStripMenuItem tsmiAbort;
private bool abortRequested;
private ScreenRecordForm()
@@ -64,6 +68,16 @@ private ScreenRecordForm()
TrayIcon.MouseClick += TrayIcon_MouseClick;
}
+ private void tsmiStart_Click(object sender, EventArgs e)
+ {
+ StartStopRecording();
+ }
+
+ private void tsmiAbort_Click(object sender, EventArgs e)
+ {
+ AbortRecording();
+ }
+
public void StartStopRecording()
{
if (regionForm != null && !regionForm.IsDisposed)
@@ -72,6 +86,14 @@ public void StartStopRecording()
}
}
+ public void AbortRecording()
+ {
+ if (regionForm != null && !regionForm.IsDisposed)
+ {
+ regionForm.Abort();
+ }
+ }
+
private void StopRecording()
{
if (IsRecording && screenRecorder != null)
@@ -223,6 +245,8 @@ public void StartRecording(ScreenRecordOutput outputType, TaskSettings taskSetti
{
trayText = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Click_tray_icon_to_start_recording_;
TrayIcon.Text = trayText.Truncate(63);
+ tsmiStart.Text = Resources.AutoCaptureForm_Execute_Start;
+ cmsMain.Enabled = true;
if (taskSettings.CaptureSettings.ScreenRecordAutoStart)
{
@@ -251,6 +275,7 @@ public void StartRecording(ScreenRecordOutput outputType, TaskSettings taskSetti
trayText = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Click_tray_icon_to_stop_recording_;
TrayIcon.Text = trayText.Truncate(63);
TrayIcon.Icon = Resources.control_record.ToIcon();
+ tsmiStart.Text = Resources.AutoCaptureForm_Execute_Stop;
if (regionForm != null)
{
@@ -289,6 +314,7 @@ public void StartRecording(ScreenRecordOutput outputType, TaskSettings taskSetti
{
TrayIcon.Text = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Encoding___;
TrayIcon.Icon = Resources.camcorder_pencil.ToIcon();
+ cmsMain.Enabled = false;
if (outputType == ScreenRecordOutput.GIF)
{
@@ -350,5 +376,51 @@ public void StartRecording(ScreenRecordOutput outputType, TaskSettings taskSetti
IsRecording = false;
});
}
+
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.tsmiStart = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmiAbort = new System.Windows.Forms.ToolStripMenuItem();
+ this.cmsMain.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // TrayIcon
+ //
+ this.TrayIcon.ContextMenuStrip = this.cmsMain;
+ //
+ // cmsMain
+ //
+ this.cmsMain.Enabled = false;
+ this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsmiStart,
+ this.tsmiAbort});
+ this.cmsMain.Name = "cmsMain";
+ this.cmsMain.Size = new System.Drawing.Size(153, 70);
+ //
+ // tsmiStart
+ //
+ this.tsmiStart.Image = global::ShareX.Properties.Resources.control_record;
+ this.tsmiStart.Name = "tsmiStart";
+ this.tsmiStart.Size = new System.Drawing.Size(104, 22);
+ this.tsmiStart.Text = "Start";
+ this.tsmiStart.Click += new System.EventHandler(this.tsmiStart_Click);
+ //
+ // tsmiAbort
+ //
+ this.tsmiAbort.Image = global::ShareX.Properties.Resources.cross;
+ this.tsmiAbort.Name = "tsmiAbort";
+ this.tsmiAbort.Size = new System.Drawing.Size(104, 22);
+ this.tsmiAbort.Text = "Abort";
+ this.tsmiAbort.Click += new System.EventHandler(this.tsmiAbort_Click);
+ //
+ // ScreenRecordForm
+ //
+ this.ClientSize = new System.Drawing.Size(284, 261);
+ this.Name = "ScreenRecordForm";
+ this.cmsMain.ResumeLayout(false);
+ this.ResumeLayout(false);
+ }
}
}
\ No newline at end of file
diff --git a/ShareX/Forms/ScreenRecordForm.resx b/ShareX/Forms/ScreenRecordForm.resx
new file mode 100644
index 000000000..ec4c89e92
--- /dev/null
+++ b/ShareX/Forms/ScreenRecordForm.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
+ 115, 17
+
+
\ No newline at end of file
diff --git a/ShareX/Forms/ScreenRegionForm.cs b/ShareX/Forms/ScreenRegionForm.cs
index 40aaefa1f..1d21961d9 100644
--- a/ShareX/Forms/ScreenRegionForm.cs
+++ b/ShareX/Forms/ScreenRegionForm.cs
@@ -207,6 +207,12 @@ public void StartStop()
}
}
+ public void Abort()
+ {
+ AbortRequested = true;
+ StartStop();
+ }
+
private void btnStop_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left)
@@ -219,8 +225,7 @@ private void btnAbort_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left)
{
- AbortRequested = true;
- StartStop();
+ Abort();
}
}
}
diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs
index 0f051f0e9..92cc80b56 100644
--- a/ShareX/Properties/Resources.Designer.cs
+++ b/ShareX/Properties/Resources.Designer.cs
@@ -312,7 +312,7 @@ public static string AutoCaptureForm_UpdateStatus_Timeleft___0_s___1____Total___
///
public static System.Drawing.Bitmap balloon_white {
get {
- object obj = ResourceManager.GetObject("balloon-white", resourceCulture);
+ object obj = ResourceManager.GetObject("balloon_white", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -524,6 +524,16 @@ public static System.Drawing.Bitmap control_record_yellow {
}
}
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap cross {
+ get {
+ object obj = ResourceManager.GetObject("cross", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx
index c7cdfa688..57643fbb6 100644
--- a/ShareX/Properties/Resources.resx
+++ b/ShareX/Properties/Resources.resx
@@ -132,27 +132,15 @@ Are you sure you want to continue?
Are you sure you want to upload {0} files?
-
- Custom
-
Stopping
Shorten URL ({0})
-
- ..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
There is no valid CLI video encoder selected.
-
- Downloading
-
Are you sure you want to upload this screenshot?
Press 'No' to cancel the current upload and disable screenshot auto uploading.
@@ -163,30 +151,27 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.
Uploading
-
- ..\Resources\layer-shape-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Custom
..\Resources\Triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\bin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\google_plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
FFmpeg error
-
- ..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
FFmpeg successfully downloaded.
@@ -250,8 +235,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.
Upload errors
-
- ..\Resources\Fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Disable hotkeys
URL is empty.
@@ -269,11 +254,14 @@ Please select a different hotkey or quit the conflicting application and reopen
File delete confirmation
+
+ ..\Resources\layer-shape-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Stop
-
- Left click to copy URL to clipboard. Right click to open URL.
+
+ CLI video encoder file does not exist:
..\Resources\robot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -314,6 +302,9 @@ Please select a different hotkey or quit the conflicting application and reopen
You can single left click the ShareX tray icon to start region capture.
+
+ ..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Task settings
@@ -358,8 +349,8 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
Image uploader: {0}
-
- CLI video encoder file does not exist:
+
+ ..\Resources\Polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\layer--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -367,21 +358,12 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
..\Resources\images-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Copied to clipboard: {0}
-
Hide menu
-
- ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Cursor position (X, Y) = {0}, {1}
-
..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -430,6 +412,9 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
..\Resources\kr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Error
@@ -464,6 +449,9 @@ here
..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Path can't be empty.
@@ -486,6 +474,9 @@ Please run ShareX as administrator to change personal folder path.
..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -505,8 +496,8 @@ Please run ShareX as administrator to change personal folder path.
FTP client only supports FTP or FTPS.
-
- ..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Choose folder path
@@ -514,9 +505,6 @@ Please run ShareX as administrator to change personal folder path.
..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Disable hotkeys
-
ShareX need to be restarted for language changes to apply.
Would you like to restart ShareX?
@@ -524,14 +512,11 @@ Would you like to restart ShareX?
..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\eraser.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
-
- ..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Copied to clipboard: {0}
Error
@@ -539,9 +524,6 @@ Would you like to restart ShareX?
..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\categories.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Use new name:
@@ -566,8 +548,8 @@ Would you like to restart ShareX?
..\Resources\nl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Configure CLI video encoders --->
+
+ Cursor position (X, Y) = {0}, {1}
..\Resources\folder-open-document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -581,8 +563,8 @@ Would you like to restart ShareX?
Translators
-
- First time upload warning
+
+ ..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\ruler-triangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -602,12 +584,18 @@ Would you like to restart ShareX?
After capture: {0}
+
+ Configure CLI video encoders --->
+
URL shortener: {0}
..\Resources\clipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\barcode-2d.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Unable to create folder:
@@ -620,8 +608,14 @@ Would you like to restart ShareX?
..\Resources\film.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Close
+
+
+ Left click to copy URL to clipboard. Right click to open URL.
+
+
+ Download of FFmpeg failed.
..\Resources\clipboard-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -638,6 +632,9 @@ Would you like to restart ShareX?
File upload
+
+ Start screen color picker
+
..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -648,6 +645,9 @@ Would you like to restart ShareX?
Download failed:
{0}
+
+ After upload: {0}
+
..\Resources\layer-shape-ellipse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -657,17 +657,23 @@ Would you like to restart ShareX?
..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\balloon-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
Preparing
+
+ First time upload warning
+
..\Resources\es.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Stopped
@@ -684,15 +690,12 @@ Would you like to restart ShareX?
Issues
-
- Close
+
+ ..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\ErrorSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -702,8 +705,8 @@ Would you like to restart ShareX?
Text upload test
-
- ..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\notebook.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -717,8 +720,8 @@ Would you like to restart ShareX?
..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Capture
+
+ Downloading
Image editor - How to load image?
@@ -741,26 +744,26 @@ Would you like to restart ShareX?
..\Resources\RoundedRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Unable to find valid Twitter account.
-
-
- {0} is about to be uploaded to {1}. You may choose a different destination.
+
+ ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Website
-
- ..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\categories.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- After upload: {0}
+
+ ..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\barcode-2d.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Capture
..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -769,13 +772,13 @@ Would you like to restart ShareX?
Click to start recording.
Text must be equal or lower than 54 characters because of tray icon text length limit.
-
- Download of FFmpeg failed.
+
+ {0} is about to be uploaded to {1}. You may choose a different destination.
-
- Start screen color picker
+
+ Unable to find valid Twitter account.
-
- ..\Resources\balloon-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\cross.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/Resources/cross.png b/ShareX/Resources/cross.png
new file mode 100644
index 000000000..d6921565d
Binary files /dev/null and b/ShareX/Resources/cross.png differ
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index 01c9eb6cf..351c3851c 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -650,6 +650,9 @@
ScreenColorPicker.cs
+
+ ScreenRecordForm.cs
+
ScreenRegionForm.cs
@@ -1005,6 +1008,7 @@
+