Skip to content

T
Thick-Common
Commit 493f34b5 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

正在添加多国语言.2024041502

parent 2a8afb63
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 55 deletions
Project.FLY.Thick.Base/FLY.Thick.Base.UI/App.xaml
View file @ 493f34b5
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/Styles.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/Styles.xaml"/>
<!--项目字符串--> <!--项目字符串-->
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/StringResource.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/StringResource.en.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<Style TargetType="GroupBox" /> <Style TargetType="GroupBox" />
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/FLY.Thick.Base.UI.csproj
View file @ 493f34b5
...@@ -416,6 +416,14 @@ ...@@ -416,6 +416,14 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="Themes\StringResources\StringResource.PgInitParam.en.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgInitParam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\StringResource.PgFlyAd.en.xaml"> <Page Include="Themes\StringResources\StringResource.PgFlyAd.en.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgInitparam.xaml
View file @ 493f34b5
...@@ -8,44 +8,42 @@ ...@@ -8,44 +8,42 @@
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignWidth="1280" d:DesignWidth="1280"
Background="WhiteSmoke"
Title="Page_Initparam" Title="Page_Initparam"
d:DataContext="{d:DesignInstance local:PgInitParamVm}"> d:DataContext="{d:DesignInstance local:PgInitParamVm}">
<Page.Resources> <Page.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Page.Resources> </Page.Resources>
<Grid > <Grid Background="{StaticResource Brushes.Card.Background}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
<RowDefinition /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}"> <StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}">
<Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/> <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
<TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="系统参数"/> <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="{StaticResource str.PgInitparam.Title}"/>
</StackPanel> </StackPanel>
<ScrollViewer CanContentScroll="False" PanningMode="Both" Grid.Row="1" > <ScrollViewer CanContentScroll="False" PanningMode="Both" Grid.Row="1" >
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<Border Style="{StaticResource Styles.Card.Border}"> <Border Style="{StaticResource Styles.Card.Border}">
<StackPanel> <StackPanel>
<TextBlock Style="{StaticResource Styles.Card.Title}" <TextBlock Style="{StaticResource Styles.Card.Title}"
Text="基本"/> Text="{StaticResource str.PgInitparam.Param}"/>
<StackPanel > <StackPanel >
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="归零间隔" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.AutoOrgInterval}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding AutoOrgInterval}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding AutoOrgInterval}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="min" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="min" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="机架长度" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.PosLength}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding PosLength}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding PosLength}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}"/> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}"/>
...@@ -62,37 +60,44 @@ ...@@ -62,37 +60,44 @@
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="编码器1比例" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.mmpp1}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Encoder1_mmpp}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Encoder1_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm/脉冲"/> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
mm/<Run Text="{StaticResource str.PgInitparam.Pulse}"/>
</TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="高级AD数据" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.IsTimeGridAdvEnabled}" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsTimeGridAdvEnabled}"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsTimeGridAdvEnabled}"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="线速度源" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.FilmVSrc}" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left"> <ComboBox Width="100" MinHeight="{StaticResource FontSize.FieldContent.Middle}" HorizontalAlignment="Left">
<ComboBoxItem x:Name="comboBoxotem_EN2" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.EN2}}"> <ComboBox.Resources>
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" FontSize="32" Text="编码器2"/> <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldContent}">
<Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent.Middle}"/>
</Style>
</ComboBox.Resources>
<ComboBoxItem IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.EN2}}" >
<TextBlock Text="{StaticResource str.PgInitparam.Encoder2}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_ROUND" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.ROUND}}"> <ComboBoxItem IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.ROUND}}">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" FontSize="32" Text="辊信号"/> <TextBlock Text="{StaticResource str.PgInitparam.Roller}"/>
</ComboBoxItem> </ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_EN2}"> <StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_EN2}">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="编码器2比例" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.mmpp2}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Encoder2_mmpp,StringFormat={}{0:F5}}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Encoder2_mmpp,StringFormat={}{0:F5}}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" > <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
<Run Text="mm/脉冲"/> mm/<Run Text="{StaticResource str.PgInitparam.Pulse}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
...@@ -100,7 +105,7 @@ ...@@ -100,7 +105,7 @@
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_ROUND}"> <StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_ROUND}">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="辊周长" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.MmOfR}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding MmOfR,StringFormat={}{0:F1}}" /> <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding MmOfR,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
...@@ -108,7 +113,7 @@ ...@@ -108,7 +113,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="最小线速度" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.FilmVThreshold}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FilmVThreshold}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FilmVThreshold}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" > <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
...@@ -120,29 +125,34 @@ ...@@ -120,29 +125,34 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="数据有效源" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.DataValidSrc}" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left"> <ComboBox Width="100" MinHeight="{StaticResource FontSize.FieldContent.Middle}" HorizontalAlignment="Left">
<ComboBoxItem x:Name="comboBoxotem_byen2" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYEN2}}"> <ComboBox.Resources>
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" FontSize="32" Text="线速度"/> <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldContent}">
<Setter Property="FontSize" Value="{StaticResource FontSize.FieldContent.Middle}"/>
</Style>
</ComboBox.Resources>
<ComboBoxItem IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYEN2}}">
<TextBlock Text="{StaticResource str.PgInitparam.FilmVelocity}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_byinput" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYINPUT}}"> <ComboBoxItem IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYINPUT}}">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" FontSize="32" Text="本地输入口"/> <TextBlock Text="{StaticResource str.PgInitparam.Input}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_valid" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.VALID}}" > <ComboBoxItem IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.VALID}}" >
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" FontSize="32" Text="长期有限"/> <TextBlock Text="{StaticResource str.PgInitparam.VALID}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_invalid" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.INVALID}}"> <ComboBoxItem IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.INVALID}}">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" FontSize="32" Text="长期无效"/> <TextBlock Text="{StaticResource str.PgInitparam.INVALID}"/>
</ComboBoxItem> </ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="数据有效时&#13;扫描" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.AutoF1F3}" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding AutoF1F3}" HorizontalAlignment="Left"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding AutoF1F3}" HorizontalAlignment="Left"/>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="扫描重启&#13;延时" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.ReStartDelay}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding ReStartDelay}" /> <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding ReStartDelay}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="s" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="s" />
...@@ -159,11 +169,11 @@ ...@@ -159,11 +169,11 @@
<Border Style="{StaticResource Styles.Card.Border}"> <Border Style="{StaticResource Styles.Card.Border}">
<StackPanel> <StackPanel>
<TextBlock Style="{StaticResource Styles.Card.Title}" <TextBlock Style="{StaticResource Styles.Card.Title}"
Text="速度"/> Text="{StaticResource str.PgInitparam.Velocity}"/>
<WrapPanel Grid.Column="1" Orientation="Horizontal"> <WrapPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="扫描速度" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.VScan}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VScan}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VScan}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
...@@ -181,7 +191,7 @@ ...@@ -181,7 +191,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="定位速度" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.VAccuracy}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VAccuracy}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VAccuracy}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
...@@ -198,7 +208,7 @@ ...@@ -198,7 +208,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调试速度" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.VJOG}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VJOG}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VJOG}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
...@@ -218,7 +228,7 @@ ...@@ -218,7 +228,7 @@
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="开始速度" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.SVelocity}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SVelocity}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SVelocity}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
...@@ -236,7 +246,7 @@ ...@@ -236,7 +246,7 @@
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="归零速度1" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.HV1}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity1}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity1}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
...@@ -253,7 +263,7 @@ ...@@ -253,7 +263,7 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="归零速度2" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.HV2}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity2}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding HVelocity2}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
...@@ -271,7 +281,7 @@ ...@@ -271,7 +281,7 @@
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="加速时间" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.ATime}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding ATime}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding ATime}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" > <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
...@@ -280,7 +290,8 @@ ...@@ -280,7 +290,8 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="减速时间" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.DTime
}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding DTime}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding DTime}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" > <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
...@@ -295,16 +306,16 @@ ...@@ -295,16 +306,16 @@
<Border Style="{StaticResource Styles.Card.Border}"> <Border Style="{StaticResource Styles.Card.Border}">
<StackPanel> <StackPanel>
<TextBlock Style="{StaticResource Styles.Card.Title}" <TextBlock Style="{StaticResource Styles.Card.Title}"
Text="硬件"/> Text="{StaticResource str.PgInitparam.Hardware}"/>
<WrapPanel Orientation="Horizontal"> <WrapPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="有打孔模块" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="{StaticResource str.PgInitparam.Punch}" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left"
IsChecked="{Binding HasPunch}" /> IsChecked="{Binding HasPunch}" />
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding HasPunch,Converter={StaticResource visbilityconv}}"> <StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding HasPunch,Converter={StaticResource visbilityconv}}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="打孔模块&#13;与探头偏移" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.PunchOffset}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding PunchOffset}" /> <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding PunchOffset}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
...@@ -313,7 +324,7 @@ ...@@ -313,7 +324,7 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="有按样&#13;生产模块" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.HasProfileSample}" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left"
IsChecked="{Binding HasProfileSample}" /> IsChecked="{Binding HasProfileSample}" />
</StackPanel> </StackPanel>
...@@ -321,12 +332,12 @@ ...@@ -321,12 +332,12 @@
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="有纵向&#13;光纤传感器" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.HasVSign}" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left"
IsChecked="{Binding HasVSign}" /> IsChecked="{Binding HasVSign}" />
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding HasVSign,Converter={StaticResource visbilityconv}}"> <StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding HasVSign,Converter={StaticResource visbilityconv}}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="纵向光纤&#13;与探头偏移" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.VSignOffset}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VSignOffset}" /> <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding VSignOffset}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
...@@ -335,14 +346,14 @@ ...@@ -335,14 +346,14 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="有横向&#13;光纤传感器" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.HasHSign}" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left"
IsChecked="{Binding HasHSign}" /> IsChecked="{Binding HasHSign}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="有机架修正&#13;功能" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="{StaticResource str.PgInitparam.HasScanCorr}" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left"
IsChecked="{Binding HasScanCorr}" /> IsChecked="{Binding HasScanCorr}" />
</StackPanel> </StackPanel>
...@@ -354,7 +365,7 @@ ...@@ -354,7 +365,7 @@
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<Button Style="{StaticResource ButtonStyle_apply}" VerticalAlignment="Bottom" Margin="0,0,20,20" <Button Style="{StaticResource Styles.Button.Apply}" VerticalAlignment="Bottom" Margin="0,0,20,20"
Command="{Binding ApplyCmd}"/> Command="{Binding ApplyCmd}"/>
</Grid> </Grid>
</Page> </Page>
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/StringResources/StringResource.PgFlyAd.en.xaml
View file @ 493f34b5
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<system:String x:Key="str.PgFlyAd.ADLag">AD Lag</system:String> <system:String x:Key="str.PgFlyAd.ADLag">AD Lag</system:String>
<system:String x:Key="str.PgFlyAd.HardwareVersion">Version</system:String> <system:String x:Key="str.PgFlyAd.HardwareVersion">Version</system:String>
<system:String x:Key="str.PgFlyAd.Version">cv</system:String> <system:String x:Key="str.PgFlyAd.Version">Commu.</system:String>
<system:String x:Key="str.PgFlyAd.Apply">Apply</system:String> <system:String x:Key="str.PgFlyAd.Apply">Apply</system:String>
<system:String x:Key="str.PgFlyAd.Initparam">Init.Param</system:String> <system:String x:Key="str.PgFlyAd.Initparam">Init.Param</system:String>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/StringResources/StringResource.PgInitParam.en.xaml 0 → 100644
View file @ 493f34b5
<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"
xml:space="preserve">
<!--字符串换行 必须添加 xml:space="preserve" -->
<!--字符串换行 换行符 &#10; -->
<system:String x:Key="str.PgInitparam.Title">Init.</system:String>
<system:String x:Key="str.PgInitparam.Param">Param</system:String>
<system:String x:Key="str.PgInitparam.AutoOrgInterval">Home Interval</system:String>
<system:String x:Key="str.PgInitparam.Pulse">p</system:String>
<system:String x:Key="str.PgInitparam.PosLength">Rack Len</system:String>
<system:String x:Key="str.PgInitparam.mmpp1">Encoder1</system:String>
<system:String x:Key="str.PgInitparam.IsTimeGridAdvEnabled">TimeGridAdv</system:String>
<system:String x:Key="str.PgInitparam.FilmVSrc">Film.V Src</system:String>
<system:String x:Key="str.PgInitparam.Encoder2">Encoder2</system:String>
<system:String x:Key="str.PgInitparam.Roller">Roller</system:String>
<system:String x:Key="str.PgInitparam.mmpp2">Encoder2</system:String>
<system:String x:Key="str.PgInitparam.MmOfR">mm/R</system:String>
<system:String x:Key="str.PgInitparam.FilmVThreshold">Min Film.V</system:String>
<system:String x:Key="str.PgInitparam.DataValidSrc">DataValid Src</system:String>
<system:String x:Key="str.PgInitparam.FilmVelocity">Film.V</system:String>
<system:String x:Key="str.PgInitparam.Input">input</system:String>
<system:String x:Key="str.PgInitparam.VALID">Valid Forever</system:String>
<system:String x:Key="str.PgInitparam.INVALID">Invalid Forever</system:String>
<system:String x:Key="str.PgInitparam.AutoF1F3" xml:space="preserve">DataValid=true&#13;Scan</system:String>
<system:String x:Key="str.PgInitparam.ReStartDelay" xml:space="preserve">Delay After&#13;Scan Again</system:String>
<system:String x:Key="str.PgInitparam.Velocity">Velocity</system:String>
<system:String x:Key="str.PgInitparam.VScan">Scan.V</system:String>
<system:String x:Key="str.PgInitparam.VAccuracy">Sample.V</system:String>
<system:String x:Key="str.PgInitparam.VJOG">Debug.V</system:String>
<system:String x:Key="str.PgInitparam.SVelocity">Start.V</system:String>
<system:String x:Key="str.PgInitparam.HV1">Home.V1</system:String>
<system:String x:Key="str.PgInitparam.HV2">Home.V2</system:String>
<system:String x:Key="str.PgInitparam.ATime">Acc</system:String>
<system:String x:Key="str.PgInitparam.DTime">Dec</system:String>
<system:String x:Key="str.PgInitparam.Hardware">Hardware</system:String>
<system:String x:Key="str.PgInitparam.Punch">Has Punch</system:String>
<system:String x:Key="str.PgInitparam.PunchOffset" xml:space="preserve">Distance between &#13;Punch and Sensor</system:String>
<system:String x:Key="str.PgInitparam.HasProfileSample" xml:space="preserve">Has Profile &#13;Sample</system:String>
<system:String x:Key="str.PgInitparam.HasVSign" xml:space="preserve">Has Vertical&#13;Fiber Optic Sensor</system:String>
<system:String x:Key="str.PgInitparam.VSignOffset" xml:space="preserve">Distance between &#13;VFOS and Sensor</system:String>
<system:String x:Key="str.PgInitparam.HasHSign" xml:space="preserve">Has Horizotal &#13;Fiber Optic Sensor</system:String>
<system:String x:Key="str.PgInitparam.HasScanCorr" xml:space="preserve">Has&#13;Rack.Corr</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/StringResources/StringResource.PgInitParam.xaml 0 → 100644
View file @ 493f34b5
<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"
xml:space="preserve">
<!--字符串换行 必须添加 xml:space="preserve" -->
<!--字符串换行 换行符 &#10; -->
<system:String x:Key="str.PgInitparam.Title">系统参数</system:String>
<system:String x:Key="str.PgInitparam.Param">参数</system:String>
<system:String x:Key="str.PgInitparam.AutoOrgInterval">归零间隔</system:String>
<system:String x:Key="str.PgInitparam.Pulse">脉冲</system:String>
<system:String x:Key="str.PgInitparam.PosLength">机架长度</system:String>
<system:String x:Key="str.PgInitparam.mmpp1">编码器1比例</system:String>
<system:String x:Key="str.PgInitparam.IsTimeGridAdvEnabled">高级AD数据</system:String>
<system:String x:Key="str.PgInitparam.FilmVSrc">生产速度来源</system:String>
<system:String x:Key="str.PgInitparam.Encoder2">编码器2</system:String>
<system:String x:Key="str.PgInitparam.Roller">辊信号</system:String>
<system:String x:Key="str.PgInitparam.mmpp2">编码器2比例</system:String>
<system:String x:Key="str.PgInitparam.MmOfR">辊周长</system:String>
<system:String x:Key="str.PgInitparam.FilmVThreshold">最小生产速度</system:String>
<system:String x:Key="str.PgInitparam.DataValidSrc">数据有效来源</system:String>
<system:String x:Key="str.PgInitparam.FilmVelocity">生产速度</system:String>
<system:String x:Key="str.PgInitparam.Input">本地输入口</system:String>
<system:String x:Key="str.PgInitparam.VALID">长期有限</system:String>
<system:String x:Key="str.PgInitparam.INVALID">长期无效</system:String>
<system:String x:Key="str.PgInitparam.AutoF1F3" xml:space="preserve">数据有效时&#13;扫描</system:String>
<system:String x:Key="str.PgInitparam.ReStartDelay" xml:space="preserve">扫描重启&#13;延时</system:String>
<system:String x:Key="str.PgInitparam.Velocity">速度</system:String>
<system:String x:Key="str.PgInitparam.VScan">扫描速度</system:String>
<system:String x:Key="str.PgInitparam.VAccuracy">采样速度</system:String>
<system:String x:Key="str.PgInitparam.VJOG">调试速度</system:String>
<system:String x:Key="str.PgInitparam.SVelocity">开始速度</system:String>
<system:String x:Key="str.PgInitparam.HV1">归零速度1</system:String>
<system:String x:Key="str.PgInitparam.HV2">归零速度2</system:String>
<system:String x:Key="str.PgInitparam.ATime">加速时间</system:String>
<system:String x:Key="str.PgInitparam.DTime">减速时间</system:String>
<system:String x:Key="str.PgInitparam.Hardware">硬件</system:String>
<system:String x:Key="str.PgInitparam.Punch">有打孔模块</system:String>
<system:String x:Key="str.PgInitparam.PunchOffset" xml:space="preserve">打孔模块&#13;与探头偏移</system:String>
<system:String x:Key="str.PgInitparam.HasProfileSample" xml:space="preserve">有按样&#13;生产模块</system:String>
<system:String x:Key="str.PgInitparam.HasVSign" xml:space="preserve">有纵向&#13;光纤传感器</system:String>
<system:String x:Key="str.PgInitparam.VSignOffset" xml:space="preserve">纵向光纤&#13;与探头偏移</system:String>
<system:String x:Key="str.PgInitparam.HasHSign" xml:space="preserve">有横向&#13;光纤传感器</system:String>
<system:String x:Key="str.PgInitparam.HasScanCorr" xml:space="preserve">有机架修正&#13;功能</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/StringResources/StringResource.en.xaml
View file @ 493f34b5
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<ResourceDictionary Source="StringResource.PgCurve.en.xaml"/> <ResourceDictionary Source="StringResource.PgCurve.en.xaml"/>
<ResourceDictionary Source="StringResource.PgFlyAd.en.xaml"/> <ResourceDictionary Source="StringResource.PgFlyAd.en.xaml"/>
<ResourceDictionary Source="StringResource.PgGetSample.en.xaml"/> <ResourceDictionary Source="StringResource.PgGetSample.en.xaml"/>
<ResourceDictionary Source="StringResource.PgInitParam.en.xaml"/>
<ResourceDictionary Source="StringResource.DynArea.en.xaml"/> <ResourceDictionary Source="StringResource.DynArea.en.xaml"/>
<ResourceDictionary Source="StringResource.Menu.en.xaml"/> <ResourceDictionary Source="StringResource.Menu.en.xaml"/>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Themes/StringResources/StringResource.xaml
View file @ 493f34b5
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<ResourceDictionary Source="StringResource.PgCurve.xaml"/> <ResourceDictionary Source="StringResource.PgCurve.xaml"/>
<ResourceDictionary Source="StringResource.PgFlyAd.xaml"/> <ResourceDictionary Source="StringResource.PgFlyAd.xaml"/>
<ResourceDictionary Source="StringResource.PgGetSample.xaml"/> <ResourceDictionary Source="StringResource.PgGetSample.xaml"/>
<ResourceDictionary Source="StringResource.PgInitParam.xaml"/>
<ResourceDictionary Source="StringResource.DynArea.xaml"/> <ResourceDictionary Source="StringResource.DynArea.xaml"/>
<ResourceDictionary Source="StringResource.Menu.xaml"/> <ResourceDictionary Source="StringResource.Menu.xaml"/>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/MenuMotion.xaml
View file @ 493f34b5
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</Button.Style> </Button.Style>
<StackPanel > <StackPanel >
<iconPacks:PackIconMaterial Kind="CloseCircle" /> <iconPacks:PackIconMaterial Kind="CloseCircle" />
<TextBlock Text="停止" Foreground="{StaticResource TextBrush}"/> <TextBlock Text="{StaticResource str.Menu.Stop}" Foreground="{StaticResource TextBrush}"/>
</StackPanel> </StackPanel>
</Button> </Button>
......
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