From d8d20745e7c334998a9e66edcca3dc1fab70b508 Mon Sep 17 00:00:00 2001
From: avpon <avp.ponomarev@gmail.com>
Date: Tue, 6 Feb 2024 18:57:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B4=D0=BE=D0=BB=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/Resources/PrimitiveToolTips.xaml             |  2 +-
 .../UI/Resources/ShapeEditTemplates.xaml            |  6 +++---
 .../Infrastructure/UI/Resources/Strings.en-US.xaml  | 10 ++++++++++
 .../Infrastructure/UI/Resources/Strings.ru-RU.xaml  | 13 ++++++++++++-
 .../PrimitiveTemplates/RCs/Beams/CircleView.xaml    | 12 ++++++------
 .../RCs/Beams/RectangleBeamView.xaml                | 12 ++++++------
 6 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/StructureHelper/Infrastructure/UI/Resources/PrimitiveToolTips.xaml b/StructureHelper/Infrastructure/UI/Resources/PrimitiveToolTips.xaml
index 30c2688..7aff461 100644
--- a/StructureHelper/Infrastructure/UI/Resources/PrimitiveToolTips.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/PrimitiveToolTips.xaml
@@ -23,5 +23,5 @@
             <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CenterY, Converter={StaticResource LengthConverter}}"/>
         </Grid>
     </DataTemplate>
-    
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/StructureHelper/Infrastructure/UI/Resources/ShapeEditTemplates.xaml b/StructureHelper/Infrastructure/UI/Resources/ShapeEditTemplates.xaml
index 7950b69..53e22e9 100644
--- a/StructureHelper/Infrastructure/UI/Resources/ShapeEditTemplates.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/ShapeEditTemplates.xaml
@@ -9,7 +9,7 @@
                 <RowDefinition Height="22"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="150"/>
+                <ColumnDefinition Width="180"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Row="0" Text="{DynamicResource Width}"/>
@@ -26,10 +26,10 @@
                 <RowDefinition Height="22"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="160"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <TextBlock Grid.Row="0" Text="Diameter"/>
+            <TextBlock Grid.Row="0" Text="{DynamicResource Diameter}"/>
             <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding Diameter, Converter={StaticResource LengthConverter}, ValidatesOnDataErrors=True}"/>
         </Grid>
     </DataTemplate>
diff --git a/StructureHelper/Infrastructure/UI/Resources/Strings.en-US.xaml b/StructureHelper/Infrastructure/UI/Resources/Strings.en-US.xaml
index 487cb6a..1d045bd 100644
--- a/StructureHelper/Infrastructure/UI/Resources/Strings.en-US.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/Strings.en-US.xaml
@@ -68,6 +68,16 @@
     <system:String x:Key="Reinforced rectangle template">Reinforced rectangle template</system:String>
     <system:String x:Key="Width">Width</system:String>
     <system:String x:Key="Height">Height</system:String>
+    <system:String x:Key="Cover gap">Cover gap</system:String>
+    <system:String x:Key="Top Diameter">Top Diameter</system:String>
+    <system:String x:Key="Bottom Diameter">Bottom Diameter</system:String>
+    <system:String x:Key="Width count">Width count</system:String>
+    <system:String x:Key="Height count">Height count</system:String>
+
+    <system:String x:Key="Diameter">Diameter</system:String>
+    <system:String x:Key="Rebar Diameter">Rebar Diameter</system:String>
+    <system:String x:Key="Rebar Count">Rebar Count</system:String>
+    <system:String x:Key="Reinforced circle template">Reinforced circle template</system:String>
     
     
     
diff --git a/StructureHelper/Infrastructure/UI/Resources/Strings.ru-RU.xaml b/StructureHelper/Infrastructure/UI/Resources/Strings.ru-RU.xaml
index 58b4ab7..98bdb1f 100644
--- a/StructureHelper/Infrastructure/UI/Resources/Strings.ru-RU.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/Strings.ru-RU.xaml
@@ -65,8 +65,19 @@
     <system:String x:Key="Work plane width">Ширина рабочей плоскости</system:String>
     <system:String x:Key="Work plane height">Высота рабочей плоскости</system:String>
 
