From 7bf89fd93bc487e8445d6d85bb527251b7371a04 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 12 五月 2025 13:14:11 +0800
Subject: [PATCH] 优化项目；
---
WPFProject/LoadingWindow.xaml | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 9 deletions(-)
diff --git a/WPFProject/LoadingWindow.xaml b/WPFProject/LoadingWindow.xaml
index a9c532f..edb3d37 100644
--- a/WPFProject/LoadingWindow.xaml
+++ b/WPFProject/LoadingWindow.xaml
@@ -1,20 +1,124 @@
-锘�<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"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.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">
+ <Window.Resources>
+ <!--<Style x:Key="CarouselStyle"
+ TargetType="pu:Carousel">
+ <Setter Property="Animation"
+ Value="Flow,Fade" />
+ <Setter Property="AnimationEasing"
+ Value="CubicOut" />
+ <Setter Property="IndicatorVisibility"
+ Value="Visible" />
+ <Setter Property="IndicatorPaginationStyle">
+ <Setter.Value>
+ <Style TargetType="pu:Pagination"
+ BasedOn="{StaticResource {x:Static pu:Carousel.IndicatorPaginationStyleKey}}">
+ <Setter Property="ItemsWidth"
+ Value="NaN" />
+ <Setter Property="ItemsHeight"
+ Value="NaN" />
+ <Setter Property="ItemsBackground"
+ Value="Transparent" />
+ <Setter Property="ItemsForeground"
+ Value="#55000000" />
+ <Setter Property="ItemsSelectedBackground"
+ Value="{x:Null}" />
+ <Setter Property="ItemsSelectedForeground"
+ Value="#C62F2F" />
+ <Setter Property="ItemContainerStyle">
+ <Setter.Value>
+ <Style TargetType="pu:PaginationItem">
+ <Setter Property="Cursor"
+ Value="Hand" />
+ <Setter Property="ContentTemplate">
+ <Setter.Value>
+ <DataTemplate>
+ <TextBlock Text=""
+ FontFamily="{StaticResource PanuonIconFont}"
+ FontSize="16" />
+ </DataTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ </Setter.Value>
+ </Setter>
+ </Style>-->
+ </Window.Resources>
+
+ <Grid Margin="10">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
<Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
<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}"/>-->
+ <Image Height="25"
+ Stretch="Uniform"
+ HorizontalAlignment="Left"
+ Source="/Resources/JingCeLogo.png"
+ Margin="0,0,0,10"
+ RenderOptions.BitmapScalingMode="HighQuality" />
+
+ <!--<pu:Carousel
+ AutoPlayDuration="0:0:2"
+ Height="300"
+ TextBlock.FontSize="40"
+ TextBlock.TextAlignment="Center">
+ <Border Background="#FAFAFA">
+ <TextBlock Text="Page 1"
+ VerticalAlignment="Center" />
+ </Border>
+ <Border Background="#FAFAFA">
+ <TextBlock Text="Page 2"
+ VerticalAlignment="Center" />
+ </Border>
+ <Border Background="#FAFAFA">
+ <TextBlock Text="Page 3"
+ VerticalAlignment="Center" />
+ </Border>
+ <Border Background="#FAFAFA">
+ <TextBlock Text="Page 4"
+ VerticalAlignment="Center" />
+ </Border>
+ <Border Background="#FAFAFA">
+ <TextBlock Text="Page 5"
+ VerticalAlignment="Center" />
+ </Border>
+ </pu:Carousel>-->
+
+ <ProgressBar Grid.Row="1" x:Name="processBar" Minimum="0" Maximum="100" Height="20" Margin="0,0,0,10"
+ Visibility="Visible"/>
+
+ <RichTextBox Grid.Row="2" x:Name="Console" IsReadOnly="True" Padding="0" VerticalScrollBarVisibility="Auto"
+ VerticalContentAlignment="Top"
+ Margin="0,0,0,10"
+ Visibility="Visible"
+ HorizontalContentAlignment="Left"/>
+ <Button Grid.Row="3" Style="{StaticResource PrimaryButton}"
+ x:Name="BtnNext" Visibility="Collapsed"
+ Content="{DynamicResource App.Continue}" Click="Button_Click"/>
</Grid>
-</Window>
+</pu:WindowX>
--
Gitblit v1.9.1