Start localization

This commit is contained in:
2024-02-05 19:54:11 +03:00
parent 165a2846bb
commit 971b5d6204
6 changed files with 549 additions and 379 deletions

View File

@@ -0,0 +1,53 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<system:String x:Key="Actions">Actions</system:String>
<system:String x:Key="Geometry">Geometry</system:String>
<system:String x:Key="Materials">Materials</system:String>
<system:String x:Key="Show Materials">Show Materials</system:String>
<system:String x:Key="Analisis">Analisis</system:String>
<system:String x:Key="Analises">Analises</system:String>
<system:String x:Key="Add Full Combination">Add Full Combination</system:String>
<system:String x:Key="Add Factored Combination">Add Factored Combination</system:String>
<system:String x:Key="Concrete">Concrete</system:String>
<system:String x:Key="Reinforcement">Reinforcement</system:String>
<system:String x:Key="Elastic">Elastic</system:String>
<system:String x:Key="CarbonFiber">CarbonFiber</system:String>
<system:String x:Key="GlassFiber">GlassFiber</system:String>
<system:String x:Key="Rectangle">Rectangle</system:String>
<system:String x:Key="Circle">Circle</system:String>
<system:String x:Key="Rebar">Rebar</system:String>
<system:String x:Key="Point">Point</system:String>
<system:String x:Key="Run">Run</system:String>
<system:String x:Key="Add">Add</system:String>
<system:String x:Key="Edit">Edit</system:String>
<system:String x:Key="Copy">Copy</system:String>
<system:String x:Key="Copy To">Copy To</system:String>
<system:String x:Key="Delete">Delete</system:String>
<system:String x:Key="To Foreground">To Foreground</system:String>
<system:String x:Key="To Background">To Background</system:String>
<system:String x:Key="Add Force Calculator">Add Force Calculator</system:String>
<system:String x:Key="Add Interaction Diagram Calculator">Add Interaction Diagram Calculator</system:String>
<system:String x:Key="Add Rectangle Primitive">Add Rectangle Primitive</system:String>
<system:String x:Key="Add Circle Primitive">Add Circle Primitive</system:String>
<system:String x:Key="Add Rebar Primitive">Add Rebar Primitive</system:String>
<system:String x:Key="Add Point Primitive">Add Point Primitive</system:String>
<system:String x:Key="Add Rectangle RC Column">Add Rectangle RC Column</system:String>
<system:String x:Key="Add Circle RC Column">Add Circle RC Column</system:String>
<system:String x:Key="Add RC Beam">Add RC Beam</system:String>
<system:String x:Key="Add RC Slab">Add RC Slab</system:String>
<system:String x:Key="Add Reinforcement Material">Add Reinforcement Material</system:String>
<system:String x:Key="Add Elastic Material">Add Elastic Material</system:String>
<system:String x:Key="Add Carbon Fiber Material">Add Carbon Fiber Material</system:String>
<system:String x:Key="Change Language">Change Language</system:String>
<system:String x:Key="Visual Settings">Visual Settings</system:String>
<system:String x:Key="RU_EN">EN</system:String>
<system:String x:Key="RC Templates">RC Templates</system:String>
<system:String x:Key="Base Primitives">Base Primitives</system:String>
<system:String x:Key="Tools">Tools</system:String>
<system:String x:Key="Grid size">Grid size: </system:String>
<system:String x:Key="Number of primitives">Number of primitives: </system:String>
<!-- All StringResources Goes Here -->
</ResourceDictionary>

View File

