diff --git a/ShareX.HelpersLib/Colors/ColorPickerForm.de.resx b/ShareX.HelpersLib/Colors/ColorPickerForm.de.resx index 52eac5ee8..ecc01a4a4 100644 --- a/ShareX.HelpersLib/Colors/ColorPickerForm.de.resx +++ b/ShareX.HelpersLib/Colors/ColorPickerForm.de.resx @@ -1,3 +1,4 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Hinzufügen... + + + Entfernen + + + Breite: + + + Höhe: + + + Thumbnails generieren + + + Ausgabe-Ordner + + + ShareX - Bild Thumbnailer + + + Ausgabe-Dateiname + + \ No newline at end of file diff --git a/ShareX.MediaLib/ShareX.MediaLib.csproj b/ShareX.MediaLib/ShareX.MediaLib.csproj index b56a58024..353d7f744 100644 --- a/ShareX.MediaLib/ShareX.MediaLib.csproj +++ b/ShareX.MediaLib/ShareX.MediaLib.csproj @@ -166,6 +166,9 @@ ImageCombinerForm.cs + + ImageThumbnailerForm.cs + ImageThumbnailerForm.cs diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs index d9e341176..c727bfaa2 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs @@ -1560,6 +1560,15 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Value of first step:. + /// + internal static string ShapeManager_CreateToolbar_StartingStepValue { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_StartingStepValue", resourceCulture); + } + } + /// /// Looks up a localized string similar to Undo. /// diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx index 4ba885d85..a9710507b 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx @@ -165,6 +165,9 @@ Distance: {6:0.00} px / Angle: {7:0.00}° Use letters + + Value of first step: + Image size... diff --git a/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs b/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs index 61a48c88b..59943f481 100644 --- a/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs +++ b/ShareX.ScreenCaptureLib/Shapes/AnnotationOptions.cs @@ -94,10 +94,10 @@ public class AnnotationOptions public string LastStickerPath { get; set; } // Blur effect - public int BlurRadius { get; set; } = 15; + public int BlurRadius { get; set; } = 35; // Pixelate effect - public int PixelateSize { get; set; } = 8; + public int PixelateSize { get; set; } = 15; // Highlight effect public Color HighlightColor { get; set; } = Color.Yellow; diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs index c7e4e0a94..755c82820 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs @@ -152,6 +152,7 @@ private set public bool IsCurrentHoverShapeValid => CurrentHoverShape != null && CurrentHoverShape.IsValidShape; public bool IsCurrentShapeTypeRegion => IsShapeTypeRegion(CurrentTool); + public int StartingStepNumber { get; set; } = 1; public bool IsCreating { get; set; } public bool IsMoving { get; set; } @@ -1474,7 +1475,7 @@ private void UpdateNodes() public void OrderStepShapes() { - int i = 1; + int i = StartingStepNumber; foreach (StepDrawingShape shape in Shapes.OfType()) { diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs index 39c29842b..48aa3ace5 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs @@ -52,7 +52,7 @@ internal partial class ShapeManager private ToolStripMenuItem tsmiArrowHeadsBothSide, tsmiShadow, tsmiShadowColor, tsmiStepUseLetters, tsmiUndo, tsmiDelete, tsmiDeleteAll, tsmiMoveTop, tsmiMoveUp, tsmiMoveDown, tsmiMoveBottom, tsmiRegionCapture, tsmiQuickCrop, tsmiShowMagnifier, tsmiImageEditorBackgroundColor; private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudCenterPoints, tslnudBlurRadius, tslnudPixelateSize, tslnudStepFontSize, - tslnudMagnifierPixelCount; + tslnudMagnifierPixelCount, tslnudStartingStepValue; private ToolStripLabel tslDragLeft, tslDragRight; private ToolStripLabeledComboBox tscbImageInterpolationMode, tscbCursorTypes; @@ -546,6 +546,16 @@ internal void CreateToolbar() }; tsddbShapeOptions.DropDownItems.Add(tslnudStepFontSize); + tslnudStartingStepValue = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateToolbar_StartingStepValue); + tslnudStartingStepValue.Content.Minimum = 1; + tslnudStartingStepValue.Content.Maximum = 10000; + tslnudStartingStepValue.Content.ValueChanged = (sender, e) => + { + StartingStepNumber = (int)tslnudStartingStepValue.Content.Value; + UpdateCurrentShape(); + }; + tsddbShapeOptions.DropDownItems.Add(tslnudStartingStepValue); + tsmiStepUseLetters = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_UseLetters); tsmiStepUseLetters.Checked = false; tsmiStepUseLetters.CheckOnClick = true; @@ -1304,6 +1314,7 @@ private void UpdateMenu() tsbHighlightColor.Image = ImageHelpers.CreateColorPickerIcon(AnnotationOptions.HighlightColor, new Rectangle(0, 0, 16, 16)); tslnudStepFontSize.Content.Value = AnnotationOptions.StepFontSize; + tslnudStartingStepValue.Content.Value = StartingStepNumber; tsmiStepUseLetters.Checked = AnnotationOptions.StepUseLetters; tsmiShadow.Checked = AnnotationOptions.Shadow; @@ -1395,6 +1406,7 @@ private void UpdateMenu() tslnudCenterPoints.Visible = shapeType == ShapeType.DrawingLine || shapeType == ShapeType.DrawingArrow; tsmiArrowHeadsBothSide.Visible = shapeType == ShapeType.DrawingArrow; tscbImageInterpolationMode.Visible = shapeType == ShapeType.DrawingImage || shapeType == ShapeType.DrawingImageScreen; + tslnudStartingStepValue.Visible = shapeType == ShapeType.DrawingStep; tslnudStepFontSize.Visible = tsmiStepUseLetters.Visible = shapeType == ShapeType.DrawingStep; tscbCursorTypes.Visible = shapeType == ShapeType.DrawingCursor; tslnudBlurRadius.Visible = shapeType == ShapeType.EffectBlur; diff --git a/ShareX.UploadersLib/Controls/OAuthControl.de.resx b/ShareX.UploadersLib/Controls/OAuthControl.de.resx index 35a30dd01..a90b672ea 100644 --- a/ShareX.UploadersLib/Controls/OAuthControl.de.resx +++ b/ShareX.UploadersLib/Controls/OAuthControl.de.resx @@ -135,4 +135,7 @@ Verifikationscode (Hole den Code von der Autorisierungsseite): + + Status: + \ No newline at end of file diff --git a/ShareX.UploadersLib/FTPClient/FTPClientForm.de.resx b/ShareX.UploadersLib/FTPClient/FTPClientForm.de.resx index 62ab2a0fb..4db109e92 100644 --- a/ShareX.UploadersLib/FTPClient/FTPClientForm.de.resx +++ b/ShareX.UploadersLib/FTPClient/FTPClientForm.de.resx @@ -1,4 +1,4 @@ - +