From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
WPFProject/LoadingWindow.xaml | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/WPFProject/LoadingWindow.xaml b/WPFProject/LoadingWindow.xaml
index a9c532f..bd89dd2 100644
--- a/WPFProject/LoadingWindow.xaml
+++ b/WPFProject/LoadingWindow.xaml
@@ -1,20 +1,30 @@
-锘�<Window x:Class="WPFProject.LoadingWindow"
+锘�<pu:WindowX x:Class="WPFProject.LoadingWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:WPFProject"
+ xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
+ xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
mc:Ignorable="d"
- WindowStartupLocation="CenterScreen"
- WindowStyle="None"
- Loaded="Window_Loaded"
- Title="LoadingWindow" Height="450" Width="800">
- <Grid>
+ Height="420"
+ Width="600"
+ pu:WindowXCaption.Background="Transparent"
+ Background="{StaticResource VerBar}"
+ pu:WindowXCaption.Buttons="None"
+ ContentRendered="WindowX_ContentRendered"
+ WindowStartupLocation="CenterScreen"
+ Loaded="Window_Loaded">
+ <Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <TextBox x:Name="Console" IsReadOnly="True"/>
- <Button Grid.Row="1" Content="涓嬩竴姝�" Click="Button_Click"/>
+ <!--TextBox x:Name="Console" IsReadOnly="True" Text="{Binding ConsoleText}"/>-->
+ <RichTextBox x:Name="Console" IsReadOnly="True" Padding="0" VerticalScrollBarVisibility="Auto"
+ VerticalContentAlignment="Top"
+ HorizontalContentAlignment="Left"
+ />
+ <Button Grid.Row="1" Style="{StaticResource PrimaryButton}" Content="涓嬩竴姝�" Click="Button_Click"/>
</Grid>
-</Window>
+</pu:WindowX>
--
Gitblit v1.9.1