TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加了初始弹窗，但是没有成功

Browse Source 
更改了CAN和LIN协调
更改了配置程序的名称顺序
This commit is contained in:
Tyrone CT
2025-01-11 12:04:34 +08:00
parent 620c5e8178
commit e49a48fb25
53 changed files with 5118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CapMachine.Wpf/App.xaml
View File

@@ -2,9 +2,11 @@
x:Class="CapMachine.Wpf.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:bar="http://www.hardcodet.net/taskbar"
xmlns:local="clr-namespace:CapMachine.Wpf"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:prism="http://prismlibrary.com/">
xmlns:prism="http://prismlibrary.com/"
xmlns:viewmodels="clr-namespace:CapMachine.Wpf.ViewModels">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -20,6 +22,28 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.LightBlue.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
</ResourceDictionary.MergedDictionaries>
<!--<bar:TaskbarIcon
x:Key="taskBar"
DoubleClickCommand="{Binding ShowViewCommand}"
IconSource="/Assets/Images/favicon.ico">
<bar:TaskbarIcon.DataContext>
<viewmodels:TaskBarViewModel />
</bar:TaskbarIcon.DataContext>
<bar:TaskbarIcon.ContextMenu>
<ContextMenu>
<MenuItem Command="{Binding ExitCommand}" Header="退出系统">
<MenuItem.Icon>
<Image
Width="20"
Height="20"
Source="/Assets/Images/favicon.ico" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</bar:TaskbarIcon.ContextMenu>
</bar:TaskbarIcon>-->
</ResourceDictionary>
</Application.Resources>
</prism:PrismApplication>