Refactored the Office Destinations, including the Interop & configuration, to the new Office plug-in. Also refactored some code to be more consistent.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2131 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-10-10 14:18:05 +00:00
commit 4d399a60ac
34 changed files with 739 additions and 365 deletions

View file

@ -288,19 +288,30 @@ namespace Greenshot {
}
}
public static MainForm instance = null;
private static MainForm instance = null;
public static MainForm Instance {
get {
return instance;
}
}
private ToolTip tooltip;
private CopyData copyData = null;
// Thumbnail preview
private ThumbnailForm thumbnailForm = null;
private ThumbnailForm thumbnailForm = null;
private IntPtr thumbnailHandle = IntPtr.Zero;
private Rectangle parentMenuBounds = Rectangle.Empty;
// Make sure we have only one settings form
private SettingsForm settingsForm = null;
// Make sure we have only one about form
private AboutForm aboutForm = null;
public NotifyIcon NotifyIcon {
get {
return notifyIcon;
}
}
public MainForm(CopyDataTransport dataTransport) {
instance = this;
@ -330,7 +341,7 @@ namespace Greenshot {
// Do loading on a different Thread to shorten the startup
Thread pluginInitThread = new Thread (delegate() {
// Load all the plugins
PluginHelper.instance.LoadPlugins(this);
PluginHelper.Instance.LoadPlugins(this);
// Check destinations, remove all that don't exist
foreach(string destination in conf.OutputDestinations.ToArray()) {
@ -1142,7 +1153,7 @@ namespace Greenshot {
// Inform all registed plugins
try {
PluginHelper.instance.Shutdown();
PluginHelper.Instance.Shutdown();
} catch (Exception e) {
LOG.Error("Error shutting down plugins!", e);
}