From 01d843e8cfbd2bc138d12dde16cc4554412ce006 Mon Sep 17 00:00:00 2001 From: JKlingen Date: Sun, 25 Jul 2010 18:20:18 +0000 Subject: [PATCH] refactoring: moved interfaces from GreenshotPlugin to GreenshotCore git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@704 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot/Drawing/ArrowContainer.cs | 1 - Greenshot/Drawing/BitmapContainer.cs | 1 - Greenshot/Drawing/CropContainer.cs | 1 - Greenshot/Drawing/CursorContainer.cs | 1 - Greenshot/Drawing/DrawableContainer.cs | 1 - Greenshot/Drawing/DrawableContainerList.cs | 1 - Greenshot/Drawing/EllipseContainer.cs | 1 - Greenshot/Drawing/FilterContainer.cs | 1 - Greenshot/Drawing/Filters/AbstractFilter.cs | 1 - Greenshot/Drawing/Filters/BlurFilter.cs | 1 - Greenshot/Drawing/Filters/BrightnessFilter.cs | 1 - Greenshot/Drawing/Filters/FastSmoothFilter.cs | 1 - Greenshot/Drawing/Filters/GrayscaleFilter.cs | 1 - Greenshot/Drawing/Filters/HighlightFilter.cs | 1 - Greenshot/Drawing/Filters/IFilter.cs | 1 - Greenshot/Drawing/Filters/MagnifierFilter.cs | 1 - .../Drawing/Filters/PixelizationFilter.cs | 1 - Greenshot/Drawing/HtmlContainer.cs | 1 - Greenshot/Drawing/IconContainer.cs | 1 - Greenshot/Drawing/LineContainer.cs | 1 - Greenshot/Drawing/MetafileContainer.cs | 1 - Greenshot/Drawing/RectangleContainer.cs | 1 - Greenshot/Drawing/Surface.cs | 2 +- Greenshot/Drawing/TextContainer.cs | 1 - Greenshot/Drawing/UrlContainer.cs | 1 - Greenshot/Forms/CaptureForm.cs | 1 + Greenshot/Forms/ImageEditorForm.Designer.cs | 2 +- Greenshot/Forms/ImageEditorForm.cs | 3 +- Greenshot/Forms/MainForm.cs | 1 + Greenshot/Forms/SaveImageFileDialog.cs | 1 + Greenshot/Helpers/FilenameHelper.cs | 1 + Greenshot/Helpers/ImageOutput.cs | 1 + Greenshot/Helpers/MailHelper.cs | 1 + Greenshot/Helpers/PluginHelper.cs | 3 + Greenshot/Helpers/PrintHelper.cs | 1 + Greenshot/Helpers/WindowCapture.cs | 1 + GreenshotCore/Drawing/Fields/FieldType.cs | 57 ------------------- GreenshotCore/GreenshotCore.csproj | 19 +++++-- .../Interfaces/Capturing}/Capture.cs | 4 +- .../{ => Interfaces}/Drawing/Fields/IField.cs | 33 +++++++++++ .../Drawing/Fields/IFieldHolder.cs | 0 .../Interfaces/Drawing/IDrawableContainer.cs | 4 +- .../Interfaces/Drawing/ISurface.cs | 6 +- .../Interfaces/Forms/IImageEditor.cs | 5 +- .../Interfaces/Plugin/PluginInterfaces.cs | 4 ++ GreenshotPlugin/GreenshotPlugin.csproj | 9 ++- 46 files changed, 80 insertions(+), 103 deletions(-) delete mode 100644 GreenshotCore/Drawing/Fields/FieldType.cs rename {GreenshotPlugin/Interfaces => GreenshotCore/Interfaces/Capturing}/Capture.cs (98%) rename GreenshotCore/{ => Interfaces}/Drawing/Fields/IField.cs (75%) rename GreenshotCore/{ => Interfaces}/Drawing/Fields/IFieldHolder.cs (100%) rename GreenshotPlugin/Interfaces/Drawing/Container.cs => GreenshotCore/Interfaces/Drawing/IDrawableContainer.cs (97%) rename GreenshotPlugin/Interfaces/Generic.cs => GreenshotCore/Interfaces/Drawing/ISurface.cs (97%) rename GreenshotPlugin/Interfaces/Forms/ImageEditor.cs => GreenshotCore/Interfaces/Forms/IImageEditor.cs (96%) rename {GreenshotPlugin => GreenshotCore}/Interfaces/Plugin/PluginInterfaces.cs (98%) diff --git a/Greenshot/Drawing/ArrowContainer.cs b/Greenshot/Drawing/ArrowContainer.cs index 3235924e7..239091150 100644 --- a/Greenshot/Drawing/ArrowContainer.cs +++ b/Greenshot/Drawing/ArrowContainer.cs @@ -28,7 +28,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/BitmapContainer.cs b/Greenshot/Drawing/BitmapContainer.cs index 33f381f3e..9307f2fcd 100644 --- a/Greenshot/Drawing/BitmapContainer.cs +++ b/Greenshot/Drawing/BitmapContainer.cs @@ -27,7 +27,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/CropContainer.cs b/Greenshot/Drawing/CropContainer.cs index 21ea7f398..17d77b460 100644 --- a/Greenshot/Drawing/CropContainer.cs +++ b/Greenshot/Drawing/CropContainer.cs @@ -25,7 +25,6 @@ using System.Windows.Forms; using Greenshot.Helpers; using Greenshot.Drawing.Fields; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/CursorContainer.cs b/Greenshot/Drawing/CursorContainer.cs index 5c2d3f12f..e25764b9c 100644 --- a/Greenshot/Drawing/CursorContainer.cs +++ b/Greenshot/Drawing/CursorContainer.cs @@ -28,7 +28,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/DrawableContainer.cs b/Greenshot/Drawing/DrawableContainer.cs index 747ebe585..75df41baa 100644 --- a/Greenshot/Drawing/DrawableContainer.cs +++ b/Greenshot/Drawing/DrawableContainer.cs @@ -34,7 +34,6 @@ using Greenshot.Drawing.Fields; using Greenshot.Drawing.Filters; using Greenshot.Helpers; using Greenshot.Plugin; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/DrawableContainerList.cs b/Greenshot/Drawing/DrawableContainerList.cs index a09b00890..e883f3e31 100644 --- a/Greenshot/Drawing/DrawableContainerList.cs +++ b/Greenshot/Drawing/DrawableContainerList.cs @@ -26,7 +26,6 @@ using System.Windows.Forms; using Greenshot.Drawing.Fields; using Greenshot.Plugin; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/EllipseContainer.cs b/Greenshot/Drawing/EllipseContainer.cs index 4711e6853..17555ab6a 100644 --- a/Greenshot/Drawing/EllipseContainer.cs +++ b/Greenshot/Drawing/EllipseContainer.cs @@ -26,7 +26,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/FilterContainer.cs b/Greenshot/Drawing/FilterContainer.cs index acd472bd2..a482f8e83 100644 --- a/Greenshot/Drawing/FilterContainer.cs +++ b/Greenshot/Drawing/FilterContainer.cs @@ -28,7 +28,6 @@ using System.Windows.Forms; using Greenshot.Drawing.Fields; using Greenshot.Drawing.Filters; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/Filters/AbstractFilter.cs b/Greenshot/Drawing/Filters/AbstractFilter.cs index cea7224b8..163aa3ff2 100644 --- a/Greenshot/Drawing/Filters/AbstractFilter.cs +++ b/Greenshot/Drawing/Filters/AbstractFilter.cs @@ -26,7 +26,6 @@ using System.Runtime.Serialization; using Greenshot.Drawing; using Greenshot.Drawing.Fields; -using Greenshot.Plugin.Drawing; /// /// Graphical filter which can be added to DrawableContainer. diff --git a/Greenshot/Drawing/Filters/BlurFilter.cs b/Greenshot/Drawing/Filters/BlurFilter.cs index be25e8888..012873210 100644 --- a/Greenshot/Drawing/Filters/BlurFilter.cs +++ b/Greenshot/Drawing/Filters/BlurFilter.cs @@ -24,7 +24,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Drawing.Filters; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { [Serializable()] diff --git a/Greenshot/Drawing/Filters/BrightnessFilter.cs b/Greenshot/Drawing/Filters/BrightnessFilter.cs index 383ba55b7..98c3bf876 100644 --- a/Greenshot/Drawing/Filters/BrightnessFilter.cs +++ b/Greenshot/Drawing/Filters/BrightnessFilter.cs @@ -25,7 +25,6 @@ using System.Runtime.Serialization; using Greenshot.Configuration; using Greenshot.Drawing.Fields; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { [Serializable()] diff --git a/Greenshot/Drawing/Filters/FastSmoothFilter.cs b/Greenshot/Drawing/Filters/FastSmoothFilter.cs index 6db3372fc..e1ae9122c 100644 --- a/Greenshot/Drawing/Filters/FastSmoothFilter.cs +++ b/Greenshot/Drawing/Filters/FastSmoothFilter.cs @@ -24,7 +24,6 @@ using System.Drawing.Imaging; using System.Runtime.Serialization; using Greenshot.Drawing.Fields; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { [Serializable()] diff --git a/Greenshot/Drawing/Filters/GrayscaleFilter.cs b/Greenshot/Drawing/Filters/GrayscaleFilter.cs index 3eb568bba..67d1e4aa2 100644 --- a/Greenshot/Drawing/Filters/GrayscaleFilter.cs +++ b/Greenshot/Drawing/Filters/GrayscaleFilter.cs @@ -23,7 +23,6 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.Serialization; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { /// diff --git a/Greenshot/Drawing/Filters/HighlightFilter.cs b/Greenshot/Drawing/Filters/HighlightFilter.cs index 3922a8ab2..351ca3add 100644 --- a/Greenshot/Drawing/Filters/HighlightFilter.cs +++ b/Greenshot/Drawing/Filters/HighlightFilter.cs @@ -25,7 +25,6 @@ using System.Runtime.Serialization; using Greenshot.Configuration; using Greenshot.Drawing.Fields; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { [Serializable()] diff --git a/Greenshot/Drawing/Filters/IFilter.cs b/Greenshot/Drawing/Filters/IFilter.cs index a556dd998..12d77c814 100644 --- a/Greenshot/Drawing/Filters/IFilter.cs +++ b/Greenshot/Drawing/Filters/IFilter.cs @@ -25,7 +25,6 @@ using System.Drawing; using Greenshot.Drawing; using Greenshot.Drawing.Fields; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { public interface IFilter : INotifyPropertyChanged, IFieldHolder { diff --git a/Greenshot/Drawing/Filters/MagnifierFilter.cs b/Greenshot/Drawing/Filters/MagnifierFilter.cs index 98678c931..9a6cd27b2 100644 --- a/Greenshot/Drawing/Filters/MagnifierFilter.cs +++ b/Greenshot/Drawing/Filters/MagnifierFilter.cs @@ -25,7 +25,6 @@ using System.Runtime.Serialization; using Greenshot.Configuration; using Greenshot.Drawing.Fields; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { [Serializable()] diff --git a/Greenshot/Drawing/Filters/PixelizationFilter.cs b/Greenshot/Drawing/Filters/PixelizationFilter.cs index 31f3a965a..d42fa5ce6 100644 --- a/Greenshot/Drawing/Filters/PixelizationFilter.cs +++ b/Greenshot/Drawing/Filters/PixelizationFilter.cs @@ -27,7 +27,6 @@ using System.Runtime.Serialization; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing.Filters { [Serializable()] diff --git a/Greenshot/Drawing/HtmlContainer.cs b/Greenshot/Drawing/HtmlContainer.cs index a00ebfdf5..ac16a43a2 100644 --- a/Greenshot/Drawing/HtmlContainer.cs +++ b/Greenshot/Drawing/HtmlContainer.cs @@ -28,7 +28,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/IconContainer.cs b/Greenshot/Drawing/IconContainer.cs index b1063aaf2..efdb1924f 100644 --- a/Greenshot/Drawing/IconContainer.cs +++ b/Greenshot/Drawing/IconContainer.cs @@ -27,7 +27,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/LineContainer.cs b/Greenshot/Drawing/LineContainer.cs index 637135e1d..54ffb3c30 100644 --- a/Greenshot/Drawing/LineContainer.cs +++ b/Greenshot/Drawing/LineContainer.cs @@ -28,7 +28,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/MetafileContainer.cs b/Greenshot/Drawing/MetafileContainer.cs index 840150848..d54b006b6 100644 --- a/Greenshot/Drawing/MetafileContainer.cs +++ b/Greenshot/Drawing/MetafileContainer.cs @@ -28,7 +28,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/RectangleContainer.cs b/Greenshot/Drawing/RectangleContainer.cs index e80741d99..6acecb439 100644 --- a/Greenshot/Drawing/RectangleContainer.cs +++ b/Greenshot/Drawing/RectangleContainer.cs @@ -26,7 +26,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/Surface.cs b/Greenshot/Drawing/Surface.cs index ddf2dd306..b0cc81eb7 100644 --- a/Greenshot/Drawing/Surface.cs +++ b/Greenshot/Drawing/Surface.cs @@ -28,12 +28,12 @@ using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Drawing.Filters; using Greenshot.Helpers; using Greenshot.Plugin; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { public delegate void SurfaceElementEventHandler(object source, DrawableContainerList element); diff --git a/Greenshot/Drawing/TextContainer.cs b/Greenshot/Drawing/TextContainer.cs index 2a0159d40..3a35b2285 100644 --- a/Greenshot/Drawing/TextContainer.cs +++ b/Greenshot/Drawing/TextContainer.cs @@ -29,7 +29,6 @@ using System.Windows.Forms; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Drawing/UrlContainer.cs b/Greenshot/Drawing/UrlContainer.cs index dd171f84e..97e6105de 100644 --- a/Greenshot/Drawing/UrlContainer.cs +++ b/Greenshot/Drawing/UrlContainer.cs @@ -27,7 +27,6 @@ using System.Windows.Forms; using Greenshot.Configuration; using Greenshot.Drawing.Fields; using Greenshot.Helpers; -using Greenshot.Plugin.Drawing; namespace Greenshot.Drawing { /// diff --git a/Greenshot/Forms/CaptureForm.cs b/Greenshot/Forms/CaptureForm.cs index 2820ef44a..eacc421b6 100644 --- a/Greenshot/Forms/CaptureForm.cs +++ b/Greenshot/Forms/CaptureForm.cs @@ -29,6 +29,7 @@ using System.IO; using System.Text; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Drawing; using Greenshot.Helpers; diff --git a/Greenshot/Forms/ImageEditorForm.Designer.cs b/Greenshot/Forms/ImageEditorForm.Designer.cs index 9a71c0cdb..b76a067d5 100644 --- a/Greenshot/Forms/ImageEditorForm.Designer.cs +++ b/Greenshot/Forms/ImageEditorForm.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 { +namespace Greenshot.Forms { partial class ImageEditorForm { /// /// Designer variable used to keep track of non-visual components. diff --git a/Greenshot/Forms/ImageEditorForm.cs b/Greenshot/Forms/ImageEditorForm.cs index 6ddbd1d4b..d410749d3 100644 --- a/Greenshot/Forms/ImageEditorForm.cs +++ b/Greenshot/Forms/ImageEditorForm.cs @@ -33,6 +33,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Drawing; using Greenshot.Drawing.Fields; @@ -42,7 +43,7 @@ using Greenshot.Helpers; using Greenshot.Plugin; using GreenshotPlugin.Core; -namespace Greenshot { +namespace Greenshot.Forms { /// /// Description of ImageEditorForm. /// diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs index 873f5d774..43c30e6ad 100644 --- a/Greenshot/Forms/MainForm.cs +++ b/Greenshot/Forms/MainForm.cs @@ -31,6 +31,7 @@ using System.Text; using System.Threading; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Drawing; using Greenshot.Forms; diff --git a/Greenshot/Forms/SaveImageFileDialog.cs b/Greenshot/Forms/SaveImageFileDialog.cs index ec55c70a2..6b290b7c2 100644 --- a/Greenshot/Forms/SaveImageFileDialog.cs +++ b/Greenshot/Forms/SaveImageFileDialog.cs @@ -26,6 +26,7 @@ using System.Reflection; using System.Text.RegularExpressions; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Helpers; using Greenshot.Plugin; diff --git a/Greenshot/Helpers/FilenameHelper.cs b/Greenshot/Helpers/FilenameHelper.cs index 9dea57bf4..0fbcd9d4e 100644 --- a/Greenshot/Helpers/FilenameHelper.cs +++ b/Greenshot/Helpers/FilenameHelper.cs @@ -23,6 +23,7 @@ using System.Collections; using System.IO; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Plugin; diff --git a/Greenshot/Helpers/ImageOutput.cs b/Greenshot/Helpers/ImageOutput.cs index 5ea0f2ee1..1763c4f28 100644 --- a/Greenshot/Helpers/ImageOutput.cs +++ b/Greenshot/Helpers/ImageOutput.cs @@ -27,6 +27,7 @@ using System.Reflection; using System.Text.RegularExpressions; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Forms; using Greenshot.Plugin; diff --git a/Greenshot/Helpers/MailHelper.cs b/Greenshot/Helpers/MailHelper.cs index 73aac615a..c1986dca3 100644 --- a/Greenshot/Helpers/MailHelper.cs +++ b/Greenshot/Helpers/MailHelper.cs @@ -28,6 +28,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Plugin; using Microsoft.Win32; diff --git a/Greenshot/Helpers/PluginHelper.cs b/Greenshot/Helpers/PluginHelper.cs index 9fb01bb60..151d4d5ff 100644 --- a/Greenshot/Helpers/PluginHelper.cs +++ b/Greenshot/Helpers/PluginHelper.cs @@ -26,7 +26,10 @@ using System.Reflection; using System.Text; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; +using Greenshot.Drawing; +using Greenshot.Forms; using Greenshot.Plugin; namespace Greenshot.Helpers { diff --git a/Greenshot/Helpers/PrintHelper.cs b/Greenshot/Helpers/PrintHelper.cs index 79cd1ed28..be5654366 100644 --- a/Greenshot/Helpers/PrintHelper.cs +++ b/Greenshot/Helpers/PrintHelper.cs @@ -24,6 +24,7 @@ using System.Drawing.Drawing2D; using System.Drawing.Printing; using System.Windows.Forms; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Forms; using Greenshot.Plugin; diff --git a/Greenshot/Helpers/WindowCapture.cs b/Greenshot/Helpers/WindowCapture.cs index 80827da46..733c0e40a 100644 --- a/Greenshot/Helpers/WindowCapture.cs +++ b/Greenshot/Helpers/WindowCapture.cs @@ -29,6 +29,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; using Greenshot; +using Greenshot.Capturing; using Greenshot.Configuration; using Greenshot.Plugin; using Greenshot.UnmanagedHelpers; diff --git a/GreenshotCore/Drawing/Fields/FieldType.cs b/GreenshotCore/Drawing/Fields/FieldType.cs deleted file mode 100644 index 7ce4aa5bc..000000000 --- a/GreenshotCore/Drawing/Fields/FieldType.cs +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Greenshot - a free and open source screenshot tool - * Copyright (C) 2007-2010 Thomas Braun, Jens Klingen, Robin Krom - * - * For more information see: http://getgreenshot.org/ - * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/ - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 1 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -using System; -using System.Drawing; - -namespace Greenshot.Drawing.Fields { - /// - /// Defines all FieldTypes + their default value. - /// (The additional value is why this is not an enum) - /// - [Serializable] - public enum FieldType { - ARROWHEADS, - BLUR_RADIUS, - BRIGHTNESS, - FILL_COLOR, - FONT_BOLD, - FONT_FAMILY, - FONT_ITALIC, - FONT_SIZE, - HIGHLIGHT_COLOR, - LINE_COLOR, - LINE_THICKNESS, - MAGNIFICATION_FACTOR, - PIXEL_SIZE, - PREVIEW_QUALITY, - SHADOW, - PREPARED_FILTER_OBFUSCATE, - PREPARED_FILTER_HIGHLIGHT, - FLAGS - } - - [Flags] - public enum FieldFlag { - NONE = 0, - CONFIRMABLE = 1 - } - -} diff --git a/GreenshotCore/GreenshotCore.csproj b/GreenshotCore/GreenshotCore.csproj index 96cdbc548..b27c1c60b 100644 --- a/GreenshotCore/GreenshotCore.csproj +++ b/GreenshotCore/GreenshotCore.csproj @@ -41,16 +41,25 @@ + - - + + + + + + - - - + + + + + + + diff --git a/GreenshotPlugin/Interfaces/Capture.cs b/GreenshotCore/Interfaces/Capturing/Capture.cs similarity index 98% rename from GreenshotPlugin/Interfaces/Capture.cs rename to GreenshotCore/Interfaces/Capturing/Capture.cs index c7f279990..40758dd33 100644 --- a/GreenshotPlugin/Interfaces/Capture.cs +++ b/GreenshotCore/Interfaces/Capturing/Capture.cs @@ -23,7 +23,9 @@ using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -namespace Greenshot.Plugin { +using Greenshot.Plugin; + +namespace Greenshot.Capturing { /// /// The capture mode for Greenshot /// diff --git a/GreenshotCore/Drawing/Fields/IField.cs b/GreenshotCore/Interfaces/Drawing/Fields/IField.cs similarity index 75% rename from GreenshotCore/Drawing/Fields/IField.cs rename to GreenshotCore/Interfaces/Drawing/Fields/IField.cs index 104e0f794..36e0e1c1d 100644 --- a/GreenshotCore/Drawing/Fields/IField.cs +++ b/GreenshotCore/Interfaces/Drawing/Fields/IField.cs @@ -45,4 +45,37 @@ namespace Greenshot.Drawing.Fields { this.Field = field; } } + + /// + /// All types of fields + /// + public enum FieldType { + ARROWHEADS, + BLUR_RADIUS, + BRIGHTNESS, + FILL_COLOR, + FONT_BOLD, + FONT_FAMILY, + FONT_ITALIC, + FONT_SIZE, + HIGHLIGHT_COLOR, + LINE_COLOR, + LINE_THICKNESS, + MAGNIFICATION_FACTOR, + PIXEL_SIZE, + PREVIEW_QUALITY, + SHADOW, + PREPARED_FILTER_OBFUSCATE, + PREPARED_FILTER_HIGHLIGHT, + FLAGS + } + + /// + /// This enum provides values for FieldType.FLAGS + /// + [Flags] + public enum FieldFlag { + NONE = 0, + CONFIRMABLE = 1 + } } diff --git a/GreenshotCore/Drawing/Fields/IFieldHolder.cs b/GreenshotCore/Interfaces/Drawing/Fields/IFieldHolder.cs similarity index 100% rename from GreenshotCore/Drawing/Fields/IFieldHolder.cs rename to GreenshotCore/Interfaces/Drawing/Fields/IFieldHolder.cs diff --git a/GreenshotPlugin/Interfaces/Drawing/Container.cs b/GreenshotCore/Interfaces/Drawing/IDrawableContainer.cs similarity index 97% rename from GreenshotPlugin/Interfaces/Drawing/Container.cs rename to GreenshotCore/Interfaces/Drawing/IDrawableContainer.cs index 8363f9bb8..2288a3ebf 100644 --- a/GreenshotPlugin/Interfaces/Drawing/Container.cs +++ b/GreenshotCore/Interfaces/Drawing/IDrawableContainer.cs @@ -24,9 +24,7 @@ using System.Drawing.Imaging; using System.IO; using System.Windows.Forms; -using Greenshot.Plugin; - -namespace Greenshot.Plugin.Drawing { +namespace Greenshot.Drawing { public enum RenderMode {EDIT, EXPORT}; public enum EditStatus {UNDRAWN, DRAWING, MOVING, RESIZING, IDLE}; diff --git a/GreenshotPlugin/Interfaces/Generic.cs b/GreenshotCore/Interfaces/Drawing/ISurface.cs similarity index 97% rename from GreenshotPlugin/Interfaces/Generic.cs rename to GreenshotCore/Interfaces/Drawing/ISurface.cs index d7802447e..dbe970698 100644 --- a/GreenshotPlugin/Interfaces/Generic.cs +++ b/GreenshotCore/Interfaces/Drawing/ISurface.cs @@ -23,11 +23,9 @@ using System.Drawing; using System.Drawing.Imaging; using System.Windows.Forms; -using Greenshot.Plugin.Drawing; - -namespace Greenshot.Plugin { +namespace Greenshot.Drawing { /// - /// Alignment Enums for possitioning + /// Alignment Enums for positioning /// //public enum HorizontalAlignment {LEFT, CENTER, RIGHT}; public enum VerticalAlignment {TOP, CENTER, BOTTOM}; diff --git a/GreenshotPlugin/Interfaces/Forms/ImageEditor.cs b/GreenshotCore/Interfaces/Forms/IImageEditor.cs similarity index 96% rename from GreenshotPlugin/Interfaces/Forms/ImageEditor.cs rename to GreenshotCore/Interfaces/Forms/IImageEditor.cs index 0ee677023..c64e8c41d 100644 --- a/GreenshotPlugin/Interfaces/Forms/ImageEditor.cs +++ b/GreenshotCore/Interfaces/Forms/IImageEditor.cs @@ -23,7 +23,10 @@ using System.Drawing; using System.IO; using System.Windows.Forms; -namespace Greenshot.Plugin { +using Greenshot.Capturing; +using Greenshot.Drawing; + +namespace Greenshot.Forms { /// /// The IImageEditor is the Interface that the Greenshot ImageEditor has to implement /// diff --git a/GreenshotPlugin/Interfaces/Plugin/PluginInterfaces.cs b/GreenshotCore/Interfaces/Plugin/PluginInterfaces.cs similarity index 98% rename from GreenshotPlugin/Interfaces/Plugin/PluginInterfaces.cs rename to GreenshotCore/Interfaces/Plugin/PluginInterfaces.cs index cb91e7b2a..f707e9feb 100644 --- a/GreenshotPlugin/Interfaces/Plugin/PluginInterfaces.cs +++ b/GreenshotCore/Interfaces/Plugin/PluginInterfaces.cs @@ -24,6 +24,10 @@ using System.Drawing; using System.IO; using System.Windows.Forms; +using Greenshot.Capturing; +using Greenshot.Drawing; +using Greenshot.Forms; + namespace Greenshot.Plugin { [Serializable] [AttributeUsageAttribute(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)] diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj index be9f68796..f860e9961 100644 --- a/GreenshotPlugin/GreenshotPlugin.csproj +++ b/GreenshotPlugin/GreenshotPlugin.csproj @@ -49,13 +49,8 @@ - - - - - @@ -66,6 +61,10 @@ + + {BDC408EE-DEA1-4474-B59D-7F05757B12EC} + GreenshotCore + rmdir /S /Q "$(SolutionDir)bin\$(Configuration)\Plugins"