mirror of
https://github.com/greenshot/greenshot
synced 2025-07-11 07:37:05 -07:00
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
This commit is contained in:
parent
0dffa6054b
commit
01d843e8cf
46 changed files with 80 additions and 103 deletions
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -25,7 +25,6 @@ using System.Windows.Forms;
|
|||
|
||||
using Greenshot.Helpers;
|
||||
using Greenshot.Drawing.Fields;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -26,7 +26,6 @@ using System.Windows.Forms;
|
|||
|
||||
using Greenshot.Drawing.Fields;
|
||||
using Greenshot.Plugin;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -26,7 +26,6 @@ using System.Runtime.Serialization;
|
|||
|
||||
using Greenshot.Drawing;
|
||||
using Greenshot.Drawing.Fields;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
/// <summary>
|
||||
/// Graphical filter which can be added to DrawableContainer.
|
||||
|
|
|
@ -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()]
|
||||
|
|
|
@ -25,7 +25,6 @@ using System.Runtime.Serialization;
|
|||
|
||||
using Greenshot.Configuration;
|
||||
using Greenshot.Drawing.Fields;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing.Filters {
|
||||
[Serializable()]
|
||||
|
|
|
@ -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()]
|
||||
|
|
|
@ -23,7 +23,6 @@ using System.Drawing;
|
|||
using System.Drawing.Imaging;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing.Filters {
|
||||
/// <summary>
|
||||
|
|
|
@ -25,7 +25,6 @@ using System.Runtime.Serialization;
|
|||
|
||||
using Greenshot.Configuration;
|
||||
using Greenshot.Drawing.Fields;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing.Filters {
|
||||
[Serializable()]
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -25,7 +25,6 @@ using System.Runtime.Serialization;
|
|||
|
||||
using Greenshot.Configuration;
|
||||
using Greenshot.Drawing.Fields;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing.Filters {
|
||||
[Serializable()]
|
||||
|
|
|
@ -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()]
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -29,7 +29,6 @@ using System.Windows.Forms;
|
|||
|
||||
using Greenshot.Drawing.Fields;
|
||||
using Greenshot.Helpers;
|
||||
using Greenshot.Plugin.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing {
|
||||
/// <summary>
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
|
|
|
@ -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;
|
||||
|
|
2
Greenshot/Forms/ImageEditorForm.Designer.cs
generated
2
Greenshot/Forms/ImageEditorForm.Designer.cs
generated
|
@ -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 {
|
||||
namespace Greenshot.Forms {
|
||||
partial class ImageEditorForm {
|
||||
/// <summary>
|
||||
/// Designer variable used to keep track of non-visual components.
|
||||
|
|
|
@ -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 {
|
||||
/// <summary>
|
||||
/// Description of ImageEditorForm.
|
||||
/// </summary>
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -23,6 +23,7 @@ using System.Collections;
|
|||
using System.IO;
|
||||
using System.Windows.Forms;
|
||||
|
||||
using Greenshot.Capturing;
|
||||
using Greenshot.Configuration;
|
||||
using Greenshot.Plugin;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
using System;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Greenshot.Drawing.Fields {
|
||||
/// <summary>
|
||||
/// Defines all FieldTypes + their default value.
|
||||
/// (The additional value is why this is not an enum)
|
||||
/// </summary>
|
||||
[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
|
||||
}
|
||||
|
||||
}
|
|
@ -41,16 +41,25 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Drawing" />
|
||||
<Folder Include="Drawing\Fields" />
|
||||
<Folder Include="Interfaces\Drawing" />
|
||||
<Folder Include="Interfaces\Drawing\Fields" />
|
||||
<Folder Include="Interfaces\Forms" />
|
||||
<Folder Include="Interfaces\Capturing" />
|
||||
<Folder Include="Interfaces\Plugin" />
|
||||
<Folder Include="Lib" />
|
||||
<Folder Include="Interfaces" />
|
||||
<Folder Include="UnmanagedHelpers" />
|
||||
<Compile Include="Drawing\Fields\FieldType.cs" />
|
||||
<Compile Include="Drawing\Fields\IField.cs" />
|
||||
<Compile Include="Drawing\Fields\IFieldHolder.cs" />
|
||||
<Compile Include="Interfaces\Capturing\Capture.cs" />
|
||||
<Compile Include="Interfaces\Drawing\IDrawableContainer.cs" />
|
||||
<Compile Include="Interfaces\Drawing\Fields\IField.cs" />
|
||||
<Compile Include="Interfaces\Drawing\Fields\IFieldHolder.cs" />
|
||||
<Compile Include="Interfaces\Drawing\ISurface.cs" />
|
||||
<Compile Include="Interfaces\Forms\IImageEditor.cs" />
|
||||
<Compile Include="Interfaces\Plugin\PluginInterfaces.cs" />
|
||||
<Compile Include="UnmanagedHelpers\GDI32.cs" />
|
||||
<Compile Include="UnmanagedHelpers\User32.cs" />
|
||||
<Compile Include="UnmanagedHelpers\Win32Errors.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 {
|
||||
/// <summary>
|
||||
/// The capture mode for Greenshot
|
||||
/// </summary>
|
|
@ -45,4 +45,37 @@ namespace Greenshot.Drawing.Fields {
|
|||
this.Field = field;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// All types of fields
|
||||
/// </summary>
|
||||
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
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This enum provides values for FieldType.FLAGS
|
||||
/// </summary>
|
||||
[Flags]
|
||||
public enum FieldFlag {
|
||||
NONE = 0,
|
||||
CONFIRMABLE = 1
|
||||
}
|
||||
}
|
|
@ -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};
|
||||
|
|
@ -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 {
|
||||
/// <summary>
|
||||
/// Alignment Enums for possitioning
|
||||
/// Alignment Enums for positioning
|
||||
/// </summary>
|
||||
//public enum HorizontalAlignment {LEFT, CENTER, RIGHT};
|
||||
public enum VerticalAlignment {TOP, CENTER, BOTTOM};
|
|
@ -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 {
|
||||
/// <summary>
|
||||
/// The IImageEditor is the Interface that the Greenshot ImageEditor has to implement
|
||||
/// </summary>
|
|
@ -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)]
|
|
@ -49,13 +49,8 @@
|
|||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Interfaces\Capture.cs" />
|
||||
<Compile Include="Core\LanguageHelper.cs" />
|
||||
<Compile Include="Core\PropertyHelper.cs" />
|
||||
<Compile Include="Interfaces\Drawing\Container.cs" />
|
||||
<Compile Include="Interfaces\Forms\ImageEditor.cs" />
|
||||
<Compile Include="Interfaces\Generic.cs" />
|
||||
<Compile Include="Interfaces\Plugin\PluginInterfaces.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<None Include="Properties\AssemblyInfo.cs.template" />
|
||||
</ItemGroup>
|
||||
|
@ -66,6 +61,10 @@
|
|||
<Folder Include="Interfaces" />
|
||||
<Folder Include="Core" />
|
||||
<Folder Include="Interfaces\Plugin" />
|
||||
<ProjectReference Include="..\GreenshotCore\GreenshotCore.csproj">
|
||||
<Project>{BDC408EE-DEA1-4474-B59D-7F05757B12EC}</Project>
|
||||
<Name>GreenshotCore</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>rmdir /S /Q "$(SolutionDir)bin\$(Configuration)\Plugins"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue