From 369679e605a247af1e5750cb263ae6ccf58bdd93 Mon Sep 17 00:00:00 2001
From: Oliver Matla <info@lupinitylabs.com>
Date: Tue, 5 Oct 2021 03:12:38 +0200
Subject: [PATCH] add new discard button to Greenshot ToolStrip in the
 ImageEditorForm and the according bitmap resource.

---
 .../Forms/ImageEditorForm.Designer.cs           | 15 ++++++++++++++-
 src/Greenshot.Editor/Forms/ImageEditorForm.resx | 17 +++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs b/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs
index 82fecf559..6a1aed35f 100644
--- a/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs
+++ b/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs
@@ -141,8 +141,9 @@ namespace Greenshot.Editor.Forms {
 			this.btnSettings = new GreenshotToolStripButton();
 			this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
 			this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
+            this.btnDiscard = new GreenshotToolStripButton();
 			this.btnHelp = new GreenshotToolStripButton();
-			this.propertiesToolStrip = new ToolStripEx();
+            this.propertiesToolStrip = new ToolStripEx();
 			this.obfuscateModeButton = new BindableToolStripDropDownButton();
 			this.pixelizeToolStripMenuItem = new GreenshotToolStripMenuItem();
 			this.blurToolStripMenuItem = new GreenshotToolStripMenuItem();
@@ -910,6 +911,7 @@ namespace Greenshot.Editor.Forms {
 									this.btnSettings,
 									this.toolStripSeparator11,
 									this.toolStripSeparator16,
+                                    this.btnDiscard,
 									this.btnHelp});
 			// 
 			// btnSave
@@ -1036,6 +1038,16 @@ namespace Greenshot.Editor.Forms {
 			this.btnHelp.Name = "btnHelp";
 			this.btnHelp.Text = "Help";
 			this.btnHelp.Click += new System.EventHandler(this.BtnHelpClick);
+            // 
+            // btnDiscard
+            // 
+            this.btnDiscard.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnDiscard.Image = ((System.Drawing.Image)(resources.GetObject("btnDiscard.Image")));
+            this.btnDiscard.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnDiscard.LanguageKey = "contextmenu_discard";
+            this.btnDiscard.Name = "btnDiscard";
+            this.btnDiscard.Text = "Discard";
+            this.btnDiscard.Click += new System.EventHandler(this.BtnDiscardClick);            
 			// 
 			// propertiesToolStrip
 			// 
@@ -1931,6 +1943,7 @@ namespace Greenshot.Editor.Forms {
 		private GreenshotToolStripMenuItem drawLineToolStripMenuItem;
 		private GreenshotToolStripButton btnLine;
 		private GreenshotToolStripButton btnSettings;
+        private GreenshotToolStripButton btnDiscard;
 		private GreenshotToolStripButton btnHelp;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
 		private GreenshotToolStripMenuItem aboutToolStripMenuItem;
diff --git a/src/Greenshot.Editor/Forms/ImageEditorForm.resx b/src/Greenshot.Editor/Forms/ImageEditorForm.resx
index 57fe2f2c7..9593cc03c 100644
--- a/src/Greenshot.Editor/Forms/ImageEditorForm.resx
+++ b/src/Greenshot.Editor/Forms/ImageEditorForm.resx
@@ -656,6 +656,23 @@
         8GMN/QX6AQLKSmIufl07AAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="btnDiscard.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+        bWFnZVJlYWR5ccllPAAAAl1JREFUeNqMUz9oE1EY/97dS3JJLpfLX7XUxkJAF4WCQ4ZMdlJw0jjo
+        4KjSoWNwinQpCIqLooOLCoKTiIuDxSEQwaUqOESjqTVWTWPPJL0/uffe+V7t1WiD9oOPd9z3/X78
+        vn+oVCqBMMdxjtfr9T2NRgNc1xW/ItxTwWAwpKoq1TTNSSQStq7rdiwWa8qy/FAk4cbkNGya9uT2
+        /Zn339a/Z9SQsjuppL8Y9kfHZcgaUDQgDAF4MJGOJk5dvXfZB2HP8/xvBDs0jkE7IsASwgEFRwj1
+        bK6AjiKQBMGmS8NgmYNVBetX7riHzXW8NyBLeIhgCzdSgevKmesP+uNLK0RWI4jcfUxyM6cDqz9M
+        2v+vgnBQDj17YWdPHgl3KufU16trA3zmWHDJdKg9SoHEGINN32CVEZKmDgR6u1KyxTygly7EF2Ma
+        +2QYaDwawmGRI3J93DYFfYdY2TRqNZYdfXZ+eUpCSO71vNTLN6bOPI9u64Fg8cvZ6r6MQpUbTT0Z
+        x+7s/IeDubGQVTqaXLYGZMDDUY6R/jkFPjancn7C+LpqBa5dnHx19kRqkSC6MnIKQwq2OsuYR/O5
+        8NrNuf1ve6Zr2+7GDgzF2e8pmK13fhP/2ANRr+mQHmEe+XvBRK7ACCxuPboFxWIRotGo83xh36Fu
+        twt1ETRN6HQ6eUIIKIoC/KAgHo9DW9Mg31ygIq9Wq4HYrnC1Wo3lcrlgoVAAwzDAsiwghEG73edX
+        6nGCMPBr3CDg1wjlchk3m80sx/ZELUnuY/w8p3lTMn5z/JoR+lXu0CuCbUrpU/5+/inAAPtDePfH
+        JvwFAAAAAElFTkSuQmCC
+    </value>
+  </data>
   <data name="btnHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8