Skip to content

Adapt SystemTools for ClassIsland misha-alpha (Avalonia12 / net10 / apiVersion 2.2) #90

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

Closed
MrWanger-qq wants to merge 5 commits into from
Closed

Adapt SystemTools for ClassIsland misha-alpha (Avalonia12 / net10 / apiVersion 2.2) #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52f8042
Adapt plugin for ClassIsland misha alpha
MrWanger-qq Jul 21, 2026
b495275
Fix Avalonia 12 FluentAvalonia API changes
MrWanger-qq Jul 21, 2026
b90d8fb
feat: 适配FA3与dotnet10
Programmer-MrWang Jul 21, 2026
e7af17d
fix:System.Management版本号错误导致程序启动崩溃
diann34 Jul 21, 2026
bcd2a46
Merge pull request #92 from diann34/codex/-avalonia-12-fluentavalonia-3
diann34 Jul 21, 2026
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
2 changes: 1 addition & 1 deletion Actions/AdvancedShutdownAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ private void ShowOrUpdateFloatingWindow()
CanResize = false,
Topmost = true,
ShowInTaskbar = false,
SystemDecorations = SystemDecorations.None,
WindowDecorations = WindowDecorations.None,
Background = Brushes.Transparent,
TransparencyLevelHint = [WindowTransparencyLevel.Transparent],
Content = new Border
Expand Down
4 changes: 2 additions & 2 deletions Controls/AdjustScreenBrightnessSettingsControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Maximum = 100,
Increment = 1,
FormatString = "0",
Watermark = "输入 0-100 的整数"

Check warning on line 28 in Controls/AdjustScreenBrightnessSettingsControl.cs

View workflow job for this annotation

GitHub Actions / build 

'NumericUpDown.Watermark' is obsolete: 'Use PlaceholderText instead.'
};
panel.Children.Add(_brightnessInput);

Expand Down Expand Up @@ -53,10 +53,10 @@
{
base.OnInitialized();

_brightnessInput[!NumericUpDown.ValueProperty] = new Binding(nameof(Settings.BrightnessPercent))
_brightnessInput.Bind(NumericUpDown.ValueProperty, new Binding(nameof(Settings.BrightnessPercent))
{
Source = Settings,
Mode = BindingMode.TwoWay
};
});
}
}
54 changes: 27 additions & 27 deletions Controls/Components/BetterCarouselContainerSettingsControl.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ci:ComponentBase
<ci:ComponentBase
x:Class="SystemTools.Controls.Components.BetterCarouselContainerSettingsControl"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand All @@ -21,10 +21,10 @@
DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:BetterCarouselContainerSettingsControl}}">
<ScrollViewer>
<StackPanel>
<controls:SettingsExpander Header="轮换模式"
<controls:FASettingsExpander Header="轮换模式"
Description="设定容器轮换组件的顺序行为"
IconSource="{ci:FluentIconSource &#xEFCD;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ComboBox Width="140"
SelectedItem="{Binding Settings.RotationMode, Mode=TwoWay}"
ItemsSource="{Binding RotationModes}">
Expand All @@ -34,21 +34,21 @@
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander Header="启用动画"
<controls:FASettingsExpander Header="启用动画"
Description="启用后，在轮换组件时播放过渡动画"
IconSource="{ci:FluentIconSource &#xEDC1;}"
IsExpanded="True">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ToggleSwitch IsChecked="{Binding Settings.IsAnimationEnabled, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
<controls:SettingsExpanderItem Content="动画样式"
</controls:FASettingsExpander.Footer>
<controls:FASettingsExpanderItem Content="动画样式"
Description="切换组件时使用的动画样式"
IconSource="{ci:FluentIconSource &#xF06B;}"
IsVisible="{Binding Settings.IsAnimationEnabled}">
<controls:SettingsExpanderItem.Footer>
<controls:FASettingsExpanderItem.Footer>
<ComboBox Width="140"
SelectedItem="{Binding Settings.AnimationStyle, Mode=TwoWay}"
ItemsSource="{Binding AnimationStyles}">
Expand All @@ -58,14 +58,14 @@
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</controls:SettingsExpanderItem.Footer>
</controls:SettingsExpanderItem>
</controls:SettingsExpander>
</controls:FASettingsExpanderItem.Footer>
</controls:FASettingsExpanderItem>
</controls:FASettingsExpander>

