Skip to content

F
FGOUT
Commit 824a9ac8 by 鲁志-悦动
Options

适配主页面、NDI设置页面、系统设置页面在英文版下的样式

parent 9ba8e0e6
Showing with 173 additions and 73 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<sys:String x:Key="Start">Start</sys:String> <sys:String x:Key="Start">Start</sys:String>
<sys:String x:Key="End">End</sys:String> <sys:String x:Key="End">End</sys:String>
<sys:String x:Key="Manual">Manual</sys:String> <sys:String x:Key="Manual">Manual</sys:String>
<sys:String x:Key="SaveMatImage">SaveMatImage</sys:String> <!--<sys:String x:Key="SaveMatImage">SaveMatImage</sys:String>-->
<sys:String x:Key="SaveMatImage">Save</sys:String>
<sys:String x:Key="Replay">Replay</sys:String> <sys:String x:Key="Replay">Replay</sys:String>
<sys:String x:Key="CleanInPoint">CleanInPoint</sys:String> <sys:String x:Key="CleanInPoint">CleanInPoint</sys:String>
<sys:String x:Key="Play">Play</sys:String> <sys:String x:Key="Play">Play</sys:String>
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
<sys:String x:Key="Setting">Setting</sys:String> <sys:String x:Key="Setting">Setting</sys:String>
<sys:String x:Key="VideoInput">VideoInput</sys:String> <sys:String x:Key="VideoInput">VideoInput</sys:String>
<sys:String x:Key="SourceVideoInput">SourceVideoInput</sys:String> <sys:String x:Key="SourceVideoInput">SourceVideoInput</sys:String>
<sys:String x:Key="ParameterSettings">ParameterSettings</sys:String> <sys:String x:Key="ParameterSettings">ParameterSetting</sys:String>
<sys:String x:Key="AlgorithmParameter">AlgorithmParameter</sys:String> <sys:String x:Key="AlgorithmParameter">AlgorithmParameter</sys:String>
<sys:String x:Key="Match">Match</sys:String> <sys:String x:Key="Match">Match</sys:String>
<sys:String x:Key="Tips">Tips</sys:String> <sys:String x:Key="Tips">Tips</sys:String>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/RadioButton/RadioButton_NdiMainViewBlue.xaml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Style x:Key="RadioButton_NdiMainViewBlue" TargetType="RadioButton"> <Style x:Key="RadioButton_NdiMainViewBlue" TargetType="RadioButton">
<Setter Property="FocusVisualStyle" Value="{x:Null}" /> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Padding" Value="10,0,0,0" /> <Setter Property="Padding" Value="10,0,0,0" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/VIZ.FGOUT.Module.Resource.csproj
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<ItemGroup> <ItemGroup>
<Page Include="Resources\StringResource.zh-cn.xaml"> <Page Include="Resources\StringResource.zh-CN.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/app.config
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/bin/x64/Debug/VIZ.FGOUT.Module.Resource.dll.config
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/bin/x64/Debug/VIZ.Framework.Common.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
221723278107 221979955803
1470602451 1470602451
11-350624472 11-350624472
24-1321085892 24-1321085892
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; 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 False
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.i.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
221723278107 221979955803
1470602451 1470602451
121374819015 121374819015
23977013142 23977013142
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; 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 True
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -691,7 +691,7 @@ ...@@ -691,7 +691,7 @@
<CheckBox <CheckBox
Width="100" Width="100"
Height="40" Height="40"
Margin="0,10,0,0" Margin="0,00,0,0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Command="{Binding SaveMatImageCommand}" Command="{Binding SaveMatImageCommand}"
Content="{DynamicResource SaveMatImage}" Content="{DynamicResource SaveMatImage}"
...@@ -760,12 +760,12 @@ ...@@ -760,12 +760,12 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Grid.ColumnSpan="4" Grid.ColumnSpan="4"
Margin="5,10,0,0" Margin="0,10,0,0"
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1"> BorderThickness="1">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock <TextBlock
Margin="20,0,0,0" Margin="15,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
...@@ -774,7 +774,7 @@ ...@@ -774,7 +774,7 @@
<Button <Button
Width="100" Width="100"
Height="40" Height="40"
Margin="65,0,0,0" Margin="60,0,0,0"
Command="{Binding Path=AbandonCommand}" Command="{Binding Path=AbandonCommand}"
Content="{DynamicResource Abandon}" Content="{DynamicResource Abandon}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
...@@ -919,8 +919,9 @@ ...@@ -919,8 +919,9 @@
</ToggleButton> </ToggleButton>
<Button <Button
Grid.Column="1" Grid.Column="1"
Width="100"
Height="40" Height="40"
Margin="5,0,44,0" Margin="0,0,0,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Command="{Binding Path=CleanInPointCommand}" Command="{Binding Path=CleanInPointCommand}"
Content="{DynamicResource CleanInPoint}" Content="{DynamicResource CleanInPoint}"
...@@ -939,7 +940,7 @@ ...@@ -939,7 +940,7 @@
Grid.Column="3" Grid.Column="3"
Width="100" Width="100"
Height="40" Height="40"
Margin="14,0,0,0" Margin="0,0,0,0"
Command="{Binding Path=ReplayStopCommand}" Command="{Binding Path=ReplayStopCommand}"
Content="{DynamicResource Stop}" Content="{DynamicResource Stop}"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -498,10 +498,8 @@ namespace VIZ.FGOUT.Module ...@@ -498,10 +498,8 @@ namespace VIZ.FGOUT.Module
this._setLanguageConfig = ApplicationDomainEx.LiteDbContext.SetLanguageConfig.FindAll().FirstOrDefault(); this._setLanguageConfig = ApplicationDomainEx.LiteDbContext.SetLanguageConfig.FindAll().FirstOrDefault();
if (_setLanguageConfig == null) return; if (_setLanguageConfig == null) return;
if (!_setLanguageConfig.IsChinese) if (!_setLanguageConfig.IsChinese)
{
InitEnglishLanguage(); InitEnglishLanguage();
} }
}
/// <summary> /// <summary>
/// 初始化英文版 /// 初始化英文版
...@@ -518,7 +516,7 @@ namespace VIZ.FGOUT.Module ...@@ -518,7 +516,7 @@ namespace VIZ.FGOUT.Module
ResourceDictionary resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture)); ResourceDictionary resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
if (resourceDictionary == null) if (resourceDictionary == null)
{ {
requestedCulture = @"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.zh-cn.xaml"; requestedCulture = @"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.zh-CN.xaml";
resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture)); resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
} }
if (resourceDictionary != null) if (resourceDictionary != null)
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.ColumnSpan="2"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="18" FontSize="18"
Foreground="White" Foreground="White"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/NDISettingView.xaml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</behaviors:Interaction.Triggers> </behaviors:Interaction.Triggers>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="230" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
Height="50" Height="50"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="{DynamicResource VideoInput}" Content="{DynamicResource VideoInput}"
FontSize="22" FontSize="20"
Foreground="White" Foreground="White"
IsChecked="True" IsChecked="True"
Style="{StaticResource RadioButton_Setting}" /> Style="{StaticResource RadioButton_Setting}" />
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
Height="50" Height="50"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="{DynamicResource ParameterSettings}" Content="{DynamicResource ParameterSettings}"
FontSize="22" FontSize="20"
Foreground="White" Foreground="White"
Style="{StaticResource RadioButton_Setting}" Style="{StaticResource RadioButton_Setting}"
Visibility="{Binding IsCam1Visibility}" /> Visibility="{Binding IsCam1Visibility}" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -428,7 +428,7 @@ namespace VIZ.FGOUT.Module ...@@ -428,7 +428,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
private void Replay(ReplayModel replayModel) private void Replay(ReplayModel replayModel)
{ {
if (this.ViewKey == NDIViewKeys.CAM_2) return; if (this.ViewKey == NDIViewKeys.CAM_2 || this.ViewKey == NDIViewKeys.CAM_4) return;
//if (this.ViewKey != NDIViewKeys.CAM_1) //if (this.ViewKey != NDIViewKeys.CAM_1)
// return; // return;
IsReplayStarted = replayModel.IsReplayStarted; IsReplayStarted = replayModel.IsReplayStarted;
......
VIZ.FGOUT/VIZ.FGOUT.Module/Setup/Provider/AppSetup_InitLiteDb.cs
...@@ -43,7 +43,7 @@ namespace VIZ.FGOUT.Module ...@@ -43,7 +43,7 @@ namespace VIZ.FGOUT.Module
this.InitData(NDIViewKeys.CAM_1); this.InitData(NDIViewKeys.CAM_1);
this.InitData(NDIViewKeys.CAM_2); this.InitData(NDIViewKeys.CAM_2);
this.InitData(NDIViewKeys.CAM_3); this.InitData(NDIViewKeys.CAM_3);
//this.InitData(NDIViewKeys.CAM_4); this.InitData(NDIViewKeys.CAM_4);
return true; return true;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/LanguagePanelView.xaml
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock <TextBlock
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/NewWindowView.xaml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
xmlns:domain="clr-namespace:VIZ.FGOUT.Domain;assembly=VIZ.FGOUT.Domain" xmlns:domain="clr-namespace:VIZ.FGOUT.Domain;assembly=VIZ.FGOUT.Domain"
xmlns:local="clr-namespace:VIZ.FGOUT.Module" xmlns:local="clr-namespace:VIZ.FGOUT.Module"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="新窗口" Title="{DynamicResource NewWindow}"
Width="800" Width="800"
Height="450" Height="450"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/SystemSettingView.xaml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</behaviors:Interaction.Triggers> </behaviors:Interaction.Triggers>
<Grid MouseDown="Grid_MouseDown"> <Grid MouseDown="Grid_MouseDown">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="230" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
Height="50" Height="50"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="{DynamicResource LanguageSetting}" Content="{DynamicResource LanguageSetting}"
FontSize="22" FontSize="20"
Foreground="White" Foreground="White"
IsChecked="True" IsChecked="True"
Style="{StaticResource RadioButton_Setting}" /> Style="{StaticResource RadioButton_Setting}" />
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
Height="50" Height="50"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="{DynamicResource HotkeySetting}" Content="{DynamicResource HotkeySetting}"
FontSize="22" FontSize="20"
Foreground="White" Foreground="White"
Style="{StaticResource RadioButton_Setting}" /> Style="{StaticResource RadioButton_Setting}" />
<RadioButton <RadioButton
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
Height="50" Height="50"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="{DynamicResource About}" Content="{DynamicResource About}"
FontSize="22" FontSize="20"
Foreground="White" Foreground="White"
Style="{StaticResource RadioButton_Setting}" /> Style="{StaticResource RadioButton_Setting}" />
</StackPanel> </StackPanel>
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/LanguagePanelViewModel.cs
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using System.Windows; using System.Windows;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
...@@ -65,25 +66,30 @@ namespace VIZ.FGOUT.Module ...@@ -65,25 +66,30 @@ namespace VIZ.FGOUT.Module
private void InitLanguage() private void InitLanguage()
{ {
this._setLanguageConfig = ApplicationDomainEx.LiteDbContext.SetLanguageConfig.FindAll().FirstOrDefault(); this._setLanguageConfig = ApplicationDomainEx.LiteDbContext.SetLanguageConfig.FindAll().FirstOrDefault();
if (_setLanguageConfig == null) if (_setLanguageConfig == null || _setLanguageConfig.IsChinese)
{ {
LanguageInfos = new List<string>() { "中文", "英文" }; LanguageInfos = new List<string>() { "中文", "英文" };
//_initItem = SelectedLanguageInfoItem = LanguageInfos.FirstOrDefault();
_initIndex = SelectedLanguageInfoIndex = 0; _initIndex = SelectedLanguageInfoIndex = 0;
} }
//英文版 //英文版
else if (!_setLanguageConfig.IsChinese)
{
LanguageInfos = new List<string>() { "Chinese","English"};
//_initItem = SelectedLanguageInfoItem = LanguageInfos.LastOrDefault();
_initIndex = SelectedLanguageInfoIndex = 1;
}
else else
{ {
LanguageInfos = new List<string>() { "中文", "英文" }; LanguageInfos = new List<string>() { "Chinese", "English" };
// _initItem = SelectedLanguageInfoItem = LanguageInfos.FirstOrDefault(); _initIndex = SelectedLanguageInfoIndex = 1;
_initIndex = SelectedLanguageInfoIndex = 0;
} }
//else if (!_setLanguageConfig.IsChinese)
//{
// LanguageInfos = new List<string>() { "Chinese","English"};
// //_initItem = SelectedLanguageInfoItem = LanguageInfos.LastOrDefault();
// _initIndex = SelectedLanguageInfoIndex = 1;
//}
//else
//{
// LanguageInfos = new List<string>() { "中文", "英文" };
// // _initItem = SelectedLanguageInfoItem = LanguageInfos.FirstOrDefault();
// _initIndex = SelectedLanguageInfoIndex = 0;
//}
} }
//页面初始化时进来的语言下标 //页面初始化时进来的语言下标
...@@ -146,7 +152,7 @@ namespace VIZ.FGOUT.Module ...@@ -146,7 +152,7 @@ namespace VIZ.FGOUT.Module
var index = SelectedLanguageInfoIndex; var index = SelectedLanguageInfoIndex;
if (index == 0) if (index == 0)
{ {
culture ="zh-cn"; culture ="zh-CN";
isChese = true; isChese = true;
} }
...@@ -155,11 +161,13 @@ namespace VIZ.FGOUT.Module ...@@ -155,11 +161,13 @@ namespace VIZ.FGOUT.Module
{ {
dictionaryList.Add(dictionary); dictionaryList.Add(dictionary);
} }
string requestedCulture = string.Format(@"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.{0}.xaml", culture); //var requestedCulture = string.Format(@"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.{0}.xaml", culture);
var requestedCulture = GetCulturePath(culture);
ResourceDictionary resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture)); ResourceDictionary resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
if (resourceDictionary == null) if (resourceDictionary == null)
{ {
requestedCulture = @"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.zh-cn.xaml"; //requestedCulture = @"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.zh-CN.xaml";
requestedCulture = GetCulturePath("zh-CN");
resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture)); resourceDictionary = dictionaryList.FirstOrDefault(d => d.Source.OriginalString.Equals(requestedCulture));
} }
if (resourceDictionary != null) if (resourceDictionary != null)
...@@ -181,6 +189,11 @@ namespace VIZ.FGOUT.Module ...@@ -181,6 +189,11 @@ namespace VIZ.FGOUT.Module
return true; return true;
} }
private string GetCulturePath(string culture)
{
return string.Format(@"/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.{0}.xaml", culture); ;
}
/// <summary> /// <summary>
/// 取消 /// 取消
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/bin/x64/Debug/VIZ.FGOUT.Module.Resource.dll.config
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
VIZ.FGOUT/VIZ.FGOUT.Module/bin/x64/Debug/VIZ.Framework.Common.Resource.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/bin/x64/Debug/VIZ.Framework.Common.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/bin/x64/Debug/VIZ.Framework.Module.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "523A39F07867E4A285AEC3DC8B32F82F868A97DC0D35C2FD6B0AF65E1DE55D3C" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FEF3F4EFF902892C019AA6201378DA317EA4496E8167D9B4844456E22284FDDB"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1265 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1408 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1409 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1423 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1424 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "523A39F07867E4A285AEC3DC8B32F82F868A97DC0D35C2FD6B0AF65E1DE55D3C" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FEF3F4EFF902892C019AA6201378DA317EA4496E8167D9B4844456E22284FDDB"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1265 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1266 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1408 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1409 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1423 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1424 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F4134FF5A74D489F66BED80B2650DC7605E0FDD14EC7869838CEABB01AD3765A" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "189B639FA1C3B5B1F4DF5BACD75606309FCADA1C445602332E998542C87BA1F7"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F4134FF5A74D489F66BED80B2650DC7605E0FDD14EC7869838CEABB01AD3765A" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "189B639FA1C3B5B1F4DF5BACD75606309FCADA1C445602332E998542C87BA1F7"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FF0AA13A5E7D46534A55575416E7126DD8E5DC77BB4D609EAB1299873DCD01CE" #pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E818EF314B3BF02DAF996686C3EC039C5C3EB1611913293C92C6A2B43FE0425"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/NDISettingView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FF0AA13A5E7D46534A55575416E7126DD8E5DC77BB4D609EAB1299873DCD01CE" #pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E818EF314B3BF02DAF996686C3EC039C5C3EB1611913293C92C6A2B43FE0425"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/SystemSettingView.g.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5AEF8EDB0A1DFCF84CAD07DCFDD7A4F20125AA514A901B119FC6C482CCCB546D" #pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0DB3FE72B38F49C927DF9E679198BF62937B7DC1BCAB0C1DB3971494740791AF"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/SystemSetting/View/SystemSettingView.g.i.cs
#pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5AEF8EDB0A1DFCF84CAD07DCFDD7A4F20125AA514A901B119FC6C482CCCB546D" #pragma checksum "..\..\..\..\..\SystemSetting\View\SystemSettingView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0DB3FE72B38F49C927DF9E679198BF62937B7DC1BCAB0C1DB3971494740791AF"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT/App.xaml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBlock/TextBlock_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/Themes/Generic.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.en.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 Source="/VIZ.FGOUT.Module.Resource;component/Resources/StringResource.zh-CN.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/VIZ.FGOUT.Module.Resource.dll.config
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/VIZ.Framework.Common.Resource.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/VIZ.Framework.Common.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/VIZ.Framework.Module.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/App.g.cs
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "29640BEB803F4DC28F7BA7EEE3F158D27DCFBE4D19596E579CBB9F623291F689" #pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "857DF14D451D3D34A1B785F723CB2325F2690A12ECFEFADF825490FC0AFBBB40"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/App.g.i.cs
#pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "29640BEB803F4DC28F7BA7EEE3F158D27DCFBE4D19596E579CBB9F623291F689" #pragma checksum "..\..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "857DF14D451D3D34A1B785F723CB2325F2690A12ECFEFADF825490FC0AFBBB40"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.Framework/VIZ.Framework.Common.Resource/app.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.Framework/VIZ.Framework.Common.Resource/bin/x64/Debug/VIZ.Framework.Common.Resource.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.Framework/VIZ.Framework.Common.Resource/bin/x64/Debug/VIZ.Framework.Common.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource.csproj.CoreCompileInputs.cache
5668c45645827c83eb76dad0cf1d30b4c24e4ffdc10e2c1518fe4c3a14475775 b87230c627158c196b4093244812bee460841337e69dee8444a09e1492cf756b
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource.csproj.FileListAbsolute.txt
...@@ -290,3 +290,16 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ. ...@@ -290,3 +290,16 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ.
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ.Framework.Common.Resource.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ.Framework.Common.Resource.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ.Framework.Common.Resource.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ.Framework.Common.Resource.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ.Fram.BB1B34A6.Up2Date C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Debug\VIZ.Fram.BB1B34A6.Up2Date
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\VIZ.FGOUT.Storage.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\CsvHelper.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\LiteDB.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\Microsoft.Bcl.HashCode.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\VIZ.FGOUT.Storage.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\VIZ.FGOUT.Storage.dll.config
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\CsvHelper.xml
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\LiteDB.xml
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.xml
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Threading.Tasks.Extensions.xml
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\Microsoft.Bcl.HashCode.xml
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource_MarkupCompile.cache
...@@ -13,7 +13,7 @@ DEBUG;TRACE ...@@ -13,7 +13,7 @@ DEBUG;TRACE
91711917753 91711917753
3-1719726047 3-1719726047
19-82108094 201914760168
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml; Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False False
......
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Release/VIZ.Framework.Common.Resource_MarkupCompile.cache
...@@ -10,10 +10,10 @@ none ...@@ -10,10 +10,10 @@ none
false false
TRACE TRACE
9-721875057 91711917753
3-630027162 3-1719726047
19468308608 19269851070
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml; Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False False
......
VIZ.Framework/VIZ.Framework.Common/MessageBox/MessageBoxEx.cs
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
...@@ -11,6 +12,7 @@ namespace VIZ.Framework.Common ...@@ -11,6 +12,7 @@ namespace VIZ.Framework.Common
[TemplatePart(Name = nameof(PART_CancelButton), Type = typeof(Button))] [TemplatePart(Name = nameof(PART_CancelButton), Type = typeof(Button))]
public class MessageBoxEx : ContentControl public class MessageBoxEx : ContentControl
{ {
private SetLanguageConfig _setLanguageConfig;
static MessageBoxEx() static MessageBoxEx()
{ {
DefaultStyleKeyProperty.OverrideMetadata(typeof(MessageBoxEx), new FrameworkPropertyMetadata(typeof(MessageBoxEx))); DefaultStyleKeyProperty.OverrideMetadata(typeof(MessageBoxEx), new FrameworkPropertyMetadata(typeof(MessageBoxEx)));
......
VIZ.Framework/VIZ.Framework.Common/VIZ.Framework.Common.csproj
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
<HintPath>obj\x64\Debug\Interop.DeckLinkAPI.dll</HintPath> <HintPath>obj\x64\Debug\Interop.DeckLinkAPI.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="LiteDB, Version=5.0.12.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
<HintPath>..\..\VIZ.FGOUT\packages\LiteDB.5.0.12\lib\net45\LiteDB.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
</Reference> </Reference>
...@@ -103,6 +106,7 @@ ...@@ -103,6 +106,7 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\VIZ.H2V\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath> <HintPath>..\..\VIZ.H2V\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\VIZ.H2V\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath> <HintPath>..\..\VIZ.H2V\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference> </Reference>
...@@ -360,6 +364,14 @@ ...@@ -360,6 +364,14 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\VIZ.FGOUT\VIZ.FGOUT.Domain\VIZ.FGOUT.Domain.csproj">
<Project>{CBFEEB64-86F4-4EC6-90B2-549462687224}</Project>
<Name>VIZ.FGOUT.Domain</Name>
</ProjectReference>
<ProjectReference Include="..\..\VIZ.FGOUT\VIZ.FGOUT.Storage\VIZ.FGOUT.Storage.csproj">
<Project>{B158AAA2-A738-4017-8554-3A104FBF439D}</Project>
<Name>VIZ.FGOUT.Storage</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.Framework.Core\VIZ.Framework.Core.csproj"> <ProjectReference Include="..\VIZ.Framework.Core\VIZ.Framework.Core.csproj">
<Project>{75b39591-4bc3-4b09-bd7d-ec9f67efa96e}</Project> <Project>{75b39591-4bc3-4b09-bd7d-ec9f67efa96e}</Project>
<Name>VIZ.Framework.Core</Name> <Name>VIZ.Framework.Core</Name>
......
VIZ.Framework/VIZ.Framework.Common/app.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
VIZ.Framework/VIZ.Framework.Common/bin/x64/Debug/VIZ.Framework.Common.dll.config
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
\ No newline at end of file
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