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

Added LinqBridge and did some code cleanup.

Browse source
This commit is contained in:
Robin 2016-09-05 23:37:40 +02:00
commit 7c7fd67b2a
20 changed files with 327 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Greenshot/Drawing/DrawableContainerList.cs
View file

@ -40,7 +40,7 @@ namespace Greenshot.Drawing {
[Serializable] [Serializable]
public class DrawableContainerList : List<IDrawableContainer>, IDrawableContainerList public class DrawableContainerList : List<IDrawableContainer>, IDrawableContainerList
{ {
private static readonly ComponentResourceManager editorFormResources = new ComponentResourceManager(typeof(ImageEditorForm)); private static readonly ComponentResourceManager EditorFormResources = new ComponentResourceManager(typeof(ImageEditorForm));
public Guid ParentID { public Guid ParentID {
get; get;
@ -50,8 +50,8 @@ namespace Greenshot.Drawing {
public DrawableContainerList() { public DrawableContainerList() {
} }
public DrawableContainerList(Guid parentID) { public DrawableContainerList(Guid parentId) {
ParentID = parentID; ParentID = parentId;
} }
public EditStatus Status { public EditStatus Status {
@ -327,10 +327,11 @@ namespace Greenshot.Drawing {
/// Pulls one or several elements up to the topmost level(s) in hierarchy (z-index). /// Pulls one or several elements up to the topmost level(s) in hierarchy (z-index).
/// </summary> /// </summary>
/// <param name="elements">of elements to pull to top</param> /// <param name="elements">of elements to pull to top</param>
public void PullElementsToTop(IDrawableContainerList elements) { public void PullElementsToTop(IDrawableContainerList elements)
{
var dcs = ToArray(); var dcs = ToArray();
for(int i=0; i<dcs.Length; i++) { foreach (var dc in dcs)
var dc = dcs[i]; {
if (!elements.Contains(dc)) { if (!elements.Contains(dc)) {
continue; continue;
} }
@ -462,27 +463,31 @@ namespace Greenshot.Drawing {
menu.Items.Add(item); menu.Items.Add(item);
// Copy // Copy
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_copytoclipboard)); item = new ToolStripMenuItem(Language.GetString(LangKey.editor_copytoclipboard))
item.Image = ((Image)(editorFormResources.GetObject("copyToolStripMenuItem.Image"))); {
Image = (Image) EditorFormResources.GetObject("copyToolStripMenuItem.Image")
};
item.Click += delegate { item.Click += delegate {
ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), this); ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), this);
}; };
menu.Items.Add(item); menu.Items.Add(item);
// Cut // Cut
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_cuttoclipboard)); item = new ToolStripMenuItem(Language.GetString(LangKey.editor_cuttoclipboard))
item.Image = ((Image)(editorFormResources.GetObject("btnCut.Image"))); {
Image = (Image) EditorFormResources.GetObject("btnCut.Image")
};
item.Click += delegate { item.Click += delegate {
ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), this); ClipboardHelper.SetClipboardData(typeof(IDrawableContainerList), this);
surface.RemoveElements(this, true); surface.RemoveElements(this);
}; };
menu.Items.Add(item); menu.Items.Add(item);
// Delete // Delete
item = new ToolStripMenuItem(Language.GetString(LangKey.editor_deleteelement)); item = new ToolStripMenuItem(Language.GetString(LangKey.editor_deleteelement));
item.Image = ((Image)(editorFormResources.GetObject("removeObjectToolStripMenuItem.Image"))); item.Image = (Image)EditorFormResources.GetObject("removeObjectToolStripMenuItem.Image");
item.Click += delegate { item.Click += delegate {
surface.RemoveElements(this, true); surface.RemoveElements(this);
}; };
menu.Items.Add(item); menu.Items.Add(item);
@ -552,7 +557,7 @@ namespace Greenshot.Drawing {
} }
#region IDisposable Support #region IDisposable Support
private bool _disposedValue = false; // To detect redundant calls private bool _disposedValue; // To detect redundant calls
protected virtual void Dispose(bool disposing) protected virtual void Dispose(bool disposing)
{ {

4
Greenshot/Greenshot.csproj
View file

@ -22,6 +22,10 @@
</UpgradeBackupLocation> </UpgradeBackupLocation>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="LinqBridge, Version=1.3.0.0, Culture=neutral, PublicKeyToken=c2b14eb747628076, processorArchitecture=MSIL">
<HintPath>..\packages\LinqBridge.1.3.0\lib\net20\LinqBridge.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>Lib\log4net.dll</HintPath> <HintPath>Lib\log4net.dll</HintPath>
</Reference> </Reference>

75
Greenshot/Helpers/MailHelper.cs
View file

@ -135,7 +135,6 @@ namespace Greenshot.Helpers {
private string _subject; private string _subject;
private string _body; private string _body;
private RecipientCollection _recipientCollection; private RecipientCollection _recipientCollection;
private readonly List<string> _files;
private readonly ManualResetEvent _manualResetEvent; private readonly ManualResetEvent _manualResetEvent;
#endregion Member Variables #endregion Member Variables
@ -146,7 +145,7 @@ namespace Greenshot.Helpers {
/// Creates a blank mail message. /// Creates a blank mail message.
/// </summary> /// </summary>
public MapiMailMessage() { public MapiMailMessage() {
_files = new List<string>(); Files = new List<string>();
_recipientCollection = new RecipientCollection(); _recipientCollection = new RecipientCollection();
_manualResetEvent = new ManualResetEvent(false); _manualResetEvent = new ManualResetEvent(false);
} }
@ -206,11 +205,7 @@ namespace Greenshot.Helpers {
/// <summary> /// <summary>
/// Gets the file list for this mail message. /// Gets the file list for this mail message.
/// </summary> /// </summary>
public List<string> Files { public List<string> Files { get; }
get {
return _files;
}
}
#endregion Public Properties #endregion Public Properties
@ -255,9 +250,9 @@ namespace Greenshot.Helpers {
/// Sends the mail message. /// Sends the mail message.
/// </summary> /// </summary>
private void _ShowMail() { private void _ShowMail() {
MAPIHelperInterop.MapiMessage message = new MAPIHelperInterop.MapiMessage(); var message = new MapiHelperInterop.MapiMessage();
using (RecipientCollection.InteropRecipientCollection interopRecipients = _recipientCollection.GetInteropRepresentation()) { using (var interopRecipients = _recipientCollection.GetInteropRepresentation()) {
message.Subject = _subject; message.Subject = _subject;
message.NoteText = _body; message.NoteText = _body;
@ -265,7 +260,7 @@ namespace Greenshot.Helpers {
message.RecipientCount = _recipientCollection.Count; message.RecipientCount = _recipientCollection.Count;
// Check if we need to add attachments // Check if we need to add attachments
if (_files.Count > 0) { if (Files.Count > 0) {
// Add attachments // Add attachments
message.Files = _AllocAttachments(out message.FileCount); message.Files = _AllocAttachments(out message.FileCount);
} }
@ -275,25 +270,29 @@ namespace Greenshot.Helpers {
const int MAPI_DIALOG = 0x8; const int MAPI_DIALOG = 0x8;
//const int MAPI_LOGON_UI = 0x1; //const int MAPI_LOGON_UI = 0x1;
int error = MAPIHelperInterop.MAPISendMail(IntPtr.Zero, IntPtr.Zero, message, MAPI_DIALOG, 0); int error = MapiHelperInterop.MAPISendMail(IntPtr.Zero, IntPtr.Zero, message, MAPI_DIALOG, 0);
if (_files.Count > 0) { if (Files.Count > 0) {
// Deallocate the files // Deallocate the files
_DeallocFiles(message); _DeallocFiles(message);
} }
MAPI_CODES errorCode = (MAPI_CODES)Enum.ToObject(typeof(MAPI_CODES), error); MAPI_CODES errorCode = (MAPI_CODES)Enum.ToObject(typeof(MAPI_CODES), error);
// Check for error // Check for error
if (errorCode != MAPI_CODES.SUCCESS && errorCode != MAPI_CODES.USER_ABORT) { if (errorCode == MAPI_CODES.SUCCESS || errorCode == MAPI_CODES.USER_ABORT)
string errorText = GetMapiError(errorCode); {
LOG.Error("Error sending MAPI Email. Error: " + errorText + " (code = " + errorCode + ")."); return;
MessageBox.Show(errorText, "Mail (MAPI) destination", MessageBoxButtons.OK, MessageBoxIcon.Error);
// Recover from bad settings, show again
if (errorCode == MAPI_CODES.INVALID_RECIPS) {
_recipientCollection = new RecipientCollection();
_ShowMail();
}
} }
string errorText = GetMapiError(errorCode);
LOG.Error("Error sending MAPI Email. Error: " + errorText + " (code = " + errorCode + ").");
MessageBox.Show(errorText, "Mail (MAPI) destination", MessageBoxButtons.OK, MessageBoxIcon.Error);
// Recover from bad settings, show again
if (errorCode != MAPI_CODES.INVALID_RECIPS)
{
return;
}
_recipientCollection = new RecipientCollection();
_ShowMail();
} }
} }
@ -301,7 +300,7 @@ namespace Greenshot.Helpers {
/// Deallocates the files in a message. /// Deallocates the files in a message.
/// </summary> /// </summary>
/// <param name="message">The message to deallocate the files from.</param> /// <param name="message">The message to deallocate the files from.</param>
private void _DeallocFiles(MAPIHelperInterop.MapiMessage message) { private void _DeallocFiles(MapiHelperInterop.MapiMessage message) {
if (message.Files != IntPtr.Zero) { if (message.Files != IntPtr.Zero) {
Type fileDescType = typeof(MapiFileDescriptor); Type fileDescType = typeof(MapiFileDescriptor);
int fsize = Marshal.SizeOf(fileDescType); int fsize = Marshal.SizeOf(fileDescType);
@ -325,29 +324,31 @@ namespace Greenshot.Helpers {
/// <returns></returns> /// <returns></returns>
private IntPtr _AllocAttachments(out int fileCount) { private IntPtr _AllocAttachments(out int fileCount) {
fileCount = 0; fileCount = 0;
if (_files == null) { if (Files == null) {
return IntPtr.Zero; return IntPtr.Zero;
} }
if ((_files.Count <= 0) || (_files.Count > 100)) { if ((Files.Count <= 0) || (Files.Count > 100)) {
return IntPtr.Zero; return IntPtr.Zero;
} }
Type atype = typeof(MapiFileDescriptor); Type atype = typeof(MapiFileDescriptor);
int asize = Marshal.SizeOf(atype); int asize = Marshal.SizeOf(atype);
IntPtr ptra = Marshal.AllocHGlobal(_files.Count * asize); IntPtr ptra = Marshal.AllocHGlobal(Files.Count * asize);
MapiFileDescriptor mfd = new MapiFileDescriptor(); MapiFileDescriptor mfd = new MapiFileDescriptor
mfd.position = -1; {
position = -1
};
IntPtr runptr = ptra; IntPtr runptr = ptra;
for (int i = 0; i < _files.Count; i++) { for (int i = 0; i < Files.Count; i++) {
string path = _files[i] as string; string path = Files[i];
mfd.name = Path.GetFileName(path); mfd.name = Path.GetFileName(path);
mfd.path = path; mfd.path = path;
Marshal.StructureToPtr(mfd, runptr, false); Marshal.StructureToPtr(mfd, runptr, false);
runptr = new IntPtr(runptr.ToInt64() + asize); runptr = new IntPtr(runptr.ToInt64() + asize);
} }
fileCount = _files.Count; fileCount = Files.Count;
return ptra; return ptra;
} }
@ -480,13 +481,13 @@ namespace Greenshot.Helpers {
/// <summary> /// <summary>
/// Internal class for calling MAPI APIs /// Internal class for calling MAPI APIs
/// </summary> /// </summary>
internal class MAPIHelperInterop { internal class MapiHelperInterop {
#region Constructors #region Constructors
/// <summary> /// <summary>
/// Private constructor. /// Private constructor.
/// </summary> /// </summary>
private MAPIHelperInterop() { private MapiHelperInterop() {
// Intenationally blank // Intenationally blank
} }
@ -599,8 +600,8 @@ namespace Greenshot.Helpers {
/// Returns an interop representation of a recepient. /// Returns an interop representation of a recepient.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
internal MapiMailMessage.MAPIHelperInterop.MapiRecipDesc GetInteropRepresentation() { internal MapiMailMessage.MapiHelperInterop.MapiRecipDesc GetInteropRepresentation() {
MapiMailMessage.MAPIHelperInterop.MapiRecipDesc interop = new MapiMailMessage.MAPIHelperInterop.MapiRecipDesc(); MapiMailMessage.MapiHelperInterop.MapiRecipDesc interop = new MapiMailMessage.MapiHelperInterop.MapiRecipDesc();
if (DisplayName == null) { if (DisplayName == null) {
interop.Name = Address; interop.Name = Address;
@ -699,13 +700,13 @@ namespace Greenshot.Helpers {
} }
// allocate enough memory to hold all recipients // allocate enough memory to hold all recipients
int size = Marshal.SizeOf(typeof(MapiMailMessage.MAPIHelperInterop.MapiRecipDesc)); int size = Marshal.SizeOf(typeof(MapiMailMessage.MapiHelperInterop.MapiRecipDesc));
_handle = Marshal.AllocHGlobal(_count * size); _handle = Marshal.AllocHGlobal(_count * size);
// place all interop recipients into the memory just allocated // place all interop recipients into the memory just allocated
IntPtr ptr = _handle; IntPtr ptr = _handle;
foreach (Recipient native in outer) { foreach (Recipient native in outer) {
MapiMailMessage.MAPIHelperInterop.MapiRecipDesc interop = native.GetInteropRepresentation(); MapiMailMessage.MapiHelperInterop.MapiRecipDesc interop = native.GetInteropRepresentation();
// stick it in the memory block // stick it in the memory block
Marshal.StructureToPtr(interop, ptr, false); Marshal.StructureToPtr(interop, ptr, false);
@ -732,7 +733,7 @@ namespace Greenshot.Helpers {
/// </summary> /// </summary>
public void Dispose() { public void Dispose() {
if (_handle != IntPtr.Zero) { if (_handle != IntPtr.Zero) {
Type type = typeof(MapiMailMessage.MAPIHelperInterop.MapiRecipDesc); Type type = typeof(MapiMailMessage.MapiHelperInterop.MapiRecipDesc);
int size = Marshal.SizeOf(type); int size = Marshal.SizeOf(type);
// destroy all the structures in the memory area // destroy all the structures in the memory area

1
Greenshot/packages.config
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="LinqBridge" version="1.3.0" targetFramework="net20" />
<package id="Tools.InnoSetup" version="5.5.9" targetFramework="net20" /> <package id="Tools.InnoSetup" version="5.5.9" targetFramework="net20" />
</packages> </packages>

3
Greenshot/releases/innosetup/setup.iss.template
View file

@ -18,7 +18,8 @@ Source: ..\..\bin\Release\Greenshot.exe; DestDir: {app}; Components: greenshot;
Source: ..\..\bin\Release\GreenshotPlugin.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\GreenshotPlugin.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\bin\Release\Greenshot.exe.config; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\Greenshot.exe.config; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\bin\Release\log4net.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\log4net.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion
Source: ..\..\LinqBridge.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion
Source: ..\..\bin\Release\checksum.MD5; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\checksum.MD5; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion ;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\additional_files\installer.txt; DestDir: {app}; Components: greenshot; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion Source: ..\additional_files\installer.txt; DestDir: {app}; Components: greenshot; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion

65
GreenshotConfluencePlugin/Confluence.cs
View file

@ -94,8 +94,8 @@ namespace Confluence {
public class ConfluenceConnector : IDisposable { public class ConfluenceConnector : IDisposable {
private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(ConfluenceConnector)); private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(ConfluenceConnector));
private const string AuthFailedExceptionName = "com.atlassian.confluence.rpc.AuthenticationFailedException"; private const string AuthFailedExceptionName = "com.atlassian.confluence.rpc.AuthenticationFailedException";
private const string V2Failed = "AXIS"; private const string V2Failed = "AXIS";
private static readonly ConfluenceConfiguration Config = IniConfig.GetIniSection<ConfluenceConfiguration>(); private static readonly ConfluenceConfiguration Config = IniConfig.GetIniSection<ConfluenceConfiguration>();
private string _credentials; private string _credentials;
private DateTime _loggedInTime = DateTime.Now; private DateTime _loggedInTime = DateTime.Now;
private bool _loggedIn; private bool _loggedIn;
@ -123,17 +123,17 @@ namespace Confluence {
public ConfluenceConnector(string url, int timeout) { public ConfluenceConnector(string url, int timeout) {
_timeout = timeout; _timeout = timeout;
Init(url); Init(url);
} }
private void Init(string url) { private void Init(string url) {
_url = url; _url = url;
_confluence = new ConfluenceSoapServiceService _confluence = new ConfluenceSoapServiceService
{ {
Url = url, Url = url,
Proxy = NetworkHelper.CreateProxy(new Uri(url)) Proxy = NetworkHelper.CreateProxy(new Uri(url))
}; };
} }
~ConfluenceConnector() { ~ConfluenceConnector() {
Dispose(false); Dispose(false);
@ -149,11 +149,11 @@ namespace Confluence {
_loggedInTime = DateTime.Now; _loggedInTime = DateTime.Now;
_loggedIn = true; _loggedIn = true;
} catch (Exception e) { } catch (Exception e) {
// Check if confluence-v2 caused an error, use v1 instead // Check if confluence-v2 caused an error, use v1 instead
if (e.Message.Contains(V2Failed) && _url.Contains("v2")) { if (e.Message.Contains(V2Failed) && _url.Contains("v2")) {
Init(_url.Replace("v2", "v1")); Init(_url.Replace("v2", "v1"));
return DoLogin(user, password); return DoLogin(user, password);
} }
// check if auth failed // check if auth failed
if (e.Message.Contains(AuthFailedExceptionName)) { if (e.Message.Contains(AuthFailedExceptionName)) {
return false; return false;
@ -173,7 +173,7 @@ namespace Confluence {
try { try {
// Get the system name, so the user knows where to login to // Get the system name, so the user knows where to login to
string systemName = _url.Replace(ConfluenceConfiguration.DEFAULT_POSTFIX1,""); string systemName = _url.Replace(ConfluenceConfiguration.DEFAULT_POSTFIX1,"");
systemName = systemName.Replace(ConfluenceConfiguration.DEFAULT_POSTFIX2, ""); systemName = systemName.Replace(ConfluenceConfiguration.DEFAULT_POSTFIX2, "");
CredentialsDialog dialog = new CredentialsDialog(systemName) CredentialsDialog dialog = new CredentialsDialog(systemName)
{ {
Name = null Name = null
@ -274,49 +274,40 @@ namespace Confluence {
return new Page(page); return new Page(page);
} }
public List<Space> GetSpaceSummaries() { public IEnumerable<Space> GetSpaceSummaries() {
CheckCredentials(); CheckCredentials();
RemoteSpaceSummary [] spaces = _confluence.getSpaces(_credentials); RemoteSpaceSummary [] spaces = _confluence.getSpaces(_credentials);
List<Space> returnSpaces = new List<Space>();
foreach(RemoteSpaceSummary space in spaces) { foreach(RemoteSpaceSummary space in spaces) {
returnSpaces.Add(new Space(space)); yield return new Space(space);
} }
returnSpaces.Sort((x, y) => string.CompareOrdinal(x.Name, y.Name));
return returnSpaces;
} }
public List<Page> GetPageChildren(Page parentPage) { public IEnumerable<Page> GetPageChildren(Page parentPage) {
CheckCredentials(); CheckCredentials();
List<Page> returnPages = new List<Page>(); List<Page> returnPages = new List<Page>();
RemotePageSummary[] pages = _confluence.getChildren(_credentials, parentPage.Id); RemotePageSummary[] pages = _confluence.getChildren(_credentials, parentPage.Id);
foreach(RemotePageSummary page in pages) { foreach(RemotePageSummary page in pages) {
returnPages.Add(new Page(page)); yield return new Page(page);
} }
returnPages.Sort((x, y) => string.CompareOrdinal(x.Title, y.Title));
return returnPages;
} }
public List<Page> GetPageSummaries(Space space) { public IEnumerable<Page> GetPageSummaries(Space space) {
CheckCredentials(); CheckCredentials();
List<Page> returnPages = new List<Page>();
RemotePageSummary[] pages = _confluence.getPages(_credentials, space.Key); RemotePageSummary[] pages = _confluence.getPages(_credentials, space.Key);
foreach(RemotePageSummary page in pages) { foreach(RemotePageSummary page in pages) {
returnPages.Add(new Page(page)); yield return new Page(page);
} }
returnPages.Sort((x, y) => string.CompareOrdinal(x.Title, y.Title));
return returnPages;
} }
public List<Page> SearchPages(string query, string space) { public IEnumerable<Page> SearchPages(string query, string space) {
CheckCredentials(); CheckCredentials();
List<Page> results = new List<Page>(); foreach(var searchResult in _confluence.search(_credentials, query, 20)) {
foreach(RemoteSearchResult searchResult in _confluence.search(_credentials, query, 20)) {
Log.DebugFormat("Got result of type {0}", searchResult.type); Log.DebugFormat("Got result of type {0}", searchResult.type);
if ("page".Equals(searchResult.type)) { if ("page".Equals(searchResult.type))
results.Add(new Page(searchResult, space)); {
yield return new Page(searchResult, space);
} }
} }
return results;
} }
} }
} }

3
GreenshotConfluencePlugin/ConfluenceUtils.cs
View file

@ -20,6 +20,7 @@
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Windows.Automation; using System.Windows.Automation;
@ -140,7 +141,7 @@ namespace GreenshotConfluencePlugin {
} }
} }
foreach(string url in IEHelper.GetIEUrls()) { foreach(string url in IEHelper.GetIEUrls().Distinct()) {
urls.Add(url); urls.Add(url);
} }

63
GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs
View file

@ -21,77 +21,68 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq;
using System.Windows; using System.Windows;
using Greenshot.IniFile; using Greenshot.IniFile;
namespace GreenshotConfluencePlugin { namespace GreenshotConfluencePlugin {
public partial class ConfluenceSearch : System.Windows.Controls.Page { public partial class ConfluenceSearch
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluenceSearch)); {
private static readonly ConfluenceConfiguration config = IniConfig.GetIniSection<ConfluenceConfiguration>(); private static readonly ConfluenceConfiguration ConfluenceConfig = IniConfig.GetIniSection<ConfluenceConfiguration>();
private readonly ConfluenceUpload confluenceUpload; private readonly ConfluenceUpload _confluenceUpload;
public List<Confluence.Space> Spaces { public IEnumerable<Confluence.Space> Spaces => _confluenceUpload.Spaces;
get {
return confluenceUpload.Spaces;
}
}
private readonly ObservableCollection<Confluence.Page> pages = new ObservableCollection<Confluence.Page>(); public ObservableCollection<Confluence.Page> Pages { get; } = new ObservableCollection<Confluence.Page>();
public ObservableCollection<Confluence.Page> Pages {
get {
return pages;
}
}
public ConfluenceSearch(ConfluenceUpload confluenceUpload) { public ConfluenceSearch(ConfluenceUpload confluenceUpload) {
this.confluenceUpload = confluenceUpload; _confluenceUpload = confluenceUpload;
DataContext = this; DataContext = this;
InitializeComponent(); InitializeComponent();
if (config.SearchSpaceKey == null) { if (ConfluenceConfig.SearchSpaceKey == null) {
SpaceComboBox.SelectedItem = Spaces[0]; SpaceComboBox.SelectedItem = Spaces.FirstOrDefault();
} else { } else {
foreach(Confluence.Space space in Spaces) { foreach(var space in Spaces) {
if (space.Key.Equals(config.SearchSpaceKey)) { if (space.Key.Equals(ConfluenceConfig.SearchSpaceKey)) {
SpaceComboBox.SelectedItem = space; SpaceComboBox.SelectedItem = space;
} }
} }
} }
} }
void PageListView_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) { private void PageListView_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) {
SelectionChanged(); SelectionChanged();
} }
void SelectionChanged() { private void SelectionChanged() {
if (PageListView.HasItems && PageListView.SelectedItems.Count > 0) { if (PageListView.HasItems && PageListView.SelectedItems.Count > 0) {
confluenceUpload.SelectedPage = (Confluence.Page)PageListView.SelectedItem; _confluenceUpload.SelectedPage = (Confluence.Page)PageListView.SelectedItem;
} else { } else {
confluenceUpload.SelectedPage = null; _confluenceUpload.SelectedPage = null;
} }
} }
void Search_Click(object sender, RoutedEventArgs e) { private void Search_Click(object sender, RoutedEventArgs e) {
doSearch(); DoSearch();
} }
void doSearch() { private void DoSearch() {
string spaceKey = (string)SpaceComboBox.SelectedValue; string spaceKey = (string)SpaceComboBox.SelectedValue;
config.SearchSpaceKey = spaceKey; ConfluenceConfig.SearchSpaceKey = spaceKey;
List<Confluence.Page> searchResult = ConfluencePlugin.ConfluenceConnector.SearchPages(searchText.Text, spaceKey); Pages.Clear();
pages.Clear(); foreach(var page in ConfluencePlugin.ConfluenceConnector.SearchPages(searchText.Text, spaceKey).OrderBy(p => p.Title)) {
foreach(Confluence.Page page in searchResult) { Pages.Add(page);
pages.Add(page);
} }
} }
void SearchText_KeyDown(object sender, System.Windows.Input.KeyEventArgs e) { private void SearchText_KeyDown(object sender, System.Windows.Input.KeyEventArgs e) {
if (e.Key == System.Windows.Input.Key.Return && Search.IsEnabled) { if (e.Key == System.Windows.Input.Key.Return && Search.IsEnabled) {
doSearch(); DoSearch();
e.Handled = true; e.Handled = true;
} }
} }
void Page_Loaded(object sender, RoutedEventArgs e) { private void Page_Loaded(object sender, RoutedEventArgs e) {
SelectionChanged(); SelectionChanged();
} }

116
GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml.cs
View file

@ -18,8 +18,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
using System; using System;
using System.Collections.Generic; using System.Linq;
using System.Threading; using System.Threading;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -32,96 +33,99 @@ namespace GreenshotConfluencePlugin {
/// <summary> /// <summary>
/// Interaction logic for ConfluenceTreePicker.xaml /// Interaction logic for ConfluenceTreePicker.xaml
/// </summary> /// </summary>
public partial class ConfluenceTreePicker : System.Windows.Controls.Page { public partial class ConfluenceTreePicker
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluenceTreePicker)); {
private readonly ConfluenceConnector confluenceConnector; private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(ConfluenceTreePicker));
private readonly ConfluenceUpload confluenceUpload; private readonly ConfluenceConnector _confluenceConnector;
private bool isInitDone = false; private readonly ConfluenceUpload _confluenceUpload;
private bool _isInitDone;
public ConfluenceTreePicker(ConfluenceUpload confluenceUpload) { public ConfluenceTreePicker(ConfluenceUpload confluenceUpload) {
confluenceConnector = ConfluencePlugin.ConfluenceConnector; _confluenceConnector = ConfluencePlugin.ConfluenceConnector;
this.confluenceUpload = confluenceUpload; _confluenceUpload = confluenceUpload;
InitializeComponent(); InitializeComponent();
} }
void pageTreeViewItem_DoubleClick(object sender, MouseButtonEventArgs eventArgs) { private void pageTreeViewItem_DoubleClick(object sender, MouseButtonEventArgs eventArgs) {
LOG.Debug("spaceTreeViewItem_MouseLeftButtonDown is called!"); Log.Debug("spaceTreeViewItem_MouseLeftButtonDown is called!");
TreeViewItem clickedItem = eventArgs.Source as TreeViewItem; TreeViewItem clickedItem = eventArgs.Source as TreeViewItem;
if (clickedItem ==null) { Confluence.Page page = clickedItem?.Tag as Confluence.Page;
return;
}
Confluence.Page page = clickedItem.Tag as Confluence.Page;
if (page == null) { if (page == null) {
return; return;
} }
if (!clickedItem.HasItems) { if (clickedItem.HasItems)
LOG.Debug("Loading pages for page: " + page.Title); {
(new Thread(() => { return;
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => {ShowBusy.Visibility = Visibility.Visible;}));
List<Confluence.Page> pages = confluenceConnector.GetPageChildren(page);
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => {
foreach(Confluence.Page childPage in pages) {
LOG.Debug("Adding page: " + childPage.Title);
TreeViewItem pageTreeViewItem = new TreeViewItem();
pageTreeViewItem.Header = childPage.Title;
pageTreeViewItem.Tag = childPage;
clickedItem.Items.Add(pageTreeViewItem);
pageTreeViewItem.PreviewMouseDoubleClick += new MouseButtonEventHandler(pageTreeViewItem_DoubleClick);
pageTreeViewItem.PreviewMouseLeftButtonDown += new MouseButtonEventHandler(pageTreeViewItem_Click);
}
ShowBusy.Visibility = Visibility.Collapsed;
}));
}
) { Name = "Loading childpages for confluence page " + page.Title }).Start();
} }
Log.Debug("Loading pages for page: " + page.Title);
new Thread(() => {
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => {ShowBusy.Visibility = Visibility.Visible;}));
var pages = _confluenceConnector.GetPageChildren(page).OrderBy(p => p.Title);
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => {
foreach(var childPage in pages) {
Log.Debug("Adding page: " + childPage.Title);
var pageTreeViewItem = new TreeViewItem
{
Header = childPage.Title,
Tag = childPage
};
clickedItem.Items.Add(pageTreeViewItem);
pageTreeViewItem.PreviewMouseDoubleClick += pageTreeViewItem_DoubleClick;
pageTreeViewItem.PreviewMouseLeftButtonDown += pageTreeViewItem_Click;
}
ShowBusy.Visibility = Visibility.Collapsed;
}));
}) { Name = "Loading childpages for confluence page " + page.Title }.Start();
} }
void pageTreeViewItem_Click(object sender, MouseButtonEventArgs eventArgs) { private void pageTreeViewItem_Click(object sender, MouseButtonEventArgs eventArgs) {
LOG.Debug("pageTreeViewItem_PreviewMouseDoubleClick is called!"); Log.Debug("pageTreeViewItem_PreviewMouseDoubleClick is called!");
TreeViewItem clickedItem = eventArgs.Source as TreeViewItem; TreeViewItem clickedItem = eventArgs.Source as TreeViewItem;
if (clickedItem ==null) { if (clickedItem ==null) {
return; return;
} }
Confluence.Page page = clickedItem.Tag as Confluence.Page; Confluence.Page page = clickedItem.Tag as Confluence.Page;
confluenceUpload.SelectedPage = page; _confluenceUpload.SelectedPage = page;
if (page != null) { if (page != null) {
LOG.Debug("Page selected: " + page.Title); Log.Debug("Page selected: " + page.Title);
} }
} }
void Page_Loaded(object sender, RoutedEventArgs e) { private void Page_Loaded(object sender, RoutedEventArgs e) {
confluenceUpload.SelectedPage = null; _confluenceUpload.SelectedPage = null;
if (isInitDone) { if (_isInitDone) {
return; return;
} }
ShowBusy.Visibility = Visibility.Visible; ShowBusy.Visibility = Visibility.Visible;
(new Thread(() => { new Thread(() => {
Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => { Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() => {
List<Space> spaces = confluenceUpload.Spaces; foreach (Space space in _confluenceUpload.Spaces) {
foreach (Space space in spaces) { TreeViewItem spaceTreeViewItem = new TreeViewItem
TreeViewItem spaceTreeViewItem = new TreeViewItem(); {
spaceTreeViewItem.Header = space.Name; Header = space.Name,
spaceTreeViewItem.Tag = space; Tag = space
};
// Get homepage // Get homepage
try { try {
Confluence.Page page = confluenceConnector.GetSpaceHomepage(space); Confluence.Page page = _confluenceConnector.GetSpaceHomepage(space);
TreeViewItem pageTreeViewItem = new TreeViewItem(); TreeViewItem pageTreeViewItem = new TreeViewItem
pageTreeViewItem.Header = page.Title; {
pageTreeViewItem.Tag = page; Header = page.Title,
pageTreeViewItem.PreviewMouseDoubleClick += new MouseButtonEventHandler(pageTreeViewItem_DoubleClick); Tag = page
pageTreeViewItem.PreviewMouseLeftButtonDown += new MouseButtonEventHandler(pageTreeViewItem_Click); };
pageTreeViewItem.PreviewMouseDoubleClick += pageTreeViewItem_DoubleClick;
pageTreeViewItem.PreviewMouseLeftButtonDown += pageTreeViewItem_Click;
spaceTreeViewItem.Items.Add(pageTreeViewItem); spaceTreeViewItem.Items.Add(pageTreeViewItem);
ConfluenceTreeView.Items.Add(spaceTreeViewItem); ConfluenceTreeView.Items.Add(spaceTreeViewItem);
} catch (Exception ex) { } catch (Exception ex) {
LOG.Error("Can't get homepage for space : " + space.Name + " (" + ex.Message + ")"); Log.Error("Can't get homepage for space : " + space.Name + " (" + ex.Message + ")");
} }
} }
ShowBusy.Visibility = Visibility.Collapsed; ShowBusy.Visibility = Visibility.Collapsed;
isInitDone = true; _isInitDone = true;
})); }));
} }) { Name = "Loading spaces for confluence"}.Start();
) { Name = "Loading spaces for confluence"}).Start();
} }
} }
} }

7
GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
View file

@ -20,6 +20,7 @@
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Threading; using System.Threading;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -88,8 +89,8 @@ namespace GreenshotConfluencePlugin {
} }
private static DateTime _lastLoad = DateTime.Now; private static DateTime _lastLoad = DateTime.Now;
private static List<Confluence.Space> _spaces; private static IList<Confluence.Space> _spaces;
public List<Confluence.Space> Spaces { public IList<Confluence.Space> Spaces {
get { get {
UpdateSpaces(); UpdateSpaces();
while (_spaces == null) { while (_spaces == null) {
@ -118,7 +119,7 @@ namespace GreenshotConfluencePlugin {
// Check if load is needed // Check if load is needed
if (_spaces == null) { if (_spaces == null) {
(new Thread(() => { (new Thread(() => {
_spaces = ConfluencePlugin.ConfluenceConnector.GetSpaceSummaries(); _spaces = ConfluencePlugin.ConfluenceConnector.GetSpaceSummaries().OrderBy(s => s.Name).ToList();
_lastLoad = DateTime.Now; _lastLoad = DateTime.Now;
}) { Name = "Loading spaces for confluence"}).Start(); }) { Name = "Loading spaces for confluence"}).Start();
} }

13
GreenshotPlugin/Core/AccessibleHelper.cs
View file

@ -165,7 +165,7 @@ namespace GreenshotPlugin.Core {
} }
} }
} }
return String.Empty; return string.Empty;
} }
} }
@ -201,7 +201,7 @@ namespace GreenshotPlugin.Core {
} }
} }
} }
return String.Empty; return string.Empty;
} }
} }
@ -217,6 +217,7 @@ namespace GreenshotPlugin.Core {
} }
} }
// TODO: Why again?
if (captionList.Count > 0) { if (captionList.Count > 0) {
captionList.RemoveAt(captionList.Count - 1); captionList.RemoveAt(captionList.Count - 1);
} }
@ -226,10 +227,8 @@ namespace GreenshotPlugin.Core {
} }
public List<string> IETabUrls { public IEnumerable<string> IETabUrls {
get { get {
var urlList = new List<string>();
foreach (Accessible accessor in Children) { foreach (Accessible accessor in Children) {
foreach (var child in accessor.Children) { foreach (var child in accessor.Children) {
foreach (var tab in child.Children) { foreach (var tab in child.Children) {
@ -238,14 +237,12 @@ namespace GreenshotPlugin.Core {
if (!string.IsNullOrEmpty(description)) { if (!string.IsNullOrEmpty(description)) {
if (description.Contains(Environment.NewLine)) { if (description.Contains(Environment.NewLine)) {
var url = description.Substring(description.IndexOf(Environment.NewLine)).Trim(); var url = description.Substring(description.IndexOf(Environment.NewLine)).Trim();
urlList.Add(url); yield return url;
} }
} }
} }
} }
} }
return urlList;
} }
} }

51
GreenshotPlugin/Core/ClipboardHelper.cs
View file

@ -25,6 +25,7 @@ using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
@ -257,8 +258,8 @@ EndSelection:<<<<<<<4
|| dataObject.GetDataPresent(FORMAT_GIF)) { || dataObject.GetDataPresent(FORMAT_GIF)) {
return true; return true;
} }
List<string> imageFiles = GetImageFilenames(dataObject); var imageFiles = GetImageFilenames(dataObject);
if (imageFiles != null && imageFiles.Count > 0) { if (imageFiles.Any()) {
return true; return true;
} }
if (dataObject.GetDataPresent(FORMAT_FILECONTENTS)) { if (dataObject.GetDataPresent(FORMAT_FILECONTENTS)) {
@ -315,19 +316,16 @@ EndSelection:<<<<<<<4
yield return singleImage; yield return singleImage;
} else { } else {
// check if files are supplied // check if files are supplied
List<string> imageFiles = GetImageFilenames(dataObject); foreach (string imageFile in GetImageFilenames(dataObject)) {
if (imageFiles != null) { Image returnImage = null;
foreach (string imageFile in imageFiles) { try {
Image returnImage = null; returnImage = ImageHelper.LoadImage(imageFile);
try { } catch (Exception streamImageEx) {
returnImage = ImageHelper.LoadImage(imageFile); Log.Error("Problem retrieving Image from clipboard.", streamImageEx);
} catch (Exception streamImageEx) { }
Log.Error("Problem retrieving Image from clipboard.", streamImageEx); if (returnImage != null) {
} Log.InfoFormat("Got image from clipboard with size {0} and format {1}", returnImage.Size, returnImage.PixelFormat);
if (returnImage != null) { yield return returnImage;
Log.InfoFormat("Got image from clipboard with size {0} and format {1}", returnImage.Size, returnImage.PixelFormat);
yield return returnImage;
}
} }
} }
} }
@ -818,22 +816,21 @@ EndSelection:<<<<<<<4
/// </summary> /// </summary>
/// <param name="dataObject">IDataObject</param> /// <param name="dataObject">IDataObject</param>
/// <returns></returns> /// <returns></returns>
public static List<string> GetImageFilenames(IDataObject dataObject) { public static IEnumerable<string> GetImageFilenames(IDataObject dataObject) {
List<string> filenames = new List<string>();
string[] dropFileNames = (string[]) dataObject.GetData(DataFormats.FileDrop); string[] dropFileNames = (string[]) dataObject.GetData(DataFormats.FileDrop);
try { if (dropFileNames != null && dropFileNames.Length > 0) {
if (dropFileNames != null && dropFileNames.Length > 0) { foreach (string filename in dropFileNames) {
foreach (string filename in dropFileNames) { if (string.IsNullOrEmpty(filename))
string ext = Path.GetExtension(filename).ToLower(); {
if ((ext == ".jpg") || (ext == ".jpeg") || (ext == ".tiff") || (ext == ".gif") || (ext == ".png") || (ext == ".bmp") || (ext == ".ico") || (ext == ".wmf")) { continue;
filenames.Add(filename); }
} string ext = Path.GetExtension(filename).ToLower().Substring(1);
if (ImageHelper.StreamConverters.ContainsKey(ext))
{
yield return filename;
} }
} }
} catch (Exception ex) {
Log.Warn("Ignoring an issue with getting the dropFilenames from the clipboard: ", ex);
} }
return filenames;
} }
/// <summary> /// <summary>

39
GreenshotPlugin/Core/IEHelper.cs
View file

@ -36,11 +36,9 @@ namespace GreenshotPlugin.Core {
int version = 7; int version = 7;
// Seeing if IE 9 is used, here we need another offset! // Seeing if IE 9 is used, here we need another offset!
using (RegistryKey ieKey = Registry.LocalMachine.OpenSubKey(IE_KEY, false)) { using (RegistryKey ieKey = Registry.LocalMachine.OpenSubKey(IE_KEY, false)) {
if (ieKey != null) { object versionKey = ieKey?.GetValue("Version");
object versionKey = ieKey.GetValue("Version"); if (versionKey != null) {
if (versionKey != null) { int.TryParse(versionKey.ToString().Substring(0,1), out version);
int.TryParse(versionKey.ToString().Substring(0,1), out version);
}
} }
} }
return version; return version;
@ -55,21 +53,15 @@ namespace GreenshotPlugin.Core {
if (browserWindowDetails == null) { if (browserWindowDetails == null) {
return null; return null;
} }
WindowDetails tmpWD = browserWindowDetails; WindowDetails tmpWd = browserWindowDetails;
// Since IE 9 the TabBandClass is less deep! // Since IE 9 the TabBandClass is less deep!
if (IEVersion() < 9) { if (IEVersion() < 9) {
tmpWD = tmpWD.GetChild("CommandBarClass"); tmpWd = tmpWd.GetChild("CommandBarClass");
if (tmpWD != null) { tmpWd = tmpWd?.GetChild("ReBarWindow32");
tmpWD = tmpWD.GetChild("ReBarWindow32");
}
} }
if (tmpWD != null) { tmpWd = tmpWd?.GetChild("TabBandClass");
tmpWD = tmpWD.GetChild("TabBandClass"); tmpWd = tmpWd?.GetChild("DirectUIHWND");
} return tmpWd;
if (tmpWD != null) {
tmpWD = tmpWD.GetChild("DirectUIHWND");
}
return tmpWD;
} }
/// <summary> /// <summary>
@ -77,24 +69,17 @@ namespace GreenshotPlugin.Core {
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static IEnumerable<string> GetIEUrls() { public static IEnumerable<string> GetIEUrls() {
List<string> urls = new List<string>();
// Find the IE window // Find the IE window
foreach (WindowDetails ieWindow in WindowDetails.GetAllWindows("IEFrame")) { foreach (WindowDetails ieWindow in WindowDetails.GetAllWindows("IEFrame")) {
WindowDetails directUIWD = GetDirectUI(ieWindow); WindowDetails directUIWD = GetDirectUI(ieWindow);
if (directUIWD != null) { if (directUIWD != null) {
Accessible ieAccessible = new Accessible(directUIWD.Handle); Accessible ieAccessible = new Accessible(directUIWD.Handle);
List<string> ieUrls = ieAccessible.IETabUrls; foreach(string url in ieAccessible.IETabUrls)
if (ieUrls != null && ieUrls.Count > 0) { {
foreach(string url in ieUrls) { yield return url;
if (!urls.Contains(url)) {
urls.Add(url);
}
}
} }
} }
} }
return urls;
} }
} }
} }

