Browse Source

Cap and translations

flabbet 1 year ago
parent
commit
18d185e256

+ 10 - 9
src/PixiEditor.AvaloniaUI/Data/Localization/Languages/en.json

@@ -562,21 +562,16 @@
   "TRANSFORM_ACTION_DISPLAY_SCALE_ROTATE_SHEAR_NOPERSPECTIVE": "Drag handles to scale transform. Hold Shift to scale proportionally. Hold Alt and drag a side handle to shear. Drag outside handles to rotate.",
   "TRANSFORM_ACTION_DISPLAY_SCALE_ROTATE_SHEAR_NOPERSPECTIVE": "Drag handles to scale transform. Hold Shift to scale proportionally. Hold Alt and drag a side handle to shear. Drag outside handles to rotate.",
   "TRANSFORM_ACTION_DISPLAY_SCALE_ROTATE_NOSHEAR_NOPERSPECTIVE": "Drag handles to scale transform. Hold Shift to scale proportionally. Drag outside handles to rotate.",
   "TRANSFORM_ACTION_DISPLAY_SCALE_ROTATE_NOSHEAR_NOPERSPECTIVE": "Drag handles to scale transform. Hold Shift to scale proportionally. Drag outside handles to rotate.",
   "TRANSFORM_ACTION_DISPLAY_SCALE_NOROTATE_NOSHEAR_NOPERSPECTIVE": "Drag handles to scale transform. Hold Shift to scale proportionally.",
   "TRANSFORM_ACTION_DISPLAY_SCALE_NOROTATE_NOSHEAR_NOPERSPECTIVE": "Drag handles to scale transform. Hold Shift to scale proportionally.",
-
   "LOCAL_PALETTE_SOURCE_NAME": "Local",
   "LOCAL_PALETTE_SOURCE_NAME": "Local",
-
   "ERROR_FORBIDDEN_UNIQUE_NAME": "Extension unique name cannot start with 'pixieditor'.",
   "ERROR_FORBIDDEN_UNIQUE_NAME": "Extension unique name cannot start with 'pixieditor'.",
   "ERROR_MISSING_METADATA": "Extension metadata key '{0}' is missing.",
   "ERROR_MISSING_METADATA": "Extension metadata key '{0}' is missing.",
   "ERROR_NO_CLASS_ENTRY": "Extension class entry is missing on path '{0}'.",
   "ERROR_NO_CLASS_ENTRY": "Extension class entry is missing on path '{0}'.",
   "ERROR_NO_ENTRY_ASSEMBLY": "Extension entry assembly is missing on path '{0}'.",
   "ERROR_NO_ENTRY_ASSEMBLY": "Extension entry assembly is missing on path '{0}'.",
   "ERROR_MISSING_ADDITIONAL_CONTENT": "Your current setup doesn't allow loading this extension. Perhaps you don't own it or don't have it installed. You can purchase it here '{0}'.",
   "ERROR_MISSING_ADDITIONAL_CONTENT": "Your current setup doesn't allow loading this extension. Perhaps you don't own it or don't have it installed. You can purchase it here '{0}'.",
-
   "BUY_SUPPORTER_PACK": "Buy Supporter Pack",
   "BUY_SUPPORTER_PACK": "Buy Supporter Pack",
-
   "NEWS": "News",
   "NEWS": "News",
   "DISABLE_NEWS_PANEL": "Disable News panel in startup window",
   "DISABLE_NEWS_PANEL": "Disable News panel in startup window",
   "FAILED_FETCH_NEWS": "Failed to fetch news",
   "FAILED_FETCH_NEWS": "Failed to fetch news",
-  
   "CROP_TO_SELECTION": "Crop to selection",
   "CROP_TO_SELECTION": "Crop to selection",
   "CROP_TO_SELECTION_DESCRIPTIVE": "Crop image to selection",
   "CROP_TO_SELECTION_DESCRIPTIVE": "Crop image to selection",
   "SHOW_CONTEXT_MENU": "Show context menu",
   "SHOW_CONTEXT_MENU": "Show context menu",
@@ -585,9 +580,7 @@
   "RIGHT_CLICK_MODE": "Right click mode",
   "RIGHT_CLICK_MODE": "Right click mode",
   "ADD_PRIMARY_COLOR_TO_PALETTE": "Add primary color to palette",
   "ADD_PRIMARY_COLOR_TO_PALETTE": "Add primary color to palette",
   "ADD_PRIMARY_COLOR_TO_PALETTE_DESCRIPTIVE": "Add primary color to current palette",
   "ADD_PRIMARY_COLOR_TO_PALETTE_DESCRIPTIVE": "Add primary color to current palette",
