Replace delete current object button with undo object button because user can delete object using right click anyway

ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs

@@ -60,6 +60,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_circle_225_left {
+            get {
+                object obj = ResourceManager.GetObject("arrow_circle_225_left", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -344,16 +354,6 @@ internal class Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap layer__minus {
-            get {
-                object obj = ResourceManager.GetObject("layer__minus", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -989,15 +989,6 @@ internal class Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Delete selected object.
-        /// </summary>
-        internal static string ShapeManager_CreateContextMenu_Delete_selected_object {
-            get {
-                return ResourceManager.GetString("ShapeManager_CreateContextMenu_Delete_selected_object", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Fill color....
         /// </summary>

ShareX.ScreenCaptureLib/Properties/Resources.resx

@@ -217,9 +217,6 @@ X: {4} Y: {5}</value>
   <data name="RectangleAnnotate_WriteTips__Shift__Change_pen_color" xml:space="preserve">
     <value>[Shift] Change pen color</value>
   </data>
-  <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="RectangleAnnotate_WriteTips__Mouse_wheel__Swap_modes" xml:space="preserve">
     <value>[Mouse wheel] Swap modes</value>
   </data>
@@ -366,9 +363,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
   <data name="ShapeManager_CreateContextMenu_Close_menu" xml:space="preserve">
     <value>Close menu</value>
   </data>
-  <data name="ShapeManager_CreateContextMenu_Delete_selected_object" xml:space="preserve">
-    <value>Delete selected object</value>
-  </data>
   <data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
     <value>Delete all objects</value>
   </data>
@@ -480,4 +474,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
   <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="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>
 </root>

ShareX.ScreenCaptureLib/Properties/Resources.ru.resx

@@ -338,9 +338,6 @@
   <data name="ShapeManager_CreateContextMenu_Pixel_size_" xml:space="preserve">
     <value>Размер пикселя:</value>
   </data>
-  <data name="ShapeManager_CreateContextMenu_Delete_selected_object" xml:space="preserve">
-    <value>Удалить выбранный объект</value>
-  </data>
   <data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
     <value>Удалить все объекты</value>
   </data>

ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx

@@ -320,9 +320,6 @@
   <data name="ShapeManager_CreateContextMenu_Delete_all_objects" xml:space="preserve">
     <value>删除所有对象</value>
   </data>
-  <data name="ShapeManager_CreateContextMenu_Delete_selected_object" xml:space="preserve">
-    <value>删除选定对象</value>
-  </data>
   <data name="ShapeManager_CreateContextMenu_Close_menu" xml:space="preserve">
     <value>关闭菜单</value>
   </data>

ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs

@@ -36,7 +36,7 @@ internal partial class ShapeManager
     {
         private Form menuForm;
         private ToolStripEx tsMain;
-        private ToolStripButton tsbDeleteSelected, tsbDeleteAll;
+        private ToolStripButton tsbUndoObject, tsbDeleteAll;
         private ToolStripDropDownButton tsddbShapeOptions;
         private ToolStripMenuItem tsmiBorderColor, tsmiFillColor, tsmiHighlightColor, tsmiQuickCrop;
         private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize;
@@ -423,11 +423,11 @@ private void CreateMenu()
             };
             tsddbShapeOptions.DropDownItems.Add(tsmiHighlightColor);
 
-            tsbDeleteSelected = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Delete_selected_object);
+            tsbUndoObject = new ToolStripButton("Undo object");
-            tsbDeleteSelected.DisplayStyle = ToolStripItemDisplayStyle.Image;
+            tsbUndoObject.DisplayStyle = ToolStripItemDisplayStyle.Image;
-            tsbDeleteSelected.Image = Resources.layer__minus;
+            tsbUndoObject.Image = Resources.arrow_circle_225_left;
-            tsbDeleteSelected.MouseDown += (sender, e) => DeleteCurrentShape();
+            tsbUndoObject.MouseDown += (sender, e) => UndoShape();
-            tsMain.Items.Add(tsbDeleteSelected);
+            tsMain.Items.Add(tsbUndoObject);
 
             tsbDeleteAll = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Delete_all_objects);
             tsbDeleteAll.DisplayStyle = ToolStripItemDisplayStyle.Image;
@@ -751,8 +751,7 @@ private void UpdateMenu()
                     break;
             }
 
-            tsbDeleteSelected.Enabled = CurrentShape != null;
+            tsbUndoObject.Enabled = tsbDeleteAll.Enabled = Shapes.Count > 0;
-            tsbDeleteAll.Enabled = Shapes.Count > 0;
 
             switch (shapeType)
             {

ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj

@@ -201,11 +201,11 @@
     <None Include="Resources\layer-shape-ellipse.png" />
     <None Include="Resources\layer-shape-round.png" />
     <None Include="Resources\layer-shape.png" />
-    <None Include="Resources\layer--minus.png" />
     <None Include="Resources\minus.png" />
     <None Include="Resources\counter-reset.png" />
     <None Include="Resources\balloon-box-left.png" />
     <None Include="Resources\clipboard.png" />
+    <None Include="Resources\arrow-circle-225-left.png" />
     <Content Include="Resources\Crosshair.cur" />
     <None Include="Resources\exclamation-button.png" />
   </ItemGroup>