From c401a2f2fd1a509cdeb33e850bb5c2827074af48 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 17 三月 2025 08:44:51 +0800
Subject: [PATCH] 完善框架，新增两个close方法；

---
 WPFProject/MainWindow.xaml |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/WPFProject/MainWindow.xaml b/WPFProject/MainWindow.xaml
index 1db740a..e4a2783 100644
--- a/WPFProject/MainWindow.xaml
+++ b/WPFProject/MainWindow.xaml
@@ -17,8 +17,8 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/WPFProject;component/Style/colors.xaml"/>
-                <ResourceDictionary Source="/WPFProject;component/Style/WindowResources.xaml"/>
+                <ResourceDictionary Source="/HMI.UI;component/Style/colors.xaml"/>
+                <ResourceDictionary Source="/HMI.UI;component/Style/WindowResources.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
@@ -39,17 +39,21 @@
             <StackPanel Grid.Column="0"></StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
                 <Button Style="{StaticResource WindowButton}" x:Name="openCloseButton"  Click="Button_Click_2">&#xe60e;</Button>
-                <Button Style="{StaticResource WindowButton}" Click="Button_Click">&#xe650;</Button>
-                <Button Style="{StaticResource WindowButton}" Click="Button_Click">&#xe602;</Button>
-                <Button Style="{StaticResource WindowCloseButton}" Click="Button_Click_1">&#xe609;</Button>
+                <Button Style="{StaticResource WindowButton}" Click="Min_Click">&#xe650;</Button>
+                <Button Style="{StaticResource WindowButton}" Click="Max_Click">&#xe602;</Button>
+                <Button Style="{StaticResource WindowCloseButton}" Click="Close_Click">&#xe609;</Button>
             </StackPanel>
         </Grid>
 
-        <ctl:MenuTabControl Grid.Row="1" x:Name="mainControl" OnTabChange="mainControl_OnTabChange">
+        <ctl:MainTabControl Grid.Row="1" x:Name="menuTab" OnTabChange="menuTab_OnTabChange">
 
-        </ctl:MenuTabControl>
+        </ctl:MainTabControl>
+
+        <!--<ctl:MenuTabControl Grid.Row="1" x:Name="menuTab" OnTabChange="menuTab_OnTabChange">
+
+        </ctl:MenuTabControl>-->
 
 
-        <StatusBar Grid.Row="2" Background="{StaticResource MainStatusBar}">99999</StatusBar>
+        <StatusBar Grid.Row="2" Background="{StaticResource PrimaryColor}">99999</StatusBar>
     </Grid>
 </Window>

--
Gitblit v1.9.1