CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Removed triangle and diamond region capture, added hotkey for rest of drawing types

Browse source
This commit is contained in:
Jaex 2016-05-05 21:14:44 +03:00
parent 3760273afa
commit 1633d4100e
17 changed files with 33 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ShareX.ScreenCaptureLib/Enums.cs
View file

@ -140,6 +140,12 @@ public enum FFmpegPaletteUseDither
public enum ShapeType
{
[Description("Region: Rectangle")]
RegionRectangle,
[Description("Region: Rounded rectangle")]
RegionRoundedRectangle,
[Description("Region: Ellipse")]
RegionEllipse,
[Description("Drawing: Rectangle")]
DrawingRectangle,
[Description("Drawing: Rounded rectangle")]
@ -149,17 +155,7 @@ public enum ShapeType
[Description("Drawing: Line")]
DrawingLine,
[Description("Drawing: Arrow")]
DrawingArrow,
[Description("Region: Rectangle")]
RegionRectangle,
[Description("Region: Rounded rectangle")]
RegionRoundedRectangle,
[Description("Region: Ellipse")]
RegionEllipse,
[Description("Region: Triangle")]
RegionTriangle,
[Description("Region: Diamond")]
RegionDiamond
DrawingArrow
}
public enum RegionAnnotateMode

17
ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs
View file

@ -448,16 +448,18 @@ protected virtual void WriteTips(StringBuilder sb)
sb.AppendLine(Resources.RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape);
if (AreaManager.CurrentShapeType == ShapeType.RegionEllipse) sb.Append("-> ");
sb.AppendLine(Resources.RectangleRegion_WriteTips__Numpad_3__Ellipse_shape);
if (AreaManager.CurrentShapeType == ShapeType.RegionTriangle) sb.Append("-> ");
sb.AppendLine(Resources.RectangleRegion_WriteTips__Numpad_4__Triangle_shape);
if (AreaManager.CurrentShapeType == ShapeType.RegionDiamond) sb.Append("-> ");
sb.AppendLine(Resources.RectangleRegion_WriteTips__Numpad_5__Diamond_shape);
// TODO: Translate
if (AreaManager.CurrentShapeType == ShapeType.DrawingRectangle) sb.Append("-> ");
sb.AppendLine("[Numpad 7] Rectangle drawing");
sb.AppendLine("[Numpad 4] Rectangle drawing");
if (AreaManager.CurrentShapeType == ShapeType.DrawingRoundedRectangle) sb.Append("-> ");
sb.AppendLine("[Numpad 8] Rounded rectangle drawing");
sb.AppendLine("[Numpad 5] Rounded rectangle drawing");
if (AreaManager.CurrentShapeType == ShapeType.DrawingEllipse) sb.Append("-> ");
sb.AppendLine("[Numpad 6] Ellipse drawing");
if (AreaManager.CurrentShapeType == ShapeType.DrawingLine) sb.Append("-> ");
sb.AppendLine("[Numpad 7] Line drawing");
if (AreaManager.CurrentShapeType == ShapeType.DrawingArrow) sb.Append("-> ");
sb.AppendLine("[Numpad 8] Arrow drawing");
switch (AreaManager.CurrentShapeType)
{
@ -465,9 +467,6 @@ protected virtual void WriteTips(StringBuilder sb)
case ShapeType.DrawingRoundedRectangle:
sb.AppendLine(Resources.RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius);
break;
case ShapeType.RegionTriangle:
sb.AppendLine(Resources.RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle);
break;
}
}

33
ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs generated
View file

