Skip to content

Commit

Permalink
Finish task and publish 2.4.502.0 version
Browse files Browse the repository at this point in the history
Finish task and publish 2.4.502.0 version
Update minimum version to 22621
  • Loading branch information
Gaoyifei1011 committed May 3, 2024
1 parent 80dd550 commit 8b89115
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 25 deletions.
4 changes: 1 addition & 3 deletions Description/README_EN-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ A toolbox that integrates multiple gadgets.

### Download and installation considerations

> * The program is built using Mile.Xaml (Xaml Islands), it is recommended that your system version is Windows 11 (codenamed 21H2 / internal version number 22000) or later, The minimum version is Windows 10 (codenamed 2004 / internal version number 19041) or later.
> * If your system is below Windows 11 (codenamed 22H2 / internal version number 22621), there are some limitations to the functionality of the application:
The system backdrop cannot be set
> * The program is built using Mile.Xaml (Xaml Islands), it is recommended that your system version is Windows 11 (codenamed 22H2 / internal version number 22621) or later, The minimum version is Windows 11 (codenamed 22H2 / internal version number 22621) or later.
> * [Release](https://github.com/Gaoyifei1011/WindowsToolbox/releases) The binary installation file for the page has been packaged into a compressed package. Unzip the package and run the install.ps1 file in Powershell admin mode (if necessary) for a quick installation.
> * Download and compile the project source code yourself. (Please read the project compilation steps below carefully)
Expand Down
4 changes: 1 addition & 3 deletions Description/README_ZH-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@

### 下载与安装注意事项

> * 该程序使用的是Mile.Xaml(Xaml Islands)构建的,建议您的系统版本为Windows 11(代号 21H2 / 内部版本号 22000)或更高版本,最低版本为Windows 10(代号2004 / 内部版本号19041)或更高版本。
> * 如果您的系统低于Windows 11(代号 22H2 / 内部版本号 22621),应用功能存在一些限制:
不支持设置背景色
> * 该程序使用的是Mile.Xaml(Xaml Islands)构建的,建议您的系统版本为Windows 11(代号 22H2 / 内部版本号 22621)或更高版本,最低版本为Windows 11(代号 22H2 / 内部版本号22621)或更高版本。
> * [Release](https://github.com/Gaoyifei1011/WindowsToolbox/releases)页面的二进制安装文件已经打包成压缩包。请解压压缩包并使用Powershell管理员模式(必要情况下)运行install.ps1文件方可实现快速安装。
> * 自行下载项目源代码并编译。(请仔细阅读下面的项目编译步骤)
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@

### 下载与安装注意事项

> * 该程序使用的是Mile.Xaml(Xaml Islands)构建的,建议您的系统版本为Windows 11(代号 21H2 / 内部版本号 22000)或更高版本,最低版本为Windows 10(代号2004 / 内部版本号19041)或更高版本。
> * 如果您的系统低于Windows 11(代号 22H2 / 内部版本号 22621),应用功能存在一些限制:
不支持设置背景色
> * 该程序使用的是Mile.Xaml(Xaml Islands)构建的,建议您的系统版本为Windows 11(代号 22H2 / 内部版本号 22621)或更高版本,最低版本为Windows 11(代号 22H2 / 内部版本号22621)或更高版本。
> * [Release](https://github.com/Gaoyifei1011/WindowsToolbox/releases)页面的二进制安装文件已经打包成压缩包。请解压压缩包并使用Powershell管理员模式(必要情况下)运行install.ps1文件方可实现快速安装。
> * 自行下载项目源代码并编译。(请仔细阅读下面的项目编译步骤)
Expand Down
6 changes: 3 additions & 3 deletions WindowsTools/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("Windows 工具箱")]
[assembly: AssemblyFileVersion("2.4.502.0")]
[assembly: AssemblyInformationalVersion("2.4.502.0")]
[assembly: AssemblyFileVersion("2.4.503.0")]
[assembly: AssemblyInformationalVersion("2.4.503.0")]
[assembly: AssemblyProduct("Windows 工具箱")]
[assembly: AssemblyTitle("Windows 工具箱")]
[assembly: AssemblyVersion("2.4.502.0")]
[assembly: AssemblyVersion("2.4.503.0")]

// 设置程序集对 COM 组件的访问权限
[assembly: ComVisible(false)]
Expand Down
3 changes: 2 additions & 1 deletion WindowsTools/Views/Pages/AddDownloadTaskPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:string="using:WindowsTools.Strings"
ActualThemeChanged="{x:Bind OnActualThemeChanged}"
mc:Ignorable="d">

<Page.Resources>
Expand All @@ -28,7 +29,7 @@
<Grid
Grid.Row="0"
Padding="{ThemeResource ContentDialogPadding}"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
Background="{x:Bind DialogBackground, Mode=OneWay}"
BorderBrush="{ThemeResource ContentDialogSeparatorBorderBrush}"
BorderThickness="{ThemeResource ContentDialogSeparatorThickness}">
<Grid.RowDefinitions>
Expand Down
39 changes: 39 additions & 0 deletions WindowsTools/Views/Pages/AddDownloadTaskPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
using System.Threading.Tasks;
using System.Web;
using System.Windows.Forms;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using WindowsTools.Helpers.Controls;
using WindowsTools.Services.Controls.Pages;
using WindowsTools.Services.Controls.Settings;
Expand Down Expand Up @@ -86,6 +88,22 @@ public string DownloadFolderText
}
}

