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
This commit is contained in:
RKrom 2012-05-18 18:13:53 +00:00
parent 19c70484ef
commit d257e4331d

View file

@ -62,7 +62,7 @@ namespace GreenshotPlugin.Core {
public bool IsFirstLaunch; 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")] [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<string> OutputDestinations = new List<string>(); public List<string> OutputDestinations = new List<string>();
[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<ClipboardFormat> ClipboardFormats = new List<ClipboardFormat>(); public List<ClipboardFormat> ClipboardFormats = new List<ClipboardFormat>();
[IniProperty("CaptureMousepointer", Description="Should the mouse be captured?", DefaultValue="true")] [IniProperty("CaptureMousepointer", Description="Should the mouse be captured?", DefaultValue="true")]
@ -289,10 +289,12 @@ namespace GreenshotPlugin.Core {
if (OutputDestinations == null) { if (OutputDestinations == null) {
OutputDestinations = new List<string>(); OutputDestinations = new List<string>();
} }
// Make sure there is an output! // Make sure there is an output!
if (OutputDestinations.Count == 0) { if (OutputDestinations.Count == 0) {
OutputDestinations.Add("Editor"); OutputDestinations.Add("Editor");
} }
// Prevent both settings at once, bug #3435056 // Prevent both settings at once, bug #3435056
if (OutputDestinations.Contains("Clipboard") && OutputFileCopyPathToClipboard) { if (OutputDestinations.Contains("Clipboard") && OutputFileCopyPathToClipboard) {
OutputFileCopyPathToClipboard = false; OutputFileCopyPathToClipboard = false;