refactoring: GreenshotCore/GreenshotEditor

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@731 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4

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();
 

Greenshot/Greenshot.csproj

@@ -53,71 +53,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Configuration\AppConfig.cs" />
-    <Compile Include="Configuration\Language.cs" />
-    <Compile Include="Configuration\LanguageKeys.cs" />
-    <Compile Include="Configuration\RuntimeConfig.cs" />
-    <Compile Include="Controls\BindableToolStripComboBox.cs" />
-    <Compile Include="Controls\BindableToolStripButton.cs" />
-    <Compile Include="Controls\BindableToolStripDropDownButton.cs" />
-    <Compile Include="Controls\ColorButton.cs" />
-    <Compile Include="Controls\FontFamilyComboBox.cs" />
-    <Compile Include="Controls\ToolStripColorButton.cs" />
-    <Compile Include="Controls\ToolStripNumericUpDown.cs" />
-    <Compile Include="Drawing\ArrowContainer.cs" />
-    <Compile Include="Drawing\BitmapBuffer.cs" />
-    <Compile Include="Drawing\BitmapContainer.cs" />
-    <Compile Include="Drawing\CropContainer.cs" />
-    <Compile Include="Drawing\CursorContainer.cs" />
-    <Compile Include="Drawing\DrawableContainer.cs" />
-    <Compile Include="Drawing\DrawableContainerList.cs" />
-    <Compile Include="Drawing\EllipseContainer.cs" />
-    <Compile Include="Drawing\Fields\AbstractFieldHolderWithChildren.cs" />
-    <Compile Include="Drawing\Fields\Binding\AbstractBindingConverter.cs" />
-    <Compile Include="Drawing\Fields\Binding\BidirectionalBinding.cs" />
-    <Compile Include="Drawing\Fields\Binding\DecimalDoublePercentageConverter.cs" />
-    <Compile Include="Drawing\Fields\Binding\DecimalFloatConverter.cs" />
-    <Compile Include="Drawing\Fields\Binding\DecimalIntConverter.cs" />
-    <Compile Include="Drawing\Fields\Binding\IBindingConverter.cs" />
-    <Compile Include="Drawing\Fields\Binding\IBindingValidator.cs" />
-    <Compile Include="Drawing\Fields\Binding\NotNullValidator.cs" />
-    <Compile Include="Drawing\FilterContainer.cs" />
-    <Compile Include="Drawing\Filters\AbstractFilter.cs" />
-    <Compile Include="Drawing\Filters\BrightnessFilter.cs" />
-    <Compile Include="Drawing\Filters\FastSmoothFilter.cs" />
-    <Compile Include="Drawing\Filters\GrayscaleFilter.cs" />
-    <Compile Include="Drawing\Filters\HighlightFilter.cs" />
-    <Compile Include="Drawing\Filters\IFilter.cs" />
-    <Compile Include="Drawing\Filters\MagnifierFilter.cs" />
-    <Compile Include="Drawing\Filters\PixelizationFilter.cs" />
-    <Compile Include="Drawing\Filters\BlurFilter.cs" />
-    <Compile Include="Drawing\HighlightContainer.cs" />
-    <Compile Include="Drawing\HtmlContainer.cs" />
-    <Compile Include="Drawing\IconContainer.cs" />
-    <Compile Include="Drawing\LineContainer.cs" />
-    <Compile Include="Drawing\Fields\AbstractFieldHolder.cs" />
-    <Compile Include="Drawing\Fields\Field.cs" />
-    <Compile Include="Drawing\Fields\FieldFactory.cs" />
-    <Compile Include="Drawing\Fields\FieldAggregator.cs" />
-    <Compile Include="Drawing\MetafileContainer.cs" />
-    <Compile Include="Drawing\ObfuscateContainer.cs" />
-    <Compile Include="Drawing\RectangleContainer.cs" />
-    <Compile Include="Drawing\RoundedRectangle.cs" />
-    <Compile Include="Drawing\Surface.cs" />
-    <Compile Include="Drawing\TextContainer.cs" />
-    <Compile Include="Drawing\UrlContainer.cs" />
-    <Compile Include="Forms\AboutForm.cs" />
-    <Compile Include="Forms\AboutForm.Designer.cs">
-      <DependentUpon>AboutForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\CaptureForm.cs" />
     <Compile Include="Forms\CaptureForm.Designer.cs">
       <DependentUpon>CaptureForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\ImageEditorForm.cs" />