private SolidColorBrush _dialogBackground;

public SolidColorBrush DialogBackground
{
get { return _dialogBackground; }

set
{
if (!Equals(_dialogBackground, value))
{
_dialogBackground = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DialogBackground)));
}
}
}

public event PropertyChangedEventHandler PropertyChanged;

public AddDownloadTaskPage()
Expand All @@ -94,6 +112,15 @@ public AddDownloadTaskPage()
DownloadFolderText = DownloadService.DownloadFolder;
RequestedTheme = (ElementTheme)Enum.Parse(typeof(ElementTheme), ThemeService.AppTheme.Value.ToString());
IsPrimaryButtonEnabled = !string.IsNullOrEmpty(DownloadLinkText) && !string.IsNullOrEmpty(DownloadFolderText);
SetBackground(ActualTheme);
}

/// <summary>
/// 应用主题发生变化时修改对话框的背景色
/// </summary>
private void OnActualThemeChanged(FrameworkElement sender, object args)
{
SetBackground(ActualTheme);
}

/// <summary>
Expand Down Expand Up @@ -201,5 +228,17 @@ private void OnCloseClicked(object sender, RoutedEventArgs args)
{
AddDownloadTaskWindow.Current?.Close();
}

private void SetBackground(ElementTheme elementTheme)
{
if (elementTheme is ElementTheme.Light)
{
DialogBackground = new SolidColorBrush(Color.FromArgb(255, 255, 255, 255));
}
else if (elementTheme is ElementTheme.Dark)
{
DialogBackground = new SolidColorBrush(Color.FromArgb(255, 43, 43, 43));
}
}
}
}
2 changes: 1 addition & 1 deletion WindowsTools/WindowsTools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<RuntimeIdentifiers>win7-x86;win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<StartupObject>WindowsTools.Program</StartupObject>
<TargetFramework>net481</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.22621.0</TargetPlatformMinVersion>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
Expand Down
4 changes: 1 addition & 3 deletions WindowsTools/app.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<maxversiontested Id="10.0.19041.0" />
<maxversiontested Id="10.0.20348.0" />
<maxversiontested Id="10.0.22000.0" />
<maxversiontested Id="10.0.22621.0" />
<maxversiontested Id="10.0.26100.0" />

<!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
Windows 版本的列表。取消评论适当的元素,
Expand Down
6 changes: 3 additions & 3 deletions WindowsToolsPackage/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Identity
Name="Gaoyifei1011.WindowsTools"
Publisher="CN=高怡飞"
Version="2.4.502.0" />
Version="2.4.503.0" />

<Properties>
<DisplayName>ms-resource:PackageDisplayName</DisplayName>
Expand All @@ -21,8 +21,8 @@
</Properties>

<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.22621.0" MaxVersionTested="10.0.26100.0" />
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.22621.0" MaxVersionTested="10.0.26100.0" />
</Dependencies>

<Resources>
Expand Down
2 changes: 1 addition & 1 deletion WindowsToolsPackage/WindowsToolsPackage.wapproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<ProjectGuid>{5AC5F60D-FD5E-4630-B7F2-951A41BE392A}</ProjectGuid>
<TargetFrameworkMoniker>.NETFramework,Version=v4.8.1</TargetFrameworkMoniker>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.22621.0</TargetPlatformMinVersion>
<PackageCertificateKeyFile>WindowsToolsPackage_SignKey.pfx</PackageCertificateKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
Expand Down
6 changes: 3 additions & 3 deletions WindowsToolsShellExtension/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyCompany("高怡飞")]
[assembly: AssemblyCopyright("Copyright ©2024 高怡飞, All Rights Reserved.")]
[assembly: AssemblyDescription("Windows 工具箱 右键菜单扩展")]
[assembly: AssemblyFileVersion("2.4.502.0")]
[assembly: AssemblyInformationalVersion("2.4.502.0")]
[assembly: AssemblyFileVersion("2.4.503.0")]
[assembly: AssemblyInformationalVersion("2.4.503.0")]
[assembly: AssemblyProduct("Windows 工具箱 右键菜单扩展")]
[assembly: AssemblyTitle("Windows 工具箱 右键菜单扩展")]
[assembly: AssemblyVersion("2.4.502.0")]
[assembly: AssemblyVersion("2.4.503.0")]

// 设置程序集对 COM 组件的访问权限
[assembly: ComVisible(false)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PublishTrimmed>True</PublishTrimmed>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.22621.0</TargetPlatformMinVersion>
<TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
</PropertyGroup>

Expand Down

0 comments on commit 8b89115

Please sign in to comment.