<controls:SettingsExpander Header="显示进度条"
<controls:FASettingsExpander Header="显示进度条"
Description="显示当前组件剩余显示时长的进度条"
IconSource="{ci:FluentIconSource &#xE093;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<StackPanel Orientation="Horizontal" Spacing="8">
<ToggleSwitch IsChecked="{Binding Settings.ShowProgressBar, Mode=TwoWay}" />
<ComboBox Width="140"
Expand All @@ -79,27 +79,27 @@
</ComboBox.ItemTemplate>
</ComboBox>
</StackPanel>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander Header="降低进度条精度"
<controls:FASettingsExpander Header="降低进度条精度"
Description="开启后进度条每秒刷新一次，降低刷新频率"
IconSource="{ci:FluentIconSource &#xEDC1;}"
IsVisible="{Binding Settings.ShowProgressBar}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ToggleSwitch IsChecked="{Binding Settings.ReduceProgressBarPrecision, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander Header="添加分隔符样式"
<controls:FASettingsExpander Header="添加分隔符样式"
Description="在容器左右两侧固定显示“&lt;”和“&gt;”"
IconSource="{ci:FluentIconSource &#xEEDF;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ToggleSwitch IsChecked="{Binding Settings.ShowSideSeparators, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander Header="设置组件显示时长"
<controls:FASettingsExpander Header="设置组件显示时长"
Description="分别设置每个组件的显示秒数"
IconSource="{ci:FluentIconSource &#xF361;}"
IsExpanded="True">
Expand Down Expand Up @@ -134,7 +134,7 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</controls:SettingsExpander>
</controls:FASettingsExpander>
<Label HorizontalAlignment="Center"
Foreground="{DynamicResource MaterialDesignBodyLight}">
Added by SystemTools
Expand Down
3 changes: 2 additions & 1 deletion Controls/Components/ClipboardContentComponent.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.ComponentModel;
using System.Linq;
using Avalonia.Controls;
using Avalonia.Input.Platform;
using SystemTools.Models.ComponentSettings;
using RoutedEventArgs = Avalonia.Interactivity.RoutedEventArgs;

Expand Down Expand Up @@ -93,7 +94,7 @@ private async System.Threading.Tasks.Task RefreshClipboardAsync()
return;
}

var text = await clipboard.GetTextAsync();
var text = await ClipboardExtensions.TryGetTextAsync(clipboard);
if (text == _lastClipboardText)
{
return;
Expand Down
48 changes: 24 additions & 24 deletions Controls/Components/LocalQuoteSettingsControl.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LocalQuoteSettingsControl}}">
<ScrollViewer>
<StackPanel>
<controls:SettingsExpander
<controls:FASettingsExpander
Header="选择 txt 文件"
Description="每行一句，自动忽略空行"
IconSource="{ci:FluentIconSource &#xE6FD;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<Grid ColumnDefinitions="*,Auto" ColumnSpacing="8">
<TextBox Grid.Column="0"
MinWidth="220"
Expand All @@ -32,35 +32,35 @@
Content="浏览"
Click="BrowseQuotesFileButton_OnClick" />
</Grid>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander
<controls:FASettingsExpander
Header="启用动画"
Description="切换句子时使用翻页动画"
IconSource="{ci:FluentIconSource &#xF001;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ToggleSwitch IsChecked="{Binding Settings.EnableAnimation, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander
<controls:FASettingsExpander
Header="轮播间隔（秒）"
Description="每次切换到下一句的时间间隔"
IconSource="{ci:FluentIconSource &#xEF75;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<NumericUpDown Minimum="1"
Maximum="8000"
Increment="1"
Value="{Binding Settings.CarouselIntervalSeconds, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander
<controls:FASettingsExpander
Header="轮播顺序"
Description="设置一言文本的轮播方式"
IconSource="{ci:FluentIconSource &#xE143;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ComboBox SelectedItem="{Binding Settings.PlaybackOrder, Mode=TwoWay}"
ItemsSource="{Binding PlaybackOrders}">
<ComboBox.ItemTemplate>
Expand All @@ -69,23 +69,23 @@
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander
<controls:FASettingsExpander
Header="记忆轮播行"
Description="重启软件后从上次的位置和剩余时间继续"
IconSource="{ci:FluentIconSource &#xF35B;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ToggleSwitch IsChecked="{Binding Settings.IsPersistenceEnabled, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander
<controls:FASettingsExpander
Header="显示进度条"
Description="显示当前句子剩余显示时长的进度条"
IconSource="{ci:FluentIconSource &#xE093;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<StackPanel Orientation="Horizontal" Spacing="8">
<ToggleSwitch IsChecked="{Binding Settings.ShowProgressBar, Mode=TwoWay}" />
<ComboBox Width="140"
Expand All @@ -99,8 +99,8 @@
</ComboBox.ItemTemplate>
</ComboBox>
</StackPanel>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>


<Label HorizontalAlignment="Center"
Expand Down
39 changes: 20 additions & 19 deletions Controls/Components/LyricsDisplaySettingsControl.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ci:ComponentBase
<ci:ComponentBase
x:Class="SystemTools.Controls.Components.LyricsDisplaySettingsControl"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand All @@ -13,24 +13,25 @@
d:DesignHeight="450"
d:DesignWidth="800"
x:TypeArguments="settings:LyricsDisplaySettings"
mc:Ignorable="d">
x:CompileBindings="False"
mc:Ignorable="d">
<Grid
DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LyricsDisplaySettingsControl}}">
<ScrollViewer>
<StackPanel>
<!-- 警告信息 -->
<controls:InfoBar IsOpen="True"
<controls:FAInfoBar IsOpen="True"
IsClosable="True"
Severity="Warning"
Margin="0,0,0,12"
Message="使用前请确保音乐软件已启用桌面歌词显示（横排/单行/关闭翻译）且不贴近屏幕上侧边缘&#x0A;您可通过调整桌面歌词的 长/宽 和下方的 缩放设置 以达到最佳效果（一般需手动缩短桌面歌词长度）&#x0A;不建议使用组件宽度限制，这可能会导致歌词显示不完整" />

