Skip to content

H
hemei
Commit 624a35d3 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

完成 收卷主界面的多国语言

parent d2608650
Expand all Show whitespace changes
Inline Side-by-side
Showing with 544 additions and 334 deletions
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Themes/StringResources/StringResource.xaml
View file @ 624a35d3
......@@ -11,7 +11,8 @@
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Blowing.UI;component/Themes/StringResources/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/en/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/StringResource.xaml"/>
</ResourceDictionary.MergedDictionaries>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Themes/StringResources/en/StringResource.xaml
View file @ 624a35d3
......@@ -12,6 +12,7 @@
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.BlowingScan.UI;component/Themes/StringResources/en/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.FeedbackRenZiJia.UI.Client;component/Themes/StringResources/en/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/StringResources/en/StringResource.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/StringResources/en/StringResource.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/PgReduce.xaml
View file @ 624a35d3
......@@ -11,7 +11,6 @@
<Page.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/ABCTab.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
......
Project.FLY.Winder/FLY.Winder.UI.Client/FLY.Winder.UI.Client.csproj
View file @ 624a35d3
......@@ -69,10 +69,10 @@
<Compile Include="PgPidParam.xaml.cs">
<DependentUpon>PgPidParam.xaml</DependentUpon>
</Compile>
<Compile Include="PgCenterParam\PgCenterParam.xaml.cs">
<Compile Include="PgCenterParam.xaml.cs">
<DependentUpon>PgCenterParam.xaml</DependentUpon>
</Compile>
<Compile Include="PgInterstitialParam\PgInterstitialParam.xaml.cs">
<Compile Include="PgInterstitialParam.xaml.cs">
<DependentUpon>PgInterstitialParam.xaml</DependentUpon>
</Compile>
<Compile Include="UiModule\MainPanel\UiModule2_MainPanel.cs" />
......@@ -129,35 +129,71 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PgCenterParam\PgCenterParam.xaml">
<Page Include="PgCenterParam.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="PgCenterParam\PgCenterParamStyle.xaml">
<Page Include="PgInterstitialParam.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="PgInterstitialParam\PgInterstitialParam.xaml">
<Page Include="Themes\BaseStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="PgInterstitialParam\PgInterstitialParamStyle.xaml">
<Page Include="Themes\Color.Dark.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Color.Light.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\BaseStyle.xaml">
<Page Include="Themes\Color.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.CenterWinderPanel.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Color.Dark.xaml">
<Page Include="Themes\StringResources\en\StringResource.DynArea.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Color.Light.xaml">
<Page Include="Themes\StringResources\en\StringResource.MainPanel.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Color.xaml">
<Page Include="Themes\StringResources\en\StringResource.MenuSetting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.PgCenterParam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.PgInterstitialParam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.PgMenu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.PgPidParam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.PgWinderParam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.WdManual.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\StringResources\en\StringResource.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
......@@ -352,9 +388,7 @@
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Themes\StringResources\en\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\Project.FLY.IBC\packages\Fody.3.2.13\build\Fody.targets" Condition="Exists('..\..\Project.FLY.IBC\packages\Fody.3.2.13\build\Fody.targets')" />
</Project>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/PgMenu.xaml
View file @ 624a35d3
......@@ -12,7 +12,6 @@
<Page.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
</ResourceDictionary.MergedDictionaries>
<misc:Ver x:Key="version" SrcType="{x:Type local:PgMenu}"/>
</ResourceDictionary>
......
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.CenterWinderPanel.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<system:String x:Key="str.Winder.CenterWinderPanel.InsideMode">内收卷模式选择</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.OutsideMode">外收卷模式选择</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.IsSurfaceWindSet">表面</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.IsCsWindSet">表面+中心</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.InsideCenter">内中心</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.OutsideCenter">外中心</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.InsideEP">内压辊EP</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.OutsideEP">外压辊EP</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterTension">设定张力</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterInitDia">初始直径</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterTaper">锥度设定</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterTensionKg">实际张力</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterDia">实际直径</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.EPInitPressure">初始压力</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.EPTaperSet">锥度设定</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.EPActPressure">实际压力</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.Open">分离</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.Closed">闭合</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.SetValue">设置值</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CurrValue">当前值</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterOutputRatio">中心扭矩</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterTensor">中心张力</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.CenterTensorTaper">张力锥度</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.EPPressure">压辊气压</system:String>
<system:String x:Key="str.Winder.CenterWinderPanel.WinderDia">收卷直径</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.DynArea.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.Winder.DynArea.Speed">速度</system:String>
<system:String x:Key="str.Winder.DynArea.InsideWinder">内收卷</system:String>
<system:String x:Key="str.Winder.DynArea.OutsideWinder">外收卷</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.MainPanel.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<!--WdMeasure.xaml-->
<system:String x:Key="str.Winder.MainPanel.Setting">设定</system:String>
<system:String x:Key="str.Winder.MainPanel.Actual">实际</system:String>
<system:String x:Key="str.Winder.MainPanel.Speed">速度</system:String>
<system:String x:Key="str.Winder.MainPanel.PreWarning">预警</system:String>
<system:String x:Key="str.Winder.MainPanel.InsideWinder">内收卷</system:String>
<system:String x:Key="str.Winder.MainPanel.OutsideWinder">外收卷</system:String>
<system:String x:Key="str.Winder.MainPanel.Measuring">计量中</system:String>
<system:String x:Key="str.Winder.MainPanel.StopMeasure">计量停</system:String>
<!--MainPanel.xaml-->
<system:String x:Key="str.Winder.MainPanel.SpinnerRack">旋转架</system:String>
<system:String x:Key="str.Winder.MainPanel.Current">电流</system:String>
<system:String x:Key="str.Winder.MainPanel.Stopping">停止中</system:String>
<system:String x:Key="str.Winder.MainPanel.Running">运行中</system:String>
<system:String x:Key="str.Winder.MainPanel.Home">复位</system:String>
<system:String x:Key="str.Winder.MainPanel.Homing">复位中</system:String>
<system:String x:Key="str.Winder.MainPanel.IsRotaryForw">正转运转中</system:String>
<system:String x:Key="str.Winder.MainPanel.IsRotaryBackw">反转运转中</system:String>
<system:String x:Key="str.Winder.MainPanel.IsRotaryForwTurn">正转换向</system:String>
<system:String x:Key="str.Winder.MainPanel.IsRotaryOrgSign">复位原点</system:String>
<system:String x:Key="str.Winder.MainPanel.IsRotaryBackwTurn">反转换向</system:String>
<system:String x:Key="str.Winder.MainPanel.IsRotaryForwLimit">正向限位</system:String>
<system:String x:Key="str.Winder.MainPanel.IsRotaryBackwLimit">反向限位</system:String>
<system:String x:Key="str.Winder.MainPanel.Manual">手动</system:String>
<system:String x:Key="str.Winder.MainPanel.Auto">自动</system:String>
<system:String x:Key="str.Winder.MainPanel.Off">停止</system:String>
<system:String x:Key="str.Winder.MainPanel.On">运行</system:String>
<system:String x:Key="str.Winder.MainPanel.SetTensor">设定张力</system:String>
<system:String x:Key="str.Winder.MainPanel.ActTensor">实际张力</system:String>
<system:String x:Key="str.Winder.MainPanel.MotorCurrent">电机电流</system:String>
<system:String x:Key="str.Winder.MainPanel.Mode">控制模式</system:String>
<system:String x:Key="str.Winder.MainPanel.Switch">控制开关</system:String>
<system:String x:Key="str.Winder.MainPanel.Traction1">一牵引</system:String>
<system:String x:Key="str.Winder.MainPanel.Traction2">二牵引</system:String>
<system:String x:Key="str.Winder.MainPanel.Traction3">三牵引</system:String>
<system:String x:Key="str.Winder.MainPanel.RotatyFreq">旋转频率</system:String>
<!--WdSetVelocity.xaml-->
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.MenuSetting.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.Winder.MenuSetting.Winder">收卷</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/PgInterstitialParam/PgInterstitialParamStyle.xaml → Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.PgCenterParam.xaml
View file @ 624a35d3
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:FLY.Winder.UI.Client">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/Styles.xaml"/>
</ResourceDictionary.MergedDictionaries>
xmlns:system="clr-namespace:System;assembly=mscorlib">
<!--字符串换行 必须添加 xml:space="preserve" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.PgLoading.Loading">初始化中</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/PgCenterParam/PgCenterParamStyle.xaml → Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.PgInterstitialParam.xaml
View file @ 624a35d3
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:FLY.Winder.UI.Client">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/Styles.xaml"/>
</ResourceDictionary.MergedDictionaries>
xmlns:system="clr-namespace:System;assembly=mscorlib">
<!--字符串换行 必须添加 xml:space="preserve" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.PgLoading.Loading">初始化中</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.PgMenu.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.Winder.PgMenu.Title">收卷配置</system:String>
<system:String x:Key="str.Winder.PgMenu.PIDParam">PID参数</system:String>
<system:String x:Key="str.Winder.PgMenu.WinderParam">收卷参数</system:String>
<system:String x:Key="str.Winder.PgMenu.CenterParam">中心设置</system:String>
<system:String x:Key="str.Winder.PgMenu.InterstitialParam">间隙设置</system:String>
<system:String x:Key="str.Winder.PgMenu.Error">报警管理</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.PgPidParam.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.PgLoading.Loading">初始化中</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.PgWinderParam.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.PgLoading.Loading">初始化中</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.WdManual.xaml 0 → 100644
View file @ 624a35d3
<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" -->
<!--字符串换行 换行符 &#10; -->
<!--PgLoading.xaml-->
<system:String x:Key="str.Winder.WdManual.InsideWinder">内收卷</system:String>
<system:String x:Key="str.Winder.WdManual.OutsideWinder">外收卷</system:String>
<system:String x:Key="str.Winder.WdManual.TurnoverJog">翻转点动</system:String>
<system:String x:Key="str.Winder.WdManual.TurnoverHome">翻转原点</system:String>
<system:String x:Key="str.Winder.WdManual.CuttingFilm">切膜飞刀</system:String>
<system:String x:Key="str.Winder.WdManual.PressureArmMove">压臂平移</system:String>
<system:String x:Key="str.Winder.WdManual.PushRod">内推杆</system:String>
<system:String x:Key="str.Winder.WdManual.TongAuto">抓手自动</system:String>
<system:String x:Key="str.Winder.WdManual.TongManual">抓手手动</system:String>
<system:String x:Key="str.Winder.WdManual.TongClamp">抓手夹紧</system:String>
<system:String x:Key="str.Winder.WdManual.TongLoosen">抓手松开</system:String>
<system:String x:Key="str.Winder.WdManual.TongUp">抓手上升</system:String>
<system:String x:Key="str.Winder.WdManual.TongDown">抓手下降</system:String>
<system:String x:Key="str.Winder.WdManual.TongIn">抓手进</system:String>
<system:String x:Key="str.Winder.WdManual.TongOut">抓手出</system:String>
<system:String x:Key="str.Winder.WdManual.ABoard">人字板</system:String>
<system:String x:Key="str.Winder.WdManual.ABoardOpen">人字板开</system:String>
<system:String x:Key="str.Winder.WdManual.ABoardClose">人字板合</system:String>
<system:String x:Key="str.Winder.WdManual.SideBoard">侧夹板</system:String>
<system:String x:Key="str.Winder.WdManual.SideBoardOpen">侧夹板开</system:String>
<system:String x:Key="str.Winder.WdManual.SideBoardClose">侧夹板合</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/StringResources/en/StringResource.xaml 0 → 100644
View file @ 624a35d3
<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">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="StringResource.CenterWinderPanel.xaml" />
<ResourceDictionary Source="StringResource.MainPanel.xaml" />
<ResourceDictionary Source="StringResource.WdManual.xaml" />
<ResourceDictionary Source="StringResource.DynArea.xaml" />
<ResourceDictionary Source="StringResource.MenuSetting.xaml" />
<ResourceDictionary Source="StringResource.PgWinderParam.xaml" />
<ResourceDictionary Source="StringResource.PgPidParam.xaml" />
<ResourceDictionary Source="StringResource.PgMenu.xaml" />
<ResourceDictionary Source="StringResource.PgInterstitialParam.xaml" />
<ResourceDictionary Source="StringResource.PgCenterParam.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder/FLY.Winder.UI.Client/Themes/Styles.xaml
View file @ 624a35d3
......@@ -9,20 +9,6 @@
M512 150.016A361.984 361.984 0 1 1 150.016 512 362.496 362.496 0 0 1 512 150.016M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z
M512 512m-229.376 0a229.376 229.376 0 1 0 458.752 0 229.376 229.376 0 1 0-458.752 0Z
</Geometry>
<!--
<Geometry x:Key="Geometry_ring">
M512 150.016A361.984 361.984 0 1 1 150.016 512 362.496 362.496 0 0 1 512 150.016M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z
</Geometry>
<Geometry x:Key="Geometry_return">
M945.8 189.1l-61.6 47C800.2 131.3 669.5 64 522.8 64 269.4 64 64.3 264 64 511.5 63.7 759.1 269.2 960 522.8 960c198.1 0 366.9-122.7 431.1-294.5 1.6-4.5-0.8-9.5-5.4-11l-61.9-20.8c-4.5-1.5-9.4 0.7-11 5.1-2 5.3-4.2 10.7-6.4 15.9-18.9 43.7-46 83-80.5 116.7s-74.7 60.2-119.4 78.7c-46.2 19.1-95.5 28.8-146.2 28.8-50.8 0-100-9.7-146.2-28.8-44.7-18.5-84.9-44.9-119.4-78.7-34.5-33.7-61.6-73-80.5-116.7-19.6-45.2-29.5-93.2-29.5-142.8 0-49.6 9.9-97.6 29.5-142.8 18.9-43.7 46-83 80.5-116.7s74.7-60.2 119.4-78.7c46.2-19.1 95.5-28.8 146.2-28.8 50.8 0 100 9.7 146.2 28.8 44.7 18.5 84.9 44.9 119.4 78.7 10.8 10.6 21 21.8 30.4 33.5L753.2 336c-5.8 4.4-3.8 13.3 3.3 15l191.9 45.9c5.5 1.3 10.8-2.8 10.8-8.2l0.9-193c-0.2-7-8.6-11-14.3-6.6z m0 0
</Geometry>
<Geometry x:Key="Geometry_offset">
M1020.416 456.704h-73.728c-4.096 0-6.144-1.024-6.144-5.632v-237.056c0-4.608 1.536-5.632 6.144-5.632h73.728v248.32zM2.048 565.76h73.728c4.096 0 6.144 1.024 6.144 5.632v237.056c0 4.608-1.536 5.632-6.144 5.632h-73.728v-248.32zM622.592 114.176c16.896 13.824 32.768 27.136 48.128 39.936 13.824 11.264 27.648 23.04 41.472 34.304l43.008 35.328c13.824 11.264 27.648 23.04 41.472 34.304 14.336 11.776 28.672 24.064 43.008 35.84 14.336 11.776 28.16 23.552 42.496 34.816 6.144 4.608 6.144 4.608 0.512 9.216-28.16 23.04-56.32 46.592-84.48 69.632-26.112 21.504-52.224 43.52-78.848 65.024-26.112 21.504-52.224 43.52-78.848 65.024-5.12 4.096-10.24 8.704-15.36 12.8-1.024 0.512-1.536 2.048-2.56 1.024-0.512-0.512-0.512-1.536-0.512-2.56v-4.096-126.464c0-9.728 1.024-8.704-8.192-8.704h-531.456c-9.216 0-8.192 1.024-8.192-8.192v-137.216c0-5.632 1.536-7.168 7.168-7.168H614.4c7.68 0 7.68 0 7.68-7.68v-127.488c0.512-2.048 0.512-4.096 0.512-7.68z
M401.92 468.48v134.656c0 5.632 1.536 7.168 7.168 7.168h529.92c7.68 0 7.68 0 7.68 7.68v136.704c0 9.216 1.024 8.192-8.192 8.192H409.6c-7.68 0-7.68 0-7.68 8.192V906.24c-8.192-5.12-14.336-11.264-20.992-16.896l-44.544-36.864c-14.336-12.288-29.184-24.064-43.52-36.352-14.848-12.288-29.184-24.064-44.032-36.352l-36.864-30.72c-14.336-11.776-28.672-24.064-43.008-35.84-9.728-8.192-19.456-15.872-28.672-23.552-2.048-2.048-1.536-3.072 0-4.608 12.288-10.24 24.064-19.968 36.352-30.208 14.336-12.288 29.184-24.064 43.52-36.352 16.384-13.824 33.28-27.648 49.664-41.472 12.288-10.24 25.088-20.48 37.376-31.232 14.336-11.776 28.672-24.064 43.008-35.84 14.848-12.8 30.208-25.088 45.056-37.888 1.536-1.024 3.584-2.56 6.656-3.584z
</Geometry>
<Geometry x:Key="Geometry_cut">
M149.6064 668.0576h276.48v-307.2h-276.48v307.2z m221.7984-254.8736v202.5472H204.1856V413.184h167.2192zM597.9136 360.8576v307.2h276.48v-307.2h-276.48z m54.6816 254.8736V413.184h167.2192v202.5472H652.5952zM576.512 179.5072c0-35.5328-28.9792-64.512-64.512-64.512s-64.512 28.9792-64.512 64.512c0 24.4736 13.7216 45.8752 33.8944 56.7296v547.9424c-20.1728 10.9568-33.8944 32.256-33.8944 56.7296 0 35.5328 28.9792 64.512 64.512 64.512s64.512-28.9792 64.512-64.512c0-24.4736-13.7216-45.8752-33.8944-56.7296V236.2368c20.1728-10.9568 33.8944-32.256 33.8944-56.7296z
</Geometry>-->
<Geometry x:Key="Geometry_light">
M510.707071 140.282828C343.973495 140.282828 208.808081 275.448242 208.808081 442.181818c0 166.734869 135.165414 301.89899 301.89899 301.89899 166.734869 0 301.89899-135.164121 301.89899-301.89899 0-166.733576-135.164121-301.89899-301.89899-301.89899z
......
Project.FLY.Winder/FLY.Winder.UI.Client/UiModule/V4/ManualPanelV4.xaml
View file @ 624a35d3
......@@ -545,31 +545,18 @@
</Grid>
<WrapPanel Orientation="Horizontal" Grid.Column="1" MaxHeight="110" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="30,10">
<StackPanel >
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForw}">
正转运转中
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackw}">
反转运转中
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForw}" Content="{StaticResource str.Winder.MainPanel.IsRotaryForw}"/>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackw}" Content="{StaticResource str.Winder.MainPanel.IsRotaryBackw}"/>
</StackPanel>
<StackPanel >
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForwTurn}">
正转换向
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryOrgSign}">
复位原点
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackwTurn}">
反转换向
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForwTurn}" Content="{StaticResource str.Winder.MainPanel.IsRotaryForwTurn}"/>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryOrgSign}" Content="{StaticResource str.Winder.MainPanel.IsRotaryOrgSign}"/>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackwTurn}" Content="{StaticResource str.Winder.MainPanel.IsRotaryBackwTurn}"/>
</StackPanel>
<StackPanel >
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForwLimit}">
正向限位
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackwLimit}">
反向限位
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForwLimit}" Content="{StaticResource str.Winder.MainPanel.IsRotaryForwLimit}"/>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackwLimit}" Content="{StaticResource str.Winder.MainPanel.IsRotaryBackwLimit}"/>
</StackPanel>
</WrapPanel>
</Grid>
......
thick_public @ 3fd6245b
Subproject commit 368993049570eb85603121b4982913e507397f02
Subproject commit 3fd6245b6c422a870c5fd83b64252577a821e63b
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