github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

Browse source
This commit is contained in:
RKrom 2013-12-04 17:46:02 +01:00
parent 2a8e2475d8
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions
Download patch file Download diff file Expand all files Collapse all files

12
GreenshotFlickrPlugin/FlickrPlugin.cs
View file

@ -123,8 +123,9 @@ namespace GreenshotFlickrPlugin
config.ShowConfigDialog();
}
public void Upload(ICaptureDetails captureDetails, ISurface surface, ExportInformation exportInformation) {
public bool Upload(ICaptureDetails captureDetails, ISurface surface, out String uploadUrl) {
SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(config.UploadFormat, config.UploadJpegQuality, false);
uploadUrl = null;
try {
string flickrUrl = null;
new PleaseWaitForm().ShowAndWait(Attributes.Name, Language.GetString("flickr", LangKey.communication_wait),
@ -135,18 +136,19 @@ namespace GreenshotFlickrPlugin
);
if (flickrUrl == null) {
exportInformation.ExportMade = false;
return;
return false;
}
exportInformation.ExportMade = true;
exportInformation.Uri = flickrUrl;
uploadUrl = flickrUrl;
if (config.AfterUploadLinkToClipBoard) {
ClipboardHelper.SetClipboardData(flickrUrl);
}
return true;
} catch (Exception e) {
LOG.Error("Error uploading.", e);
MessageBox.Show(Language.GetString("flickr", LangKey.upload_failure) + " " + e.Message);
}
return false;
}
}
}