@@ -0,0 +1,53 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib">
<system:String x:Key="Actions">Усилия</system:String>
<system:String x:Key="Geometry">Геометрия</system:String>
<system:String x:Key="Materials">Материалы</system:String>
<system:String x:Key="Show Materials">Показать материалы</system:String>
<system:String x:Key="Analisis">Расчет</system:String>
<system:String x:Key="Analises">Расчеты</system:String>
<system:String x:Key="Add Full Combination">Создать комбинацию явно</system:String>
<system:String x:Key="Add Factored Combination">Создать комбинацию коэффициентами</system:String>
<system:String x:Key="Concrete">Бетон</system:String>
<system:String x:Key="Reinforcement">Арматура</system:String>
<system:String x:Key="Elastic">Упругий</system:String>
<system:String x:Key="CarbonFiber">Углеволокно</system:String>
<system:String x:Key="GlassFiber">Стекловолокно</system:String>
<system:String x:Key="Rectangle">Прямоугольник</system:String>
<system:String x:Key="Circle">Окружность</system:String>
<system:String x:Key="Rebar">Стержень</system:String>
<system:String x:Key="Point">Точка</system:String>
<system:String x:Key="Run">Выполнить</system:String>
<system:String x:Key="Add">Создать</system:String>
<system:String x:Key="Edit">Изменить</system:String>
<system:String x:Key="Copy">Копировать</system:String>
<system:String x:Key="Copy To">Копировать в</system:String>
<system:String x:Key="Delete">Удалить</system:String>
<system:String x:Key="To Foreground">На передний план</system:String>
<system:String x:Key="To Background">На задний план</system:String>
<system:String x:Key="Add Force Calculator">Создать расчет по усилиям</system:String>
<system:String x:Key="Add Interaction Diagram Calculator">Создать расчет области прочности</system:String>
<system:String x:Key="Add Rectangle Primitive">Создать прямоугольник</system:String>
<system:String x:Key="Add Circle Primitive">Создать окружность</system:String>
<system:String x:Key="Add Rebar Primitive">Создать арматурный стержень</system:String>
<system:String x:Key="Add Point Primitive">Создать точку</system:String>
<system:String x:Key="Add Rectangle RC Column">Создать прямоугольную ЖБ колонну</system:String>
<system:String x:Key="Add Circle RC Column">Создать круглую ЖБ колонну</system:String>
<system:String x:Key="Add RC Beam">Создать ЖБ балку</system:String>
<system:String x:Key="Add RC Slab">Создать ЖБ плиту</system:String>
<system:String x:Key="Add Reinforcement Material">Создать материал армирования</system:String>
<system:String x:Key="Add Elastic Material">Создать упругий материал</system:String>
<system:String x:Key="Add Carbon Fiber Material">Создать углеволокно</system:String>
<system:String x:Key="Change Language">Смена языка</system:String>
<system:String x:Key="Visual Settings">Настройки изображения</system:String>
<system:String x:Key="RU_EN">RU</system:String>
<system:String x:Key="RC Templates">ЖБ шаблоны</system:String>
<system:String x:Key="Base Primitives">Базовые примитивы</system:String>
<system:String x:Key="Tools">Инструменты</system:String>
<system:String x:Key="Grid size">Шаг сетки: </system:String>
<system:String x:Key="Number of primitives">Кол-во примитивов: </system:String>
<!-- All StringResources Goes Here -->
</ResourceDictionary>

View File

@@ -74,6 +74,12 @@
<Page Update="Infrastructure\UI\Resources\Materials.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Infrastructure\UI\Resources\Strings.en-US.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Infrastructure\UI\Resources\Strings.ru-RU.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Windows\Arrays\ArrayView.xaml">
<SubType>Designer</SubType>
</Page>

View File

