home-PC
85919381b1
- 安装 FontAwesome.Sharp v6.6.0，新增 Helpers/IconProvider.cs（190+ 图标，11 分类） - ToolEditWindow/GroupEditWindow: 添加图标选择 ComboBox，按分类分组，带图标预览 - MainWindow 卡片模板: 使用 fa:IconBlock 渲染图标，IconCode 为空时回退首字母 - 组合角标从 emoji 改为 FontAwesome Cubes 图标，放置于卡片右上角 - ComboBox 样式修复: TextBlock→ContentPresenter，支持 ItemTemplate+DisplayMemberPath - ComboBox 滚轮修复: CanContentScroll=False 解决分组模式下滑轮跳组问题 - 编辑弹窗: 所有输入控件添加 VerticalContentAlignment=Center - 组合可包含其他组合: GetAncestorIds 递归排除自身及祖先防止循环引用 - ProcessExecutionService: 支持嵌套组合递归执行，visited 集合防死循环 - MainWindow 右键菜单新增删除功能，工具和组合均支持 - 移除侧边栏顶部个人工具箱标题文字 - 更新测试: 适配组合嵌套逻辑，新增祖先排除测试 (83/83 通过)
56 lines
2.5 KiB
XML
56 lines
2.5 KiB
XML
<Window x:Class="PersonalToolBox.Views.CategoryEditWindow"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
Title="{Binding WindowTitle}" Height="170" Width="380"
|
|
WindowStartupLocation="CenterOwner"
|
|
ResizeMode="NoResize"
|
|
Background="{DynamicResource Theme.Background}">
|
|
|
|
<Grid Margin="20">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="*"/>
|
|
<RowDefinition Height="Auto"/>
|
|
</Grid.RowDefinitions>
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="60"/>
|
|
<ColumnDefinition Width="*"/>
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<TextBlock Grid.Row="0" Grid.Column="0"
|
|
Text="名称:" Foreground="{DynamicResource Theme.Foreground}"
|
|
VerticalAlignment="Center" Margin="0,0,0,12"/>
|
|
<TextBox Grid.Row="0" Grid.Column="1"
|
|
Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
|
|
Background="{DynamicResource Theme.InputBackground}"
|
|
Foreground="{DynamicResource Theme.Foreground}"
|
|
BorderBrush="{DynamicResource Theme.InputBorder}"
|
|
VerticalContentAlignment="Center"
|
|
Height="30" Margin="0,0,0,16" Padding="6,0"/>
|
|
|
|
<Border Grid.Row="2" Grid.ColumnSpan="2"
|
|
BorderBrush="{DynamicResource Theme.CardBorder}"
|
|
BorderThickness="0,1,0,0" Margin="0,0,0,14"/>
|
|
|
|
<StackPanel Grid.Row="3" Grid.Column="1"
|
|
Orientation="Horizontal" HorizontalAlignment="Right">
|
|
<Button Content="保存"
|
|
Command="{Binding SaveCommand}"
|
|
Background="{DynamicResource Theme.ButtonBackground}"
|
|
Foreground="{DynamicResource Theme.ButtonForeground}"
|
|
BorderThickness="0"
|
|
Width="80" Height="30" FontSize="13"
|
|
Cursor="Hand" Margin="0,0,10,0"/>
|
|
<Button Content="取消"
|
|
Command="{Binding CancelCommand}"
|
|
Background="{DynamicResource Theme.CardBackground}"
|
|
Foreground="{DynamicResource Theme.Foreground}"
|
|
BorderBrush="{DynamicResource Theme.CardBorder}"
|
|
BorderThickness="1"
|
|
Width="80" Height="30" FontSize="13"
|
|
Cursor="Hand"/>
|
|
</StackPanel>
|
|
</Grid>
|
|
</Window>
|