David P.G
ec1f94a898
2
3 - 将AppSettings从DMS.Infrastructure移至DMS.Application
4 - 将DatabaseSettings重命名为AppSettings.Database并更新所有引用
5 - 将配置文件从appSettings.json更改为dms_config.json
6 - 更新所有项目引用以使用新的AppSettings命名空间
7 - 移除DI容器中的SqlSugarDbContext直接实例化
8 - 添加Material Design Icons字体并更新设置视图UI
9 - 通过移除不必要的变量映射更新来优化S7服务
10 - 将数据库连接字符串属性名从Database更新为DbName
56 lines
3.0 KiB
XML
56 lines
3.0 KiB
XML
<Application
|
|
x:Class="DMS.WPF.App"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
|
xmlns:triggers="clr-namespace:DMS.Core.Models.Triggers;assembly=DMS.Core"
|
|
xmlns:converters="clr-namespace:DMS.WPF.Converters"
|
|
xmlns:localConverters="clr-namespace:DMS.WPF.Converters"
|
|
|
|
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
|
|
<Application.Resources>
|
|
<ResourceDictionary>
|
|
<ResourceDictionary.MergedDictionaries>
|
|
<ui:ThemeResources />
|
|
<ui:XamlControlsResources />
|
|
<ResourceDictionary Source="Resources/DevicesItemTemplateDictionary.xaml" />
|
|
|
|
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml" />
|
|
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml" />
|
|
</ResourceDictionary.MergedDictionaries>
|
|
|
|
<!-- Converters -->
|
|
<converters:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter"/>
|
|
<converters:NullableTimeSpanToSecondsConverter x:Key="NullableTimeSpanToSecondsConverter"/>
|
|
<localConverters:BooleanToBrushConverter x:Key="BooleanToBrushConverter"/> <!-- 确保这个转换器也被引用 -->
|
|
|
|
<!-- 添加缺失的转换器 -->
|
|
<localConverters:EnumToVisibilityConverter x:Key="LocalEnumToVisibilityConverter"/>
|
|
<localConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
|
|
<localConverters:CountToVisibilityConverter x:Key="CountToVisibilityConverter"/>
|
|
<localConverters:BoolToStringConverter x:Key="BoolToStringConverter"/>
|
|
<localConverters:BoolToColorConverter x:Key="BoolToColorConverter"/>
|
|
|
|
<!-- System Accent Color as Brush -->
|
|
<SolidColorBrush x:Key="SystemAccentColorBrush" Color="{DynamicResource SystemAccentColor}" />
|
|
|
|
<!-- Material Design Icons Font -->
|
|
<FontFamily x:Key="MdFontIcons">/Assets/Fonts/materialdesignicons-webfont.ttf#Material Design Icons</FontFamily>
|
|
|
|
<!-- Enum Values for ComboBoxes -->
|
|
<ObjectDataProvider x:Key="ConditionTypeEnum" ObjectType="{x:Type sys:Enum}" MethodName="GetValues">
|
|
<ObjectDataProvider.MethodParameters>
|
|
<x:Type TypeName="triggers:ConditionType"/>
|
|
</ObjectDataProvider.MethodParameters>
|
|
</ObjectDataProvider>
|
|
|
|
<ObjectDataProvider x:Key="ActionTypeEnum" ObjectType="{x:Type sys:Enum}" MethodName="GetValues">
|
|
<ObjectDataProvider.MethodParameters>
|
|
<x:Type TypeName="triggers:ActionType"/>
|
|
</ObjectDataProvider.MethodParameters>
|
|
</ObjectDataProvider>
|
|
|
|
</ResourceDictionary>
|
|
|
|
</Application.Resources>
|
|
</Application> |