@@ -205,6 +205,8 @@
<Button Command="{Binding ShowVisualProperty}" ToolTip="Visual Settings">
<Image Width="32" Height="32" Source="/Windows/MainWindow/Tools_Settings.png"/>
</Button>
<Button Command="{Binding ChangeLanguage}" ToolTip="{DynamicResource Change Language}" Content="{DynamicResource RU_EN}">
</Button>
</ToolBar>
</ToolBarTray>
<Grid>
@@ -250,33 +252,33 @@
</Expander.Header>
<Expander.ContextMenu>
<ContextMenu>
<MenuItem Header="Materials" Command="{Binding EditMaterialsCommand}">
<MenuItem Header="{DynamicResource Materials}" Command="{Binding EditMaterialsCommand}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Materials32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Add">
<MenuItem Header="Concrete" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Concrete}">
<MenuItem Header="{DynamicResource Concrete}" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Concrete}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/ConMaterial32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Reinforcement" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}">
<MenuItem Header="{DynamicResource Reinforcement}" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Reinforcement}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/RFMaterial32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Elastic" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}">
<MenuItem Header="{DynamicResource Elastic}" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.Elastic}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/ElasticMaterial32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="CarbonFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}">
<MenuItem Header="{DynamicResource CarbonFiber}" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.CarbonFiber}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/СarbonMaterial32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="GlassFiber" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}">
<MenuItem Header="{DynamicResource GlassFiber}" Command="{Binding Add}" CommandParameter="{x:Static enums:MaterialType.GlassFiber}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/GlassMaterial32.png" />
</MenuItem.Icon>
@@ -289,26 +291,26 @@
ItemTemplate="{StaticResource ColoredItemTemplate}"
ContextMenu="{StaticResource EditCopyDelete}"/>
</Expander>
<Expander Header="Geometry" MinWidth="20">
<Expander Header="{DynamicResource Geometry}" MinWidth="20">
<Expander.ContextMenu>
<ContextMenu>
<MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
<MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
<MenuItem Header="{DynamicResource Add}" DataContext="{Binding PrimitiveLogic}">
<MenuItem Header="{DynamicResource Rectangle}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rectangle32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
<MenuItem Header="{DynamicResource Circle}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Circle32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
<MenuItem Header="{DynamicResource Rebar}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rebar32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
<MenuItem Header="{DynamicResource Point}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Point32.png" />
</MenuItem.Icon>
@@ -330,7 +332,7 @@
</Expander.Header>
<Expander.ContextMenu>
<ContextMenu>
<MenuItem Header="Add" Command="{Binding Add}" CommandParameter="{x:Static enums:CalculatorTypes.ForceCalculator}">
<MenuItem Header="{DynamicResource Add}" Command="{Binding Add}" CommandParameter="{x:Static enums:CalculatorTypes.ForceCalculator}">
<MenuItem Header="Add Force Calculator" Command="{Binding Add}" CommandParameter="{x:Static enums:CalculatorTypes.ForceCalculator}">
<MenuItem.Icon>
<Image Width="16" Height="16" Source="/Windows/MainWindow/Calculator32.png" />
@@ -367,39 +369,39 @@
<Canvas.ContextMenu>
<ContextMenu>
<MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
<MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
<MenuItem Header="{DynamicResource Rectangle}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rectangle32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
<MenuItem Header="{DynamicResource Circle}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Circle32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
<MenuItem Header="{DynamicResource Rebar}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Rebar32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
<MenuItem Header="{DynamicResource Point}" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Point.png" />
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Templates" DataContext="{Binding}">
<MenuItem Header="Add Rectangle RC Column" Command="{Binding AddColumnCase}">
<MenuItem Header="{DynamicResource Add Rectangle RC Column}" Command="{Binding AddColumnCase}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/RectangleColumn32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Add Circle RC Column" Command="{Binding AddRCCircleCase}">
<MenuItem Header="{DynamicResource Add Circle RC Column}" Command="{Binding AddRCCircleCase}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/CircleColumn32.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Add RC Beam" Command="{Binding AddBeamCase}">
<MenuItem Header="{DynamicResource Add RC Beam}" Command="{Binding AddBeamCase}">
<MenuItem.Icon>
<Image Style="{StaticResource ButtonImage16}" Source="/Windows/MainWindow/Beam32.png" />
</MenuItem.Icon>
@@ -471,14 +473,14 @@
</StatusBarItem>
<StatusBarItem>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Number of primitives: "/>
<TextBlock Text="{Binding PrimitiveLogic.PrimitivesCount}"/>
<TextBlock Text="{DynamicResource Number of primitives}"/>
<TextBlock Margin="5,0,0,0" Text="{Binding PrimitiveLogic.PrimitivesCount}"/>
</StackPanel>
</StatusBarItem>
<StatusBarItem>
<StackPanel Orientation="Horizontal">
<TextBlock Text="Grid size: "/>
<TextBlock Text="{Binding GridSize, Converter={StaticResource LengthConverter}}"/>
<TextBlock Text="{DynamicResource Grid size}"/>
<TextBlock Margin="5,0,0,0" Text="{Binding GridSize, Converter={StaticResource LengthConverter}}"/>
</StackPanel>
</StatusBarItem>
</StatusBar>

View File

