1berry/ShareX
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Class name changes

Browse Source
This commit is contained in:
Jaex 2016-09-04 19:22:27 +03:00
parent 643ef4a19e
commit a9cbc5647d
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs → ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs
View File

@ -37,7 +37,7 @@ using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib
{
public class RectangleRegionForm : Form
public sealed class RegionCaptureForm : Form
{
public static GraphicsPath LastRegionFillPath { get; protected set; }
@ -91,7 +91,7 @@ namespace ShareX.ScreenCaptureLib
private TextAnimation shapeTypeTextAnimation = new TextAnimation(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(0.5));
private Bitmap bmpBackgroundImage;
public RectangleRegionForm(RegionCaptureMode mode)
public RegionCaptureForm(RegionCaptureMode mode)
{
Mode = mode;

4
ShareX.ScreenCaptureLib/Forms/RectangleRegionLightForm.cs → ShareX.ScreenCaptureLib/Forms/RegionCaptureLightForm.cs
View File

@ -33,7 +33,7 @@ using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib
{
public class RectangleRegionLightForm : Form
public sealed class RegionCaptureLightForm : Form
{
private const int MinimumRectangleSize = 3;
@ -56,7 +56,7 @@ namespace ShareX.ScreenCaptureLib
private bool isMouseDown;
private Stopwatch penTimer;
public RectangleRegionLightForm(Screenshot screenshot)
public RegionCaptureLightForm(Screenshot screenshot)
{
backgroundImage = screenshot.CaptureFullscreen();
backgroundBrush = new TextureBrush(backgroundImage);

6
ShareX.ScreenCaptureLib/Forms/RectangleRegionAnnotateForm.cs → ShareX.ScreenCaptureLib/Forms/RegionCaptureSimpleAnnotateForm.cs
View File

@ -35,7 +35,7 @@ using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib
{
public class RectangleRegionAnnotateForm : Form
public sealed class RegionCaptureSimpleAnnotateForm : Form
{
public static Rectangle LastSelectionRectangle0Based { get; private set; }
@ -71,7 +71,7 @@ namespace ShareX.ScreenCaptureLib
private Stopwatch penTimer;
private Font infoFont;
public RectangleRegionAnnotateForm(Screenshot screenshot, RectangleAnnotateOptions options)
public RegionCaptureSimpleAnnotateForm(Screenshot screenshot, RectangleAnnotateOptions options)
{
Options = options;
@ -395,7 +395,7 @@ namespace ShareX.ScreenCaptureLib
DrawInfoText(g, tipText, textRectangle, padding);
}
protected virtual void WriteTips(StringBuilder sb)
private void WriteTips(StringBuilder sb)
{
sb.AppendLine(Resources.RectangleRegion_WriteTips__F1__Hide_tips);

4
ShareX.ScreenCaptureLib/Forms/RectangleRegionTransparentForm.cs → ShareX.ScreenCaptureLib/Forms/RegionCaptureTransparentForm.cs
View File

@ -33,7 +33,7 @@ using System.Windows.Forms;
namespace ShareX.ScreenCaptureLib
{
public class RectangleRegionTransparentForm : LayeredForm
public sealed class RegionCaptureTransparentForm : LayeredForm
{
private const int MinimumRectangleSize = 3;
@ -61,7 +61,7 @@ namespace ShareX.ScreenCaptureLib
private bool isMouseDown;
private Stopwatch penTimer;
public RectangleRegionTransparentForm()
public RegionCaptureTransparentForm()
{
clearPen = new Pen(Color.FromArgb(1, 0, 0, 0));
borderDotPen = new Pen(Color.Black, 1);

12
ShareX.ScreenCaptureLib/RegionHelpers/RegionCaptureHelpers.cs
View File

@ -35,7 +35,7 @@ namespace ShareX.ScreenCaptureLib
{
public static Image GetRegionImage(RegionCaptureOptions options)
{
using (RectangleRegionForm form = new RectangleRegionForm(RegionCaptureMode.Default))
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.Default))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.ShowTips = false;
@ -49,7 +49,7 @@ namespace ShareX.ScreenCaptureLib
public static bool GetRectangleRegion(out Rectangle rect, RegionCaptureOptions options)
{
using (RectangleRegionForm form = new RectangleRegionForm(RegionCaptureMode.Default))
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.Default))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.ShowTips = false;
@ -94,7 +94,7 @@ namespace ShareX.ScreenCaptureLib
public static PointInfo GetPointInfo(RegionCaptureOptions options)
{
using (RectangleRegionForm form = new RectangleRegionForm(RegionCaptureMode.ScreenColorPicker))
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.ScreenColorPicker))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.DetectWindows = false;
@ -118,7 +118,7 @@ namespace ShareX.ScreenCaptureLib
public static SimpleWindowInfo GetWindowInfo(RegionCaptureOptions options)
{
using (RectangleRegionForm form = new RectangleRegionForm(RegionCaptureMode.OneClick))
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.OneClick))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.UseDimming = false;
@ -139,7 +139,7 @@ namespace ShareX.ScreenCaptureLib
public static void ShowScreenRuler(RegionCaptureOptions options)
{
using (RectangleRegionForm form = new RectangleRegionForm(RegionCaptureMode.Ruler))
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.Ruler))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.QuickCrop = false;
@ -155,7 +155,7 @@ namespace ShareX.ScreenCaptureLib
if (File.Exists(filePath))
{
using (Image img = ImageHelpers.LoadImage(filePath))
using (RectangleRegionForm form = new RectangleRegionForm(RegionCaptureMode.Editor))
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.Editor))
{
form.Config = GetRegionCaptureOptions(options);
form.Config.DetectWindows = false;

4
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View File

@ -181,14 +181,14 @@ namespace ShareX.ScreenCaptureLib
public event Action<BaseShape> CurrentShapeChanged;
public event Action<ShapeType> CurrentShapeTypeChanged;
private RectangleRegionForm form;
private RegionCaptureForm form;
private ContextMenuStrip cmsContextMenu;
private ToolStripSeparator tssObjectOptions, tssShapeOptions;
private ToolStripMenuItem tsmiDeleteSelected, tsmiDeleteAll, tsmiBorderColor, tsmiFillColor, tsmiHighlightColor, tsmiQuickCrop;
private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize;
private bool isLeftPressed, isRightPressed, isUpPressed, isDownPressed;
public ShapeManager(RectangleRegionForm form)
public ShapeManager(RegionCaptureForm form)
{
this.form = form;
Config = form.Config;

8
ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
View File

@ -61,10 +61,10 @@
<ItemGroup>
<Compile Include="Shapes\AnnotationOptions.cs" />
<Compile Include="Enums.cs" />
<Compile Include="Forms\RectangleRegionAnnotateForm.cs">
<Compile Include="Forms\RegionCaptureSimpleAnnotateForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\RectangleRegionTransparentForm.cs">
<Compile Include="Forms\RegionCaptureTransparentForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\ScrollingCaptureForm.cs">
@ -119,7 +119,7 @@
<DependentUpon>FFmpegOptionsForm.cs</DependentUpon>
</Compile>
<Compile Include="Screencast\ScreencastOptions.cs" />
<Compile Include="Forms\RectangleRegionLightForm.cs">
<Compile Include="Forms\RegionCaptureLightForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Screencast\ImageCache.cs" />
@ -131,7 +131,7 @@
</Compile>
<Compile Include="Shapes\ShapeManager.cs" />
<Compile Include="RegionHelpers\DrawableObject.cs" />
<Compile Include="Forms\RectangleRegionForm.cs">
<Compile Include="Forms\RegionCaptureForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="RegionHelpers\InputManager.cs" />

24
ShareX/Forms/MainForm.cs
View File

@ -2128,7 +2128,7 @@ namespace ShareX
private void CaptureRegion(TaskSettings taskSettings, bool autoHideForm = true)
{
RectangleRegionForm form = new RectangleRegionForm(RegionCaptureMode.Annotation);
RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.Annotation);
DoCapture(() =>
{
@ -2181,7 +2181,7 @@ namespace ShareX
{
Image img = null;
using (RectangleRegionLightForm rectangleLight = new RectangleRegionLightForm(TaskHelpers.GetScreenshot(taskSettings)))
using (RegionCaptureLightForm rectangleLight = new RegionCaptureLightForm(TaskHelpers.GetScreenshot(taskSettings)))
{
if (rectangleLight.ShowDialog() == DialogResult.OK)
{
@ -2206,7 +2206,7 @@ namespace ShareX
{
Image img = null;
using (RectangleRegionTransparentForm rectangleTransparent = new RectangleRegionTransparentForm())
using (RegionCaptureTransparentForm rectangleTransparent = new RegionCaptureTransparentForm())
{
if (rectangleTransparent.ShowDialog() == DialogResult.OK)
{
@ -2231,7 +2231,7 @@ namespace ShareX
{
Image img = null;
using (RectangleRegionAnnotateForm rectangleAnnotate = new RectangleRegionAnnotateForm(TaskHelpers.GetScreenshot(taskSettings),
using (RegionCaptureSimpleAnnotateForm rectangleAnnotate = new RegionCaptureSimpleAnnotateForm(TaskHelpers.GetScreenshot(taskSettings),
taskSettings.CaptureSettingsReference.RectangleAnnotateOptions))
{
if (rectangleAnnotate.ShowDialog() == DialogResult.OK)
@ -2254,13 +2254,13 @@ namespace ShareX
switch (lastRegionCaptureType)
{
case LastRegionCaptureType.Default:
if (RectangleRegionForm.LastRegionFillPath != null)
if (RegionCaptureForm.LastRegionFillPath != null)
{
DoCapture(() =>
{
using (Image screenshot = TaskHelpers.GetScreenshot(taskSettings).CaptureFullscreen())
{
return RegionCaptureHelpers.ApplyRegionPathToImage(screenshot, RectangleRegionForm.LastRegionFillPath);
return RegionCaptureHelpers.ApplyRegionPathToImage(screenshot, RegionCaptureForm.LastRegionFillPath);
}
}, CaptureType.LastRegion, taskSettings, autoHideForm);
}
@ -2270,13 +2270,13 @@ namespace ShareX
}
break;
case LastRegionCaptureType.Light:
if (!RectangleRegionLightForm.LastSelectionRectangle0Based.IsEmpty)
if (!RegionCaptureLightForm.LastSelectionRectangle0Based.IsEmpty)
{
DoCapture(() =>
{
using (Image screenshot = TaskHelpers.GetScreenshot(taskSettings).CaptureFullscreen())
{
return ImageHelpers.CropImage(screenshot, RectangleRegionLightForm.LastSelectionRectangle0Based);
return ImageHelpers.CropImage(screenshot, RegionCaptureLightForm.LastSelectionRectangle0Based);
}
}, CaptureType.LastRegion, taskSettings, autoHideForm);
}
@ -2286,13 +2286,13 @@ namespace ShareX
}
break;
case LastRegionCaptureType.Transparent:
if (!RectangleRegionTransparentForm.LastSelectionRectangle0Based.IsEmpty)
if (!RegionCaptureTransparentForm.LastSelectionRectangle0Based.IsEmpty)
{
DoCapture(() =>
{
using (Image screenshot = TaskHelpers.GetScreenshot(taskSettings).CaptureFullscreen())
{
return ImageHelpers.CropImage(screenshot, RectangleRegionTransparentForm.LastSelectionRectangle0Based);
return ImageHelpers.CropImage(screenshot, RegionCaptureTransparentForm.LastSelectionRectangle0Based);
}
}, CaptureType.LastRegion, taskSettings, autoHideForm);
}
@ -2302,13 +2302,13 @@ namespace ShareX
}
break;
case LastRegionCaptureType.Annotate:
if (!RectangleRegionAnnotateForm.LastSelectionRectangle0Based.IsEmpty)
if (!RegionCaptureSimpleAnnotateForm.LastSelectionRectangle0Based.IsEmpty)
{
DoCapture(() =>
{
using (Image screenshot = TaskHelpers.GetScreenshot(taskSettings).CaptureFullscreen())
{
return ImageHelpers.CropImage(screenshot, RectangleRegionAnnotateForm.LastSelectionRectangle0Based);
return ImageHelpers.CropImage(screenshot, RegionCaptureSimpleAnnotateForm.LastSelectionRectangle0Based);
}
}, CaptureType.LastRegion, taskSettings, autoHideForm);
}