3
GreenshotPlugin/Core/ImageHelper.cs
View file

@ -372,7 +372,7 @@ namespace GreenshotPlugin.Core {
// Fixed lock problem Bug #3431881 // Fixed lock problem Bug #3431881
using (Stream imageFileStream = File.OpenRead(filename)) using (Stream imageFileStream = File.OpenRead(filename))
{ {
fileImage = FromStream(imageFileStream); fileImage = FromStream(imageFileStream, Path.GetExtension(filename));
} }
if (fileImage != null) if (fileImage != null)
{ {
@ -381,7 +381,6 @@ namespace GreenshotPlugin.Core {
return fileImage; return fileImage;
} }
/// <summary> /// <summary>
/// Based on: http://www.codeproject.com/KB/cs/IconExtractor.aspx /// Based on: http://www.codeproject.com/KB/cs/IconExtractor.aspx
/// And a hint from: http://www.codeproject.com/KB/cs/IconLib.aspx /// And a hint from: http://www.codeproject.com/KB/cs/IconLib.aspx

122
GreenshotPlugin/Core/ImageOutput.cs
View file

@ -42,10 +42,10 @@ namespace GreenshotPlugin.Core {
/// Description of ImageOutput. /// Description of ImageOutput.
/// </summary> /// </summary>
public static class ImageOutput { public static class ImageOutput {
private static readonly ILog LOG = LogManager.GetLogger(typeof(ImageOutput)); private static readonly ILog Log = LogManager.GetLogger(typeof(ImageOutput));
private static readonly CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>(); private static readonly CoreConfiguration CoreConfig = IniConfig.GetIniSection<CoreConfiguration>();
private static readonly int PROPERTY_TAG_SOFTWARE_USED = 0x0131; private static readonly int PROPERTY_TAG_SOFTWARE_USED = 0x0131;
private static readonly Cache<string, string> tmpFileCache = new Cache<string, string>(10 * 60 * 60, RemoveExpiredTmpFile); private static readonly Cache<string, string> TmpFileCache = new Cache<string, string>(10 * 60 * 60, RemoveExpiredTmpFile);
/// <summary> /// <summary>
/// Creates a PropertyItem (Metadata) to store with the image. /// Creates a PropertyItem (Metadata) to store with the image.
@ -71,7 +71,7 @@ namespace GreenshotPlugin.Core {
propertyItem.Value = byteString; propertyItem.Value = byteString;
propertyItem.Len = text.Length + 1; propertyItem.Len = text.Length + 1;
} catch (Exception e) { } catch (Exception e) {
LOG.WarnFormat("Error creating a PropertyItem: {0}", e.Message); Log.WarnFormat("Error creating a PropertyItem: {0}", e.Message);
} }
return propertyItem; return propertyItem;
} }
@ -87,8 +87,8 @@ namespace GreenshotPlugin.Core {
bool disposeImage = CreateImageFromSurface(surface, outputSettings, out imageToSave); bool disposeImage = CreateImageFromSurface(surface, outputSettings, out imageToSave);
SaveToStream(imageToSave, surface, stream, outputSettings); SaveToStream(imageToSave, surface, stream, outputSettings);
// cleanup if needed // cleanup if needed
if (disposeImage && imageToSave != null) { if (disposeImage) {
imageToSave.Dispose(); imageToSave?.Dispose();
} }
} }
@ -133,13 +133,13 @@ namespace GreenshotPlugin.Core {
if (!Environment.OSVersion.IsWindows7OrLater()) if (!Environment.OSVersion.IsWindows7OrLater())
{ {
useMemoryStream = true; useMemoryStream = true;
LOG.Warn("Using memorystream prevent an issue with saving to a non seekable stream."); Log.Warn("Using memorystream prevent an issue with saving to a non seekable stream.");
} }
} }
imageFormat = ImageFormat.Png; imageFormat = ImageFormat.Png;
break; break;
} }
LOG.DebugFormat("Saving image to stream with Format {0} and PixelFormat {1}", imageFormat, imageToSave.PixelFormat); Log.DebugFormat("Saving image to stream with Format {0} and PixelFormat {1}", imageFormat, imageToSave.PixelFormat);
// Check if we want to use a memory stream, to prevent a issue which happens with Windows before "7". // Check if we want to use a memory stream, to prevent a issue which happens with Windows before "7".
// The save is made to the targetStream, this is directed to either the MemoryStream or the original // The save is made to the targetStream, this is directed to either the MemoryStream or the original
@ -156,8 +156,10 @@ namespace GreenshotPlugin.Core {
{ {
if (imageCodec.FormatID == imageFormat.Guid) if (imageCodec.FormatID == imageFormat.Guid)
{ {
EncoderParameters parameters = new EncoderParameters(1); EncoderParameters parameters = new EncoderParameters(1)
parameters.Param[0] = new EncoderParameter(Encoder.Quality, outputSettings.JPGQuality); {
Param = {[0] = new EncoderParameter(Encoder.Quality, outputSettings.JPGQuality)}
};
// Removing transparency if it's not supported in the output // Removing transparency if it's not supported in the output
if (Image.IsAlphaPixelFormat(imageToSave.PixelFormat)) if (Image.IsAlphaPixelFormat(imageToSave.PixelFormat))
{ {
@ -195,7 +197,7 @@ namespace GreenshotPlugin.Core {
AddTag(imageToSave); AddTag(imageToSave);
// Added for OptiPNG // Added for OptiPNG
bool processed = false; bool processed = false;
if (Equals(imageFormat, ImageFormat.Png) && !string.IsNullOrEmpty(conf.OptimizePNGCommand)) { if (Equals(imageFormat, ImageFormat.Png) && !string.IsNullOrEmpty(CoreConfig.OptimizePNGCommand)) {
processed = ProcessPngImageExternally(imageToSave, targetStream); processed = ProcessPngImageExternally(imageToSave, targetStream);
} }
if (!processed) { if (!processed) {
@ -225,10 +227,10 @@ namespace GreenshotPlugin.Core {
} }
} }
} }
} finally { }
if (memoryStream != null) { finally
memoryStream.Dispose(); {
} memoryStream?.Dispose();
} }
} }
@ -239,29 +241,29 @@ namespace GreenshotPlugin.Core {
/// <param name="targetStream">stream to write the processed image to</param> /// <param name="targetStream">stream to write the processed image to</param>
/// <returns></returns> /// <returns></returns>
private static bool ProcessPngImageExternally(Image imageToProcess, Stream targetStream) { private static bool ProcessPngImageExternally(Image imageToProcess, Stream targetStream) {
if (string.IsNullOrEmpty(conf.OptimizePNGCommand)) { if (string.IsNullOrEmpty(CoreConfig.OptimizePNGCommand)) {
return false; return false;
} }
if (!File.Exists(conf.OptimizePNGCommand)) { if (!File.Exists(CoreConfig.OptimizePNGCommand)) {
LOG.WarnFormat("Can't find 'OptimizePNGCommand' {0}", conf.OptimizePNGCommand); Log.WarnFormat("Can't find 'OptimizePNGCommand' {0}", CoreConfig.OptimizePNGCommand);
return false; return false;
} }
string tmpFileName = Path.Combine(Path.GetTempPath(),Path.GetRandomFileName() + ".png"); string tmpFileName = Path.Combine(Path.GetTempPath(),Path.GetRandomFileName() + ".png");
try { try {
using (FileStream tmpStream = File.Create(tmpFileName)) { using (FileStream tmpStream = File.Create(tmpFileName)) {
LOG.DebugFormat("Writing png to tmp file: {0}", tmpFileName); Log.DebugFormat("Writing png to tmp file: {0}", tmpFileName);
imageToProcess.Save(tmpStream, ImageFormat.Png); imageToProcess.Save(tmpStream, ImageFormat.Png);
if (LOG.IsDebugEnabled) { if (Log.IsDebugEnabled) {
LOG.DebugFormat("File size before processing {0}", new FileInfo(tmpFileName).Length); Log.DebugFormat("File size before processing {0}", new FileInfo(tmpFileName).Length);
} }
} }
if (LOG.IsDebugEnabled) { if (Log.IsDebugEnabled) {
LOG.DebugFormat("Starting : {0}", conf.OptimizePNGCommand); Log.DebugFormat("Starting : {0}", CoreConfig.OptimizePNGCommand);
} }
ProcessStartInfo processStartInfo = new ProcessStartInfo(conf.OptimizePNGCommand) ProcessStartInfo processStartInfo = new ProcessStartInfo(CoreConfig.OptimizePNGCommand)
{ {
Arguments = string.Format(conf.OptimizePNGCommandArguments, tmpFileName), Arguments = string.Format(CoreConfig.OptimizePNGCommandArguments, tmpFileName),
CreateNoWindow = true, CreateNoWindow = true,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = true, RedirectStandardError = true,
@ -271,24 +273,24 @@ namespace GreenshotPlugin.Core {
if (process != null) { if (process != null) {
process.WaitForExit(); process.WaitForExit();
if (process.ExitCode == 0) { if (process.ExitCode == 0) {
if (LOG.IsDebugEnabled) { if (Log.IsDebugEnabled) {
LOG.DebugFormat("File size after processing {0}", new FileInfo(tmpFileName).Length); Log.DebugFormat("File size after processing {0}", new FileInfo(tmpFileName).Length);
LOG.DebugFormat("Reading back tmp file: {0}", tmpFileName); Log.DebugFormat("Reading back tmp file: {0}", tmpFileName);
} }
byte[] processedImage = File.ReadAllBytes(tmpFileName); byte[] processedImage = File.ReadAllBytes(tmpFileName);
targetStream.Write(processedImage, 0, processedImage.Length); targetStream.Write(processedImage, 0, processedImage.Length);
return true; return true;
} }
LOG.ErrorFormat("Error while processing PNG image: {0}", process.ExitCode); Log.ErrorFormat("Error while processing PNG image: {0}", process.ExitCode);
LOG.ErrorFormat("Output: {0}", process.StandardOutput.ReadToEnd()); Log.ErrorFormat("Output: {0}", process.StandardOutput.ReadToEnd());
LOG.ErrorFormat("Error: {0}", process.StandardError.ReadToEnd()); Log.ErrorFormat("Error: {0}", process.StandardError.ReadToEnd());
} }
} }
} catch (Exception e) { } catch (Exception e) {
LOG.Error("Error while processing PNG image: ", e); Log.Error("Error while processing PNG image: ", e);
} finally { } finally {
if (File.Exists(tmpFileName)) { if (File.Exists(tmpFileName)) {
LOG.DebugFormat("Cleaning up tmp file: {0}", tmpFileName); Log.DebugFormat("Cleaning up tmp file: {0}", tmpFileName);
File.Delete(tmpFileName); File.Delete(tmpFileName);
} }
} }
@ -334,20 +336,20 @@ namespace GreenshotPlugin.Core {
} }
// check for color reduction, forced or automatically, only when the DisableReduceColors is false // check for color reduction, forced or automatically, only when the DisableReduceColors is false
if (outputSettings.DisableReduceColors || (!conf.OutputFileAutoReduceColors && !outputSettings.ReduceColors)) { if (outputSettings.DisableReduceColors || (!CoreConfig.OutputFileAutoReduceColors && !outputSettings.ReduceColors)) {
return disposeImage; return disposeImage;
} }
bool isAlpha = Image.IsAlphaPixelFormat(imageToSave.PixelFormat); bool isAlpha = Image.IsAlphaPixelFormat(imageToSave.PixelFormat);
if (outputSettings.ReduceColors || (!isAlpha && conf.OutputFileAutoReduceColors)) { if (outputSettings.ReduceColors || (!isAlpha && CoreConfig.OutputFileAutoReduceColors)) {
using (var quantizer = new WuQuantizer((Bitmap)imageToSave)) { using (var quantizer = new WuQuantizer((Bitmap)imageToSave)) {
int colorCount = quantizer.GetColorCount(); int colorCount = quantizer.GetColorCount();
LOG.InfoFormat("Image with format {0} has {1} colors", imageToSave.PixelFormat, colorCount); Log.InfoFormat("Image with format {0} has {1} colors", imageToSave.PixelFormat, colorCount);
if (!outputSettings.ReduceColors && colorCount >= 256) { if (!outputSettings.ReduceColors && colorCount >= 256) {
return disposeImage; return disposeImage;
} }
try { try {
LOG.Info("Reducing colors on bitmap to 256."); Log.Info("Reducing colors on bitmap to 256.");
tmpImage = quantizer.GetQuantizedImage(conf.OutputFileReduceColorsTo); tmpImage = quantizer.GetQuantizedImage(CoreConfig.OutputFileReduceColorsTo);
if (disposeImage) { if (disposeImage) {
imageToSave.Dispose(); imageToSave.Dispose();
} }
@ -355,11 +357,11 @@ namespace GreenshotPlugin.Core {
// Make sure the "new" image is disposed // Make sure the "new" image is disposed
disposeImage = true; disposeImage = true;
} catch (Exception e) { } catch (Exception e) {
LOG.Warn("Error occurred while Quantizing the image, ignoring and using original. Error: ", e); Log.Warn("Error occurred while Quantizing the image, ignoring and using original. Error: ", e);
} }
} }
} else if (isAlpha && !outputSettings.ReduceColors) { } else if (isAlpha && !outputSettings.ReduceColors) {
LOG.Info("Skipping 'optional' color reduction as the image has alpha"); Log.Info("Skipping 'optional' color reduction as the image has alpha");
} }
return disposeImage; return disposeImage;
} }
@ -375,7 +377,7 @@ namespace GreenshotPlugin.Core {
try { try {
imageToSave.SetPropertyItem(softwareUsedPropertyItem); imageToSave.SetPropertyItem(softwareUsedPropertyItem);
} catch (Exception) { } catch (Exception) {
LOG.WarnFormat("Couldn't set property {0}", softwareUsedPropertyItem.Id); Log.WarnFormat("Couldn't set property {0}", softwareUsedPropertyItem.Id);
} }
} }
} }
@ -390,13 +392,13 @@ namespace GreenshotPlugin.Core {
if (string.IsNullOrEmpty(fullPath)) { if (string.IsNullOrEmpty(fullPath)) {
return null; return null;
} }
LOG.InfoFormat("Loading image from file {0}", fullPath); Log.InfoFormat("Loading image from file {0}", fullPath);
// Fixed lock problem Bug #3431881 // Fixed lock problem Bug #3431881
using (Stream surfaceFileStream = File.OpenRead(fullPath)) { using (Stream surfaceFileStream = File.OpenRead(fullPath)) {
returnSurface = ImageHelper.LoadGreenshotSurface(surfaceFileStream, returnSurface); returnSurface = ImageHelper.LoadGreenshotSurface(surfaceFileStream, returnSurface);
} }
if (returnSurface != null) { if (returnSurface != null) {
LOG.InfoFormat("Information about file {0}: {1}x{2}-{3} Resolution {4}x{5}", fullPath, returnSurface.Image.Width, returnSurface.Image.Height, returnSurface.Image.PixelFormat, returnSurface.Image.HorizontalResolution, returnSurface.Image.VerticalResolution); Log.InfoFormat("Information about file {0}: {1}x{2}-{3} Resolution {4}x{5}", fullPath, returnSurface.Image.Width, returnSurface.Image.Height, returnSurface.Image.PixelFormat, returnSurface.Image.HorizontalResolution, returnSurface.Image.VerticalResolution);
} }
return returnSurface; return returnSurface;
} }
@ -421,7 +423,7 @@ namespace GreenshotPlugin.Core {
throwingException.Data.Add("fullPath", fullPath); throwingException.Data.Add("fullPath", fullPath);
throw throwingException; throw throwingException;
} }
LOG.DebugFormat("Saving surface to {0}", fullPath); Log.DebugFormat("Saving surface to {0}", fullPath);
// Create the stream and call SaveToStream // Create the stream and call SaveToStream
using (FileStream stream = new FileStream(fullPath, FileMode.Create, FileAccess.Write)) { using (FileStream stream = new FileStream(fullPath, FileMode.Create, FileAccess.Write)) {
SaveToStream(surface, stream, outputSettings); SaveToStream(surface, stream, outputSettings);
@ -444,7 +446,7 @@ namespace GreenshotPlugin.Core {
try { try {
format = (OutputFormat)Enum.Parse(typeof(OutputFormat), extension.ToLower()); format = (OutputFormat)Enum.Parse(typeof(OutputFormat), extension.ToLower());
} catch (ArgumentException ae) { } catch (ArgumentException ae) {
LOG.Warn("Couldn't parse extension: " + extension, ae); Log.Warn("Couldn't parse extension: " + extension, ae);
} }
return format; return format;
} }
@ -466,12 +468,12 @@ namespace GreenshotPlugin.Core {
try { try {
string fileNameWithExtension = saveImageFileDialog.FileNameWithExtension; string fileNameWithExtension = saveImageFileDialog.FileNameWithExtension;
SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(FormatForFilename(fileNameWithExtension)); SurfaceOutputSettings outputSettings = new SurfaceOutputSettings(FormatForFilename(fileNameWithExtension));
if (conf.OutputFilePromptQuality) { if (CoreConfig.OutputFilePromptQuality) {
QualityDialog qualityDialog = new QualityDialog(outputSettings); QualityDialog qualityDialog = new QualityDialog(outputSettings);
qualityDialog.ShowDialog(); qualityDialog.ShowDialog();
} }
// TODO: For now we always overwrite, should be changed // TODO: For now we always overwrite, should be changed
Save(surface, fileNameWithExtension, true, outputSettings, conf.OutputFileCopyPathToClipboard); Save(surface, fileNameWithExtension, true, outputSettings, CoreConfig.OutputFileCopyPathToClipboard);
returnValue = fileNameWithExtension; returnValue = fileNameWithExtension;
IniConfig.Save(); IniConfig.Save();
} catch (ExternalException) { } catch (ExternalException) {
@ -492,8 +494,8 @@ namespace GreenshotPlugin.Core {
/// <param name="outputSettings"></param> /// <param name="outputSettings"></param>
/// <returns>Path to image file</returns> /// <returns>Path to image file</returns>
public static string SaveNamedTmpFile(ISurface surface, ICaptureDetails captureDetails, SurfaceOutputSettings outputSettings) { public static string SaveNamedTmpFile(ISurface surface, ICaptureDetails captureDetails, SurfaceOutputSettings outputSettings) {
string pattern = conf.OutputFileFilenamePattern; string pattern = CoreConfig.OutputFileFilenamePattern;
if (pattern == null || string.IsNullOrEmpty(pattern.Trim())) { if (string.IsNullOrEmpty(pattern?.Trim())) {
pattern = "greenshot ${capturetime}"; pattern = "greenshot ${capturetime}";
} }
string filename = FilenameHelper.GetFilenameFromPattern(pattern, outputSettings.Format, captureDetails); string filename = FilenameHelper.GetFilenameFromPattern(pattern, outputSettings.Format, captureDetails);
@ -503,13 +505,13 @@ namespace GreenshotPlugin.Core {
filename = Regex.Replace(filename, @"_+", "_"); filename = Regex.Replace(filename, @"_+", "_");
string tmpFile = Path.Combine(Path.GetTempPath(), filename); string tmpFile = Path.Combine(Path.GetTempPath(), filename);
LOG.Debug("Creating TMP File: " + tmpFile); Log.Debug("Creating TMP File: " + tmpFile);
// Catching any exception to prevent that the user can't write in the directory. // Catching any exception to prevent that the user can't write in the directory.
// This is done for e.g. bugs #2974608, #2963943, #2816163, #2795317, #2789218 // This is done for e.g. bugs #2974608, #2963943, #2816163, #2795317, #2789218
try { try {
Save(surface, tmpFile, true, outputSettings, false); Save(surface, tmpFile, true, outputSettings, false);
tmpFileCache.Add(tmpFile, tmpFile); TmpFileCache.Add(tmpFile, tmpFile);
} catch (Exception e) { } catch (Exception e) {
// Show the problem // Show the problem
MessageBox.Show(e.Message, "Error"); MessageBox.Show(e.Message, "Error");
@ -526,15 +528,15 @@ namespace GreenshotPlugin.Core {
/// <param name="tmpfile"></param> /// <param name="tmpfile"></param>
/// <returns>true if it worked</returns> /// <returns>true if it worked</returns>
public static bool DeleteNamedTmpFile(string tmpfile) { public static bool DeleteNamedTmpFile(string tmpfile) {
LOG.Debug("Deleting TMP File: " + tmpfile); Log.Debug("Deleting TMP File: " + tmpfile);
try { try {
if (File.Exists(tmpfile)) { if (File.Exists(tmpfile)) {
File.Delete(tmpfile); File.Delete(tmpfile);
tmpFileCache.Remove(tmpfile); TmpFileCache.Remove(tmpfile);
} }
return true; return true;
} catch (Exception ex) { } catch (Exception ex) {
LOG.Warn("Error deleting tmp file: ", ex); Log.Warn("Error deleting tmp file: ", ex);
} }
return false; return false;
} }
@ -554,11 +556,11 @@ namespace GreenshotPlugin.Core {
destinationPath = Path.GetTempPath(); destinationPath = Path.GetTempPath();
} }
string tmpPath = Path.Combine(destinationPath, tmpFile); string tmpPath = Path.Combine(destinationPath, tmpFile);
LOG.Debug("Creating TMP File : " + tmpPath); Log.Debug("Creating TMP File : " + tmpPath);
try { try {
Save(surface, tmpPath, true, outputSettings, false); Save(surface, tmpPath, true, outputSettings, false);
tmpFileCache.Add(tmpPath, tmpPath); TmpFileCache.Add(tmpPath, tmpPath);
} catch (Exception) { } catch (Exception) {
return null; return null;
} }
@ -569,12 +571,12 @@ namespace GreenshotPlugin.Core {
/// Cleanup all created tmpfiles /// Cleanup all created tmpfiles
/// </summary> /// </summary>
public static void RemoveTmpFiles() { public static void RemoveTmpFiles() {
foreach (string tmpFile in tmpFileCache.Elements) { foreach (string tmpFile in TmpFileCache.Elements) {
if (File.Exists(tmpFile)) { if (File.Exists(tmpFile)) {
LOG.DebugFormat("Removing old temp file {0}", tmpFile); Log.DebugFormat("Removing old temp file {0}", tmpFile);
File.Delete(tmpFile); File.Delete(tmpFile);
} }
tmpFileCache.Remove(tmpFile); TmpFileCache.Remove(tmpFile);
} }
} }
@ -586,7 +588,7 @@ namespace GreenshotPlugin.Core {
private static void RemoveExpiredTmpFile(string filekey, object filename) { private static void RemoveExpiredTmpFile(string filekey, object filename) {
string path = filename as string; string path = filename as string;
if (path != null && File.Exists(path)) { if (path != null && File.Exists(path)) {
LOG.DebugFormat("Removing expired file {0}", path); Log.DebugFormat("Removing expired file {0}", path);
File.Delete(path); File.Delete(path);
} }
} }

18
GreenshotPlugin/Core/WindowCapture.cs
View file

@ -80,30 +80,26 @@ namespace GreenshotPlugin.Core {
set; set;
} }
private List<IDestination> _captureDestinations = new List<IDestination>(); public List<IDestination> CaptureDestinations { get; set; } = new List<IDestination>();
public List<IDestination> CaptureDestinations {
get {return _captureDestinations;}
set {_captureDestinations = value;}
}
public void ClearDestinations() { public void ClearDestinations() {
_captureDestinations.Clear(); CaptureDestinations.Clear();
} }
public void RemoveDestination(IDestination destination) { public void RemoveDestination(IDestination destination) {
if (_captureDestinations.Contains(destination)) { if (CaptureDestinations.Contains(destination)) {
_captureDestinations.Remove(destination); CaptureDestinations.Remove(destination);
} }
} }
public void AddDestination(IDestination captureDestination) { public void AddDestination(IDestination captureDestination) {
if (!_captureDestinations.Contains(captureDestination)) { if (!CaptureDestinations.Contains(captureDestination)) {
_captureDestinations.Add(captureDestination); CaptureDestinations.Add(captureDestination);
} }
} }
public bool HasDestination(string designation) { public bool HasDestination(string designation) {
foreach(IDestination destination in _captureDestinations) { foreach(IDestination destination in CaptureDestinations) {
if (designation.Equals(destination.Designation)) { if (designation.Equals(destination.Designation)) {
return true; return true;
} }

7
GreenshotPlugin/GreenshotPlugin.csproj
View file

@ -24,6 +24,10 @@
<ItemGroup> <ItemGroup>
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
<Reference Include="CustomMarshalers" /> <Reference Include="CustomMarshalers" />
<Reference Include="LinqBridge, Version=1.3.0.0, Culture=neutral, PublicKeyToken=c2b14eb747628076, processorArchitecture=MSIL">
<HintPath>..\packages\LinqBridge.1.3.0\lib\net20\LinqBridge.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\Greenshot\Lib\log4net.dll</HintPath> <HintPath>..\Greenshot\Lib\log4net.dll</HintPath>
</Reference> </Reference>
@ -223,4 +227,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="Interfaces\Drawing\Filters\" /> <Folder Include="Interfaces\Drawing\Filters\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project> </Project>

29
GreenshotPlugin/Interfaces/Plugin/PluginInterfaces.cs
View file

@ -75,16 +75,15 @@ namespace Greenshot.Plugin {
public delegate void HotKeyHandler(); public delegate void HotKeyHandler();
public class SurfaceOutputSettings { public class SurfaceOutputSettings {
private static readonly CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>(); private static readonly CoreConfiguration CoreConfig = IniConfig.GetIniSection<CoreConfiguration>();
private bool reduceColors; private bool _reduceColors;
private bool disableReduceColors; private bool _disableReduceColors;
private readonly List<IEffect> effects = new List<IEffect>();
public SurfaceOutputSettings() { public SurfaceOutputSettings() {
disableReduceColors = false; _disableReduceColors = false;
Format = conf.OutputFileFormat; Format = CoreConfig.OutputFileFormat;
JPGQuality = conf.OutputFileJpegQuality; JPGQuality = CoreConfig.OutputFileJpegQuality;
ReduceColors = conf.OutputFileReduceColors; ReduceColors = CoreConfig.OutputFileReduceColors;
} }
public SurfaceOutputSettings(OutputFormat format) : this() { public SurfaceOutputSettings(OutputFormat format) : this() {
@ -121,11 +120,7 @@ namespace Greenshot.Plugin {
set; set;
} }
public List<IEffect> Effects { public List<IEffect> Effects { get; } = new List<IEffect>();
get {
return effects;
}
}
public bool ReduceColors { public bool ReduceColors {
get { get {
@ -133,10 +128,10 @@ namespace Greenshot.Plugin {
if (OutputFormat.gif.Equals(Format)) { if (OutputFormat.gif.Equals(Format)) {
return true; return true;
} }
return reduceColors; return _reduceColors;
} }
set { set {
reduceColors = value; _reduceColors = value;
} }
} }
@ -145,12 +140,12 @@ namespace Greenshot.Plugin {
/// </summary> /// </summary>
public bool DisableReduceColors { public bool DisableReduceColors {
get { get {
return disableReduceColors; return _disableReduceColors;
} }
set { set {
// Quantizing os needed when output format is gif as this has only 256 colors! // Quantizing os needed when output format is gif as this has only 256 colors!
if (!OutputFormat.gif.Equals(Format)) { if (!OutputFormat.gif.Equals(Format)) {
disableReduceColors = value; _disableReduceColors = value;
} }
} }
} }

4
GreenshotPlugin/packages.config Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LinqBridge" version="1.3.0" targetFramework="net20" />
</packages>

2
build.ps1
View file

@ -135,6 +135,7 @@ Function PackagePortable {
@( "$sourcebase\checksum.MD5", @( "$sourcebase\checksum.MD5",
"$sourcebase\Greenshot.exe.config", "$sourcebase\Greenshot.exe.config",
"$sourcebase\GreenshotPlugin.dll", "$sourcebase\GreenshotPlugin.dll",
"$sourcebase\LinqBridge.dll",
"$sourcebase\log4net.dll", "$sourcebase\log4net.dll",
"$sourcebase\log4net-portable.xml", "$sourcebase\log4net-portable.xml",
"$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destbase\portabletmp\App\Greenshot\" } "$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destbase\portabletmp\App\Greenshot\" }
@ -208,6 +209,7 @@ Function PackageZip {
"$sourcebase\Greenshot.exe", "$sourcebase\Greenshot.exe",
"$sourcebase\Greenshot.exe.config", "$sourcebase\Greenshot.exe.config",
"$sourcebase\GreenshotPlugin.dll", "$sourcebase\GreenshotPlugin.dll",
"$sourcebase\LinqBridge.dll",
"$sourcebase\log4net.dll", "$sourcebase\log4net.dll",
"$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destzip\" } "$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destzip\" }