Skip to content

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

整理 pack://application:,,,/FLY.ControlLibrary;component/Converters/Converters.xaml 加载问题

parent f9bc14c6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
MultiLayout/MainWindow.xaml
View file @ e40e6743
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<local:UcMultiGageVmUt x:Key="viewModel" GageTag="机尾" IsErrMsgVisable ="True"/> <local:UcMultiGageVmUt x:Key="viewModel" GageTag="机尾" IsErrMsgVisable ="True"/>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/App.xaml
View file @ e40e6743
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<!--项目字符串--> <!--项目字符串-->
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/en/StringResource.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/StringResources/zh/StringResource.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<Style TargetType="GroupBox" /> <Style TargetType="GroupBox" />
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/DynAreaIO2.xaml
View file @ e40e6743
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<conv:IO2BitColorConverter x:Key="io2bitcolorconv" /> <conv:IO2BitColorConverter x:Key="io2bitcolorconv" />
<Style TargetType="Rectangle" x:Key="IOStyle"> <Style TargetType="Rectangle" x:Key="IOStyle">
......
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