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

Changes for feature 683

Browse source
This commit is contained in:
RKrom 2014-02-07 17:51:05 +01:00
commit fced4164a7
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
GreenshotConfluencePlugin/ConfluenceDestination.cs
View file

@ -37,7 +37,8 @@ namespace GreenshotConfluencePlugin {
/// </summary>
public class ConfluenceDestination : AbstractDestination {
private static log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluenceDestination));
private static ConfluenceConfiguration config = IniConfig.GetIniSection<ConfluenceConfiguration>();
private static readonly ConfluenceConfiguration config = IniConfig.GetIniSection<ConfluenceConfiguration>();
private static readonly CoreConfiguration coreConfig = IniConfig.GetIniSection<CoreConfiguration>();
private static Image confluenceIcon = null;
private Confluence.Page page;
public static bool IsInitialized {
@ -122,7 +123,7 @@ namespace GreenshotConfluencePlugin {
Page selectedPage = page;
bool openPage = (page == null) && config.OpenPageAfterUpload;
string filename = FilenameHelper.GetFilename(config.UploadFormat, captureDetails);
string filename = FilenameHelper.GetFilenameWithoutExtensionFromPattern(coreConfig.OutputFileFilenamePattern, captureDetails);
if (selectedPage == null) {
ConfluenceUpload confluenceUpload = new ConfluenceUpload(filename);
Nullable<bool> dialogResult = confluenceUpload.ShowDialog();
@ -134,6 +135,10 @@ namespace GreenshotConfluencePlugin {
filename = confluenceUpload.Filename;
}
}
string extension = "." + config.UploadFormat;
if (!filename.ToLower().EndsWith(extension)) {
filename = filename + extension;
}
if (selectedPage != null) {
string errorMessage;
bool uploaded = upload(surface, selectedPage, filename, out errorMessage);