-    <system:String x:Key="Reinforced rectangle template">Шаблон армированного прямоугольника</system:String>
+    <system:String x:Key="Reinforced rectangle template">Шаблон армирования прямоугольника</system:String>
     <system:String x:Key="Width">Ширина</system:String>
     <system:String x:Key="Height">Высота</system:String>
+    <system:String x:Key="Cover gap">Защитный слой</system:String>
+    <system:String x:Key="Top Diameter">Диаметр верхней арматуры</system:String>
+    <system:String x:Key="Bottom Diameter">Диаметр нижней арматуры</system:String>
+    <system:String x:Key="Width count">Число стержней по ширине</system:String>
+    <system:String x:Key="Height count">Число стержней по высоте</system:String>
+
+    <system:String x:Key="Diameter">Диаметр окужности</system:String>
+    <system:String x:Key="Rebar Diameter">Диаметр арматуры</system:String>
+    <system:String x:Key="Rebar Count">Число стержней арматуры</system:String>
+    <system:String x:Key="Reinforced circle template">Шаблон армирования окружности</system:String>
+
     <!-- All StringResources Goes Here -->
 </ResourceDictionary> 
\ No newline at end of file
diff --git a/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/CircleView.xaml b/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/CircleView.xaml
index d1832c6..745c17c 100644
--- a/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/CircleView.xaml
+++ b/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/CircleView.xaml
@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:StructureHelper.Windows.PrimitiveTemplates.RCs.Beams"
         mc:Ignorable="d"
-        Title="Reinforced circle template" Height="220" Width="300" SizeToContent="Height" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
-    <Grid>
+        Title="{DynamicResource Reinforced circle template}" Height="220" Width="300" SizeToContent="Height" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
+    <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition Height="35"/>
@@ -22,12 +22,12 @@
                     <RowDefinition Height="22"/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="160"/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Row="0" Text="Cover gap"/>
-                <TextBlock Grid.Row="1" Text="Rebar Diameter"/>
-                <TextBlock Grid.Row="2" Text="Rebar Count"/>
+                <TextBlock Grid.Row="0" Text="{DynamicResource Cover gap}"/>
+                <TextBlock Grid.Row="1" Text="{DynamicResource Rebar Diameter}"/>
+                <TextBlock Grid.Row="2" Text="{DynamicResource Rebar Count}"/>
                 <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding CoverGap, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
                 <TextBox Grid.Row="1" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BarDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
                 <TextBox Grid.Row="2" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BarCount, ValidatesOnExceptions=True}"/>
diff --git a/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/RectangleBeamView.xaml b/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/RectangleBeamView.xaml
index 6e5cdc2..adec720 100644
--- a/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/RectangleBeamView.xaml
+++ b/StructureHelper/Windows/PrimitiveTemplates/RCs/Beams/RectangleBeamView.xaml
@@ -27,14 +27,14 @@
                     <RowDefinition Height="22"/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="150"/>
+                    <ColumnDefinition Width="180"/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Grid.Row="0" Text="Cover gap"/>
-                <TextBlock Grid.Row="1" Text="Top Diameter"/>
-                <TextBlock Grid.Row="2" Text="Bottom Diameter"/>
-                <TextBlock Grid.Row="3" Text="Width count"/>
-                <TextBlock Grid.Row="4" Text="Height count"/>
+                <TextBlock Grid.Row="0" Text="{DynamicResource Cover gap}"/>
+                <TextBlock Grid.Row="1" Text="{DynamicResource Top Diameter}"/>
+                <TextBlock Grid.Row="2" Text="{DynamicResource Bottom Diameter}"/>
+                <TextBlock Grid.Row="3" Text="{DynamicResource Width count}"/>
+                <TextBlock Grid.Row="4" Text="{DynamicResource Height count}"/>
                 <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding CoverGap, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
                 <TextBox Grid.Row="1" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding TopDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
                 <TextBox Grid.Row="2" Grid.Column="1" Margin="1" Style="{StaticResource ValidatedError}" Text="{Binding BottomDiameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>