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 @@ - + \ 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 @@ - + @@ -26,10 +26,10 @@ - + - + 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 @@ Reinforced rectangle template Width Height + Cover gap + Top Diameter + Bottom Diameter + Width count + Height count + + Diameter + Rebar Diameter + Rebar Count + Reinforced circle template 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 @@ Ширина рабочей плоскости Высота рабочей плоскости - Шаблон армированного прямоугольника + Шаблон армирования прямоугольника Ширина Высота + Защитный слой + Диаметр верхней арматуры + Диаметр нижней арматуры + Число стержней по ширине + Число стержней по высоте + + Диаметр окужности + Диаметр арматуры + Число стержней арматуры + Шаблон армирования окружности + \ 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"> - + Title="{DynamicResource Reinforced circle template}" Height="220" Width="300" SizeToContent="Height" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"> + @@ -22,12 +22,12 @@ - + - - - + + + 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 @@ - + - - - - - + + + + +