<!-- 音乐软件选择 -->
<controls:SettingsExpander
<controls:FASettingsExpander
Header="选择音乐软件"
Description="选择要显示歌词的音乐软件"
IconSource="{ci:FluentIconSource &#xE342;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<ComboBox MinWidth="150"
SelectedIndex="{Binding Settings.SelectedMusicSoftware, Mode=TwoWay}"
SelectionChanged="MusicSoftwareComboBox_SelectionChanged">
Expand All @@ -42,51 +43,51 @@
<ComboBoxItem IsEnabled="False" Foreground="Gray">酷我音乐(将不会适配)</ComboBoxItem>
<ComboBoxItem IsEnabled="False" Foreground="Gray">Apple Music(将不会适配)</ComboBoxItem>
</ComboBox>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<controls:SettingsExpander
<controls:FASettingsExpander
Header="歌词显示缩放"
Description="调整歌词显示大小比例"
Margin="0,6,0,0"
IconSource="{ci:FluentIconSource &#xE10B;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<Slider MinWidth="150"
Minimum="0.3"
Maximum="3.0"
TickFrequency="0.1"
Value="{Binding Settings.ImageScale, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<!-- 歌词刷新率设置 -->
<controls:SettingsExpander
<controls:FASettingsExpander
Header="歌词刷新率"
Description="对于配置较低电脑建议提高数值，但会导致歌词显示延迟；建议100；重启 ClassIsland 以应用该设置"
Margin="0,6,0,0"
IconSource="{ci:FluentIconSource &#xE8E1;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<NumericUpDown MinWidth="100"
Minimum="25"
Maximum="1000"
Increment="25"
Value="{Binding Settings.RefreshRate, Mode=TwoWay}" />
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<!-- 保持歌词窗口置底 -->
<controls:SettingsExpander
<controls:FASettingsExpander
Header="保持歌词窗口置底"
Description="强制将歌词窗口置底（每80ms/暂不适用网易云音乐）;请在上侧调整好样式再使用此功能！"
Margin="0,6,0,0"
IconSource="{ci:FluentIconSource &#xF4AB;}">
<controls:SettingsExpander.Footer>
<controls:FASettingsExpander.Footer>
<StackPanel Orientation="Horizontal">
<controls1:ExperimentalBadge IsVisible="{Binding Settings.IsExperimentalModeActivated}" />
<ToggleSwitch IsChecked="{Binding Settings.KeepLyricsWindowBottom, Mode=TwoWay}" />
</StackPanel>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
</controls:FASettingsExpander.Footer>
</controls:FASettingsExpander>

<Label HorizontalAlignment="Center"
Foreground="{DynamicResource MaterialDesignBodyLight}">
Expand Down
Loading
Loading