-    <Compile Include="Forms\ImageEditorForm.Designer.cs">
-      <DependentUpon>ImageEditorForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\LanguageDialog.cs" />
     <Compile Include="Forms\LanguageDialog.Designer.cs">
       <DependentUpon>LanguageDialog.cs</DependentUpon>
@@ -126,66 +65,24 @@
     <Compile Include="Forms\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\PrintOptionsDialog.cs" />
-    <Compile Include="Forms\PrintOptionsDialog.Designer.cs">
-      <DependentUpon>PrintOptionsDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\SaveImageFileDialog.cs" />
-    <Compile Include="Forms\SettingsForm.cs" />
-    <Compile Include="Forms\SettingsForm.Designer.cs">
-      <DependentUpon>SettingsForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\ToolStripMenuSelectList.cs" />
     <Compile Include="Forms\BugReportForm.cs" />
     <Compile Include="Forms\BugReportForm.Designer.cs">
       <DependentUpon>BugReportForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Helpers\ClipboardHelper.cs" />
-    <Compile Include="Helpers\Colors.cs" />
-    <Compile Include="Helpers\CopyData.cs" />
-    <Compile Include="Helpers\DrawingHelper.cs" />
-    <Compile Include="Helpers\FormHelper.cs" />
-    <Compile Include="Helpers\ImageHelper.cs" />
-    <Compile Include="Helpers\WindowsHelper.cs" />
-    <Compile Include="Helpers\EnvironmentInfo.cs" />
-    <Compile Include="Helpers\GuiRectangle.cs" />
-    <Compile Include="Helpers\HotkeyHelper.cs" />
-    <Compile Include="Helpers\HtmlFragment.cs" />
     <Compile Include="Helpers\LogHelper.cs" />
-    <Compile Include="Helpers\MailHelper.cs" />
-    <Compile Include="Helpers\Objects.cs" />
-    <Compile Include="Helpers\PluginHelper.cs" />
-    <Compile Include="Helpers\PrintHelper.cs" />
-    <Compile Include="Helpers\ImageOutput.cs" />
-    <Compile Include="Helpers\ScaleHelper.cs" />
     <Compile Include="Helpers\SoundHelper.cs" />
-    <Compile Include="Helpers\StartupHelper.cs" />
     <Compile Include="Helpers\StringHelper.cs" />
-    <Compile Include="Helpers\ToolStripItemEndisabler.cs" />
-    <Compile Include="Helpers\WebToBitmap.cs" />
-    <Compile Include="Helpers\WindowCapture.cs" />
     <Compile Include="Test\Drawing\Filters\BitmapByteBufferTest.cs" />
     <Compile Include="Test\Drawing\Properties\PropertyAggregatorTest.cs" />
     <Compile Include="Test\Drawing\Properties\SerializationTest.cs" />
     <Compile Include="Test\SaveImageFileDialogTest.cs" />
-    <EmbeddedResource Include="Forms\AboutForm.resx">
-      <DependentUpon>AboutForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\ImageEditorForm.resx">
-      <DependentUpon>ImageEditorForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\LanguageDialog.resx">
       <DependentUpon>LanguageDialog.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\PrintOptionsDialog.resx">
-      <DependentUpon>PrintOptionsDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SettingsForm.resx">
-      <DependentUpon>SettingsForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\BugReportForm.resx">
       <DependentUpon>BugReportForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -230,37 +127,11 @@
       <DependentUpon>FlashlightForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\FlashlightForm.cs" />
