Skip to content

update in nuget #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JusterZhu merged 1 commit into from
Dec 19, 2024
Merged

update in nuget #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion UI/WPFDevelopers/Upgrade/Upgrade.WPF/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Windows;
using Upgrade.WPF.Views;
using WPFDevelopers.Helpers;
using MessageBox = WPFDevelopers.Controls.MessageBox;

namespace Upgrade.WPF
Expand All @@ -17,7 +18,7 @@ public MainWindow()

private void BtnUpgrade1_Click(object sender, System.Windows.RoutedEventArgs e)
{
new UpgradeWindow().ShowDialog();
new UpgradeWindow().MaskShowDialog();
}
private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
Expand Down
2 changes: 1 addition & 1 deletion UI/WPFDevelopers/Upgrade/Upgrade.WPF/Upgrade.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Content Include="WPFDevelopers.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WPFDevelopers" Version="0.0.0.1" />
<PackageReference Include="WPFDevelopers" Version="1.1.0.3-preview" />
</ItemGroup>
<ItemGroup>
<Resource Include="GeneralUpdate.png" />
Expand Down
87 changes: 24 additions & 63 deletions UI/WPFDevelopers/Upgrade/Upgrade.WPF/Views/UpgradeWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,81 +12,42 @@
BorderBrush="Transparent"
BorderThickness="0"
Icon="/GeneralUpdate.png"
NoChrome="True"
ResizeMode="NoResize"
TitleBackground="{DynamicResource WD.BackgroundSolidColorBrush}"
TitleHeight="30"
WindowStartupLocation="CenterScreen"
WindowStyle="ToolWindow"
mc:Ignorable="d">
<wd:Window.TitleBar>
<Grid Height="40" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" MinWidth="30" />
</Grid.ColumnDefinitions>
<Image
Width="20"
Height="20"
Margin="4,0"
Source="/GeneralUpdate.png" />
<TextBlock
Grid.Column="1"
VerticalAlignment="Center"
FontSize="14"
Foreground="{StaticResource WD.SecondaryTextSolidColorBrush}"
IsHitTestVisible="False"
Text="General Update 01 客户端升级" />
<Button
x:Name="CloseButton"
Grid.Column="2"
Width="30"
Height="30"
HorizontalAlignment="Right"
Click="CloseButton_Click"
Style="{StaticResource WD.WindowButtonStyle}"
ToolTip="关闭">
<wd:PathIcon
Width="10"
Height="10"
Kind="WindowClose" />
</Button>
</Grid>
</wd:Window.TitleBar>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="20" />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Border
Grid.Row="1"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<wd:SmallPanel>
<!--<Image
x:Name="PART_Image"
Width="100"
Height="100"
Source="/GeneralUpdate.png"
Stretch="Uniform" />-->
<wd:BreathLamp
Width="140"
Height="140"
GradientStopColor1="#FF00cec9"
GradientStopColor2="#2000cec9"
IsLampStart="True"
LampEffect="Streamer">
<Ellipse Width="100" Height="100">
<Ellipse.Fill>
<ImageBrush ImageSource="pack://application:,,,/GeneralUpdate.png" />
</Ellipse.Fill>
</Ellipse>
</wd:BreathLamp>
<wd:CircularProgressBar x:Name="PART_Slider" Value="{Binding ElementName=CirularSlider, Path=Value}" />
</wd:SmallPanel>
</Border>
<Grid Grid.Row="1">
<wd:BreathLamp
Width="150"
Height="150"
GradientStopColor1="#FF00cec9"
GradientStopColor2="#2000cec9"
IsLampStart="True"
LampEffect="Streamer" />
<Image
x:Name="PART_Image"
Width="110"
Height="110"
Source="/GeneralUpdate.png"
Stretch="Uniform" />
<wd:CircleProgressBar
x:Name="PART_Slider"
Width="120"
Height="120"
Padding="3,3,0,0"
BorderThickness="20"
IsRound="True"
Value="{Binding ElementName=CirularSlider, Path=Value}" />
</Grid>

<Grid
Grid.Row="2"
Margin="0,0,0,30"
Expand Down
4 changes: 0 additions & 4 deletions UI/WPFDevelopers/Upgrade/Upgrade.WPF/Views/UpgradeWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ private void UpgradeWindow_Loaded(object sender, RoutedEventArgs e)
StartDownload();
}

private void CloseButton_Click(object sender, RoutedEventArgs e)
{
Close();
}
private async void StartDownload()
{
for (double i = 0; i <= 100; i += 1)
Expand Down
Loading