Merge 8ef14c6049 into c1ad1d4a93

src/Greenshot.Editor/Configuration/LanguageKeys.cs

@@ -40,6 +40,8 @@ namespace Greenshot.Editor.Configuration
         editor_copytoclipboard,
         editor_cuttoclipboard,
         editor_deleteelement,
+        editor_discard,
+        editor_discard_title,
         editor_downonelevel,
         editor_downtobottom,
         editor_duplicate,

src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs

@@ -138,8 +138,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.cropModeButton = new BindableToolStripDropDownButton();
 			this.pixelizeToolStripMenuItem = new GreenshotToolStripMenuItem();
@@ -900,6 +901,7 @@ namespace Greenshot.Editor.Forms {
 									this.btnSettings,
 									this.toolStripSeparator11,
 									this.toolStripSeparator16,
+                                    this.btnDiscard,
 									this.btnHelp});
 			// 
 			// btnSave
@@ -1026,6 +1028,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
 			// 
@@ -1979,6 +1991,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;

src/Greenshot.Editor/Forms/ImageEditorForm.cs

@@ -922,6 +922,41 @@ namespace Greenshot.Editor.Forms
             HelpToolStripMenuItem1Click(sender, e);
         }
 
+        private void BtnDiscardClick(object sender, EventArgs e)
+        {
+            // Make sure the editor is visible
+            WindowDetails.ToForeground(Handle);
+
+            DialogResult result = MessageBox.Show(Language.GetString(LangKey.editor_discard), Language.GetString(LangKey.editor_discard_title), MessageBoxButtons.YesNo,
+                MessageBoxIcon.Question);
+            if (result.Equals(DialogResult.No))
+            {
+                return;
+            }
+
+            if (result.Equals(DialogResult.Yes))
+            {
+                _surface.Modified = false;
+
+                if (_surface.LastSaveFullPath != null)
+                {
+                    if (File.Exists(_surface.LastSaveFullPath))
+                    {
+                        try
+                        {
+                            File.Delete(_surface.LastSaveFullPath);
+                        }
+                        catch (Exception ex)
+                        {
+                            // Do nothing.
+                        }
+                    }
+                }
+
+                Close();
+            }
+        }
+
         private void ImageEditorFormActivated(object sender, EventArgs e)
         {
             UpdateClipboardSurfaceDependencies();
@@ -990,6 +1025,9 @@ namespace Greenshot.Editor.Forms
                     case Keys.Escape:
                         BtnCursorClick(sender, e);
                         break;
+                    case Keys.Delete: // Discard changes, delete file and close.
+                        BtnDiscardClick(sender, e);
+                        break;
                     case Keys.R:
                         BtnRectClick(sender, e);
                         break;

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

src/Greenshot/Configuration/LanguageKeys.cs

@@ -39,6 +39,8 @@ namespace Greenshot.Configuration
         editor_copytoclipboard,
         editor_cuttoclipboard,
         editor_deleteelement,
+        editor_discard,
+        editor_discard_title,
         editor_downonelevel,
         editor_downtobottom,
         editor_duplicate,

src/Greenshot/Languages/language-de-DE.xml

@@ -54,6 +54,7 @@ schnell zu finden. Vielen Dank :)</resource>
 		<resource name="contextmenu_capturelastregion">Zuletzt gewählten Bereich abfotografieren</resource>
 		<resource name="contextmenu_capturewindow">Fenster abfotografieren</resource>
 		<resource name="contextmenu_capturewindowfromlist">Fenster aus Liste abfotografieren</resource>
+		<resource name="contextmenu_discard">Verwerfen und schließen</resource>
 		<resource name="contextmenu_donate">Greenshot unterstützen</resource>
 		<resource name="contextmenu_exit">Schließen</resource>
 		<resource name="contextmenu_help">Hilfe</resource>
@@ -101,6 +102,8 @@ schnell zu finden. Vielen Dank :)</resource>
 		<resource name="editor_cursortool">Auswahlwerkzeug (Esc)</resource>
 		<resource name="editor_cuttoclipboard">Ausschneiden</resource>
 		<resource name="editor_deleteelement">Gewähltes Element löschen</resource>
+		<resource name="editor_discard">Möchten Sie den Screenshot löschen und den Editor schließen?</resource>
+		<resource name="editor_discard_title">Bild verwerfen?</resource>
 		<resource name="editor_downonelevel">Eine Ebene nach hinten</resource>
 		<resource name="editor_downtobottom">In den Hintergrund</resource>
 		<resource name="editor_drawarrow">Pfeil zeichnen (A)</resource>

src/Greenshot/Languages/language-en-US.xml

@@ -55,6 +55,7 @@ Also, we would highly appreciate if you checked whether a tracker item already e
 		<resource name="contextmenu_capturelastregion">Capture last region</resource>
 		<resource name="contextmenu_capturewindow">Capture window</resource>
 		<resource name="contextmenu_capturewindowfromlist">Capture window from list</resource>
+		<resource name="contextmenu_discard">Discard and quit</resource>
 		<resource name="contextmenu_donate">Support Greenshot</resource>
 		<resource name="contextmenu_exit">Exit</resource>
 		<resource name="contextmenu_help">Help</resource>
@@ -102,6 +103,8 @@ Also, we would highly appreciate if you checked whether a tracker item already e
 		<resource name="editor_cursortool">Selection Tool (ESC)</resource>
 		<resource name="editor_cuttoclipboard">Cut</resource>
 		<resource name="editor_deleteelement">Delete</resource>
+		<resource name="editor_discard">Do you want to quit and delete the saved screenshot?</resource>
+		<resource name="editor_discard_title">Discard image?</resource>
 		<resource name="editor_downonelevel">Down one level</resource>
 		<resource name="editor_downtobottom">Down to bottom</resource>
 		<resource name="editor_drawarrow">Draw arrow (A)</resource>