-    <Compile Include="Help\HelpBrowserForm.cs" />
-    <Compile Include="Help\HelpBrowserForm.Designer.cs" />
-    <EmbeddedResource Include="Help\HelpBrowserForm.resx" />
-    <Compile Include="Helpers\FilenameHelper.cs" />
-    <Compile Include="Helpers\PropertyItemProvider.cs" />
-    <EmbeddedResource Include="Helpers\PropertyItemProvider.resx" />
-    <Compile Include="Forms\JpegQualityDialog.Designer.cs">
-      <DependentUpon>JpegQualityDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\JpegQualityDialog.cs" />
-    <EmbeddedResource Include="Forms\JpegQualityDialog.resx">
-      <DependentUpon>JpegQualityDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <Compile Include="Forms\ColorDialog.Designer.cs">
-      <DependentUpon>ColorDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\ColorDialog.cs" />
-    <EmbeddedResource Include="Forms\ColorDialog.resx">
-      <DependentUpon>ColorDialog.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Drawing\Fields\Binding" />
-    <Folder Include="Drawing\Filters" />
-    <Folder Include="Drawing\Fields" />
     <Folder Include="Forms" />
     <Folder Include="Helpers" />
-    <Folder Include="Configuration" />
     <Folder Include="Helpers" />
-    <Folder Include="Drawing" />
-    <Folder Include="Controls" />
     <Folder Include="Languages" />
     <Folder Include="Test" />
     <Folder Include="Test\Drawing" />

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

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 <http://www.gnu.org/licenses/>.
  */
