Commit f6b0606f by 鲁志-悦动

英文版开发中

parent f9a8db2f
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<sys:String x:Key="WinTitle">MainWindow</sys:String>
<sys:String x:Key="TblText">Support multi language demo.</sys:String>
<sys:String x:Key="BtnOk">OK</sys:String>
<sys:String x:Key="HdNo">No.</sys:String>
<sys:String x:Key="HdName">Name</sys:String>
<sys:String x:Key="HdGender">Gender</sys:String>
<sys:String x:Key="HdDept">Dept</sys:String>
<sys:String x:Key="HdEmail">Email</sys:String>
<sys:String x:Key="HdTel">Tel</sys:String>
<sys:String x:Key="MsgShowTime">Now time is:{0}</sys:String>
<sys:String x:Key="Replay">Replay</sys:String>
</ResourceDictionary>
\ No newline at end of file
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<sys:String x:Key="WinTitle">主窗体</sys:String>
<sys:String x:Key="TblText">支持多国语言示例。</sys:String>
<sys:String x:Key="BtnOk">确定</sys:String>
<sys:String x:Key="HdNo">员工号</sys:String>
<sys:String x:Key="HdName">姓名</sys:String>
<sys:String x:Key="HdGender">性别</sys:String>
<sys:String x:Key="HdDept">部门</sys:String>
<sys:String x:Key="HdEmail">邮箱</sys:String>
<sys:String x:Key="HdTel">电话</sys:String>
<sys:String x:Key="MsgShowTime">现在时间是:{0}</sys:String>
<sys:String x:Key="Replay">回放</sys:String>
</ResourceDictionary>
\ No newline at end of file
......@@ -150,6 +150,14 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Page Include="Resources\StringResource.zh-cn.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Resources\StringResource.en.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\Button\Button_NdiView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......
......@@ -603,3 +603,5 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Themes\Gener
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\RadioButton\RadioButton_NdiMainViewBlue.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_RaidoButtonStyle.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOU.942AC757.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.zh-CN.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Resources\StringResource.en.baml
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
20-1486193684
221723278107
1470602451
11-350624472
24-1321085892
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiMainViewBlue.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
Resources\StringResource.zh-cn.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiMainViewBlue.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
False
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
20-1486193684
221723278107
1470602451
121374819015
23977013142
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiMainViewBlue.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
Resources\StringResource.zh-cn.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiMainViewBlue.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
False
......@@ -905,7 +905,7 @@
Grid.Column="0"
Width="100"
Height="40"
Content="回放"
Content="{DynamicResource Replay}"
IsChecked="{Binding ReplayIsChecked, Mode=TwoWay}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
......
......@@ -68,6 +68,8 @@ namespace VIZ.FGOUT.Module
//初始化体育项目名称
InitSportName();
//初始化语言
InitLanguage();
}
//Dictionary<string, string> dics = new Dictionary<string, string>
......@@ -487,6 +489,20 @@ namespace VIZ.FGOUT.Module
// _isReplayChecked = false;
//}
private SetLanguageConfig _setLanguageConfig;
/// <summary>
/// 初始化语言
/// </summary>
private void InitLanguage()
{
this._setLanguageConfig = ApplicationDomainEx.LiteDbContext.SetLanguageConfig.FindAll().FirstOrDefault();
if (_setLanguageConfig == null) return;
if (!_setLanguageConfig.IsChinese)
{
}
}
private SetManualConfig manualConfig;
/// <summary>
/// 初始化属性
......
......@@ -100,11 +100,11 @@
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Horizontal">
<TextBlock
<!--<TextBlock
VerticalAlignment="Center"
FontSize="16"
Foreground="Red"
Text="提示:敲击回车和鼠标左键点击保存按钮同样效果。" />
Text="提示:敲击回车和鼠标左键点击保存按钮同样效果。" />-->
<Button
Width="120"
Height="40"
......
......@@ -251,7 +251,6 @@ namespace VIZ.FGOUT.Module
if (!setting.Apply())
{
log.Error($"{setting.GetType().Name} -- 应用失败");
continue;
}
}
......
......@@ -34,15 +34,20 @@
<Grid Margin="45,60,40,0">
<Grid.RowDefinitions>
<RowDefinition Height="50" />
<RowDefinition Height="60" />
<RowDefinition Height="300" />
</Grid.RowDefinitions>
<!-- 算法裁切快捷键 -->
<!--<TextBlock
VerticalAlignment="Center"
FontSize="20"
Foreground="#AAFFFFFF"
Text="快捷键(输入法切换到英文设置)" />-->
<TextBlock
VerticalAlignment="Center"
FontSize="20"
Foreground="#AAFFFFFF"
Text="快捷键(输入法切换到英文设置)" />
Text="快捷键" />
<Rectangle
Height="1"
VerticalAlignment="Bottom"
......
<UserControl
x:Class="VIZ.FGOUT.Module.LanguagePanelView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:VIZ.FGOUT.Module"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<Border>
<Grid Margin="45,60,40,0">
<Grid.RowDefinitions>
<RowDefinition Height="60" />
<RowDefinition Height="50" />
<RowDefinition Height="60" />
<RowDefinition Height="60" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock
VerticalAlignment="Center"
FontSize="20"
Foreground="White"
Text="语言" />
<Rectangle
Height="1"
VerticalAlignment="Bottom"
Fill="#ff3d4758" />
<StackPanel Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Height="40"
Margin="0,20,0,0"
FontSize="18"
Foreground="White"
Text="语言选择" />
<ComboBox
Grid.Column="1"
Width="150"
Height="40"
ItemsSource="{Binding Path=MattingImageItems, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedMattiingImageItem, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />
<!--<Button
Grid.Column="2"
Width="150"
Height="40"
Command="{Binding Path=OkCommand}"
Content="确定"
Style="{StaticResource ButtonStyle}" />-->
</Grid>
</StackPanel>
</Grid>
</Border>
</UserControl>
using System.Windows.Controls;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module
{
/// <summary>
/// LanguagePanelView.xaml 的交互逻辑
/// </summary>
public partial class LanguagePanelView
{
public LanguagePanelView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this,new LanguagePanelViewModel());
}
}
}
......@@ -54,7 +54,7 @@
Text="系统设置" />
</StackPanel>
<StackPanel Grid.Row="1" Grid.RowSpan="2">
<RadioButton
<!--<RadioButton
x:Name="rbMatting"
Height="50"
VerticalContentAlignment="Center"
......@@ -78,12 +78,21 @@
Content="包装设置"
FontSize="22"
Foreground="White"
Style="{StaticResource RadioButton_Setting}" />-->
<RadioButton
x:Name="rbLanguage"
Height="50"
VerticalContentAlignment="Center"
Content="语言设置"
FontSize="22"
Foreground="White"
IsChecked="True"
Style="{StaticResource RadioButton_Setting}" />
<RadioButton
x:Name="rbHotkey"
Height="50"
VerticalContentAlignment="Center"
Content="快捷键置"
Content="快捷键置"
FontSize="22"
Foreground="White"
Style="{StaticResource RadioButton_Setting}" />
......@@ -99,8 +108,6 @@
<Button
Grid.Column="1"
Width="40"
Height="40"
Margin="0,10,10,0"
HorizontalAlignment="Right"
VerticalAlignment="Top"
......@@ -112,9 +119,10 @@
Grid.Row="0"
Grid.RowSpan="2"
Grid.Column="1">
<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbMatting, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:MattingImagePanelView}" />
<!--<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbMatting, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:MattingImagePanelView}" />
<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbCheckData, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:CheckDataPanelView}" />
<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbPackage, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:PackageSettingPanelView}" />
<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbPackage, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:PackageSettingPanelView}" />-->
<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbLanguage, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:LanguagePanelView}" />
<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbHotkey, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:HotkeySettingPanelView}" />
<fcommon:NavigationItemControl IsSelected="{Binding ElementName=rbAbout, Path=IsChecked, Mode=OneWay}" ViewType="{x:Type local:AboutPanelView}" />
</fcommon:NavigationControl>
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Module
{
......
......@@ -291,7 +291,6 @@ namespace VIZ.FGOUT.Module
/// </summary>
private void Loaded()
{
SystemSettingViewModel vm = WPFHelper.GetAncestorByType<SystemSettingView>(this.GetView<FrameworkElement>()).DataContext as SystemSettingViewModel;
vm.Settings.Add(this);
......
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module
{
/// <summary>
/// 关于面板视图模型
/// </summary>
public class LanguagePanelViewModel : ViewModelBase, ISystemSetting
{
public LanguagePanelViewModel()
{
this.LoadedCommand = new VCommand(this.Loaded);
}
// ======================================================================================
// === Property ===
// ======================================================================================
#region SystemVersion -- 系统版本
private string systemVersion;
/// <summary>
/// 系统版本
/// </summary>
public string SystemVersion
{
get { return systemVersion; }
set { systemVersion = value; this.RaisePropertyChanged(nameof(SystemVersion)); }
}
#endregion
// ======================================================================================
// === Commond ===
// ======================================================================================
#region LoadedCommand -- 加载命令
/// <summary>
/// 加载命令
/// </summary>
public VCommand LoadedCommand { get; set; }
/// <summary>
/// 加载
/// </summary>
private void Loaded()
{
SystemSettingViewModel vm = WPFHelper.GetAncestorByType<SystemSettingView>(this.GetView<FrameworkElement>()).DataContext as SystemSettingViewModel;
vm.Settings.Add(this);
//初始化语言
InitLanguage();
}
private SetLanguageConfig _setLanguageConfig;
/// <summary>
/// 初始化语言
/// </summary>
private void InitLanguage()
{
this._setLanguageConfig = ApplicationDomainEx.LiteDbContext.SetLanguageConfig.FindAll().FirstOrDefault();
if (_setLanguageConfig == null) return;
if (!_setLanguageConfig.IsChinese)
{
}
}
#endregion
/// <summary>
/// 是否需要保存
/// </summary>
/// <returns>是否需要保存</returns>
public bool IsNeedSave()
{
//return false;
return true;
}
/// <summary>
/// 保存
/// </summary>
/// <returns>是否成功保存</returns>
public bool Save()
{
var Culture = "en";
List<ResourceDictionary> dictionaryList = new List<ResourceDictionary>();
foreach (ResourceDictionary dictionary in Application.Current.Resources.MergedDictionaries)
{
dictionaryList.Add(dictionary);
}
string requestedCulture = string.Format(@"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.{0}.xaml", Culture);
ResourceDictionary resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
if (resourceDictionary == null)
{
requestedCulture = @"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.zh-cn.xaml";
resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
}
if (resourceDictionary != null)
{
Application.Current.Resources.MergedDictionaries.Remove(resourceDictionary);
//生效最后一行配置
Application.Current.Resources.MergedDictionaries.Add(resourceDictionary);
}
return true;
}
/// <summary>
/// 取消
/// </summary>
public void Cancel()
{
}
}
}
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web;
using System.Web.Hosting;
using System.Windows.Forms.VisualStyles;
using VIZ.FGOUT.Domain;
using VIZ.Framework.Core;
......@@ -14,9 +7,6 @@ namespace VIZ.FGOUT.Module
{
public class MattingImagePanelViewModel : ViewModelBase, ISystemSetting
{
public MattingImagePanelViewModel()
{
//初始化Command命令
......
......@@ -220,6 +220,7 @@
<Compile Include="Setup\Provider\AppSetup_Recording.cs" />
<Compile Include="SystemSetting\Model\NDIStreamSelectionModel.cs" />
<Compile Include="SystemSetting\Model\TallyCamSignalModel.cs" />
<Compile Include="SystemSetting\ViewModel\LanguagePanelViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\AboutPanelViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\HotkeySettingPanelViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\ISystemSetting.cs" />
......@@ -239,6 +240,9 @@
<Compile Include="SystemSetting\View\HotkeySettingPanelView.xaml.cs">
<DependentUpon>HotkeySettingPanelView.xaml</DependentUpon>
</Compile>
<Compile Include="SystemSetting\View\LanguagePanelView.xaml.cs">
<DependentUpon>LanguagePanelView.xaml</DependentUpon>
</Compile>
<Compile Include="SystemSetting\View\MattingImagePanelView.xaml.cs">
<DependentUpon>MattingImagePanelView.xaml</DependentUpon>
</Compile>
......@@ -386,6 +390,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SystemSetting\View\LanguagePanelView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SystemSetting\View\MattingImagePanelView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5CFFE3E9A5115F8CA83E4D3B67097DEF4559AC2B8462D768121E586DC89E2AA6"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AD8DCDD1D1700ACF66B2A8F3A75BA3E381AA43CBE60C69A6DC403FEB57941097"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5CFFE3E9A5115F8CA83E4D3B67097DEF4559AC2B8462D768121E586DC89E2AA6"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AD8DCDD1D1700ACF66B2A8F3A75BA3E381AA43CBE60C69A6DC403FEB57941097"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5FFD385E15D132AAD41DD13A25EC50463826A1ABFC73A67BE39570184AC1F88C"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E31E0B0E402C395908915FFF78F8690227170854231FC14BE5354DE3F37BE2B"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5FFD385E15D132AAD41DD13A25EC50463826A1ABFC73A67BE39570184AC1F88C"
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E31E0B0E402C395908915FFF78F8690227170854231FC14BE5354DE3F37BE2B"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6BE88D65078AF1CFC8A2B520F11D0EC8C0EE28292B3C1C029B935E7986462B17"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "24F88D3FCD4B81E63C2BDFE3A6BFF72D5E39EE2F4AC595F05411F2810FEFDC5E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6BE88D65078AF1CFC8A2B520F11D0EC8C0EE28292B3C1C029B935E7986462B17"
#pragma checksum "..\..\..\..\..\SystemSetting\View\HotkeySettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "24F88D3FCD4B81E63C2BDFE3A6BFF72D5E39EE2F4AC595F05411F2810FEFDC5E"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "93FCC886D9DA7016C9F877C7900F6EFFF450A85B7DE4F874D7C7D45BA7A3BD91"
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "91765E5DA7D45490DFD7B3BF055C4587E95504C478B8ECE52E1AED2B87F1AF03"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,31 +48,15 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 58 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbMatting;
#line default
#line hidden
#line 67 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbCheckData;
#line default
#line hidden
#line 75 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbPackage;
internal System.Windows.Controls.RadioButton rbLanguage;
#line default
#line hidden
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 92 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey;
......@@ -80,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 91 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 100 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout;
......@@ -126,18 +110,12 @@ namespace VIZ.FGOUT.Module {
#line hidden
return;
case 2:
this.rbMatting = ((System.Windows.Controls.RadioButton)(target));
this.rbLanguage = ((System.Windows.Controls.RadioButton)(target));
return;
case 3:
this.rbCheckData = ((System.Windows.Controls.RadioButton)(target));
return;
case 4:
this.rbPackage = ((System.Windows.Controls.RadioButton)(target));
return;
case 5:
this.rbHotkey = ((System.Windows.Controls.RadioButton)(target));
return;
case 6:
case 4:
this.rbAbout = ((System.Windows.Controls.RadioButton)(target));
return;
}
......
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "93FCC886D9DA7016C9F877C7900F6EFFF450A85B7DE4F874D7C7D45BA7A3BD91"
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "91765E5DA7D45490DFD7B3BF055C4587E95504C478B8ECE52E1AED2B87F1AF03"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -48,31 +48,15 @@ namespace VIZ.FGOUT.Module {
public partial class SystemSettingView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 58 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbMatting;
#line default
#line hidden
#line 67 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbCheckData;
#line default
#line hidden
#line 75 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbPackage;
internal System.Windows.Controls.RadioButton rbLanguage;
#line default
#line hidden
#line 83 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 92 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbHotkey;
......@@ -80,7 +64,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 91 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
#line 100 "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton rbAbout;
......@@ -126,18 +110,12 @@ namespace VIZ.FGOUT.Module {
#line hidden
return;
case 2:
this.rbMatting = ((System.Windows.Controls.RadioButton)(target));
this.rbLanguage = ((System.Windows.Controls.RadioButton)(target));
return;
case 3:
this.rbCheckData = ((System.Windows.Controls.RadioButton)(target));
return;
case 4:
this.rbPackage = ((System.Windows.Controls.RadioButton)(target));
return;
case 5:
this.rbHotkey = ((System.Windows.Controls.RadioButton)(target));
return;
case 6:
case 4:
this.rbAbout = ((System.Windows.Controls.RadioButton)(target));
return;
}
......
9536c6808ea29cf793e01c1cc8a09846956315d3fa3ba064be4ed3492f6c81d1
11e1bf39176a68b81241b16db1f983754dad879ca8a35ea485d3114701f5e8ed
......@@ -914,3 +914,5 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\Ne
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\Themes\SliderArrange.g.cs
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\Themes\SliderArrange.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\VIZ.FGOU.D281B367.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\LanguagePanelView.g.cs
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\LanguagePanelView.baml
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
241325682082
25-1434354873
4-699044453
951167816992
97-187026604
151674092382
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\LanguagePanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
False
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......@@ -14,6 +14,7 @@ FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIView\View\NDIView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\AboutPanelView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\CheckDataPanelView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\HotkeySettingPanelView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\LanguagePanelView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\MattingImagePanelView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\NewWindowView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\PackageSettingPanelView.xaml;;
......
......@@ -51,6 +51,8 @@ namespace VIZ.FGOUT.Storage
this.SetManualConfig = this.Database.GetCollection<SetManualConfig>();
// 掷标枪设置
this.JavelinThrowConfig = this.Database.GetCollection<JavelinThrowConfig>();
// 语言设置
this.SetLanguageConfig = this.Database.GetCollection<SetLanguageConfig>();
}
// -----------------------------------------------------------------------------------------------------------
......@@ -146,6 +148,11 @@ namespace VIZ.FGOUT.Storage
public ILiteCollection<JavelinThrowConfig> JavelinThrowConfig { get; private set; }
/// <summary>
/// 语言设置
/// </summary>
public ILiteCollection<SetLanguageConfig> SetLanguageConfig { get; private set; }
/// <summary>
/// 销毁
/// </summary>
public void Dispose()
......@@ -165,6 +172,7 @@ namespace VIZ.FGOUT.Storage
this.SetPlaceNewConfig = null;
this.SetManualConfig = null;
this.JavelinThrowConfig = null;
this.SetLanguageConfig = null;
this.Database?.Dispose();
}
}
......
namespace VIZ.FGOUT.Storage
{
public class SetLanguageConfig
{
/// <summary>
/// 编号
/// </summary>
[LiteDB.BsonId(true)]
public int Id { get; set; }
/// <summary>
/// 是否中文
/// </summary>
public bool IsChinese { get; set; }
}
}
......@@ -9,7 +9,7 @@
public int Id { get; set; }
/// <summary>
/// 是 手动
/// 是手动
/// </summary>
public bool IsManual { get; set; }
......
......@@ -138,6 +138,7 @@
<Compile Include="LiteDB\NdiView\NdiViewConfig.cs" />
<Compile Include="LiteDB\System\HotkeyConfig.cs" />
<Compile Include="LiteDB\System\Info\TallyInfo.cs" />
<Compile Include="LiteDB\System\SetLanguageConfig.cs" />
<Compile Include="LiteDB\System\SetManualConfig.cs" />
<Compile Include="LiteDB\System\SetPlaceNewConfig.cs" />
<Compile Include="LiteDB\System\SetPlaceConfig.cs" />
......
dc010ea18807862c5074b95cf9896635a761d847892b480047edccc260d09ab3
44fb20756f107c8719ac50bc8847a11f32f3122e0de435e4450ac0b0abac272d
......@@ -22,6 +22,8 @@
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ToogleButton/ToogleButton_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Themes/Generic.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.en.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.zh-cn.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
......
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "278284D8EB9AA165286C62557FCF31BE5FC2C2B0B026835B21241DB87D7DF725"
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "29640BEB803F4DC28F7BA7EEE3F158D27DCFBE4D19596E579CBB9F623291F689"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "278284D8EB9AA165286C62557FCF31BE5FC2C2B0B026835B21241DB87D7DF725"
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "29640BEB803F4DC28F7BA7EEE3F158D27DCFBE4D19596E579CBB9F623291F689"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment