WindyMadman/Pixeval
1
0
Fork 0
mirror of https://github.com/Pixeval/Pixeval.git synced 2025-04-03 23:11:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加翻译功能 (#635)

Browse Source 
* 添加翻译功能

* 清理测试代码

* 在翻译时禁用按钮

* update

---------

Co-authored-by: Poker <poker_sang@outlook.com>
This commit is contained in:
Betta_Fish 2025-02-01 17:55:26 +08:00 committed by GitHub
parent 01317ea2d5
commit 89e07113fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 177 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Packages.props
View File

@ -43,7 +43,7 @@
<PackageVersion Include="LiteDB" Version="5.0.21" />
<PackageVersion Include="MinVer" Version="6.0.0" />
<PackageVersion Include="PininSharp" Version="1.2.0" />
<PackageVersion Include="Pixeval.Extensions.Common" Version="4.3.4" />
<PackageVersion Include="Pixeval.Extensions.Common" Version="4.3.4.1" />
<PackageVersion Include="Pixeval.QRCoder" Version="1.4.5" />
<PackageVersion Include="QuestPDF" Version="2024.12.3" />
<PackageVersion Include="ReverseMarkdown" Version="4.6.0" />

4
nuget.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear></clear>
@ -6,4 +6,4 @@
<add key="CommunityToolkit-Labs" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
<!--<add key="Pixeval.Extensions" value="C:\WorkSpace\Pixeval.Extensions\src\output" />-->
</packageSources>
</configuration>
</configuration>

2
src/Pixeval.Controls/C.cs
View File

@ -12,6 +12,7 @@ using Microsoft.UI.Xaml.Media;
using WinUI3Utilities;
using Windows.UI.Text;
using Microsoft.UI.Text;
using Pixeval.Utilities;
namespace Pixeval.Controls;
@ -47,6 +48,7 @@ public static class C
public static Visibility IsNotZeroToVisibility(int value) => value is not 0 ? Visibility.Visible : Visibility.Collapsed;
public static Visibility IsNotZeroDToVisibility(double value) => value is not 0 ? Visibility.Visible : Visibility.Collapsed;
public static Visibility IsNullOrEmptyToVisibility(string? value) => value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
public static unsafe Color ToAlphaColor(uint color)
{

11
src/Pixeval/Controls/Comment/CommentItem.xaml
View File

@ -28,11 +28,12 @@
<controls:Case.Value>
<x:Boolean>False</x:Boolean>
</controls:Case.Value>
<RichTextBlock
x:Name="CommentContent"
FontSize="{StaticResource CaptionTextBlockFontSize}"
LineHeight="14.4"
TextWrapping="Wrap" />
<StackPanel>
<local:TranslatableTextBlock
TransformerType="Comment"
x:Name="CommentContent"/>
</StackPanel>
</controls:Case>
</controls:SwitchPresenter>
<CommandBar

4
src/Pixeval/Controls/Comment/CommentItem.xaml.cs
View File

@ -36,8 +36,8 @@ public sealed partial class CommentItem
}
else
{
block.CommentContent.Blocks.Clear();
block.CommentContent.Blocks.Add(await viewModel.GetReplyContentParagraphAsync());
block.CommentContent.RawText.Blocks.Clear();
block.CommentContent.RawText.Blocks.Add(await viewModel.GetReplyContentParagraphAsync());
}
}

28
src/Pixeval/Controls/TranslatableTextBlock.xaml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>
<UserControl
x:Class="Pixeval.Controls.TranslatableTextBlock"
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:local="using:Pixeval.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<StackPanel Spacing="4">
<RichTextBlock
x:Name="RawText"
x:FieldModifier="public"
TextWrapping="Wrap" />
<TextBlock
x:Name="TranslatedText"
IsTextSelectionEnabled="True"
TextWrapping="Wrap"
Visibility="{x:Bind local:C.IsNullOrEmptyToVisibility(TranslatedText.Text), Mode=OneWay}" />
<HyperlinkButton
x:Name="TranslateButton"
Background="Transparent"
BorderBrush="Transparent"
Click="GetTranslationClicked"
Content="翻译" />
</StackPanel>
</UserControl>

35
src/Pixeval/Controls/TranslatableTextBlock.xaml.cs Normal file
View File

@ -0,0 +1,35 @@
// Copyright (c) Pixeval.
// Licensed under the GPL v3 License.
using System.Linq;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.Extensions.DependencyInjection;
using Pixeval.Extensions;
using Pixeval.Extensions.Common.Commands.Transformers;
using WinUI3Utilities.Attributes;
using Microsoft.UI.Xaml.Documents;
namespace Pixeval.Controls;
[DependencyProperty<TextTransformerType>("TransformerType", defaultValueType: DependencyPropertyDefaultValue.New)]
public sealed partial class TranslatableTextBlock : UserControl
{
public TranslatableTextBlock() => InitializeComponent();
private async void GetTranslationClicked(object sender, RoutedEventArgs e)
{
var extensionService = App.AppViewModel.AppServiceProvider.GetRequiredService<ExtensionService>();
if (extensionService.ActiveExtensions.FirstOrDefault(p => p is ITextTransformerCommandExtension) is not ITextTransformerCommandExtension translator)
return;
var text = "";
foreach (var block in RawText.Blocks)
if (block is Paragraph p)
foreach (var i in p.Inlines)
if (i is Run r)
text += r.Text;
if (text == "")
return;
var result = await translator.TransformAsync(text, TransformerType);
TranslatedText.Text = result;
}
}

202
src/Pixeval/Pixeval.csproj
View File

@ -22,111 +22,111 @@
<MinVerTagPrefix>v</MinVerTagPrefix>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TitleBar" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TokenView" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" />
<PackageReference Include="CommunityToolkit.WinUI.Collections" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.ColorPicker" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" />
<PackageReference Include="CommunityToolkit.WinUI.Converters" />
<PackageReference Include="CommunityToolkit.WinUI.Media" />
<PackageReference Include="CommunityToolkit.Diagnostics" />
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="FluentIcons.WinUI" />
<PackageReference Include="JsonPoke" />
<PackageReference Include="LiteDB" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
<PackageReference Include="Microsoft.Windows.CsWin32">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MinVer">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PininSharp" />
<PackageReference Include="Pixeval.Extensions.Common" />
<!--<PackageReference Include="Pixeval.Bypass" />-->
<PackageReference Include="Pixeval.QRCoder" />
<PackageReference Include="QuestPDF" />
<PackageReference Include="ReverseMarkdown" />
<PackageReference Include="SixLabors.ImageSharp" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="WinUI3Utilities" />
<ProjectReference Include="..\Pixeval.Caching\Pixeval.Caching.csproj" />
<ProjectReference Include="..\Pixeval.Controls\Pixeval.Controls.csproj" />
<ProjectReference Include="..\Pixeval.CoreApi\Pixeval.CoreApi.csproj" />
<ProjectReference Include="..\Pixeval.Utilities\Pixeval.Utilities.csproj" />
<ProjectReference Include="..\Pixeval.SourceGen\Pixeval.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="False" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TitleBar" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.TokenView" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" />
<PackageReference Include="CommunityToolkit.WinUI.Collections" />
<PackageReference Include="CommunityToolkit.WinUI.Animations" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.ColorPicker" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" />
<PackageReference Include="CommunityToolkit.WinUI.Converters" />
<PackageReference Include="CommunityToolkit.WinUI.Media" />
<PackageReference Include="CommunityToolkit.Diagnostics" />
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="FluentIcons.WinUI" />
<PackageReference Include="JsonPoke" />
<PackageReference Include="LiteDB" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
<PackageReference Include="Microsoft.Windows.CsWin32">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MinVer">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PininSharp" />
<PackageReference Include="Pixeval.Extensions.Common" />
<!--<PackageReference Include="Pixeval.Bypass" />-->
<PackageReference Include="Pixeval.QRCoder" />
<PackageReference Include="QuestPDF" />
<PackageReference Include="ReverseMarkdown" />
<PackageReference Include="SixLabors.ImageSharp" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="WinUI3Utilities" />
<ProjectReference Include="..\Pixeval.Caching\Pixeval.Caching.csproj" />
<ProjectReference Include="..\Pixeval.Controls\Pixeval.Controls.csproj" />
<ProjectReference Include="..\Pixeval.CoreApi\Pixeval.CoreApi.csproj" />
<ProjectReference Include="..\Pixeval.Utilities\Pixeval.Utilities.csproj" />
<ProjectReference Include="..\Pixeval.SourceGen\Pixeval.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="False" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
<!--Exposes PRI resources-->
<Target Name="InjectAdditionalFiles" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" Condition="'$(DesignTimeBuild)' != 'true'">
<RemoveDir Directories="Generated" />
<ItemGroup>
<TextFiles Include="%(TextFile.OutputTarget)">
<Key>$([System.String]::Copy('%(TextFile.Key)').Replace('_', '/'))</Key>
<Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
</TextFiles>
</ItemGroup>
<WriteLinesToFile Condition="%(TextFiles.Identity) != ''" File="%(TextFiles.Identity)" Overwrite="true" Lines="{}" />
<JsonPoke Condition="%(TextFiles.Identity) != ''" ContentPath="%(TextFiles.Identity)" Query="$['%(TextFiles.Key)']" Value="%(TextFiles.Content)"></JsonPoke>
<ItemGroup>
<PRIResource Include="@(TextFiles)" />
<AdditionalFiles Include="@(PRIResource)" SourceItemGroup="PRIResource" />
</ItemGroup>
</Target>
<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemGroup" />
<!--Exposes PRI resources-->
<Target Name="InjectAdditionalFiles" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" Condition="'$(DesignTimeBuild)' != 'true'">
<RemoveDir Directories="Generated" />
<ItemGroup>
<TextFiles Include="%(TextFile.OutputTarget)">
<Key>$([System.String]::Copy('%(TextFile.Key)').Replace('_', '/'))</Key>
<Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
</TextFiles>
</ItemGroup>
<WriteLinesToFile Condition="%(TextFiles.Identity) != ''" File="%(TextFiles.Identity)" Overwrite="true" Lines="{}" />
<JsonPoke Condition="%(TextFiles.Identity) != ''" ContentPath="%(TextFiles.Identity)" Query="$['%(TextFiles.Key)']" Value="%(TextFiles.Content)"></JsonPoke>
<ItemGroup>
<PRIResource Include="@(TextFiles)" />
<AdditionalFiles Include="@(PRIResource)" SourceItemGroup="PRIResource" />
</ItemGroup>
</Target>
<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemGroup" />
<TextFile Include="Strings\*\*.md">
<OutputTarget>Generated\%(RecursiveDir)TextGenerated.resjson</OutputTarget>
<Key>%(Filename)</Key>
</TextFile>
<TextFile Include="Strings\*\*.txt">
<OutputTarget>Generated\%(RecursiveDir)TextGenerated.resjson</OutputTarget>
<Key>%(Filename)</Key>
</TextFile>
<TextFile Include="Strings\*\*.md">
<OutputTarget>Generated\%(RecursiveDir)TextGenerated.resjson</OutputTarget>
<Key>%(Filename)</Key>
</TextFile>
<TextFile Include="Strings\*\*.txt">
<OutputTarget>Generated\%(RecursiveDir)TextGenerated.resjson</OutputTarget>
<Key>%(Filename)</Key>
</TextFile>
<PRIResource Include="Assets\Svg.resw" />
<PRIResource Include="Strings\*\*.resjson" />
<PRIResource Include="Strings\*\*.resw" />
</ItemGroup>
<PRIResource Include="Assets\Svg.resw" />
<PRIResource Include="Strings\*\*.resjson" />
<PRIResource Include="Strings\*\*.resw" />
</ItemGroup>
<!--PackageManifest-->
<PropertyGroup>
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundle>Always</AppxBundle>
<AppInstallerUri>%UserProfile%\Desktop</AppInstallerUri>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
</PropertyGroup>
<!--PackageManifest-->
<PropertyGroup>
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundle>Always</AppxBundle>
<AppInstallerUri>%UserProfile%\Desktop</AppInstallerUri>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
</PropertyGroup>
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<ProjectCapability Include="Msix" />
</ItemGroup>
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<ProjectCapability Include="Msix" />
</ItemGroup>
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
</Project>