Merge from 0.8: Added "Editor match capture size" option, which was still missing. Also set this to default and added translations DE,EN,NL (which all need to be checked).

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1286 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4

Greenshot/Configuration/EditorConfiguration.cs

@@ -43,7 +43,7 @@ namespace Greenshot.Configuration {
 		[IniProperty("LastFieldValue", Separator="|", Description="Field values, make sure the last used settings are re-used")]
 		public Dictionary<string, object> LastUsedFieldValues;
 
-		[IniProperty("MatchSizeToCapture", Description="Match the editor window size to the capture", DefaultValue="false")]
+		[IniProperty("MatchSizeToCapture", Description="Match the editor window size to the capture", DefaultValue="True")]
 		public bool MatchSizeToCapture;
 		[IniProperty("WindowPlacementFlags", Description="Placement flags", DefaultValue="0")]
 		public WindowPlacementFlags WindowPlacementFlags;

Greenshot/Configuration/LanguageKeys.cs

@@ -106,6 +106,7 @@ namespace Greenshot.Configuration {
 		editor_italic,
 		editor_load_objects,
 		editor_magnification_factor,
+		editor_match_capture_size,
 		editor_obfuscate,
 		editor_obfuscate_blur,
 		editor_obfuscate_mode,
@@ -161,6 +162,7 @@ namespace Greenshot.Configuration {
 		settings_destination_file,
 		settings_destination_fileas,
 		settings_destination_printer,
+		settings_editor,
 		settings_filenamepattern,
 		settings_general,
 		settings_iecapture,

Greenshot/Forms/SettingsForm.Designer.cs

@@ -95,6 +95,8 @@ namespace Greenshot {
 			this.window_hotkeyControl = new GreenshotPlugin.Controls.HotkeyControl();
 			this.fullscreen_hotkeyControl = new GreenshotPlugin.Controls.HotkeyControl();
 			this.tab_capture = new System.Windows.Forms.TabPage();
+			this.groupbox_editor = new System.Windows.Forms.GroupBox();
+			this.checkbox_editor_match_capture_size = new System.Windows.Forms.CheckBox();
 			this.groupbox_iecapture = new System.Windows.Forms.GroupBox();
 			this.checkbox_ie_capture = new System.Windows.Forms.CheckBox();
 			this.groupbox_windowscapture = new System.Windows.Forms.GroupBox();
@@ -132,6 +134,7 @@ namespace Greenshot {
 			((System.ComponentModel.ISupportInitialize)(this.numericUpDown_daysbetweencheck)).BeginInit();
 			this.groupbox_hotkeys.SuspendLayout();
 			this.tab_capture.SuspendLayout();
+			this.groupbox_editor.SuspendLayout();
 			this.groupbox_iecapture.SuspendLayout();
 			this.groupbox_windowscapture.SuspendLayout();
 			this.groupbox_capture.SuspendLayout();
@@ -611,6 +614,7 @@ namespace Greenshot {
 			// 
 			// tab_capture
 			// 
+			this.tab_capture.Controls.Add(this.groupbox_editor);
 			this.tab_capture.Controls.Add(this.groupbox_iecapture);
 			this.tab_capture.Controls.Add(this.groupbox_windowscapture);
 			this.tab_capture.Controls.Add(this.groupbox_capture);
@@ -621,6 +625,25 @@ namespace Greenshot {
 			this.tab_capture.Text = "Capture";
 			this.tab_capture.UseVisualStyleBackColor = true;
 			// 
+			// groupbox_editor
+			// 
+			this.groupbox_editor.Controls.Add(this.checkbox_editor_match_capture_size);
+			this.groupbox_editor.Location = new System.Drawing.Point(4, 260);
+			this.groupbox_editor.Name = "groupbox_editor";
+			this.groupbox_editor.Size = new System.Drawing.Size(416, 50);
+			this.groupbox_editor.TabIndex = 27;
+			this.groupbox_editor.TabStop = false;
+			this.groupbox_editor.Text = "Editor";
+			// 
+			// checkbox_editor_match_capture_size
+			// 
+			this.checkbox_editor_match_capture_size.Location = new System.Drawing.Point(6, 19);
+			this.checkbox_editor_match_capture_size.Name = "checkbox_editor_match_capture_size";
+			this.checkbox_editor_match_capture_size.Size = new System.Drawing.Size(213, 24);
+			this.checkbox_editor_match_capture_size.TabIndex = 26;
+			this.checkbox_editor_match_capture_size.Text = "Match capture size";
+			this.checkbox_editor_match_capture_size.UseVisualStyleBackColor = true;
+			// 
 			// groupbox_iecapture
 			// 
 			this.groupbox_iecapture.Controls.Add(this.checkbox_ie_capture);
@@ -952,6 +975,7 @@ namespace Greenshot {
 			this.groupbox_hotkeys.ResumeLayout(false);
 			this.groupbox_hotkeys.PerformLayout();
 			this.tab_capture.ResumeLayout(false);
+			this.groupbox_editor.ResumeLayout(false);
 			this.groupbox_iecapture.ResumeLayout(false);
 			this.groupbox_windowscapture.ResumeLayout(false);
 			this.groupbox_windowscapture.PerformLayout();
@@ -965,6 +989,8 @@ namespace Greenshot {
 			this.groupbox_plugins.PerformLayout();
 			this.ResumeLayout(false);
 		}
+		private System.Windows.Forms.GroupBox groupbox_editor;
+		private System.Windows.Forms.CheckBox checkbox_editor_match_capture_size;
 		private System.Windows.Forms.NumericUpDown numericUpDown_daysbetweencheck;
 		private System.Windows.Forms.GroupBox groupbox_network;
 		private System.Windows.Forms.CheckBox checkbox_usedefaultproxy;

Greenshot/Forms/SettingsForm.cs

@@ -40,7 +40,8 @@ namespace Greenshot {
 	/// </summary>
 	public partial class SettingsForm : Form {
 		private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(SettingsForm));
-		private static CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>();
+		private static CoreConfiguration coreConfiguration = IniConfig.GetIniSection<CoreConfiguration>();
+		private static EditorConfiguration editorConfiguration = IniConfig.GetIniSection<EditorConfiguration>();
 		ILanguage lang;
 		private ToolTip toolTip;
 		
@@ -114,6 +115,9 @@ namespace Greenshot {
 			this.groupbox_iecapture.Text = lang.GetString(LangKey.settings_iecapture);
 			this.checkbox_ie_capture.Text = lang.GetString(LangKey.settings_iecapture);
 
+			this.groupbox_editor.Text = lang.GetString(LangKey.settings_editor);
+			this.checkbox_editor_match_capture_size.Text = lang.GetString(LangKey.editor_match_capture_size);
+
 			this.groupbox_windowscapture.Text  = lang.GetString(LangKey.settings_windowscapture);
 			this.label_window_capture_mode.Text = lang.GetString(LangKey.settings_window_capture_mode);
 
@@ -195,51 +199,53 @@ namespace Greenshot {
 		}
 
 		private void DisplaySettings() {
-			region_hotkeyControl.SetHotkey(conf.RegionHotkey);
+			region_hotkeyControl.SetHotkey(coreConfiguration.RegionHotkey);
-			fullscreen_hotkeyControl.SetHotkey(conf.FullscreenHotkey);
+			fullscreen_hotkeyControl.SetHotkey(coreConfiguration.FullscreenHotkey);
-			window_hotkeyControl.SetHotkey(conf.WindowHotkey);
+			window_hotkeyControl.SetHotkey(coreConfiguration.WindowHotkey);
-			lastregion_hotkeyControl.SetHotkey(conf.LastregionHotkey);
+			lastregion_hotkeyControl.SetHotkey(coreConfiguration.LastregionHotkey);
-			ie_hotkeyControl.SetHotkey(conf.IEHotkey);
+			ie_hotkeyControl.SetHotkey(coreConfiguration.IEHotkey);
-			colorButton_window_background.SelectedColor = conf.DWMBackgroundColor;
+			colorButton_window_background.SelectedColor = coreConfiguration.DWMBackgroundColor;
 			
-			checkbox_ie_capture.Checked = conf.IECapture;
+			checkbox_ie_capture.Checked = coreConfiguration.IECapture;
 			combobox_language.SelectedValue = lang.CurrentLanguage;
-			textbox_storagelocation.Text = FilenameHelper.FillVariables(conf.OutputFilePath);
+			textbox_storagelocation.Text = FilenameHelper.FillVariables(coreConfiguration.OutputFilePath);
-			textbox_screenshotname.Text = conf.OutputFileFilenamePattern;
+			textbox_screenshotname.Text = coreConfiguration.OutputFileFilenamePattern;
-			combobox_primaryimageformat.SelectedItem = conf.OutputFileFormat;
+			combobox_primaryimageformat.SelectedItem = coreConfiguration.OutputFileFormat;
-			combobox_emailformat.SelectedItem = conf.OutputEMailFormat;
+			combobox_emailformat.SelectedItem = coreConfiguration.OutputEMailFormat;
 			if (!DWM.isDWMEnabled()) {
 				// Remove DWM from configuration, as DWM is disabled!
-				if (conf.WindowCaptureMode == WindowCaptureMode.Aero || conf.WindowCaptureMode == WindowCaptureMode.AeroTransparent) {
+				if (coreConfiguration.WindowCaptureMode == WindowCaptureMode.Aero || coreConfiguration.WindowCaptureMode == WindowCaptureMode.AeroTransparent) {
-					conf.WindowCaptureMode = WindowCaptureMode.GDI;
+					coreConfiguration.WindowCaptureMode = WindowCaptureMode.GDI;
 				}
 			}
-			combobox_window_capture_mode.SelectedItem = conf.WindowCaptureMode;
+			combobox_window_capture_mode.SelectedItem = coreConfiguration.WindowCaptureMode;
 
-			checkbox_copypathtoclipboard.Checked = conf.OutputFileCopyPathToClipboard;
+			checkbox_copypathtoclipboard.Checked = coreConfiguration.OutputFileCopyPathToClipboard;
-			trackBarJpegQuality.Value = conf.OutputFileJpegQuality;
+			trackBarJpegQuality.Value = coreConfiguration.OutputFileJpegQuality;
-			textBoxJpegQuality.Text = conf.OutputFileJpegQuality+"%";
+			textBoxJpegQuality.Text = coreConfiguration.OutputFileJpegQuality+"%";
-			checkbox_alwaysshowjpegqualitydialog.Checked = conf.OutputFilePromptJpegQuality;
+			checkbox_alwaysshowjpegqualitydialog.Checked = coreConfiguration.OutputFilePromptJpegQuality;
-			checkbox_playsound.Checked = conf.PlayCameraSound;
+			checkbox_playsound.Checked = coreConfiguration.PlayCameraSound;
 			
-			checkbox_clipboard.Checked = conf.OutputDestinations.Contains(Destination.Clipboard);
+			checkbox_clipboard.Checked = coreConfiguration.OutputDestinations.Contains(Destination.Clipboard);
-			checkbox_file.Checked = conf.OutputDestinations.Contains(Destination.FileDefault);
+			checkbox_file.Checked = coreConfiguration.OutputDestinations.Contains(Destination.FileDefault);
-			checkbox_fileas.Checked = conf.OutputDestinations.Contains(Destination.FileWithDialog);
+			checkbox_fileas.Checked = coreConfiguration.OutputDestinations.Contains(Destination.FileWithDialog);
-			checkbox_printer.Checked = conf.OutputDestinations.Contains(Destination.Printer);
+			checkbox_printer.Checked = coreConfiguration.OutputDestinations.Contains(Destination.Printer);
-			checkbox_editor.Checked = conf.OutputDestinations.Contains(Destination.Editor);
+			checkbox_editor.Checked = coreConfiguration.OutputDestinations.Contains(Destination.Editor);
-			checkbox_email.Checked = conf.OutputDestinations.Contains(Destination.EMail);
+			checkbox_email.Checked = coreConfiguration.OutputDestinations.Contains(Destination.EMail);
 
-			checkboxPrintInverted.Checked = conf.OutputPrintInverted;
+			checkboxPrintInverted.Checked = coreConfiguration.OutputPrintInverted;
-			checkboxAllowCenter.Checked = conf.OutputPrintCenter;
+			checkboxAllowCenter.Checked = coreConfiguration.OutputPrintCenter;
-			checkboxAllowEnlarge.Checked = conf.OutputPrintAllowEnlarge;
+			checkboxAllowEnlarge.Checked = coreConfiguration.OutputPrintAllowEnlarge;
-			checkboxAllowRotate.Checked = conf.OutputPrintAllowRotate;
+			checkboxAllowRotate.Checked = coreConfiguration.OutputPrintAllowRotate;
-			checkboxAllowShrink.Checked = conf.OutputPrintAllowShrink;
+			checkboxAllowShrink.Checked = coreConfiguration.OutputPrintAllowShrink;
-			checkboxTimestamp.Checked = conf.OutputPrintTimestamp;
+			checkboxTimestamp.Checked = coreConfiguration.OutputPrintTimestamp;
-			checkbox_alwaysshowprintoptionsdialog.Checked = conf.OutputPrintPromptOptions;
+			checkbox_alwaysshowprintoptionsdialog.Checked = coreConfiguration.OutputPrintPromptOptions;
-			checkbox_capture_mousepointer.Checked = conf.CaptureMousepointer;
+			checkbox_capture_mousepointer.Checked = coreConfiguration.CaptureMousepointer;
-			checkbox_capture_windows_interactive.Checked = conf.CaptureWindowsInteractive;
+			checkbox_capture_windows_interactive.Checked = coreConfiguration.CaptureWindowsInteractive;
 			
-			numericUpDownWaitTime.Value = conf.CaptureDelay >=0?conf.CaptureDelay:0;
+			checkbox_editor_match_capture_size.Checked = editorConfiguration.MatchSizeToCapture;
+
+			numericUpDownWaitTime.Value = coreConfiguration.CaptureDelay >=0?coreConfiguration.CaptureDelay:0;
 
 			// If the run for all is set we disable and set the checkbox
 			if (StartupHelper.checkRunAll()) {
@@ -264,25 +270,25 @@ namespace Greenshot {
 				}
 			}
 			
-			checkbox_usedefaultproxy.Checked = conf.UseProxy;
+			checkbox_usedefaultproxy.Checked = coreConfiguration.UseProxy;
-			numericUpDown_daysbetweencheck.Value = conf.UpdateCheckInterval;
+			numericUpDown_daysbetweencheck.Value = coreConfiguration.UpdateCheckInterval;
 		}
 
 		private void SaveSettings() {
-			conf.Language = combobox_language.SelectedValue.ToString();
+			coreConfiguration.Language = combobox_language.SelectedValue.ToString();
 
-			conf.WindowCaptureMode = (WindowCaptureMode)combobox_window_capture_mode.SelectedItem;
+			coreConfiguration.WindowCaptureMode = (WindowCaptureMode)combobox_window_capture_mode.SelectedItem;
-			conf.OutputFileFilenamePattern = textbox_screenshotname.Text;
+			coreConfiguration.OutputFileFilenamePattern = textbox_screenshotname.Text;
-			if (!FilenameHelper.FillVariables(conf.OutputFilePath).Equals(textbox_storagelocation.Text)) {
+			if (!FilenameHelper.FillVariables(coreConfiguration.OutputFilePath).Equals(textbox_storagelocation.Text)) {
-				conf.OutputFilePath = textbox_storagelocation.Text;
+				coreConfiguration.OutputFilePath = textbox_storagelocation.Text;
 			}
-			conf.OutputFileFormat = (OutputFormat)combobox_primaryimageformat.SelectedItem;
+			coreConfiguration.OutputFileFormat = (OutputFormat)combobox_primaryimageformat.SelectedItem;
-			conf.OutputEMailFormat = (EmailFormat)combobox_emailformat.SelectedItem;
+			coreConfiguration.OutputEMailFormat = (EmailFormat)combobox_emailformat.SelectedItem;
 
-			conf.OutputFileCopyPathToClipboard = checkbox_copypathtoclipboard.Checked;
+			coreConfiguration.OutputFileCopyPathToClipboard = checkbox_copypathtoclipboard.Checked;
-			conf.OutputFileJpegQuality = trackBarJpegQuality.Value;
+			coreConfiguration.OutputFileJpegQuality = trackBarJpegQuality.Value;
-			conf.OutputFilePromptJpegQuality = checkbox_alwaysshowjpegqualitydialog.Checked;
+			coreConfiguration.OutputFilePromptJpegQuality = checkbox_alwaysshowjpegqualitydialog.Checked;
-			conf.PlayCameraSound = checkbox_playsound.Checked;
+			coreConfiguration.PlayCameraSound = checkbox_playsound.Checked;
 
 			List<Destination> destinations = new List<Destination>();
 			if (checkbox_clipboard.Checked) destinations.Add(Destination.Clipboard);
@@ -291,30 +297,32 @@ namespace Greenshot {
 			if (checkbox_printer.Checked) destinations.Add(Destination.Printer);
 			if (checkbox_editor.Checked) destinations.Add(Destination.Editor);
 			if (checkbox_email.Checked) destinations.Add(Destination.EMail);
-			conf.OutputDestinations = destinations;
+			coreConfiguration.OutputDestinations = destinations;
 			
-			conf.OutputPrintInverted = checkboxPrintInverted.Checked;
+			coreConfiguration.OutputPrintInverted = checkboxPrintInverted.Checked;
-			conf.OutputPrintCenter = checkboxAllowCenter.Checked;
+			coreConfiguration.OutputPrintCenter = checkboxAllowCenter.Checked;
-			conf.OutputPrintAllowEnlarge = checkboxAllowEnlarge.Checked;
+			coreConfiguration.OutputPrintAllowEnlarge = checkboxAllowEnlarge.Checked;
-			conf.OutputPrintAllowRotate = checkboxAllowRotate.Checked;
+			coreConfiguration.OutputPrintAllowRotate = checkboxAllowRotate.Checked;
-			conf.OutputPrintAllowShrink = checkboxAllowShrink.Checked;
+			coreConfiguration.OutputPrintAllowShrink = checkboxAllowShrink.Checked;
-			conf.OutputPrintTimestamp = checkboxTimestamp.Checked;
+			coreConfiguration.OutputPrintTimestamp = checkboxTimestamp.Checked;
-			conf.OutputPrintPromptOptions = checkbox_alwaysshowprintoptionsdialog.Checked;
+			coreConfiguration.OutputPrintPromptOptions = checkbox_alwaysshowprintoptionsdialog.Checked;
-			conf.CaptureMousepointer = checkbox_capture_mousepointer.Checked;
+			coreConfiguration.CaptureMousepointer = checkbox_capture_mousepointer.Checked;
-			conf.CaptureWindowsInteractive = checkbox_capture_windows_interactive.Checked;
+			coreConfiguration.CaptureWindowsInteractive = checkbox_capture_windows_interactive.Checked;
-			conf.CaptureDelay = (int)numericUpDownWaitTime.Value;
+			coreConfiguration.CaptureDelay = (int)numericUpDownWaitTime.Value;
-			conf.DWMBackgroundColor = colorButton_window_background.SelectedColor;
+			coreConfiguration.DWMBackgroundColor = colorButton_window_background.SelectedColor;
 
-			conf.RegionHotkey = region_hotkeyControl.ToString();
+			coreConfiguration.RegionHotkey = region_hotkeyControl.ToString();
-			conf.FullscreenHotkey = fullscreen_hotkeyControl.ToString();
+			coreConfiguration.FullscreenHotkey = fullscreen_hotkeyControl.ToString();
-			conf.WindowHotkey = window_hotkeyControl.ToString();
+			coreConfiguration.WindowHotkey = window_hotkeyControl.ToString();
-			conf.LastregionHotkey = lastregion_hotkeyControl.ToString();
+			coreConfiguration.LastregionHotkey = lastregion_hotkeyControl.ToString();
-			conf.IEHotkey = ie_hotkeyControl.ToString();
+			coreConfiguration.IEHotkey = ie_hotkeyControl.ToString();
 
-			conf.IECapture = checkbox_ie_capture.Checked;
+			coreConfiguration.IECapture = checkbox_ie_capture.Checked;
 
-			conf.UpdateCheckInterval = (int)numericUpDown_daysbetweencheck.Value;
+			coreConfiguration.UpdateCheckInterval = (int)numericUpDown_daysbetweencheck.Value;
-			conf.UseProxy = checkbox_usedefaultproxy.Checked;
+			coreConfiguration.UseProxy = checkbox_usedefaultproxy.Checked;
+
+			editorConfiguration.MatchSizeToCapture = checkbox_editor_match_capture_size.Checked;
 
 			IniConfig.Save();
 

Greenshot/Languages/language-de-DE.xml

@@ -500,6 +500,9 @@ Zeit, z.B. 11_58_32 (plus Dateinamenerweiterung wie in den Einstellungen definie
 	<resource name="settings_iecapture">
 		Internet Explorer abfotografieren
 	</resource>
+	<resource name="settings_editor">
+		Editor
+	</resource>
 	<resource name="contextmenu_openfile">
 		Bild aus Datei öffnen
 	</resource>
@@ -527,6 +530,9 @@ Zeit, z.B. 11_58_32 (plus Dateinamenerweiterung wie in den Einstellungen definie
 	<resource name="editor_save_objects">
 		Objekte in Datei speichern
 	</resource>
+	<resource name="editor_match_capture_size">
+		Mache dem Editor so groß wie dem screenshot
+	</resource>
 	<resource name="settings_waittime">
 		Millisekunden warten vor abfotografieren
 	</resource>

Greenshot/Languages/language-en-US.xml

@@ -503,6 +503,9 @@ time, e.g. 11_58_32 (plus extension defined in the settings)
 	<resource name="settings_iecapture">
 		Internet Explorer capture
 	</resource>
+	<resource name="settings_editor">
+		Editor
+	</resource>
 	<resource name="error_openfile">
 		The file "{0}" could not be opened.
 	</resource>
@@ -527,6 +530,9 @@ time, e.g. 11_58_32 (plus extension defined in the settings)
 	<resource name="editor_save_objects">
 		Save objects to file
 	</resource>
+	<resource name="editor_match_capture_size">
+		Match capture size
+	</resource>
 	<resource name="settings_waittime">
 		Milliseconds to wait before capture
 	</resource>

Greenshot/Languages/language-nl-NL.xml

@@ -493,6 +493,9 @@ genereert een directorie voor de huidige dag in uw standaard opslag lokatie, b.v
 	<resource name="settings_iecapture">
 		Internet Explorer vastleggen
 	</resource>
+	<resource name="settings_editor">
+		Beeld bewerken
+	</resource>
 	<resource name="contextmenu_openfile">
 		Open beeld uit bestand
 	</resource>
@@ -520,6 +523,9 @@ genereert een directorie voor de huidige dag in uw standaard opslag lokatie, b.v
 	<resource name="editor_save_objects">
 		Objecten in bestand opslaan
 	</resource>
+	<resource name="editor_match_capture_size">
+		Pas groote aan screenshot aan
+	</resource>
 	<resource name="settings_waittime">
 		Milliseconden wachten voor vastleggen
 	</resource>

Greenshot/releases/additional_files/readme.txt

@@ -19,22 +19,21 @@ Bugs resolved:
 * At first start all available languages can be selected
 
 Features added:
+* Changed the configuration from a proprietary binary format to a readable & modifiable "greenshot.ini".
 * Added the Dutch language as a third default language for all Greenshot parts (application, plugins and installer)
 * Added all currently available languages to the installer.
 * Added configurable hotkeys
 * Added Aero (DWM) window capture on Windows Vista and later! Either the window is captured with transparency or it is possible to replace the transparent window border with a background color, making the capture look cleaner.
 * Added Internet Explorer capture. Select your IE - Tab from the Greenshot context menu or use the default hotkey "Ctrl + Shift + PrintScreen" to capture the active IE page.
 * Added OCR Plugin, this will only work when Microsoft Office 2003 or 2007 is installed. Unfortunately there is no way to check what languages Office supports, this needs to be set manually! To set the language, go into the Greenshot configuration screen, a new "plugin" tab is available. Click on the tab, on the OCR plugin and on the configure button. This should allow you to change the language which is used to OCR your selection!
-* Added a simple plugin that will cut the "garbage" from the Internet Explorer and Firefox title when capturing currently the behaviour can only be controlled by changing the configuration manually (titlefix.properties in the configuration directory)
 * Added environment variable support for the filename and path. Now one can use e.g. "${TMP}"…
-* Changed the configuration from a proprietary binary format to a readable & modifiable "greenshot.ini".
 * Added "experimental" Windows "Enhanced" MetaFile (=Vector graphics) support. The bitmap can be resized "without" quality loss. To use this, e.g. drag/drop a "WMF" file from the Microsoft Office "Clipart" directory on the open Greenshot editor.
 * Added Imgur (see: http://Imgur.com) plugin
 * Added plugin white/black listing, mainly needed for administrators specifying which plugins will be loaded and which not.
-* Added Outlook support, creating HTML email with "in-body" image using the default signature for new Emails.
+* Added better Email export: Outlook support, creating HTML email with "in-body" image using the default signature for new Emails.
 * Added GDI capturing windows with transparency, only works if Aero (DWM) is disabled!
-* Added update check
+* Added update check, if an update is detected a popup is shown asking if the user wants to download this
-
+* Added HTML as clipboard format
 
 
 Known bugs: