From 9c3fe5fb08ce4b63f732df427755409ac486d256 Mon Sep 17 00:00:00 2001 From: Oliver Matla Date: Tue, 5 Oct 2021 02:21:29 +0200 Subject: [PATCH 1/5] add language keys and translations (English and German only) for new button and dialog texts. --- src/Greenshot.Editor/Configuration/LanguageKeys.cs | 2 ++ src/Greenshot/Configuration/LanguageKeys.cs | 2 ++ src/Greenshot/Languages/language-de-DE.xml | 5 ++++- src/Greenshot/Languages/language-en-US.xml | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Greenshot.Editor/Configuration/LanguageKeys.cs b/src/Greenshot.Editor/Configuration/LanguageKeys.cs index f15b113d4..85e05bb68 100644 --- a/src/Greenshot.Editor/Configuration/LanguageKeys.cs +++ b/src/Greenshot.Editor/Configuration/LanguageKeys.cs @@ -39,6 +39,8 @@ namespace Greenshot.Editor.Configuration editor_copytoclipboard, editor_cuttoclipboard, editor_deleteelement, + editor_discard, + editor_discard_title, editor_downonelevel, editor_downtobottom, editor_duplicate, diff --git a/src/Greenshot/Configuration/LanguageKeys.cs b/src/Greenshot/Configuration/LanguageKeys.cs index 879c24a9d..fb52b36b7 100644 --- a/src/Greenshot/Configuration/LanguageKeys.cs +++ b/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, diff --git a/src/Greenshot/Languages/language-de-DE.xml b/src/Greenshot/Languages/language-de-DE.xml index 9ece82568..67205abb8 100644 --- a/src/Greenshot/Languages/language-de-DE.xml +++ b/src/Greenshot/Languages/language-de-DE.xml @@ -54,6 +54,7 @@ schnell zu finden. Vielen Dank :) Zuletzt gewählten Bereich abfotografieren Fenster abfotografieren Fenster aus Liste abfotografieren + Verwerfen und schließen Greenshot unterstützen Schließen Hilfe @@ -95,7 +96,9 @@ schnell zu finden. Vielen Dank :) Auswahlwerkzeug (ESC) Ausschneiden Gewähltes Element löschen - Eine Ebene nach hinten + Möchten Sie den Screenshot löschen und den Editor schließen? + Bild verwerfen? + Eine Ebene nach hinten In den Hintergrund Pfeil zeichnen (A) Ellipse zeichnen (E) diff --git a/src/Greenshot/Languages/language-en-US.xml b/src/Greenshot/Languages/language-en-US.xml index 3db9fbf0e..d8a12a135 100644 --- a/src/Greenshot/Languages/language-en-US.xml +++ b/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 Capture last region Capture window Capture window from list + Discard and quit Support Greenshot Exit Help @@ -96,7 +97,9 @@ Also, we would highly appreciate if you checked whether a tracker item already e Selection Tool (ESC) Cut Delete - Down one level + Do you want to quit and delete the saved screenshot? + Discard image? + Down one level Down to bottom Draw arrow (A) Draw ellipse (E) From 6959c590b7f4a8d64cdcb84a8787d2a7b97fc15c Mon Sep 17 00:00:00 2001 From: Oliver Matla Date: Tue, 5 Oct 2021 03:09:40 +0200 Subject: [PATCH 2/5] add fugue bin icon to icons directory for reference. --- src/Greenshot/icons/fugue/bin.png | Bin 0 -> 699 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Greenshot/icons/fugue/bin.png diff --git a/src/Greenshot/icons/fugue/bin.png b/src/Greenshot/icons/fugue/bin.png new file mode 100644 index 0000000000000000000000000000000000000000..01d304aa65c4582df1ab2669faafc6da5a601665 GIT binary patch literal 699 zcmV;s0!00ZP)5W%G?I7FkVHC9by z&m_G+x%b}rUhUOrgZ6`ucii{=e*C_Fs8lL}FvoF@*X#8?jYb1p*A>4a+*83|Fr=y~ z)iljXBoel+>vk*_Ys#|xP$c2TsRi$ zhs|}oHy}%Rh+qphQi1Ernd=Yw<4Y?w#eL%h~F_j6#(gO+6XM?(F=B zgSoMgRXUnnwgzOt!%>cr{y7CcHm7oa!uYys1+HD3e0BCjYLOtiGI9z-3bs1Sm`C%u z@Y>C}{cn4wYuoO|4h+TF?5v{_9{GF0M6SRHEN(rz1;t_!qS2`H zd|}_AZnq0{5j0KcbUJxL2q=mI{GcEnk3(D2Am3b|BCl4ff!MBawOWnka=BokPyoX) zz_KhLgh9LA=U3`+f-vxF+#ulB2<37aH=E5Y$M!@mN$z9(Jg0e6GJbRXni2X{?$9fO hZA$4={(k-`zySM0c=yL9`~?62002ovPDHLkV1k}WM~DCb literal 0 HcmV?d00001 From 369679e605a247af1e5750cb263ae6ccf58bdd93 Mon Sep 17 00:00:00 2001 From: Oliver Matla Date: Tue, 5 Oct 2021 03:12:38 +0200 Subject: [PATCH 3/5] 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 + + + 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 + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 From e6efc03177abdb0d279359ff0a17549b016670c6 Mon Sep 17 00:00:00 2001 From: Oliver Matla Date: Tue, 5 Oct 2021 03:14:32 +0200 Subject: [PATCH 4/5] add click method for discard button, verifying the user intent, deleting the screenshot and closing the editor. --- src/Greenshot.Editor/Forms/ImageEditorForm.cs | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/Greenshot.Editor/Forms/ImageEditorForm.cs b/src/Greenshot.Editor/Forms/ImageEditorForm.cs index ffbea1a8b..10f213f98 100644 --- a/src/Greenshot.Editor/Forms/ImageEditorForm.cs +++ b/src/Greenshot.Editor/Forms/ImageEditorForm.cs @@ -867,6 +867,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(); @@ -935,6 +970,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; From 8ef14c604921d4e5efd3c39ec3d64ef24eab731b Mon Sep 17 00:00:00 2001 From: Oliver Matla Date: Tue, 5 Oct 2021 03:24:20 +0200 Subject: [PATCH 5/5] replace spaces with tabs in language files. --- src/Greenshot/Languages/language-de-DE.xml | 8 ++++---- src/Greenshot/Languages/language-en-US.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Greenshot/Languages/language-de-DE.xml b/src/Greenshot/Languages/language-de-DE.xml index 67205abb8..7cb84ac1b 100644 --- a/src/Greenshot/Languages/language-de-DE.xml +++ b/src/Greenshot/Languages/language-de-DE.xml @@ -54,7 +54,7 @@ schnell zu finden. Vielen Dank :) Zuletzt gewählten Bereich abfotografieren Fenster abfotografieren Fenster aus Liste abfotografieren - Verwerfen und schließen + Verwerfen und schließen Greenshot unterstützen Schließen Hilfe @@ -96,9 +96,9 @@ schnell zu finden. Vielen Dank :) Auswahlwerkzeug (ESC) Ausschneiden Gewähltes Element löschen - Möchten Sie den Screenshot löschen und den Editor schließen? - Bild verwerfen? - Eine Ebene nach hinten + Möchten Sie den Screenshot löschen und den Editor schließen? + Bild verwerfen? + Eine Ebene nach hinten In den Hintergrund Pfeil zeichnen (A) Ellipse zeichnen (E) diff --git a/src/Greenshot/Languages/language-en-US.xml b/src/Greenshot/Languages/language-en-US.xml index d8a12a135..c6bc0460a 100644 --- a/src/Greenshot/Languages/language-en-US.xml +++ b/src/Greenshot/Languages/language-en-US.xml @@ -55,7 +55,7 @@ Also, we would highly appreciate if you checked whether a tracker item already e Capture last region Capture window Capture window from list - Discard and quit + Discard and quit Support Greenshot Exit Help @@ -97,9 +97,9 @@ Also, we would highly appreciate if you checked whether a tracker item already e Selection Tool (ESC) Cut Delete - Do you want to quit and delete the saved screenshot? - Discard image? - Down one level + Do you want to quit and delete the saved screenshot? + Discard image? + Down one level Down to bottom Draw arrow (A) Draw ellipse (E)