diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs index f12d8b2d3..5ed0c41b0 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs @@ -99,16 +99,6 @@ internal static System.Drawing.Bitmap counter_reset { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal 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.Byte[]. /// @@ -534,16 +524,6 @@ internal static System.Drawing.Bitmap printer { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap prohibition { - get { - object obj = ResourceManager.GetObject("prohibition", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to Rectangle capture annotate. /// @@ -955,15 +935,6 @@ internal static string ShapeManager_CreateContextMenu_Border_size_ { } } - /// - /// Looks up a localized string similar to Cancel capture. - /// - internal static string ShapeManager_CreateContextMenu_Cancel_capture { - get { - return ResourceManager.GetString("ShapeManager_CreateContextMenu_Cancel_capture", resourceCulture); - } - } - /// /// Looks up a localized string similar to Capture active monitor. /// diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx index 15f626576..26303d513 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx @@ -273,9 +273,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}° Bitrate: {0}k - - ..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - [Hold left click] [Insert] Start region selection @@ -309,9 +306,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}° X: {0} Y: {1} W: {2} H: {3} - - ..\Resources\prohibition.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\edit-alignment-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -369,9 +363,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}° [Mouse wheel] Change magnifier size - - Cancel capture - Close menu diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx b/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx index d346fa758..1ffe35774 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx @@ -251,9 +251,6 @@ Высота: - - Отменить захват - Закрыть меню diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx b/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx index 39d8a1082..2b1dc17e0 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx @@ -326,9 +326,6 @@ 关闭菜单 - - 取消捕捉 - [鼠标滚轮] 更改当前工具 diff --git a/ShareX.ScreenCaptureLib/Resources/cross.png b/ShareX.ScreenCaptureLib/Resources/cross.png deleted file mode 100644 index d6921565d..000000000 Binary files a/ShareX.ScreenCaptureLib/Resources/cross.png and /dev/null differ diff --git a/ShareX.ScreenCaptureLib/Resources/prohibition.png b/ShareX.ScreenCaptureLib/Resources/prohibition.png deleted file mode 100644 index 7a368df09..000000000 Binary files a/ShareX.ScreenCaptureLib/Resources/prohibition.png and /dev/null differ diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs index 2686ba98d..07d62c1e1 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs @@ -139,31 +139,8 @@ private void CreateMenu() #endregion Editor mode - #region Main - - string buttonText; - - if (form.Mode == RegionCaptureMode.Editor) - { - buttonText = "Cancel annotation"; - } - else - { - buttonText = Resources.ShapeManager_CreateContextMenu_Cancel_capture; - } - - ToolStripButton tsbCancelCapture = new ToolStripButton(buttonText); - tsbCancelCapture.DisplayStyle = ToolStripItemDisplayStyle.Image; - tsbCancelCapture.Image = Resources.cross; - tsbCancelCapture.MouseDown += (sender, e) => form.Close(); - tsMain.Items.Add(tsbCancelCapture); - - #endregion Main - #region Tools - tsMain.Items.Add(new ToolStripSeparator()); - foreach (ShapeType shapeType in Helpers.GetEnums()) { if (form.Mode == RegionCaptureMode.Editor && IsShapeTypeRegion(shapeType)) diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj index 1e02268a3..57c791840 100644 --- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj +++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj @@ -203,8 +203,6 @@ - -