-namespace Greenshot.Help
+namespace Greenshot.Forms
 {
 	partial class HelpBrowserForm : System.Windows.Forms.Form
 	{

GreenshotCore/Forms/HelpBrowserForm.cs

@@ -23,7 +23,7 @@ using System.IO;
 using Greenshot.Configuration;
 using Greenshot.Core;
 
-namespace Greenshot.Help {
+namespace Greenshot.Forms {
 	/// <summary>
 	/// Description of HelpBrowserForm.
 	/// </summary>

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;

GreenshotCore/GreenshotCore.csproj

@@ -56,9 +56,53 @@
     <Folder Include="Interfaces\Plugin" />
     <Folder Include="Lib" />
     <Folder Include="Interfaces" />
+    <Folder Include="Configuration" />
+    <Folder Include="Helpers" />
+    <Folder Include="Forms" />
     <Folder Include="UnmanagedHelpers" />
+    <Compile Include="Configuration\AppConfig.cs" />
+    <Compile Include="Configuration\Language.cs" />
+    <Compile Include="Configuration\LanguageKeys.cs" />
+    <Compile Include="Configuration\RuntimeConfig.cs" />
     <Compile Include="Core\LanguageHelper.cs" />
     <Compile Include="Core\PropertyHelper.cs" />
+    <Compile Include="Forms\AboutForm.cs" />
+    <Compile Include="Forms\AboutForm.Designer.cs">
+      <DependentUpon>AboutForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\HelpBrowserForm.cs" />
+    <Compile Include="Forms\HelpBrowserForm.Designer.cs">
+      <DependentUpon>HelpBrowserForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\JpegQualityDialog.cs" />
+    <Compile Include="Forms\JpegQualityDialog.Designer.cs">
+      <DependentUpon>JpegQualityDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\PrintOptionsDialog.cs" />
+    <Compile Include="Forms\PrintOptionsDialog.Designer.cs">
+      <DependentUpon>PrintOptionsDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\SaveImageFileDialog.cs" />
+    <Compile Include="Forms\SettingsForm.cs" />
+    <Compile Include="Forms\SettingsForm.Designer.cs">
+      <DependentUpon>SettingsForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Helpers\ClipboardHelper.cs" />
+    <Compile Include="Helpers\CopyData.cs" />
+    <Compile Include="Helpers\EnvironmentInfo.cs" />
+    <Compile Include="Helpers\FilenameHelper.cs" />
+    <Compile Include="Helpers\HotkeyHelper.cs" />
+    <Compile Include="Helpers\ImageHelper.cs" />
+    <Compile Include="Helpers\ImageOutput.cs" />
+    <Compile Include="Helpers\MailHelper.cs" />
+    <Compile Include="Helpers\Objects.cs" />
+    <Compile Include="Helpers\PluginHelper.cs" />
+    <Compile Include="Helpers\PrintHelper.cs" />
+    <Compile Include="Helpers\PropertyItemProvider.cs" />
+    <Compile Include="Helpers\ScaleHelper.cs" />
+    <Compile Include="Helpers\StartupHelper.cs" />
+    <Compile Include="Helpers\WindowCapture.cs" />
+    <Compile Include="Helpers\WindowsHelper.cs" />
     <Compile Include="Interfaces\Capturing\Capture.cs" />
     <Compile Include="Interfaces\Drawing\IDrawableContainer.cs" />
     <Compile Include="Interfaces\Drawing\Fields\IField.cs" />
@@ -72,5 +116,23 @@
     <Compile Include="UnmanagedHelpers\WinMM.cs" />
     <None Include="Lib\log4net.dll" />
     <None Include="Lib\nunit.framework.dll" />
+    <EmbeddedResource Include="Forms\AboutForm.resx">
+      <DependentUpon>AboutForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\HelpBrowserForm.resx">
+      <DependentUpon>HelpBrowserForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\JpegQualityDialog.resx">
+      <DependentUpon>JpegQualityDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\PrintOptionsDialog.resx">
+      <DependentUpon>PrintOptionsDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\SettingsForm.resx">
+      <DependentUpon>SettingsForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Helpers\PropertyItemProvider.resx">
+      <DependentUpon>PropertyItemProvider.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
 </Project>

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<string> pluginFiles = new List<string>();
 			foreach(string pluginFile in Directory.GetFiles(configpath, "*.gsp", SearchOption.AllDirectories)) {

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;
 

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 {
 	/// <summary>

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 {
 	/// <summary>

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 {
 	/// <summary>

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;

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;
 

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 {
 	/// <summary>

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 {
 	/// <summary>

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 {
 	/// <summary>

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 {

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;
 

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 {

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 {

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 {

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;
 

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;
 

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 {
 	/// <summary>

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;
 

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 {
 	/// <summary>

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;
 

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;
 

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;

GreenshotEditor/GreenshotEditor.csproj

@@ -10,13 +10,21 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\jens\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
     <NoWin32Manifest>True</NoWin32Manifest>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
     <PlatformTarget>x86</PlatformTarget>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>bin\Debug\</OutputPath>
-    <DebugSymbols>True</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
@@ -32,6 +40,12 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
+    <Reference Include="log4net">
+      <HintPath>..\GreenshotCore\Lib\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\GreenshotCore\Lib\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -48,12 +62,90 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controls\BindableToolStripButton.cs" />
+    <Compile Include="Controls\BindableToolStripComboBox.cs" />
+    <Compile Include="Controls\BindableToolStripDropDownButton.cs" />
+    <Compile Include="Controls\ColorButton.cs" />
+    <Compile Include="Controls\FontFamilyComboBox.cs" />
+    <Compile Include="Controls\ToolStripColorButton.cs" />
+    <Compile Include="Controls\ToolStripNumericUpDown.cs" />
+    <Compile Include="Drawing\ArrowContainer.cs" />
+    <Compile Include="Drawing\BitmapBuffer.cs" />
+    <Compile Include="Drawing\BitmapContainer.cs" />
+    <Compile Include="Drawing\CropContainer.cs" />
+    <Compile Include="Drawing\CursorContainer.cs" />
+    <Compile Include="Drawing\DrawableContainer.cs" />
+    <Compile Include="Drawing\DrawableContainerList.cs" />
+    <Compile Include="Drawing\EllipseContainer.cs" />
+    <Compile Include="Drawing\Fields\AbstractFieldHolder.cs" />
+    <Compile Include="Drawing\Fields\AbstractFieldHolderWithChildren.cs" />
+    <Compile Include="Drawing\Fields\Binding\AbstractBindingConverter.cs" />
+    <Compile Include="Drawing\Fields\Binding\BidirectionalBinding.cs" />
+    <Compile Include="Drawing\Fields\Binding\DecimalDoublePercentageConverter.cs" />
+    <Compile Include="Drawing\Fields\Binding\DecimalFloatConverter.cs" />
+    <Compile Include="Drawing\Fields\Binding\DecimalIntConverter.cs" />
+    <Compile Include="Drawing\Fields\Binding\IBindingConverter.cs" />
+    <Compile Include="Drawing\Fields\Binding\IBindingValidator.cs" />
+    <Compile Include="Drawing\Fields\Binding\NotNullValidator.cs" />
+    <Compile Include="Drawing\Fields\Field.cs" />
+    <Compile Include="Drawing\Fields\FieldAggregator.cs" />
+    <Compile Include="Drawing\Fields\FieldFactory.cs" />
+    <Compile Include="Drawing\FilterContainer.cs" />
+    <Compile Include="Drawing\Filters\AbstractFilter.cs" />
+    <Compile Include="Drawing\Filters\BlurFilter.cs" />
+    <Compile Include="Drawing\Filters\BrightnessFilter.cs" />
+    <Compile Include="Drawing\Filters\FastSmoothFilter.cs" />
+    <Compile Include="Drawing\Filters\GrayscaleFilter.cs" />
+    <Compile Include="Drawing\Filters\HighlightFilter.cs" />
+    <Compile Include="Drawing\Filters\IFilter.cs" />
+    <Compile Include="Drawing\Filters\MagnifierFilter.cs" />
+    <Compile Include="Drawing\Filters\PixelizationFilter.cs" />
+    <Compile Include="Drawing\HighlightContainer.cs" />
+    <Compile Include="Drawing\HtmlContainer.cs" />
+    <Compile Include="Drawing\IconContainer.cs" />
+    <Compile Include="Drawing\LineContainer.cs" />
+    <Compile Include="Drawing\MetafileContainer.cs" />
+    <Compile Include="Drawing\ObfuscateContainer.cs" />
+    <Compile Include="Drawing\RectangleContainer.cs" />
+    <Compile Include="Drawing\RoundedRectangle.cs" />
+    <Compile Include="Drawing\Surface.cs" />
+    <Compile Include="Drawing\TextContainer.cs" />
+    <Compile Include="Drawing\UrlContainer.cs" />
+    <Compile Include="Forms\ColorDialog.cs" />
+    <Compile Include="Forms\ColorDialog.Designer.cs">
+      <DependentUpon>ColorDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\ImageEditorForm.cs" />
+    <Compile Include="Forms\ImageEditorForm.Designer.cs">
+      <DependentUpon>ImageEditorForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Helpers\Colors.cs" />
+    <Compile Include="Helpers\DrawingHelper.cs" />
+    <Compile Include="Helpers\FormHelper.cs" />
+    <Compile Include="Helpers\GuiRectangle.cs" />
+    <Compile Include="Helpers\HtmlFragment.cs" />
+    <Compile Include="Helpers\ToolStripItemEndisabler.cs" />
+    <Compile Include="Helpers\WebToBitmap.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Forms\ColorDialog.resx">
+      <DependentUpon>ColorDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ImageEditorForm.resx">
+      <DependentUpon>ImageEditorForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ImageEditorForm.resx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GreenshotCore\GreenshotCore.csproj">
       <Project>{BDC408EE-DEA1-4474-B59D-7F05757B12EC}</Project>
       <Name>GreenshotCore</Name>
     </ProjectReference>
+    <Folder Include="Drawing" />
+    <Folder Include="Drawing\Fields" />
+    <Folder Include="Drawing\Fields\Binding" />
+    <Folder Include="Drawing\Filters" />
+    <Folder Include="Forms" />
+    <Folder Include="Controls" />
+    <Folder Include="Helpers" />
   </ItemGroup>
 </Project>