@ -428,16 +428,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to [Numpad + or -] Change triangle angle.
/// </summary>
internal static string RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle {
get {
return ResourceManager.GetString("RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Numpad 1] Rectangle shape.
/// Looks up a localized string similar to [Numpad 1] Rectangle region.
/// </summary>
internal static string RectangleRegion_WriteTips__Numpad_1__Rectangle_shape {
get {
@ -446,7 +437,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to [Numpad 2] Rounded rectangle shape.
/// Looks up a localized string similar to [Numpad 2] Rounded rectangle region.
/// </summary>
internal static string RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape {
get {
@ -455,7 +446,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to [Numpad 3] Ellipse shape.
/// Looks up a localized string similar to [Numpad 3] Ellipse region.
/// </summary>
internal static string RectangleRegion_WriteTips__Numpad_3__Ellipse_shape {
get {
@ -463,24 +454,6 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to [Numpad 4] Triangle shape.
/// </summary>
internal static string RectangleRegion_WriteTips__Numpad_4__Triangle_shape {
get {
return ResourceManager.GetString("RectangleRegion_WriteTips__Numpad_4__Triangle_shape", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Numpad 5] Diamond shape.
/// </summary>
internal static string RectangleRegion_WriteTips__Numpad_5__Diamond_shape {
get {
return ResourceManager.GetString("RectangleRegion_WriteTips__Numpad_5__Diamond_shape", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Esc] Cancel capture.
/// </summary>

9
ShareX.ScreenCaptureLib/Properties/Resources.de.resx
View file

@ -236,9 +236,6 @@ Distanz: {6:0.00} px / Winkel: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius" xml:space="preserve">
<value>[Numpad + oder -] Radius der abgerundeten Rechteck Ecken ändern</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Numpad + oder -] Dreieck Winkel ändern</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[Numpad 1] Rechteckform</value>
</data>
@ -248,12 +245,6 @@ Distanz: {6:0.00} px / Winkel: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
<value>[Numpad 3] Ellipsenform</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[Numpad 4] Dreieckform</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[Numpad 5] Diamantform</value>
</data>
<data name="ScrollingCaptureForm_StartCapture_Stop_capture" xml:space="preserve">
<value>Aufnahme Stoppen</value>
</data>

9
ShareX.ScreenCaptureLib/Properties/Resources.fr.resx
View file

@ -224,12 +224,6 @@ Distance : {6:0.00} px / Angle : {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape" xml:space="preserve">
<value>[Pavé numérique 2] Forme rectangulaire arrondie</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[Pavé numérique 4] Forme triangulaire</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[Pavé numérique 5] Forme de losange</value>
</data>
<data name="RectangleRegion_WriteTips__Ctrl___C__Copy_info" xml:space="preserve">
<value>[Ctrl + C] Copier les infos</value>
</data>
@ -242,9 +236,6 @@ Distance : {6:0.00} px / Angle : {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Suppr] Supprimer la région</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Pavé numérique + ou -] Changer l'angle du triangle</value>
</data>
<data name="RectangleRegion_WriteTips__Hold_Left_click_on_selection__Move_region" xml:space="preserve">
<value>[Maintenir clic gauche sur la sélection] Déplacer la région</value>
</data>

9
ShareX.ScreenCaptureLib/Properties/Resources.nl-NL.resx
View file

@ -242,9 +242,6 @@ Afstand: {6:0.00} px / Hoek: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius" xml:space="preserve">
<value>[Numpad + of -] Pas diameter afgeronde rechthoek aan</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Numpad + of -] Pas hoek driehoek aan</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[Numpad 1] Rechthoekige vorm</value>
</data>
@ -254,12 +251,6 @@ Afstand: {6:0.00} px / Hoek: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
<value>[Numpad 3] Ellipsvorm</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[Numpad 4] Driehoekige vorm</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[Numpad 5] Diamantvorm</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Esc] Annuleer vastleggen</value>
</data>

9
ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx
View file

@ -234,21 +234,12 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[Teclado numérico 1] Formato de retângulo</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[Teclado numérico 4] Formato de triângulo</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[Teclado numérico 5] Formato de diamante</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
<value>[Teclado numérico 3] Formato de elipse</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape" xml:space="preserve">
<value>[Teclado numérico 2] Formato de retângulo arredondado</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Teclado numérico + ou -] Mudar o ângulo do triângulo</value>
</data>
<data name="RectangleRegion_WriteTips_bottom_right" xml:space="preserve">
<value>canto inferior direito</value>
</data>

15
ShareX.ScreenCaptureLib/Properties/Resources.resx
View file

@ -168,10 +168,7 @@ Width: {4} px / Height: {5} px
Distance: {6:0.00} px / Angle: {7:0.00}°</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[Numpad 1] Rectangle shape</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[Numpad 4] Triangle shape</value>
<value>[Numpad 1] Rectangle region</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Delete] Remove region</value>
@ -188,12 +185,6 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__F1__Hide_tips" xml:space="preserve">
<value>[F1] Hide tips</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[Numpad 5] Diamond shape</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Numpad + or -] Change triangle angle</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Crosshair" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Crosshair.cur;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -220,7 +211,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<value>[Esc] Cancel capture</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape" xml:space="preserve">
<value>[Numpad 2] Rounded rectangle shape</value>
<value>[Numpad 2] Rounded rectangle region</value>
</data>
<data name="FFmpegOptionsForm_buttonFFmpegBrowse_Click_Browse_for_ffmpeg_exe" xml:space="preserve">
<value>Browse for ffmpeg.exe</value>
@ -229,7 +220,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<value>[Double left click] [Enter] Capture regions</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
<value>[Numpad 3] Ellipse shape</value>
<value>[Numpad 3] Ellipse region</value>
</data>
<data name="RectangleRegion_WriteTips__Ctrl___C__Copy_info" xml:space="preserve">
<value>[Ctrl + C] Copy info</value>

9
ShareX.ScreenCaptureLib/Properties/Resources.ru.resx
View file

@ -257,9 +257,6 @@
<data name="RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius" xml:space="preserve">
<value>[+ или - на циф. клавиатуре] Изменить радиус скругления</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[+ или - на циф. клавиатуре] Изменить угол поворота треугольника</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[1 на циф. клавиатуре] Прямоугольник</value>
</data>
@ -269,12 +266,6 @@
<data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
<value>[3 на циф. клавиатуре] Эллипс</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[4 на циф. клавиатуре] Треугольник</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[5 на циф. клавиатуре] Ромб</value>
</data>
<data name="ScrollingCaptureForm_StartCapture_Stop_capture" xml:space="preserve">
<value>Остановить захват</value>
</data>

9
ShareX.ScreenCaptureLib/Properties/Resources.tr.resx
View file

@ -242,9 +242,6 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius" xml:space="preserve">
<value>[Tuş takımı + veya -] Yuvarlatılmış dikdörtgen kenar yarıçapını değiştir</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Tuş takımı + veya -] Üçgen açısını değiştir</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[Tuş takımı 1] Dikdörtgen şekli</value>
</data>
@ -254,12 +251,6 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
<value>[Tuş takımı 3] Elips şekli</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[Tuş takımı 4] Üçgen şekli</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[Tuş takımı 5] Elmas şekli</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Esc] Yakalamayı iptal et</value>
</data>

9
ShareX.ScreenCaptureLib/Properties/Resources.vi-VN.resx
View file

@ -236,12 +236,6 @@ Khoảng cách: {6:0.00} px / Góc: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_rounded_rectangle_corner_radius" xml:space="preserve">
<value>[Numpad + hoặc -] Thay đổi độ tròn của góc ở hình chữ nhật</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[Numpad 5] Hình kim cương</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[Numpad 4] Hình tam giác</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_3__Ellipse_shape" xml:space="preserve">
<value>[Numpad 3] Hình ellipse</value>
</data>
@ -251,9 +245,6 @@ Khoảng cách: {6:0.00} px / Góc: {7:0.00}°</value>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[Numpad 1] Hình chữ nhật</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Numpad + hoặc -] Thay đổi góc tam giác</value>
</data>
<data name="RectangleAnnotate_InitializeComponent_Rectangle_capture_annotate" xml:space="preserve">
<value>Chụp hình chữ nhật (Đánh dấu)</value>
</data>

9
ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
View file

@ -179,9 +179,6 @@
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[小键盘1]矩形形状</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_4__Triangle_shape" xml:space="preserve">
<value>[小键盘4]三角形状</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Delete]删除区域</value>
</data>
@ -194,12 +191,6 @@
<data name="RectangleRegion_WriteTips__F1__Hide_tips" xml:space="preserve">
<value>[F1]隐藏提示</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_5__Diamond_shape" xml:space="preserve">
<value>[小键盘5]钻石形状</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[数字键盘+或 - ]更改三角形夹角</value>
</data>
<data name="RectangleRegion_WriteTips__Hold_Left_click__Start_region_selection" xml:space="preserve">
<value>[按住左键] [Insert]启动区域选择</value>
</data>

65
ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
View file

@ -106,8 +106,7 @@ public bool IsCurrentShapeTypeRegion
{
get
{
return CurrentShapeType == ShapeType.RegionRectangle || CurrentShapeType == ShapeType.RegionRoundedRectangle || CurrentShapeType == ShapeType.RegionEllipse ||
CurrentShapeType == ShapeType.RegionTriangle || CurrentShapeType == ShapeType.RegionDiamond;
return CurrentShapeType == ShapeType.RegionRectangle || CurrentShapeType == ShapeType.RegionRoundedRectangle || CurrentShapeType == ShapeType.RegionEllipse;
}
}
@ -117,7 +116,6 @@ public bool IsCurrentShapeTypeRegion
public float RoundedRectangleRadius { get; set; } = 15;
public int RoundedRectangleRadiusIncrement { get; set; } = 3;
public TriangleAngle TriangleAngle { get; set; } = TriangleAngle.Top;
public Point CurrentPosition { get; private set; }
public Point PositionOnClick { get; private set; }
@ -385,17 +383,20 @@ private void surface_KeyDown(object sender, KeyEventArgs e)
ChangeCurrentShapeType(ShapeType.RegionEllipse);
break;
case Keys.NumPad4:
ChangeCurrentShapeType(ShapeType.RegionTriangle);
break;
case Keys.NumPad5:
ChangeCurrentShapeType(ShapeType.RegionDiamond);
break;
case Keys.NumPad7:
ChangeCurrentShapeType(ShapeType.DrawingRectangle);
break;
case Keys.NumPad8:
case Keys.NumPad5:
ChangeCurrentShapeType(ShapeType.DrawingRoundedRectangle);
break;
case Keys.NumPad6:
ChangeCurrentShapeType(ShapeType.DrawingEllipse);
break;
case Keys.NumPad7:
ChangeCurrentShapeType(ShapeType.DrawingLine);
break;
case Keys.NumPad8:
ChangeCurrentShapeType(ShapeType.DrawingArrow);
break;
case Keys.Add:
switch (CurrentShapeType)
{
@ -403,17 +404,6 @@ private void surface_KeyDown(object sender, KeyEventArgs e)
RoundedRectangleRadius += RoundedRectangleRadiusIncrement;
UpdateRoundedRectangle();
break;
case ShapeType.RegionTriangle:
if (TriangleAngle == TriangleAngle.Left)
{
TriangleAngle = TriangleAngle.Top;
}
else
{
TriangleAngle++;
}
UpdateTriangle();
break;
}
break;
case Keys.Subtract:
@ -423,17 +413,6 @@ private void surface_KeyDown(object sender, KeyEventArgs e)
RoundedRectangleRadius = Math.Max(0, RoundedRectangleRadius - RoundedRectangleRadiusIncrement);
UpdateRoundedRectangle();
break;
case ShapeType.RegionTriangle:
if (TriangleAngle == TriangleAngle.Top)
{
TriangleAngle = TriangleAngle.Left;
}
else
{
TriangleAngle--;
}
UpdateTriangle();
break;
}
break;
}
@ -459,19 +438,6 @@ private void UpdateRoundedRectangle()
}
}
private void UpdateTriangle()
{
if (CurrentShape != null)
{
TriangleRegionShape triangleShape = CurrentShape as TriangleRegionShape;
if (triangleShape != null)
{
triangleShape.Angle = TriangleAngle;
}
}
}
private void surface_KeyUp(object sender, KeyEventArgs e)
{
switch (e.KeyCode)
@ -711,15 +677,6 @@ public BaseShape CreateRegionShape(Rectangle rect)
case ShapeType.RegionEllipse:
shape = new EllipseRegionShape();
break;
case ShapeType.RegionTriangle:
shape = new TriangleRegionShape()
{
Angle = TriangleAngle
};
break;
case ShapeType.RegionDiamond:
shape = new DiamondRegionShape();
break;
case ShapeType.DrawingRectangle:
shape = new RectangleDrawingShape();
break;

45
ShareX.ScreenCaptureLib/Shapes/Region/DiamondRegionShape.cs
View file

@ -1,45 +0,0 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (c) 2007-2016 ShareX Team
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 2
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, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Text;
namespace ShareX.ScreenCaptureLib
{
public class DiamondRegionShape : BaseRegionShape
{
public override ShapeType ShapeType { get; } = ShapeType.RegionDiamond;
public override void AddShapePath(GraphicsPath gp, Rectangle rect)
{
gp.AddDiamond(rect);
}
}
}

47
ShareX.ScreenCaptureLib/Shapes/Region/TriangleRegionShape.cs
View file

@ -1,47 +0,0 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (c) 2007-2016 ShareX Team
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 2
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, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Text;
namespace ShareX.ScreenCaptureLib
{
public class TriangleRegionShape : BaseRegionShape
{
public override ShapeType ShapeType { get; } = ShapeType.RegionTriangle;
public TriangleAngle Angle { get; set; }
public override void AddShapePath(GraphicsPath gp, Rectangle rect)
{
gp.AddTriangle(rect, Angle);
}
}
}

2
ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
View file

@ -87,7 +87,6 @@
<Compile Include="Shapes\Drawing\LineDrawingShape.cs" />
<Compile Include="Shapes\Drawing\RectangleDrawingShape.cs" />
<Compile Include="Shapes\Drawing\RoundedRectangleDrawingShape.cs" />
<Compile Include="Shapes\Region\DiamondRegionShape.cs" />
<Compile Include="Shapes\Region\EllipseRegionShape.cs" />
<Compile Include="Shapes\Region\RectangleRegionShape.cs" />
<Compile Include="Shapes\Region\BaseRegionShape.cs" />
@ -131,7 +130,6 @@
<Compile Include="RegionHelpers\ShapeCaptureHelpers.cs" />
<Compile Include="ScrollingCaptureOptions.cs" />
<Compile Include="Shapes\Region\RoundedRectangleRegionShape.cs" />
<Compile Include="Shapes\Region\TriangleRegionShape.cs" />
<Compile Include="SimpleWindowInfo.cs" />
<Compile Include="SnapSize.cs" />
<Compile Include="SurfaceOptions.cs" />

5
ShareX.ScreenCaptureLib/SurfaceOptions.cs
View file

@ -113,10 +113,7 @@ public SurfaceOptions()
new SnapSize(1280, 720), // 720p
new SnapSize(1920, 1080), // 1080p
new SnapSize(2560, 1440), // 1440p
new SnapSize(3840, 2160), // 2160p
new SnapSize(800, 600), // SVGA
new SnapSize(1024, 768), // XGA
new SnapSize(4096, 2160) // 4K
new SnapSize(3840, 2160) // 2160p
};
}
}