-
   "EXPORT_SAVE_TITLE": "Choose a location to save the image",
   "EXPORT_SAVE_TITLE": "Choose a location to save the image",
-
   "BROWSE_DIRECTORY": "Browse Directory",
   "BROWSE_DIRECTORY": "Browse Directory",
   "CRASH_NOT_ALL_DOCUMENTS_RECOVERED_TITLE": "Not all documents were recovered",
   "CRASH_NOT_ALL_DOCUMENTS_RECOVERED_TITLE": "Not all documents were recovered",
   "CRASH_NOT_ALL_DOCUMENTS_RECOVERED": "Could not recover all documents. Git gud at saving your work.",
   "CRASH_NOT_ALL_DOCUMENTS_RECOVERED": "Could not recover all documents. Git gud at saving your work.",
@@ -606,7 +599,7 @@
   "VIDEO_FILES": "Video Files",
   "VIDEO_FILES": "Video Files",
   "MP4_FILE": "MP4 Videos",
   "MP4_FILE": "MP4 Videos",
   "COLUMNS": "Columns",
   "COLUMNS": "Columns",
-    "ROWS": "Rows",
+  "ROWS": "Rows",
   "BACKGROUND": "Background",
   "BACKGROUND": "Background",
   "OPACITY": "Opacity",
   "OPACITY": "Opacity",
   "IS_VISIBLE": "Is visible",
   "IS_VISIBLE": "Is visible",
@@ -615,5 +608,13 @@
   "MASK": "Mask",
   "MASK": "Mask",
   "MASK_IS_VISIBLE": "Mask is visible",
   "MASK_IS_VISIBLE": "Mask is visible",
   "OUTPUT": "Output",
   "OUTPUT": "Output",
-  "INPUT": "Input"
+  "INPUT": "Input",
+  "NODE_GRAPH_TITLE": "Graph View",
+  "CONTENT": "Content",
+  "RADIUS": "Radius",
+  "STROKE_COLOR": "Stroke color",
+  "STROKE_WIDTH": "Stroke width",
+  "FILL_COLOR": "Fill color",
+  "TOP": "Top",
+  "BOTTOM": "Bottom"
 }
 }

+ 2 - 2
src/PixiEditor.AvaloniaUI/Styles/Templates/NodeSocket.axaml

@@ -7,9 +7,9 @@
         <Setter Property="Template">
         <Setter Property="Template">
             <ControlTemplate>
             <ControlTemplate>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                    <TextBlock Margin="0, 0, 2, 0" ui:Translator.Key="{TemplateBinding Label}" IsVisible="{Binding !IsInput, RelativeSource={RelativeSource TemplatedParent}}"/>
+                    <TextBlock VerticalAlignment="Center" Margin="0, 0, 2, 0" ui:Translator.Key="{TemplateBinding Label}" IsVisible="{Binding !IsInput, RelativeSource={RelativeSource TemplatedParent}}"/>
                     <Ellipse Width="10" Height="10" Fill="{TemplateBinding SocketBrush}" Name="PART_ConnectPort"/>
                     <Ellipse Width="10" Height="10" Fill="{TemplateBinding SocketBrush}" Name="PART_ConnectPort"/>
-                    <TextBlock Margin="2, 0, 0, 0" ui:Translator.Key="{TemplateBinding Label}" IsVisible="{Binding IsInput, RelativeSource={RelativeSource TemplatedParent}}"/>
+                    <TextBlock VerticalAlignment="Center" Margin="2, 0, 0, 0" ui:Translator.Key="{TemplateBinding Label}" IsVisible="{Binding IsInput, RelativeSource={RelativeSource TemplatedParent}}"/>
                 </StackPanel>
                 </StackPanel>
             </ControlTemplate>
             </ControlTemplate>
         </Setter>
         </Setter>

+ 1 - 1
src/PixiEditor.AvaloniaUI/Views/Nodes/ConnectionLine.cs

@@ -63,6 +63,6 @@ public class ConnectionLine : Control
         ctx.BeginFigure(p1, false);
         ctx.BeginFigure(p1, false);
         ctx.CubicBezierTo(controlPoint, controlPoint2, p2);
         ctx.CubicBezierTo(controlPoint, controlPoint2, p2);
         
         
-        context.DrawGeometry(Color, new Pen(Color, Thickness), geometry);
+        context.DrawGeometry(Color, new Pen(Color, Thickness) { LineCap = PenLineCap.Round }, geometry);
     }
     }
 }
 }