CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Rename effect enum names

Browse source
This commit is contained in:
Jaex 2016-09-02 09:16:52 +03:00
parent 5d48b3c4f9
commit e3232dee70
10 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View file

@ -2392,15 +2392,6 @@ internal static string ShapeType_DrawingArrow {
}
}
/// <summary>
/// Looks up a localized string similar to Effect: Blur.
/// </summary>
internal static string ShapeType_DrawingBlur {
get {
return ResourceManager.GetString("ShapeType_DrawingBlur", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Drawing: Ellipse.
/// </summary>
@ -2419,15 +2410,6 @@ internal static string ShapeType_DrawingFreehand {
}
}
/// <summary>
/// Looks up a localized string similar to Effect: Highlight.
/// </summary>
internal static string ShapeType_DrawingHighlight {
get {
return ResourceManager.GetString("ShapeType_DrawingHighlight", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Drawing: Image.
/// </summary>
@ -2446,15 +2428,6 @@ internal static string ShapeType_DrawingLine {
}
}
/// <summary>
/// Looks up a localized string similar to Effect: Pixelate.
/// </summary>
internal static string ShapeType_DrawingPixelate {
get {
return ResourceManager.GetString("ShapeType_DrawingPixelate", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Drawing: Rectangle.
/// </summary>
@ -2500,6 +2473,33 @@ internal static string ShapeType_DrawingText {
}
}
/// <summary>
/// Looks up a localized string similar to Effect: Blur.
/// </summary>
internal static string ShapeType_EffectBlur {
get {
return ResourceManager.GetString("ShapeType_EffectBlur", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Effect: Highlight.
/// </summary>
internal static string ShapeType_EffectHighlight {
get {
return ResourceManager.GetString("ShapeType_EffectHighlight", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Effect: Pixelate.
/// </summary>
internal static string ShapeType_EffectPixelate {
get {
return ResourceManager.GetString("ShapeType_EffectPixelate", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Region: Ellipse.
/// </summary>

6
ShareX.HelpersLib/Properties/Resources.resx
View file

@ -917,19 +917,19 @@ Would you like to download it?</value>
<data name="ShapeType_DrawingArrow" xml:space="preserve">
<value>Drawing: Arrow</value>
</data>
<data name="ShapeType_DrawingBlur" xml:space="preserve">
<data name="ShapeType_EffectBlur" xml:space="preserve">
<value>Effect: Blur</value>
</data>
<data name="ShapeType_DrawingEllipse" xml:space="preserve">
<value>Drawing: Ellipse</value>
</data>
<data name="ShapeType_DrawingHighlight" xml:space="preserve">
<data name="ShapeType_EffectHighlight" xml:space="preserve">
<value>Effect: Highlight</value>
</data>
<data name="ShapeType_DrawingLine" xml:space="preserve">
<value>Drawing: Line</value>
</data>
<data name="ShapeType_DrawingPixelate" xml:space="preserve">
<data name="ShapeType_EffectPixelate" xml:space="preserve">
<value>Effect: Pixelate</value>
</data>
<data name="ShapeType_DrawingRectangle" xml:space="preserve">

6
ShareX.HelpersLib/Properties/Resources.ru.resx
View file

@ -883,19 +883,19 @@
<data name="ShapeType_DrawingArrow" xml:space="preserve">
<value>Рисование: Стрелка</value>
</data>
<data name="ShapeType_DrawingBlur" xml:space="preserve">
<data name="ShapeType_EffectBlur" xml:space="preserve">
<value>Эффект: размытие</value>
</data>
<data name="ShapeType_DrawingEllipse" xml:space="preserve">
<value>Рисование: Эллипс</value>
</data>
<data name="ShapeType_DrawingHighlight" xml:space="preserve">
<data name="ShapeType_EffectHighlight" xml:space="preserve">
<value>Эффект: Подсветить область</value>
</data>
<data name="ShapeType_DrawingLine" xml:space="preserve">
<value>Рисование: Линия</value>
</data>
<data name="ShapeType_DrawingPixelate" xml:space="preserve">
<data name="ShapeType_EffectPixelate" xml:space="preserve">
<value>Эффект: Пикселизация</value>
</data>
<data name="ShapeType_DrawingRectangle" xml:space="preserve">

6
ShareX.HelpersLib/Properties/Resources.zh-CN.resx
View file

@ -880,19 +880,19 @@
<data name="ShapeType_DrawingArrow" xml:space="preserve">
<value>绘图：箭头</value>
</data>
<data name="ShapeType_DrawingBlur" xml:space="preserve">
<data name="ShapeType_EffectBlur" xml:space="preserve">
<value>效果：朦胧</value>
</data>
<data name="ShapeType_DrawingEllipse" xml:space="preserve">
<value>绘图：椭圆</value>
</data>
<data name="ShapeType_DrawingHighlight" xml:space="preserve">
<data name="ShapeType_EffectHighlight" xml:space="preserve">
<value>效果：高亮</value>
</data>
<data name="ShapeType_DrawingLine" xml:space="preserve">
<value>绘图：线条</value>
</data>
<data name="ShapeType_DrawingPixelate" xml:space="preserve">
<data name="ShapeType_EffectPixelate" xml:space="preserve">
<value>效果：马赛克</value>
</data>
<data name="ShapeType_DrawingRectangle" xml:space="preserve">

6
ShareX.ScreenCaptureLib/Enums.cs
View file

@ -182,9 +182,9 @@ public enum ShapeType // Localized
DrawingSpeechBalloon,
DrawingStep,
DrawingImage,
DrawingBlur,
DrawingPixelate,
DrawingHighlight
EffectBlur,
EffectPixelate,
EffectHighlight
}
public enum RegionAnnotateMode

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

@ -528,12 +528,12 @@ private void WriteTips(StringBuilder sb)
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 6", ShapeType.DrawingText.GetLocalizedDescription()));
if (ShapeManager.CurrentShapeType == ShapeType.DrawingStep) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 7", ShapeType.DrawingStep.GetLocalizedDescription()));
if (ShapeManager.CurrentShapeType == ShapeType.DrawingBlur) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 8", ShapeType.DrawingBlur.GetLocalizedDescription()));
if (ShapeManager.CurrentShapeType == ShapeType.DrawingPixelate) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 9", ShapeType.DrawingPixelate.GetLocalizedDescription()));
if (ShapeManager.CurrentShapeType == ShapeType.DrawingHighlight) sb.Append("-> ");
sb.AppendLine(ShapeType.DrawingHighlight.GetLocalizedDescription());
if (ShapeManager.CurrentShapeType == ShapeType.EffectBlur) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 8", ShapeType.EffectBlur.GetLocalizedDescription()));
if (ShapeManager.CurrentShapeType == ShapeType.EffectPixelate) sb.Append("-> ");
sb.AppendLine(string.Format("[{0}] {1}", "Numpad 9", ShapeType.EffectPixelate.GetLocalizedDescription()));
if (ShapeManager.CurrentShapeType == ShapeType.EffectHighlight) sb.Append("-> ");
sb.AppendLine(ShapeType.EffectHighlight.GetLocalizedDescription());
}
sb.AppendLine();

2
ShareX.ScreenCaptureLib/Shapes/Effect/BlurEffectShape.cs
View file

@ -30,7 +30,7 @@ namespace ShareX.ScreenCaptureLib
{
public class BlurEffectShape : BaseEffectShape
{
public override ShapeType ShapeType { get; } = ShapeType.DrawingBlur;
public override ShapeType ShapeType { get; } = ShapeType.EffectBlur;
public int BlurRadius { get; set; }

2
ShareX.ScreenCaptureLib/Shapes/Effect/HighlightEffectShape.cs
View file

@ -30,7 +30,7 @@ namespace ShareX.ScreenCaptureLib
{
public class HighlightEffectShape : BaseEffectShape
{
public override ShapeType ShapeType { get; } = ShapeType.DrawingHighlight;
public override ShapeType ShapeType { get; } = ShapeType.EffectHighlight;
public Color HighlightColor { get; set; }

2
ShareX.ScreenCaptureLib/Shapes/Effect/PixelateEffectShape.cs
View file

@ -30,7 +30,7 @@ namespace ShareX.ScreenCaptureLib
{
public class PixelateEffectShape : BaseEffectShape
{
public override ShapeType ShapeType { get; } = ShapeType.DrawingPixelate;
public override ShapeType ShapeType { get; } = ShapeType.EffectPixelate;
public int PixelSize { get; set; }

28
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View file

@ -345,13 +345,13 @@ private void CreateContextMenu()
case ShapeType.DrawingImage:
img = Resources.image;
break;
case ShapeType.DrawingBlur:
case ShapeType.EffectBlur:
img = Resources.layer_shade;
break;
case ShapeType.DrawingPixelate:
case ShapeType.EffectPixelate:
img = Resources.grid;
break;
case ShapeType.DrawingHighlight:
case ShapeType.EffectHighlight:
img = Resources.highlighter_text;
break;
}
@ -770,9 +770,9 @@ private void UpdateContextMenu()
case ShapeType.DrawingText:
case ShapeType.DrawingSpeechBalloon:
case ShapeType.DrawingStep:
case ShapeType.DrawingBlur:
case ShapeType.DrawingPixelate:
case ShapeType.DrawingHighlight:
case ShapeType.EffectBlur:
case ShapeType.EffectPixelate:
case ShapeType.EffectHighlight:
tssShapeOptions.Visible = true;
break;
}
@ -813,9 +813,9 @@ private void UpdateContextMenu()
}
tslnudRoundedRectangleRadius.Visible = shapeType == ShapeType.RegionRoundedRectangle || shapeType == ShapeType.DrawingRoundedRectangle;
tslnudBlurRadius.Visible = shapeType == ShapeType.DrawingBlur;
tslnudPixelateSize.Visible = shapeType == ShapeType.DrawingPixelate;
tsmiHighlightColor.Visible = shapeType == ShapeType.DrawingHighlight;
tslnudBlurRadius.Visible = shapeType == ShapeType.EffectBlur;
tslnudPixelateSize.Visible = shapeType == ShapeType.EffectPixelate;
tsmiHighlightColor.Visible = shapeType == ShapeType.EffectHighlight;
}
private void form_LostFocus(object sender, EventArgs e)
@ -999,10 +999,10 @@ private void form_KeyDown(object sender, KeyEventArgs e)
CurrentShapeType = ShapeType.DrawingStep;
break;
case Keys.NumPad8:
CurrentShapeType = ShapeType.DrawingBlur;
CurrentShapeType = ShapeType.EffectBlur;
break;
case Keys.NumPad9:
CurrentShapeType = ShapeType.DrawingPixelate;
CurrentShapeType = ShapeType.EffectPixelate;
break;
case Keys.Control | Keys.V:
PasteFromClipboard();
@ -1315,13 +1315,13 @@ private BaseShape CreateShape(ShapeType shapeType)
case ShapeType.DrawingImage:
shape = new ImageDrawingShape();
break;
case ShapeType.DrawingBlur:
case ShapeType.EffectBlur:
shape = new BlurEffectShape();
break;
case ShapeType.DrawingPixelate:
case ShapeType.EffectPixelate:
shape = new PixelateEffectShape();
break;
case ShapeType.DrawingHighlight:
case ShapeType.EffectHighlight:
shape = new HighlightEffectShape();
break;
}