From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
HMI.SettingControl/SettingControl.xaml | 65 ++++++++++++--------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/HMI.SettingControl/SettingControl.xaml b/HMI.SettingControl/SettingControl.xaml
index 3116895..0f5ef74 100644
--- a/HMI.SettingControl/SettingControl.xaml
+++ b/HMI.SettingControl/SettingControl.xaml
@@ -9,15 +9,14 @@
xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
- xmlns:dp="clr-namespace:HMI.UI;assembly=HMI.UI"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
Loaded="UserControl_Loaded"
- Background="{StaticResource WorkspaceBackground}"
+ Background="{DynamicResource WorkspaceBackground}"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<pu:StyleDictionary Includes="TabControl" />
- <ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
</ResourceDictionary.MergedDictionaries>
@@ -28,49 +27,35 @@
<Grid>
<Border Style="{StaticResource CardBoarder}">
- <Grid>
+ <Grid dp:GridHelper.Space="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition />
+ <RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <TextBlock VerticalAlignment="Center" Text="绯荤粺璁剧疆" Margin="0,0,0,10"
- FontSize="{StaticResource TitleFontSize}" />
- <TabControl Grid.Row="1"
-pu:TabControlHelper.HeaderPanelAlignment="Front"
-pu:TabControlHelper.ItemsBackground="{StaticResource PrimaryColorContract}"
-pu:TabControlHelper.ItemsForeground="{StaticResource PrimaryColor}"
-
-pu:TabControlHelper.ItemsHeight="40"
-pu:TabControlHelper.ItemsHorizontalHeaderAlignment="Left"
-pu:TabControlHelper.ItemsHoverBackground="{StaticResource SecondPrimaryColor}"
-pu:TabControlHelper.ItemsHoverForeground="{StaticResource SecondPrimaryColorContract}"
-pu:TabControlHelper.ItemsRibbonLineMargin="0,5,0,5"
-pu:TabControlHelper.ItemsRibbonLineThickness="4"
-pu:TabControlHelper.ItemsRibbonLineVisibility="Visible"
-pu:TabControlHelper.ItemsSelectedBackground="{StaticResource PrimaryColor}"
-pu:TabControlHelper.ItemsSelectedForeground="{StaticResource PrimaryColorContract}"
-pu:TabControlHelper.ItemsSelectedRibbonLineBrush="#FFFFFF"
-pu:TabControlHelper.ItemsSelectedRibbonLineThickness="2"
-TabStripPlacement="Left"
- BorderThickness="0"
- BorderBrush="{StaticResource CommonBoarder}"
+ <TextBlock VerticalAlignment="Center" Text="{DynamicResource Setting.SystemSetting}" FontSize="{StaticResource TitleFontSize}" />
+ <TabControl Grid.Row="1" x:Name="tabControl"
+ pu:TabControlHelper.ItemsSelectedBackground="{DynamicResource HoriBar}"
+ pu:TabControlHelper.ItemsSelectedForeground="{DynamicResource PrimaryColorContract}"
+ pu:TabControlHelper.ItemsFontSize="14"
+ pu:TabControlHelper.ItemsRibbonLineVisibility="Visible"
+ pu:TabControlHelper.ItemsRibbonLinePlacement="Right"
+ pu:TabControlHelper.HeaderPanelBorderThickness="0,0,1,0"
+ pu:TabControlHelper.HeaderPanelBorderBrush="{DynamicResource CommonBoarder}"
+ pu:TabControlHelper.ItemsRibbonLineBrush="Transparent"
+ pu:TabControlHelper.ItemsSelectedRibbonLineBrush="{DynamicResource PrimaryColorContract}"
+ pu:TabControlHelper.ItemsRibbonLineMargin="0,5,10,5"
+ pu:TabControlHelper.ItemsRibbonLineThickness="3"
+ Cursor="Hand"
+ pu:TabControlHelper.ItemsPadding="60,0"
+ TabStripPlacement="Left"
+ BorderBrush="{DynamicResource CommonBoarder}"
ItemsSource="{Binding TabItems}">
-
- <TabControl.Resources>
- <Style TargetType="TabControl" BasedOn="{StaticResource {x:Static pu:StyleKeys.TabControlStyle}}">
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="TabControl">
- <Border BorderBrush="Black" BorderThickness="1">
- <ContentPresenter/>
- </Border>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- </Style>
- </TabControl.Resources>
-
</TabControl>
+ <StackPanel Grid.Row="2" Style="{StaticResource ButtonGroup}">
+ <Button Style="{StaticResource ResetBtn}" x:Name="resetBtn" Click="Button_Click"/>
+ <Button Style="{StaticResource SaveBtn}" x:Name="saveBtn" Click="Button_Click"/>
+ </StackPanel>
</Grid>
</Border>
</Grid>
--
Gitblit v1.9.1