diff --git a/Greenshot/Configuration/LanguageKeys.cs b/Greenshot/Configuration/LanguageKeys.cs index c2280f2f4..37bf75600 100644 --- a/Greenshot/Configuration/LanguageKeys.cs +++ b/Greenshot/Configuration/LanguageKeys.cs @@ -92,6 +92,7 @@ namespace Greenshot.Configuration { editor_close_on_save_title, editor_confirm, editor_copyimagetoclipboard, + editor_copyimagetoclipboardandcloseeditor, editor_copypathtoclipboard, editor_copytoclipboard, editor_crop, diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs index 1bf498412..6c5c226d5 100644 --- a/Greenshot/Forms/ImageEditorForm.Designer.cs +++ b/Greenshot/Forms/ImageEditorForm.Designer.cs @@ -125,6 +125,7 @@ namespace Greenshot { this.destinationsToolStrip = new Greenshot.Controls.ToolStripEx(); this.btnSave = new GreenshotPlugin.Controls.GreenshotToolStripButton(); this.btnClipboard = new GreenshotPlugin.Controls.GreenshotToolStripButton(); + this.btnClipboardAndClose = new GreenshotPlugin.Controls.GreenshotToolStripButton(); this.btnPrint = new GreenshotPlugin.Controls.GreenshotToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btnDelete = new GreenshotPlugin.Controls.GreenshotToolStripButton(); @@ -186,6 +187,7 @@ namespace Greenshot { this.btnCancel = new Greenshot.Controls.BindableToolStripButton(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.closeToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); + this.clipboardAndCloseToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.fileSavedStatusContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.copyPathMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.openDirectoryMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); @@ -870,6 +872,7 @@ namespace Greenshot { this.destinationsToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.btnSave, this.btnClipboard, + this.btnClipboardAndClose, this.btnPrint, this.toolStripSeparator2, this.btnDelete, @@ -903,6 +906,15 @@ namespace Greenshot { this.btnClipboard.Name = "btnClipboard"; this.btnClipboard.Click += new System.EventHandler(this.BtnClipboardClick); // + // btnClipboardAndClose + // + this.btnClipboardAndClose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnClipboardAndClose.Image = ((System.Drawing.Image)(resources.GetObject("btnClipboardAndClose.Image"))); + this.btnClipboardAndClose.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnClipboardAndClose.LanguageKey = "editor_clipboardandclose"; + this.btnClipboardAndClose.Name = "btnClipboardAndClose"; + this.btnClipboardAndClose.Click += new System.EventHandler(this.BtnClipboardClickAndClose); + // // btnPrint // this.btnPrint.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -1566,6 +1578,14 @@ namespace Greenshot { this.closeToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.closeToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItemClick); // + // clipboardAndCloseToolStripMenuItem + // + this.clipboardAndCloseToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnClipboardAndClose.Image"))); + this.clipboardAndCloseToolStripMenuItem.LanguageKey = "editor_clipboardandclose"; + this.clipboardAndCloseToolStripMenuItem.Name = "clipboardAndClose"; + this.clipboardAndCloseToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.C))); + this.clipboardAndCloseToolStripMenuItem.Click += new System.EventHandler(this.ClipboardAndCloseToolStripMenuItemClick); + // // fileSavedStatusContextMenu // this.fileSavedStatusContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1747,6 +1767,7 @@ namespace Greenshot { private GreenshotPlugin.Controls.GreenshotToolStripMenuItem helpToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem preferencesToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; + private GreenshotPlugin.Controls.GreenshotToolStripMenuItem clipboardAndCloseToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem closeToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; @@ -1779,6 +1800,7 @@ namespace Greenshot { private System.Windows.Forms.ToolStripButton btnRedo; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private GreenshotPlugin.Controls.GreenshotToolStripButton btnClipboard; + private GreenshotPlugin.Controls.GreenshotToolStripButton btnClipboardAndClose; private GreenshotPlugin.Controls.GreenshotToolStripButton btnDelete; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; diff --git a/Greenshot/Forms/ImageEditorForm.cs b/Greenshot/Forms/ImageEditorForm.cs index 9577772f9..d83a5f101 100644 --- a/Greenshot/Forms/ImageEditorForm.cs +++ b/Greenshot/Forms/ImageEditorForm.cs @@ -364,6 +364,7 @@ namespace Greenshot { } } // add the elements after the destinations + fileStripMenuItem.DropDownItems.Add(clipboardAndCloseToolStripMenuItem); fileStripMenuItem.DropDownItems.Add(toolStripSeparator9); fileStripMenuItem.DropDownItems.Add(closeToolStripMenuItem); } @@ -516,6 +517,11 @@ namespace Greenshot { DestinationHelper.ExportCapture(true, ClipboardDestination.DESIGNATION, _surface, _surface.CaptureDetails); } + private void BtnClipboardClickAndClose(object sender, EventArgs e) { + DestinationHelper.ExportCapture(true, ClipboardDestination.DESIGNATION, _surface, _surface.CaptureDetails); + Close(); + } + private void BtnPrintClick(object sender, EventArgs e) { // The BeginInvoke is a solution for the printdialog not having focus BeginInvoke((MethodInvoker) delegate { @@ -523,6 +529,11 @@ namespace Greenshot { }); } + private void ClipboardAndCloseToolStripMenuItemClick(object sender, EventArgs e) { + DestinationHelper.ExportCapture(true, ClipboardDestination.DESIGNATION, _surface, _surface.CaptureDetails); + Close(); + } + private void CloseToolStripMenuItemClick(object sender, EventArgs e) { Close(); } diff --git a/Greenshot/Forms/ImageEditorForm.resx b/Greenshot/Forms/ImageEditorForm.resx index 88fd73b87..22bd0e809 100644 --- a/Greenshot/Forms/ImageEditorForm.resx +++ b/Greenshot/Forms/ImageEditorForm.resx @@ -1026,4 +1026,7 @@ 17, 17 + + ..\icons\clipboardandclose.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Greenshot/Languages/language-de-DE.xml b/Greenshot/Languages/language-de-DE.xml index cab377ef9..411469966 100644 --- a/Greenshot/Languages/language-de-DE.xml +++ b/Greenshot/Languages/language-de-DE.xml @@ -83,6 +83,7 @@ schnell zu finden. Vielen Dank :) Rand Helligkeit Abbrechen + In Zwischenablage kopieren und schließen Fehler beim Zugriff auf die Zwischenablage. Bitte wiederholen Sie den Vorgang. Schließen Möchten Sie den Screenshot speichern? diff --git a/Greenshot/Languages/language-en-US.xml b/Greenshot/Languages/language-en-US.xml index 3100b76f0..ab60217bf 100644 --- a/Greenshot/Languages/language-en-US.xml +++ b/Greenshot/Languages/language-en-US.xml @@ -83,6 +83,7 @@ Also, we would highly appreciate if you checked whether a tracker item already e Border Brightness Cancel + Copy to clipboard and close Error while accessing the clipboard. Please try again. Close Do you want to save the screenshot? diff --git a/Greenshot/icons/clipboardandclose.png b/Greenshot/icons/clipboardandclose.png new file mode 100644 index 000000000..cb30aab86 Binary files /dev/null and b/Greenshot/icons/clipboardandclose.png differ