返回提交历史

XFEstudio/MyFirstRespo

添加新元素至下载页面 为项目分类 添加XFEToolBox的安装器

7d1e864
X
XFEstudio <mail@xfegzs.com>
提交于
父提交 d147e96

代码差异

10 个文件 +146 -4
Modified XFEToolBox.sln +16 -0
@@ -12,6 +12,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XFEToolBox.Test", "XFEToolB
12 12 EndProject
13 13 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XFEToolBox.Core", "XFEToolBox.Core\XFEToolBox.Core.csproj", "{AA68EC1E-93C8-4D18-8372-64F3D91A66F1}"
14 14 EndProject
15 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{6B2C3055-23D6-4804-928F-F2F0EBE5E6AA}"
16 EndProject
17 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{79A854E4-C4AC-43B3-BBC7-0581CCDB1A1F}"
18 EndProject
19 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XFEToolBoxInstaller", "XFEToolBoxInstaller\XFEToolBoxInstaller.csproj", "{F6F4DC45-737B-47FD-84C5-072C50C64A8E}"
20 EndProject
15 21 Global
16 22 GlobalSection(SolutionConfigurationPlatforms) = preSolution
17 23 Debug|Any CPU = Debug|Any CPU
@@ -30,10 +36,20 @@ Global
30 36 {AA68EC1E-93C8-4D18-8372-64F3D91A66F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
31 37 {AA68EC1E-93C8-4D18-8372-64F3D91A66F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
32 38 {AA68EC1E-93C8-4D18-8372-64F3D91A66F1}.Release|Any CPU.Build.0 = Release|Any CPU
39 {F6F4DC45-737B-47FD-84C5-072C50C64A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40 {F6F4DC45-737B-47FD-84C5-072C50C64A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
41 {F6F4DC45-737B-47FD-84C5-072C50C64A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
42 {F6F4DC45-737B-47FD-84C5-072C50C64A8E}.Release|Any CPU.Build.0 = Release|Any CPU
33 43 EndGlobalSection
34 44 GlobalSection(SolutionProperties) = preSolution
35 45 HideSolutionNode = FALSE
36 46 EndGlobalSection
47 GlobalSection(NestedProjects) = preSolution
48 {7A065B44-8D37-4415-A97F-9F7C8F8E9567} = {6B2C3055-23D6-4804-928F-F2F0EBE5E6AA}
49 {9AEA29D2-6EC5-4CE2-BCC0-850160D81DBF} = {6B2C3055-23D6-4804-928F-F2F0EBE5E6AA}
50 {AA68EC1E-93C8-4D18-8372-64F3D91A66F1} = {6B2C3055-23D6-4804-928F-F2F0EBE5E6AA}
51 {F6F4DC45-737B-47FD-84C5-072C50C64A8E} = {79A854E4-C4AC-43B3-BBC7-0581CCDB1A1F}
52 EndGlobalSection
37 53 GlobalSection(ExtensibilityGlobals) = postSolution
38 54 SolutionGuid = {9EEA9668-487B-420D-A957-97140D8FBCF8}
39 55 EndGlobalSection
Added XFEToolBox/ViewModel/Pages/DownloadInfoPageViewModel.cs +12 -0
@@ -0,0 +1,12 @@
1 using CommunityToolkit.Mvvm.ComponentModel;
2 using XFEToolBox.Views.Pages;
3
4 namespace XFEToolBox.ViewModel.Pages;
5
6 public partial class DownloadInfoPageViewModel(DownloadInfoPage viewPage) : ObservableObject
7 {
8 [ObservableProperty]
9 string appTitle = "";
10 public DownloadInfoPage ViewPage { get; set; } = viewPage;
11
12 }
Modified XFEToolBox/ViewModel/Pages/DownloadPageViewModel.cs +1 -1
@@ -16,7 +16,7 @@ public partial class DownloadPageViewModel(DownloadPage viewPage) : ObservableOb
16 16 [RelayCommand]
17 17 void GotoDownloadPage(MiniToolButton miniToolButton)
18 18 {
19 if (!DownloadProfile.DownloadAgreementAccepted)
19 if (DownloadProfile.DownloadAgreementAccepted)
20 20 {
21 21 var result = PopupHelper.ShowDialog(new AgreementDialogPopupPage()
22 22 {
Modified XFEToolBox/Views/Pages/DownloadInfoPage.xaml +37 -3
@@ -3,12 +3,46 @@
3 3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4 4 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5 5 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6 xmlns:viewmodel="clr-namespace:XFEToolBox.ViewModel.Pages"
7 xmlns:ctr="clr-namespace:XFEToolBox.Views.Controls"
6 8 xmlns:local="clr-namespace:XFEToolBox.Views.Pages"
7 9 mc:Ignorable="d"
10 d:DataContext="{d:DesignInstance Type=viewmodel:DownloadInfoPageViewModel}"
8 11 d:DesignHeight="450" d:DesignWidth="800"
9 Title="DownloadInfoPage">
10
12 Title="DownloadInfoPage" Background="#1e1e1e">
11 13 <Grid>
12
14 <Image Source="/Resources/Image/DownloadImage/steam_logo.png">
15 <Image.Effect>
16 <BlurEffect Radius="100" KernelType="Gaussian"/>
17 </Image.Effect>
18 </Image>
19 <Grid>
20 <Grid.ColumnDefinitions>
21 <ColumnDefinition Width="*"/>
22 </Grid.ColumnDefinitions>
23 <Grid.RowDefinitions>
24 <RowDefinition Height="Auto"/>
25 <RowDefinition Height="*"/>
26 </Grid.RowDefinitions>
27 <Grid Margin="20,10,0,0">
28 <Grid.ColumnDefinitions>
29 <ColumnDefinition Width="50"/>
30 <ColumnDefinition Width="*"/>
31 </Grid.ColumnDefinitions>
32 <Image Source="/Resources/Image/DownloadImage/steam_logo.png"/>
33 <TextBlock Grid.Column="1" Text="{Binding AppTitle,StringFormat='软件名称：{0}'}" Foreground="White" FontSize="20" FontWeight="Bold" TextTrimming="CharacterEllipsis" VerticalAlignment="Center" Margin="10,0,0,0"/>
34 </Grid>
35 <Grid Grid.Row="1" Height="100" VerticalAlignment="Bottom">
36 <Grid.ColumnDefinitions>
37 <ColumnDefinition Width="*"/>
38 <ColumnDefinition Width="3*"/>
39 <ColumnDefinition Width="*"/>
40 </Grid.ColumnDefinitions>
41 <Border Grid.ColumnSpan="3" CornerRadius="15,15,0,0" Background="White" Opacity="0.8"/>
42 <ctr:RoundButton Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch">
43 <TextBlock Text="下载" Foreground="{DynamicResource MainColor}" FontSize="25" Margin="0,10" VerticalAlignment="Center" HorizontalAlignment="Center"/>
44 </ctr:RoundButton>
45 </Grid>
46 </Grid>
13 47 </Grid>
14 48 </Page>
Added XFEToolBoxInstaller/App.xaml +9 -0
@@ -0,0 +1,9 @@
1 <Application x:Class="XFEToolBoxInstaller.App"
2 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4 xmlns:local="clr-namespace:XFEToolBoxInstaller"
5 StartupUri="MainWindow.xaml">
6 <Application.Resources>
7
8 </Application.Resources>
9 </Application>
Added XFEToolBoxInstaller/App.xaml.cs +14 -0
@@ -0,0 +1,14 @@
1 using System.Configuration;
2 using System.Data;
3 using System.Windows;
4
5 namespace XFEToolBoxInstaller
6 {
7 /// <summary>
8 /// Interaction logic for App.xaml
9 /// </summary>
10 public partial class App : Application
11 {
12 }
13
14 }
Added XFEToolBoxInstaller/AssemblyInfo.cs +10 -0
@@ -0,0 +1,10 @@
1 using System.Windows;
2
3 [assembly: ThemeInfo(
4 ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
5 //(used if a resource is not found in the page,
6 // or application resource dictionaries)
7 ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
8 //(used if a resource is not found in the page,
9 // app, or any theme specific resource dictionaries)
10 )]
Added XFEToolBoxInstaller/MainWindow.xaml +12 -0
@@ -0,0 +1,12 @@
1 <Window x:Class="XFEToolBoxInstaller.MainWindow"
2 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6 xmlns:local="clr-namespace:XFEToolBoxInstaller"
7 mc:Ignorable="d"
8 Title="MainWindow" Height="450" Width="800">
9 <Grid>
10
11 </Grid>
12 </Window>
Added XFEToolBoxInstaller/MainWindow.xaml.cs +24 -0
@@ -0,0 +1,24 @@
1 using System.Text;
2 using System.Windows;
3 using System.Windows.Controls;
4 using System.Windows.Data;
5 using System.Windows.Documents;
6 using System.Windows.Input;
7 using System.Windows.Media;
8 using System.Windows.Media.Imaging;
9 using System.Windows.Navigation;
10 using System.Windows.Shapes;
11
12 namespace XFEToolBoxInstaller
13 {
14 /// <summary>
15 /// Interaction logic for MainWindow.xaml
16 /// </summary>
17 public partial class MainWindow : Window
18 {
19 public MainWindow()
20 {
21 InitializeComponent();
22 }
23 }
24 }
Added XFEToolBoxInstaller/XFEToolBoxInstaller.csproj +11 -0
@@ -0,0 +1,11 @@
1 <Project Sdk="Microsoft.NET.Sdk">
2
3 <PropertyGroup>
4 <OutputType>WinExe</OutputType>
5 <TargetFramework>net9.0-windows</TargetFramework>
6 <Nullable>enable</Nullable>
7 <ImplicitUsings>enable</ImplicitUsings>
8 <UseWPF>true</UseWPF>
9 </PropertyGroup>
10
11 </Project>