From d257e4331deef7f0702e3dfc7f6e1240016fdf46 Mon Sep 17 00:00:00 2001 From: RKrom Date: Fri, 18 May 2012 18:13:53 +0000 Subject: [PATCH] Changing the default clipboard format to work without HTML. git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1886 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- GreenshotPlugin/Core/CoreConfiguration.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/GreenshotPlugin/Core/CoreConfiguration.cs b/GreenshotPlugin/Core/CoreConfiguration.cs index 6dfc58e2c..370343923 100644 --- a/GreenshotPlugin/Core/CoreConfiguration.cs +++ b/GreenshotPlugin/Core/CoreConfiguration.cs @@ -62,7 +62,7 @@ namespace GreenshotPlugin.Core { public bool IsFirstLaunch; [IniProperty("Destinations", Separator=",", Description="Which destinations? Possible options (more might be added by plugins) are: Editor, FileDefault, FileWithDialog, Clipboard, Printer, EMail, Picker", DefaultValue="Picker")] public List OutputDestinations = new List(); - [IniProperty("ClipboardFormats", Separator=",", Description="Specify which formats we copy on the clipboard? Options are: PNG,HTML and DIB", DefaultValue="PNG,HTML,DIB")] + [IniProperty("ClipboardFormats", Separator=",", Description="Specify which formats we copy on the clipboard? Options are: PNG, HTML, HTMLDATAURL and DIB", DefaultValue="PNG,DIB")] public List ClipboardFormats = new List(); [IniProperty("CaptureMousepointer", Description="Should the mouse be captured?", DefaultValue="true")] @@ -289,10 +289,12 @@ namespace GreenshotPlugin.Core { if (OutputDestinations == null) { OutputDestinations = new List(); } + // Make sure there is an output! if (OutputDestinations.Count == 0) { OutputDestinations.Add("Editor"); } + // Prevent both settings at once, bug #3435056 if (OutputDestinations.Contains("Clipboard") && OutputFileCopyPathToClipboard) { OutputFileCopyPathToClipboard = false;