diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs index 301e78b04..6c1980d4c 100644 --- a/Greenshot/Forms/MainForm.cs +++ b/Greenshot/Forms/MainForm.cs @@ -35,7 +35,6 @@ using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Drawing; using Greenshot.Forms; -using Greenshot.Help; using Greenshot.Helpers; using Greenshot.Plugin; using Greenshot.UnmanagedHelpers; @@ -274,7 +273,7 @@ namespace Greenshot { captureForm = new CaptureForm(); // Load all the plugins - PluginHelper.instance.LoadPlugins(this, captureForm); + PluginHelper.instance.LoadPlugins(this.ContextMenuStrip, captureForm); PluginHelper.instance.OnImageOutput += new OnImageOutputHandler(ImageWritten); SoundHelper.Initialize(); diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj index 3ccd9c385..7ed2446eb 100644 --- a/Greenshot/Greenshot.csproj +++ b/Greenshot/Greenshot.csproj @@ -53,71 +53,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AboutForm.cs - CaptureForm.cs - - - ImageEditorForm.cs - LanguageDialog.cs @@ -126,66 +65,24 @@ MainForm.cs - - - PrintOptionsDialog.cs - - - - - SettingsForm.cs - BugReportForm.cs - - - - - - - - - - - - - - - - - - - - - - - AboutForm.cs - - - ImageEditorForm.cs - LanguageDialog.cs MainForm.cs - - PrintOptionsDialog.cs - - - SettingsForm.cs - BugReportForm.cs @@ -230,37 +127,11 @@ FlashlightForm.cs - - - - - - - - JpegQualityDialog.cs - - - - JpegQualityDialog.cs - - - ColorDialog.cs - - - - ColorDialog.cs - - - - - - - diff --git a/Greenshot/Greenshot.sln b/Greenshot/Greenshot.sln index 86786dd49..640a0d53f 100644 --- a/Greenshot/Greenshot.sln +++ b/Greenshot/Greenshot.sln @@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 # SharpDevelop 3.2.0.5505 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotPlugin", "..\GreenshotPlugin\GreenshotPlugin.csproj", "{5B924697-4DCD-4F98-85F1-105CB84B7341}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot", "Greenshot.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}" ProjectSection(ProjectDependencies) = postProject EndProjectSection @@ -22,10 +20,6 @@ Global {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.Build.0 = Release|Any CPU {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.Build.0 = Debug|x86 - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.ActiveCfg = Debug|x86 - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.Build.0 = Release|x86 - {5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.ActiveCfg = Release|x86 {BDC408EE-DEA1-4474-B59D-7F05757B12EC}.Debug|Any CPU.Build.0 = Debug|x86 {BDC408EE-DEA1-4474-B59D-7F05757B12EC}.Debug|Any CPU.ActiveCfg = Debug|x86 {BDC408EE-DEA1-4474-B59D-7F05757B12EC}.Release|Any CPU.Build.0 = Release|x86 diff --git a/Greenshot/Configuration/AppConfig.cs b/GreenshotCore/Configuration/AppConfig.cs similarity index 100% rename from Greenshot/Configuration/AppConfig.cs rename to GreenshotCore/Configuration/AppConfig.cs diff --git a/Greenshot/Configuration/Language.cs b/GreenshotCore/Configuration/Language.cs similarity index 100% rename from Greenshot/Configuration/Language.cs rename to GreenshotCore/Configuration/Language.cs diff --git a/Greenshot/Configuration/LanguageKeys.cs b/GreenshotCore/Configuration/LanguageKeys.cs similarity index 100% rename from Greenshot/Configuration/LanguageKeys.cs rename to GreenshotCore/Configuration/LanguageKeys.cs diff --git a/Greenshot/Configuration/RuntimeConfig.cs b/GreenshotCore/Configuration/RuntimeConfig.cs similarity index 100% rename from Greenshot/Configuration/RuntimeConfig.cs rename to GreenshotCore/Configuration/RuntimeConfig.cs diff --git a/Greenshot/Forms/AboutForm.Designer.cs b/GreenshotCore/Forms/AboutForm.Designer.cs similarity index 100% rename from Greenshot/Forms/AboutForm.Designer.cs rename to GreenshotCore/Forms/AboutForm.Designer.cs diff --git a/Greenshot/Forms/AboutForm.cs b/GreenshotCore/Forms/AboutForm.cs similarity index 100% rename from Greenshot/Forms/AboutForm.cs rename to GreenshotCore/Forms/AboutForm.cs diff --git a/Greenshot/Forms/AboutForm.resx b/GreenshotCore/Forms/AboutForm.resx similarity index 100% rename from Greenshot/Forms/AboutForm.resx rename to GreenshotCore/Forms/AboutForm.resx diff --git a/Greenshot/Help/HelpBrowserForm.Designer.cs b/GreenshotCore/Forms/HelpBrowserForm.Designer.cs similarity index 99% rename from Greenshot/Help/HelpBrowserForm.Designer.cs rename to GreenshotCore/Forms/HelpBrowserForm.Designer.cs index 426e666c2..7e836e634 100644 --- a/Greenshot/Help/HelpBrowserForm.Designer.cs +++ b/GreenshotCore/Forms/HelpBrowserForm.Designer.cs @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace Greenshot.Help +namespace Greenshot.Forms { partial class HelpBrowserForm : System.Windows.Forms.Form { diff --git a/Greenshot/Help/HelpBrowserForm.cs b/GreenshotCore/Forms/HelpBrowserForm.cs similarity index 98% rename from Greenshot/Help/HelpBrowserForm.cs rename to GreenshotCore/Forms/HelpBrowserForm.cs index 410820ee7..a2c92e20e 100644 --- a/Greenshot/Help/HelpBrowserForm.cs +++ b/GreenshotCore/Forms/HelpBrowserForm.cs @@ -23,7 +23,7 @@ using System.IO; using Greenshot.Configuration; using Greenshot.Core; -namespace Greenshot.Help { +namespace Greenshot.Forms { /// /// Description of HelpBrowserForm. /// diff --git a/Greenshot/Help/HelpBrowserForm.resx b/GreenshotCore/Forms/HelpBrowserForm.resx similarity index 100% rename from Greenshot/Help/HelpBrowserForm.resx rename to GreenshotCore/Forms/HelpBrowserForm.resx diff --git a/Greenshot/Forms/JpegQualityDialog.Designer.cs b/GreenshotCore/Forms/JpegQualityDialog.Designer.cs similarity index 100% rename from Greenshot/Forms/JpegQualityDialog.Designer.cs rename to GreenshotCore/Forms/JpegQualityDialog.Designer.cs diff --git a/Greenshot/Forms/JpegQualityDialog.cs b/GreenshotCore/Forms/JpegQualityDialog.cs similarity index 100% rename from Greenshot/Forms/JpegQualityDialog.cs rename to GreenshotCore/Forms/JpegQualityDialog.cs diff --git a/Greenshot/Forms/JpegQualityDialog.resx b/GreenshotCore/Forms/JpegQualityDialog.resx similarity index 100% rename from Greenshot/Forms/JpegQualityDialog.resx rename to GreenshotCore/Forms/JpegQualityDialog.resx diff --git a/Greenshot/Forms/PrintOptionsDialog.Designer.cs b/GreenshotCore/Forms/PrintOptionsDialog.Designer.cs similarity index 100% rename from Greenshot/Forms/PrintOptionsDialog.Designer.cs rename to GreenshotCore/Forms/PrintOptionsDialog.Designer.cs diff --git a/Greenshot/Forms/PrintOptionsDialog.cs b/GreenshotCore/Forms/PrintOptionsDialog.cs similarity index 100% rename from Greenshot/Forms/PrintOptionsDialog.cs rename to GreenshotCore/Forms/PrintOptionsDialog.cs diff --git a/Greenshot/Forms/PrintOptionsDialog.resx b/GreenshotCore/Forms/PrintOptionsDialog.resx similarity index 100% rename from Greenshot/Forms/PrintOptionsDialog.resx rename to GreenshotCore/Forms/PrintOptionsDialog.resx diff --git a/Greenshot/Forms/SaveImageFileDialog.cs b/GreenshotCore/Forms/SaveImageFileDialog.cs similarity index 100% rename from Greenshot/Forms/SaveImageFileDialog.cs rename to GreenshotCore/Forms/SaveImageFileDialog.cs diff --git a/Greenshot/Forms/SettingsForm.Designer.cs b/GreenshotCore/Forms/SettingsForm.Designer.cs similarity index 100% rename from Greenshot/Forms/SettingsForm.Designer.cs rename to GreenshotCore/Forms/SettingsForm.Designer.cs diff --git a/Greenshot/Forms/SettingsForm.cs b/GreenshotCore/Forms/SettingsForm.cs similarity index 99% rename from Greenshot/Forms/SettingsForm.cs rename to GreenshotCore/Forms/SettingsForm.cs index 3d05e2865..b327d984c 100644 --- a/Greenshot/Forms/SettingsForm.cs +++ b/GreenshotCore/Forms/SettingsForm.cs @@ -214,7 +214,7 @@ namespace Greenshot { conf.Ui_Language = combobox_language.SelectedValue.ToString(); // Make sure the current language is reflected in the Main-context menu - MainForm.instance.UpdateUI(); + //MainForm.instance.UpdateUI(); // TODO conf.General_RegisterHotkeys = (bool?)checkbox_registerhotkeys.Checked; conf.Output_File_Path = textbox_storagelocation.Text; diff --git a/Greenshot/Forms/SettingsForm.resx b/GreenshotCore/Forms/SettingsForm.resx similarity index 100% rename from Greenshot/Forms/SettingsForm.resx rename to GreenshotCore/Forms/SettingsForm.resx diff --git a/GreenshotCore/GreenshotCore.csproj b/GreenshotCore/GreenshotCore.csproj index 146c50b9d..8723d4bae 100644 --- a/GreenshotCore/GreenshotCore.csproj +++ b/GreenshotCore/GreenshotCore.csproj @@ -56,9 +56,53 @@ + + + + + + + + + + AboutForm.cs + + + + HelpBrowserForm.cs + + + + JpegQualityDialog.cs + + + + PrintOptionsDialog.cs + + + + + SettingsForm.cs + + + + + + + + + + + + + + + + + @@ -72,5 +116,23 @@ + + AboutForm.cs + + + HelpBrowserForm.cs + + + JpegQualityDialog.cs + + + PrintOptionsDialog.cs + + + SettingsForm.cs + + + PropertyItemProvider.cs + \ No newline at end of file diff --git a/Greenshot/Helpers/ClipboardHelper.cs b/GreenshotCore/Helpers/ClipboardHelper.cs similarity index 100% rename from Greenshot/Helpers/ClipboardHelper.cs rename to GreenshotCore/Helpers/ClipboardHelper.cs diff --git a/Greenshot/Helpers/CopyData.cs b/GreenshotCore/Helpers/CopyData.cs similarity index 100% rename from Greenshot/Helpers/CopyData.cs rename to GreenshotCore/Helpers/CopyData.cs diff --git a/Greenshot/Helpers/EnvironmentInfo.cs b/GreenshotCore/Helpers/EnvironmentInfo.cs similarity index 100% rename from Greenshot/Helpers/EnvironmentInfo.cs rename to GreenshotCore/Helpers/EnvironmentInfo.cs diff --git a/Greenshot/Helpers/FilenameHelper.cs b/GreenshotCore/Helpers/FilenameHelper.cs similarity index 100% rename from Greenshot/Helpers/FilenameHelper.cs rename to GreenshotCore/Helpers/FilenameHelper.cs diff --git a/Greenshot/Helpers/HotkeyHelper.cs b/GreenshotCore/Helpers/HotkeyHelper.cs similarity index 100% rename from Greenshot/Helpers/HotkeyHelper.cs rename to GreenshotCore/Helpers/HotkeyHelper.cs diff --git a/Greenshot/Helpers/ImageHelper.cs b/GreenshotCore/Helpers/ImageHelper.cs similarity index 100% rename from Greenshot/Helpers/ImageHelper.cs rename to GreenshotCore/Helpers/ImageHelper.cs diff --git a/Greenshot/Helpers/ImageOutput.cs b/GreenshotCore/Helpers/ImageOutput.cs similarity index 100% rename from Greenshot/Helpers/ImageOutput.cs rename to GreenshotCore/Helpers/ImageOutput.cs diff --git a/Greenshot/Helpers/MailHelper.cs b/GreenshotCore/Helpers/MailHelper.cs similarity index 100% rename from Greenshot/Helpers/MailHelper.cs rename to GreenshotCore/Helpers/MailHelper.cs diff --git a/Greenshot/Helpers/Objects.cs b/GreenshotCore/Helpers/Objects.cs similarity index 100% rename from Greenshot/Helpers/Objects.cs rename to GreenshotCore/Helpers/Objects.cs diff --git a/Greenshot/Helpers/PluginHelper.cs b/GreenshotCore/Helpers/PluginHelper.cs similarity index 97% rename from Greenshot/Helpers/PluginHelper.cs rename to GreenshotCore/Helpers/PluginHelper.cs index 151d4d5ff..e89baf71b 100644 --- a/Greenshot/Helpers/PluginHelper.cs +++ b/GreenshotCore/Helpers/PluginHelper.cs @@ -164,7 +164,8 @@ namespace Greenshot.Helpers { } public bool RegisterHotKey(int modifierKeyCode, int virtualKeyCode, HotKeyHandler handler) { - return HotkeyHelper.RegisterHotKey((int)MainForm.instance.Handle, modifierKeyCode, virtualKeyCode, handler); + //return HotkeyHelper.RegisterHotKey((int)MainForm.instance.Handle, modifierKeyCode, virtualKeyCode, handler); + return false; // TODO } #endregion @@ -195,9 +196,9 @@ namespace Greenshot.Helpers { return false; } - public void LoadPlugins(MainForm mainForm, ICaptureHost captureHost) { + public void LoadPlugins(ContextMenuStrip mainMenu, ICaptureHost captureHost) { // Copy ContextMenu - mainMenu = mainForm.MainMenu; + this.mainMenu = mainMenu; List pluginFiles = new List(); foreach(string pluginFile in Directory.GetFiles(configpath, "*.gsp", SearchOption.AllDirectories)) { diff --git a/Greenshot/Helpers/PrintHelper.cs b/GreenshotCore/Helpers/PrintHelper.cs similarity index 100% rename from Greenshot/Helpers/PrintHelper.cs rename to GreenshotCore/Helpers/PrintHelper.cs diff --git a/Greenshot/Helpers/PropertyItemProvider.cs b/GreenshotCore/Helpers/PropertyItemProvider.cs similarity index 100% rename from Greenshot/Helpers/PropertyItemProvider.cs rename to GreenshotCore/Helpers/PropertyItemProvider.cs diff --git a/Greenshot/Helpers/PropertyItemProvider.resx b/GreenshotCore/Helpers/PropertyItemProvider.resx similarity index 100% rename from Greenshot/Helpers/PropertyItemProvider.resx rename to GreenshotCore/Helpers/PropertyItemProvider.resx diff --git a/Greenshot/Helpers/ScaleHelper.cs b/GreenshotCore/Helpers/ScaleHelper.cs similarity index 100% rename from Greenshot/Helpers/ScaleHelper.cs rename to GreenshotCore/Helpers/ScaleHelper.cs diff --git a/Greenshot/Helpers/StartupHelper.cs b/GreenshotCore/Helpers/StartupHelper.cs similarity index 100% rename from Greenshot/Helpers/StartupHelper.cs rename to GreenshotCore/Helpers/StartupHelper.cs diff --git a/Greenshot/Helpers/WindowCapture.cs b/GreenshotCore/Helpers/WindowCapture.cs similarity index 100% rename from Greenshot/Helpers/WindowCapture.cs rename to GreenshotCore/Helpers/WindowCapture.cs diff --git a/Greenshot/Helpers/WindowsHelper.cs b/GreenshotCore/Helpers/WindowsHelper.cs similarity index 100% rename from Greenshot/Helpers/WindowsHelper.cs rename to GreenshotCore/Helpers/WindowsHelper.cs diff --git a/Greenshot/Controls/BindableToolStripButton.cs b/GreenshotEditor/Controls/BindableToolStripButton.cs similarity index 100% rename from Greenshot/Controls/BindableToolStripButton.cs rename to GreenshotEditor/Controls/BindableToolStripButton.cs diff --git a/Greenshot/Controls/BindableToolStripComboBox.cs b/GreenshotEditor/Controls/BindableToolStripComboBox.cs similarity index 100% rename from Greenshot/Controls/BindableToolStripComboBox.cs rename to GreenshotEditor/Controls/BindableToolStripComboBox.cs diff --git a/Greenshot/Controls/BindableToolStripDropDownButton.cs b/GreenshotEditor/Controls/BindableToolStripDropDownButton.cs similarity index 100% rename from Greenshot/Controls/BindableToolStripDropDownButton.cs rename to GreenshotEditor/Controls/BindableToolStripDropDownButton.cs diff --git a/Greenshot/Controls/ColorButton.cs b/GreenshotEditor/Controls/ColorButton.cs similarity index 100% rename from Greenshot/Controls/ColorButton.cs rename to GreenshotEditor/Controls/ColorButton.cs diff --git a/Greenshot/Controls/FontFamilyComboBox.cs b/GreenshotEditor/Controls/FontFamilyComboBox.cs similarity index 100% rename from Greenshot/Controls/FontFamilyComboBox.cs rename to GreenshotEditor/Controls/FontFamilyComboBox.cs diff --git a/Greenshot/Controls/ToolStripColorButton.cs b/GreenshotEditor/Controls/ToolStripColorButton.cs similarity index 100% rename from Greenshot/Controls/ToolStripColorButton.cs rename to GreenshotEditor/Controls/ToolStripColorButton.cs diff --git a/Greenshot/Controls/ToolStripNumericUpDown.cs b/GreenshotEditor/Controls/ToolStripNumericUpDown.cs similarity index 100% rename from Greenshot/Controls/ToolStripNumericUpDown.cs rename to GreenshotEditor/Controls/ToolStripNumericUpDown.cs diff --git a/Greenshot/Drawing/ArrowContainer.cs b/GreenshotEditor/Drawing/ArrowContainer.cs similarity index 99% rename from Greenshot/Drawing/ArrowContainer.cs rename to GreenshotEditor/Drawing/ArrowContainer.cs index 239091150..501febe68 100644 --- a/Greenshot/Drawing/ArrowContainer.cs +++ b/GreenshotEditor/Drawing/ArrowContainer.cs @@ -25,7 +25,6 @@ using System.Drawing.Drawing2D; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; diff --git a/Greenshot/Drawing/BitmapBuffer.cs b/GreenshotEditor/Drawing/BitmapBuffer.cs similarity index 100% rename from Greenshot/Drawing/BitmapBuffer.cs rename to GreenshotEditor/Drawing/BitmapBuffer.cs diff --git a/Greenshot/Drawing/BitmapContainer.cs b/GreenshotEditor/Drawing/BitmapContainer.cs similarity index 98% rename from Greenshot/Drawing/BitmapContainer.cs rename to GreenshotEditor/Drawing/BitmapContainer.cs index 9307f2fcd..7cae6ae1c 100644 --- a/Greenshot/Drawing/BitmapContainer.cs +++ b/GreenshotEditor/Drawing/BitmapContainer.cs @@ -24,9 +24,7 @@ using System.IO; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; -using Greenshot.Helpers; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/CropContainer.cs b/GreenshotEditor/Drawing/CropContainer.cs similarity index 100% rename from Greenshot/Drawing/CropContainer.cs rename to GreenshotEditor/Drawing/CropContainer.cs index 17d77b460..db3cdafac 100644 --- a/Greenshot/Drawing/CropContainer.cs +++ b/GreenshotEditor/Drawing/CropContainer.cs @@ -23,8 +23,8 @@ using System.Drawing; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Helpers; using Greenshot.Drawing.Fields; +using Greenshot.Helpers; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/CursorContainer.cs b/GreenshotEditor/Drawing/CursorContainer.cs similarity index 98% rename from Greenshot/Drawing/CursorContainer.cs rename to GreenshotEditor/Drawing/CursorContainer.cs index e25764b9c..ed7527801 100644 --- a/Greenshot/Drawing/CursorContainer.cs +++ b/GreenshotEditor/Drawing/CursorContainer.cs @@ -25,9 +25,7 @@ using System.IO; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; -using Greenshot.Helpers; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/DrawableContainer.cs b/GreenshotEditor/Drawing/DrawableContainer.cs similarity index 99% rename from Greenshot/Drawing/DrawableContainer.cs rename to GreenshotEditor/Drawing/DrawableContainer.cs index 75df41baa..692417fd7 100644 --- a/Greenshot/Drawing/DrawableContainer.cs +++ b/GreenshotEditor/Drawing/DrawableContainer.cs @@ -28,8 +28,6 @@ using System.Drawing.Imaging; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; -using Greenshot.Controls; using Greenshot.Drawing.Fields; using Greenshot.Drawing.Filters; using Greenshot.Helpers; diff --git a/Greenshot/Drawing/DrawableContainerList.cs b/GreenshotEditor/Drawing/DrawableContainerList.cs similarity index 100% rename from Greenshot/Drawing/DrawableContainerList.cs rename to GreenshotEditor/Drawing/DrawableContainerList.cs diff --git a/Greenshot/Drawing/EllipseContainer.cs b/GreenshotEditor/Drawing/EllipseContainer.cs similarity index 99% rename from Greenshot/Drawing/EllipseContainer.cs rename to GreenshotEditor/Drawing/EllipseContainer.cs index 17555ab6a..be34c668a 100644 --- a/Greenshot/Drawing/EllipseContainer.cs +++ b/GreenshotEditor/Drawing/EllipseContainer.cs @@ -23,7 +23,6 @@ using System.Drawing; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; diff --git a/Greenshot/Drawing/Fields/AbstractFieldHolder.cs b/GreenshotEditor/Drawing/Fields/AbstractFieldHolder.cs similarity index 99% rename from Greenshot/Drawing/Fields/AbstractFieldHolder.cs rename to GreenshotEditor/Drawing/Fields/AbstractFieldHolder.cs index 1c2f0a78f..e5135d478 100644 --- a/Greenshot/Drawing/Fields/AbstractFieldHolder.cs +++ b/GreenshotEditor/Drawing/Fields/AbstractFieldHolder.cs @@ -25,7 +25,6 @@ using System.Drawing; using System.Reflection; using System.Runtime.Serialization; -using Greenshot.Helpers; namespace Greenshot.Drawing.Fields { /// diff --git a/Greenshot/Drawing/Fields/AbstractFieldHolderWithChildren.cs b/GreenshotEditor/Drawing/Fields/AbstractFieldHolderWithChildren.cs similarity index 99% rename from Greenshot/Drawing/Fields/AbstractFieldHolderWithChildren.cs rename to GreenshotEditor/Drawing/Fields/AbstractFieldHolderWithChildren.cs index 4a2a1ff4f..da038a4f4 100644 --- a/Greenshot/Drawing/Fields/AbstractFieldHolderWithChildren.cs +++ b/GreenshotEditor/Drawing/Fields/AbstractFieldHolderWithChildren.cs @@ -25,7 +25,6 @@ using System.Drawing; using System.Reflection; using System.Runtime.Serialization; -using Greenshot.Helpers; namespace Greenshot.Drawing.Fields { /// diff --git a/Greenshot/Drawing/Fields/Binding/AbstractBindingConverter.cs b/GreenshotEditor/Drawing/Fields/Binding/AbstractBindingConverter.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/AbstractBindingConverter.cs rename to GreenshotEditor/Drawing/Fields/Binding/AbstractBindingConverter.cs diff --git a/Greenshot/Drawing/Fields/Binding/BidirectionalBinding.cs b/GreenshotEditor/Drawing/Fields/Binding/BidirectionalBinding.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/BidirectionalBinding.cs rename to GreenshotEditor/Drawing/Fields/Binding/BidirectionalBinding.cs diff --git a/Greenshot/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs b/GreenshotEditor/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs rename to GreenshotEditor/Drawing/Fields/Binding/DecimalDoublePercentageConverter.cs diff --git a/Greenshot/Drawing/Fields/Binding/DecimalFloatConverter.cs b/GreenshotEditor/Drawing/Fields/Binding/DecimalFloatConverter.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/DecimalFloatConverter.cs rename to GreenshotEditor/Drawing/Fields/Binding/DecimalFloatConverter.cs diff --git a/Greenshot/Drawing/Fields/Binding/DecimalIntConverter.cs b/GreenshotEditor/Drawing/Fields/Binding/DecimalIntConverter.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/DecimalIntConverter.cs rename to GreenshotEditor/Drawing/Fields/Binding/DecimalIntConverter.cs diff --git a/Greenshot/Drawing/Fields/Binding/IBindingConverter.cs b/GreenshotEditor/Drawing/Fields/Binding/IBindingConverter.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/IBindingConverter.cs rename to GreenshotEditor/Drawing/Fields/Binding/IBindingConverter.cs diff --git a/Greenshot/Drawing/Fields/Binding/IBindingValidator.cs b/GreenshotEditor/Drawing/Fields/Binding/IBindingValidator.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/IBindingValidator.cs rename to GreenshotEditor/Drawing/Fields/Binding/IBindingValidator.cs diff --git a/Greenshot/Drawing/Fields/Binding/NotNullValidator.cs b/GreenshotEditor/Drawing/Fields/Binding/NotNullValidator.cs similarity index 100% rename from Greenshot/Drawing/Fields/Binding/NotNullValidator.cs rename to GreenshotEditor/Drawing/Fields/Binding/NotNullValidator.cs diff --git a/Greenshot/Drawing/Fields/Field.cs b/GreenshotEditor/Drawing/Fields/Field.cs similarity index 100% rename from Greenshot/Drawing/Fields/Field.cs rename to GreenshotEditor/Drawing/Fields/Field.cs diff --git a/Greenshot/Drawing/Fields/FieldAggregator.cs b/GreenshotEditor/Drawing/Fields/FieldAggregator.cs similarity index 99% rename from Greenshot/Drawing/Fields/FieldAggregator.cs rename to GreenshotEditor/Drawing/Fields/FieldAggregator.cs index b2b5264ca..336eea3a6 100644 --- a/Greenshot/Drawing/Fields/FieldAggregator.cs +++ b/GreenshotEditor/Drawing/Fields/FieldAggregator.cs @@ -23,9 +23,9 @@ using System.Drawing; using System.Reflection; using System.ComponentModel; using System.Collections.Generic; + using Greenshot.Configuration; using Greenshot.Drawing.Filters; -using Greenshot.Helpers; namespace Greenshot.Drawing.Fields { /// diff --git a/Greenshot/Drawing/Fields/FieldFactory.cs b/GreenshotEditor/Drawing/Fields/FieldFactory.cs similarity index 99% rename from Greenshot/Drawing/Fields/FieldFactory.cs rename to GreenshotEditor/Drawing/Fields/FieldFactory.cs index cc5c9c7bd..b5c28717b 100644 --- a/Greenshot/Drawing/Fields/FieldFactory.cs +++ b/GreenshotEditor/Drawing/Fields/FieldFactory.cs @@ -21,6 +21,7 @@ using System; using System.Drawing; using System.Collections.Generic; + using Greenshot.Configuration; namespace Greenshot.Drawing.Fields { diff --git a/Greenshot/Drawing/FilterContainer.cs b/GreenshotEditor/Drawing/FilterContainer.cs similarity index 100% rename from Greenshot/Drawing/FilterContainer.cs rename to GreenshotEditor/Drawing/FilterContainer.cs diff --git a/Greenshot/Drawing/Filters/AbstractFilter.cs b/GreenshotEditor/Drawing/Filters/AbstractFilter.cs similarity index 100% rename from Greenshot/Drawing/Filters/AbstractFilter.cs rename to GreenshotEditor/Drawing/Filters/AbstractFilter.cs diff --git a/Greenshot/Drawing/Filters/BlurFilter.cs b/GreenshotEditor/Drawing/Filters/BlurFilter.cs similarity index 99% rename from Greenshot/Drawing/Filters/BlurFilter.cs rename to GreenshotEditor/Drawing/Filters/BlurFilter.cs index 012873210..f4bbb5791 100644 --- a/Greenshot/Drawing/Filters/BlurFilter.cs +++ b/GreenshotEditor/Drawing/Filters/BlurFilter.cs @@ -21,7 +21,6 @@ using System.Drawing; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Drawing.Filters; diff --git a/Greenshot/Drawing/Filters/BrightnessFilter.cs b/GreenshotEditor/Drawing/Filters/BrightnessFilter.cs similarity index 98% rename from Greenshot/Drawing/Filters/BrightnessFilter.cs rename to GreenshotEditor/Drawing/Filters/BrightnessFilter.cs index 98c3bf876..dba060b4d 100644 --- a/Greenshot/Drawing/Filters/BrightnessFilter.cs +++ b/GreenshotEditor/Drawing/Filters/BrightnessFilter.cs @@ -23,7 +23,6 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.Serialization; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; namespace Greenshot.Drawing.Filters { diff --git a/Greenshot/Drawing/Filters/FastSmoothFilter.cs b/GreenshotEditor/Drawing/Filters/FastSmoothFilter.cs similarity index 100% rename from Greenshot/Drawing/Filters/FastSmoothFilter.cs rename to GreenshotEditor/Drawing/Filters/FastSmoothFilter.cs diff --git a/Greenshot/Drawing/Filters/GrayscaleFilter.cs b/GreenshotEditor/Drawing/Filters/GrayscaleFilter.cs similarity index 100% rename from Greenshot/Drawing/Filters/GrayscaleFilter.cs rename to GreenshotEditor/Drawing/Filters/GrayscaleFilter.cs diff --git a/Greenshot/Drawing/Filters/HighlightFilter.cs b/GreenshotEditor/Drawing/Filters/HighlightFilter.cs similarity index 98% rename from Greenshot/Drawing/Filters/HighlightFilter.cs rename to GreenshotEditor/Drawing/Filters/HighlightFilter.cs index 351ca3add..0fc1f105e 100644 --- a/Greenshot/Drawing/Filters/HighlightFilter.cs +++ b/GreenshotEditor/Drawing/Filters/HighlightFilter.cs @@ -23,7 +23,6 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.Serialization; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; namespace Greenshot.Drawing.Filters { diff --git a/Greenshot/Drawing/Filters/IFilter.cs b/GreenshotEditor/Drawing/Filters/IFilter.cs similarity index 100% rename from Greenshot/Drawing/Filters/IFilter.cs rename to GreenshotEditor/Drawing/Filters/IFilter.cs diff --git a/Greenshot/Drawing/Filters/MagnifierFilter.cs b/GreenshotEditor/Drawing/Filters/MagnifierFilter.cs similarity index 98% rename from Greenshot/Drawing/Filters/MagnifierFilter.cs rename to GreenshotEditor/Drawing/Filters/MagnifierFilter.cs index 9a6cd27b2..48a47e847 100644 --- a/Greenshot/Drawing/Filters/MagnifierFilter.cs +++ b/GreenshotEditor/Drawing/Filters/MagnifierFilter.cs @@ -23,7 +23,6 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.Serialization; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; namespace Greenshot.Drawing.Filters { diff --git a/Greenshot/Drawing/Filters/PixelizationFilter.cs b/GreenshotEditor/Drawing/Filters/PixelizationFilter.cs similarity index 98% rename from Greenshot/Drawing/Filters/PixelizationFilter.cs rename to GreenshotEditor/Drawing/Filters/PixelizationFilter.cs index d42fa5ce6..9463d41ac 100644 --- a/Greenshot/Drawing/Filters/PixelizationFilter.cs +++ b/GreenshotEditor/Drawing/Filters/PixelizationFilter.cs @@ -24,7 +24,6 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.Serialization; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; diff --git a/Greenshot/Drawing/HighlightContainer.cs b/GreenshotEditor/Drawing/HighlightContainer.cs similarity index 100% rename from Greenshot/Drawing/HighlightContainer.cs rename to GreenshotEditor/Drawing/HighlightContainer.cs diff --git a/Greenshot/Drawing/HtmlContainer.cs b/GreenshotEditor/Drawing/HtmlContainer.cs similarity index 99% rename from Greenshot/Drawing/HtmlContainer.cs rename to GreenshotEditor/Drawing/HtmlContainer.cs index ac16a43a2..bc628f9d1 100644 --- a/Greenshot/Drawing/HtmlContainer.cs +++ b/GreenshotEditor/Drawing/HtmlContainer.cs @@ -25,7 +25,6 @@ using System.Runtime.Serialization; using System.Text.RegularExpressions; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; diff --git a/Greenshot/Drawing/IconContainer.cs b/GreenshotEditor/Drawing/IconContainer.cs similarity index 98% rename from Greenshot/Drawing/IconContainer.cs rename to GreenshotEditor/Drawing/IconContainer.cs index efdb1924f..cb7680969 100644 --- a/Greenshot/Drawing/IconContainer.cs +++ b/GreenshotEditor/Drawing/IconContainer.cs @@ -24,9 +24,7 @@ using System.IO; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; -using Greenshot.Helpers; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/LineContainer.cs b/GreenshotEditor/Drawing/LineContainer.cs similarity index 99% rename from Greenshot/Drawing/LineContainer.cs rename to GreenshotEditor/Drawing/LineContainer.cs index 54ffb3c30..35618dedb 100644 --- a/Greenshot/Drawing/LineContainer.cs +++ b/GreenshotEditor/Drawing/LineContainer.cs @@ -25,7 +25,6 @@ using System.Drawing.Drawing2D; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; diff --git a/Greenshot/Drawing/MetafileContainer.cs b/GreenshotEditor/Drawing/MetafileContainer.cs similarity index 98% rename from Greenshot/Drawing/MetafileContainer.cs rename to GreenshotEditor/Drawing/MetafileContainer.cs index d54b006b6..a1948517f 100644 --- a/Greenshot/Drawing/MetafileContainer.cs +++ b/GreenshotEditor/Drawing/MetafileContainer.cs @@ -25,9 +25,7 @@ using System.IO; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; -using Greenshot.Helpers; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/ObfuscateContainer.cs b/GreenshotEditor/Drawing/ObfuscateContainer.cs similarity index 100% rename from Greenshot/Drawing/ObfuscateContainer.cs rename to GreenshotEditor/Drawing/ObfuscateContainer.cs diff --git a/Greenshot/Drawing/RectangleContainer.cs b/GreenshotEditor/Drawing/RectangleContainer.cs similarity index 99% rename from Greenshot/Drawing/RectangleContainer.cs rename to GreenshotEditor/Drawing/RectangleContainer.cs index 6acecb439..1eefa9c26 100644 --- a/Greenshot/Drawing/RectangleContainer.cs +++ b/GreenshotEditor/Drawing/RectangleContainer.cs @@ -23,7 +23,6 @@ using System.Drawing; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; diff --git a/Greenshot/Drawing/RoundedRectangle.cs b/GreenshotEditor/Drawing/RoundedRectangle.cs similarity index 100% rename from Greenshot/Drawing/RoundedRectangle.cs rename to GreenshotEditor/Drawing/RoundedRectangle.cs diff --git a/Greenshot/Drawing/Surface.cs b/GreenshotEditor/Drawing/Surface.cs similarity index 100% rename from Greenshot/Drawing/Surface.cs rename to GreenshotEditor/Drawing/Surface.cs diff --git a/Greenshot/Drawing/TextContainer.cs b/GreenshotEditor/Drawing/TextContainer.cs similarity index 100% rename from Greenshot/Drawing/TextContainer.cs rename to GreenshotEditor/Drawing/TextContainer.cs diff --git a/Greenshot/Drawing/UrlContainer.cs b/GreenshotEditor/Drawing/UrlContainer.cs similarity index 98% rename from Greenshot/Drawing/UrlContainer.cs rename to GreenshotEditor/Drawing/UrlContainer.cs index 97e6105de..7ff5be335 100644 --- a/Greenshot/Drawing/UrlContainer.cs +++ b/GreenshotEditor/Drawing/UrlContainer.cs @@ -24,7 +24,6 @@ using System.IO; using System.Runtime.Serialization; using System.Windows.Forms; -using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; diff --git a/Greenshot/Forms/ColorDialog.Designer.cs b/GreenshotEditor/Forms/ColorDialog.Designer.cs similarity index 100% rename from Greenshot/Forms/ColorDialog.Designer.cs rename to GreenshotEditor/Forms/ColorDialog.Designer.cs diff --git a/Greenshot/Forms/ColorDialog.cs b/GreenshotEditor/Forms/ColorDialog.cs similarity index 100% rename from Greenshot/Forms/ColorDialog.cs rename to GreenshotEditor/Forms/ColorDialog.cs diff --git a/Greenshot/Forms/ColorDialog.resx b/GreenshotEditor/Forms/ColorDialog.resx similarity index 100% rename from Greenshot/Forms/ColorDialog.resx rename to GreenshotEditor/Forms/ColorDialog.resx diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/GreenshotEditor/Forms/ImageEditorForm.Designer.cs similarity index 100% rename from Greenshot/Forms/ImageEditorForm.Designer.cs rename to GreenshotEditor/Forms/ImageEditorForm.Designer.cs diff --git a/Greenshot/Forms/ImageEditorForm.cs b/GreenshotEditor/Forms/ImageEditorForm.cs similarity index 99% rename from Greenshot/Forms/ImageEditorForm.cs rename to GreenshotEditor/Forms/ImageEditorForm.cs index f33ca942d..35d7a3980 100644 --- a/Greenshot/Forms/ImageEditorForm.cs +++ b/GreenshotEditor/Forms/ImageEditorForm.cs @@ -38,7 +38,7 @@ using Greenshot.Configuration; using Greenshot.Drawing; using Greenshot.Drawing.Fields; using Greenshot.Drawing.Fields.Binding; -using Greenshot.Help; +//using Greenshot.Help; using Greenshot.Helpers; using Greenshot.Plugin; using Greenshot.Core; diff --git a/Greenshot/Forms/ImageEditorForm.resx b/GreenshotEditor/Forms/ImageEditorForm.resx similarity index 100% rename from Greenshot/Forms/ImageEditorForm.resx rename to GreenshotEditor/Forms/ImageEditorForm.resx diff --git a/GreenshotEditor/GreenshotEditor.csproj b/GreenshotEditor/GreenshotEditor.csproj index 038e83a0b..79208ddb7 100644 --- a/GreenshotEditor/GreenshotEditor.csproj +++ b/GreenshotEditor/GreenshotEditor.csproj @@ -10,13 +10,21 @@ Properties C:\Dokumente und Einstellungen\jens\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis True + True + False + 4 + false x86 + False + Auto + 4194304 + 4096 bin\Debug\ - True + true Full False True @@ -32,6 +40,12 @@ + + ..\GreenshotCore\Lib\log4net.dll + + + ..\GreenshotCore\Lib\nunit.framework.dll + 3.5 @@ -48,12 +62,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ColorDialog.cs + + + + ImageEditorForm.cs + + + + + + + + + + ColorDialog.cs + + + ImageEditorForm.cs + + {BDC408EE-DEA1-4474-B59D-7F05757B12EC} GreenshotCore + + + + + + + \ No newline at end of file diff --git a/Greenshot/Helpers/Colors.cs b/GreenshotEditor/Helpers/Colors.cs similarity index 100% rename from Greenshot/Helpers/Colors.cs rename to GreenshotEditor/Helpers/Colors.cs diff --git a/Greenshot/Helpers/DrawingHelper.cs b/GreenshotEditor/Helpers/DrawingHelper.cs similarity index 100% rename from Greenshot/Helpers/DrawingHelper.cs rename to GreenshotEditor/Helpers/DrawingHelper.cs diff --git a/Greenshot/Helpers/FormHelper.cs b/GreenshotEditor/Helpers/FormHelper.cs similarity index 100% rename from Greenshot/Helpers/FormHelper.cs rename to GreenshotEditor/Helpers/FormHelper.cs diff --git a/Greenshot/Helpers/GuiRectangle.cs b/GreenshotEditor/Helpers/GuiRectangle.cs similarity index 100% rename from Greenshot/Helpers/GuiRectangle.cs rename to GreenshotEditor/Helpers/GuiRectangle.cs diff --git a/Greenshot/Helpers/HtmlFragment.cs b/GreenshotEditor/Helpers/HtmlFragment.cs similarity index 100% rename from Greenshot/Helpers/HtmlFragment.cs rename to GreenshotEditor/Helpers/HtmlFragment.cs diff --git a/Greenshot/Helpers/ToolStripItemEndisabler.cs b/GreenshotEditor/Helpers/ToolStripItemEndisabler.cs similarity index 100% rename from Greenshot/Helpers/ToolStripItemEndisabler.cs rename to GreenshotEditor/Helpers/ToolStripItemEndisabler.cs diff --git a/Greenshot/Helpers/WebToBitmap.cs b/GreenshotEditor/Helpers/WebToBitmap.cs similarity index 100% rename from Greenshot/Helpers/WebToBitmap.cs rename to GreenshotEditor/Helpers/WebToBitmap.cs