github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extended the ExportCapture with ExportInformation as a result object, this allows us to better and more consistently return & handle information from the export. Also it should be easier to extend the functionality. TODO: Still need to cleanup some messages, some are no longer needed

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2034 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-09-14 15:04:37 +00:00
commit be797ecf8a
27 changed files with 379 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

21
GreenshotConfluencePlugin/ConfluenceDestination.cs
View file

@ -114,10 +114,11 @@ namespace GreenshotConfluencePlugin {
}
}
public override bool ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) {
public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) {
ExportInformation exportInformation = new ExportInformation(this.Designation, this.Description);
// force password check to take place before the pages load
if (!ConfluencePlugin.ConfluenceConnector.isLoggedIn) {
return false;
return exportInformation;
}
Page selectedPage = page;
@ -132,8 +133,6 @@ namespace GreenshotConfluencePlugin {
openPage = false;
}
filename = confluenceUpload.Filename;
} else {
return false;
}
}
if (selectedPage != null) {
@ -143,20 +142,18 @@ namespace GreenshotConfluencePlugin {
if (uploaded) {
if (openPage) {
try {
Process.Start(selectedPage.Url);
Process.Start(selectedPage.Url);
} catch { }
}
surface.UploadURL = selectedPage.Url;
surface.SendMessageEvent(this, SurfaceMessageTyp.UploadedUrl, Language.GetFormattedString("exported_to", Description));
surface.Modified = false;
return true;
exportInformation.ExportMade = true;
exportInformation.Uri = selectedPage.Url;
} else {
surface.SendMessageEvent(this, SurfaceMessageTyp.Error, Language.GetString("confluence", LangKey.upload_failure) + " " + errorMessage);
exportInformation.ErrorMessage = errorMessage;
}
}
}
return false;
ProcessExport(exportInformation, surface);
return exportInformation;
}
private bool upload(Image image, Page page, string filename, out string errorMessage) {