@@ -1,5 +1,7 @@
using System.Windows;
using System;
using System.Windows;
using System.Windows.Controls;
using StructureHelper.Infrastructure.UI.DataContexts;
using StructureHelper.Services;
using StructureHelper.Services.Primitives;
@@ -16,6 +18,11 @@ namespace StructureHelper.Windows.MainWindow
PrimitiveRepository = primitiveRepository;
this.viewModel = viewModel;
DataContext = this.viewModel;
viewModel.MV = this;
ResourceDictionary dict = new ResourceDictionary();
dict.Source = new Uri("..\\Infrastructure\\UI\\Resources\\Strings.en-US.xaml",
UriKind.Relative);
this.Resources.MergedDictionaries.Add(dict);
InitializeComponent();
}

View File

@@ -1,4 +1,5 @@
using LoaderCalculator.Logics.Geometry;
using StructureHelper.Infrastructure;
using StructureHelper.Infrastructure.UI.DataContexts;
using StructureHelper.Models.Materials;
@@ -9,12 +10,15 @@ using StructureHelper.Windows.ViewModels;
using StructureHelper.Windows.ViewModels.Forces;
using StructureHelper.Windows.ViewModels.Materials;
using StructureHelper.Windows.ViewModels.NdmCrossSections;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperLogics.Models.CrossSections;
using StructureHelperLogics.Models.Templates.CrossSections.RCs;
using StructureHelperLogics.Models.Templates.RCs;
using StructureHelperLogics.Services.NdmPrimitives;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -133,6 +137,50 @@ namespace StructureHelper.Windows.MainWindow
/// </summary>
public double MiddleLimitY => VisualProperty.WorkPlainHeight / 2d;
private int langID = 0;
public int LangID { get => langID; set { langID = value; OnPropertyChanged(); } }
public RelayCommand ChangeLanguage
{
get
{
return changeLanguage ?? (changeLanguage = new RelayCommand(obj => { ChangeLang(); }));
}
}
public void ChangeLang()
{
if (LangID == 0)
{
LangID = 1;
SetLanguageDictionary(LangID);
}
else
{
LangID = 0;
SetLanguageDictionary(LangID);
}
}
// Загрузка файлов ресурсов для выбранного языка
private void SetLanguageDictionary(int local)
{
ResourceDictionary dict = new ResourceDictionary();
switch (local)
{
case 0:
dict.Source = new Uri("..\\Infrastructure\\UI\\Resources\\Strings.en-US.xaml",
UriKind.Relative);
break;
case 1:
dict.Source = new Uri("..\\Infrastructure\\UI\\Resources\\Strings.ru-RU.xaml",
UriKind.Relative);
break;
}
MV.Resources.MergedDictionaries.Add(dict);
}
internal CrossSectionView MV;
public ICommand Calculate { get; }
public ICommand EditCalculationPropertyCommand { get; }
public ICommand EditHeadMaterialsCommand { get; }
@@ -170,7 +218,7 @@ namespace StructureHelper.Windows.MainWindow
get
{
return showVisualProperty ??
(showVisualProperty = new RelayCommand(o=>
(showVisualProperty = new RelayCommand(o =>
{
var wnd = new VisualPropertyView(VisualProperty);
wnd.ShowDialog();
@@ -193,7 +241,7 @@ namespace StructureHelper.Windows.MainWindow
get
{
return selectPrimitive ??
(selectPrimitive = new RelayCommand(obj=>
(selectPrimitive = new RelayCommand(obj =>
{
if (obj is PrimitiveBase)
{
@@ -206,6 +254,7 @@ namespace StructureHelper.Windows.MainWindow
private double delta = 0.0005;
private RelayCommand showVisualProperty;
private RelayCommand selectPrimitive;
private RelayCommand changeLanguage;
public CrossSectionViewModel(CrossSectionModel model)
{
@@ -281,7 +330,7 @@ namespace StructureHelper.Windows.MainWindow
MovePrimitiveToGravityCenterCommand = new RelayCommand(o =>
{
if (CheckMaterials() == false) { return;}
if (CheckMaterials() == false) { return; }
var ndms = NdmPrimitivesService.GetNdms(repository.Primitives, LimitStates.SLS, CalcTerms.ShortTerm);
var center = GeometryOperations.GetGravityCenter(ndms);
foreach (var item in PrimitiveLogic.Items)