CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'beta' into New-New-Settings

Browse Source
This commit is contained in:
PrefacedCorg
2026-04-05 17:08:03 +08:00
parent 2f54e9d7b3 1165e5bbf2
commit 04a8224484
56 changed files with 2207 additions and 7646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml
+15 -1
View File
@@ -66,7 +66,7 @@
<TextBlock Foreground="#2e3436" FontSize="14.5" Text="屏蔽压感" HorizontalAlignment="Left"/>
<TextBlock Foreground="#9a9996" FontSize="11" Margin="0,3.5,0,0" Text="{i18n:I18n Key=CanvasAndInkPanel_Hint_2}" HorizontalAlignment="Left"/>
</StackPanel>
<Border x:Name="ToggleSwitchDisablePressure" Style="{StaticResource ToggleSwitchStyle}" Background="#3584e4" Tag="DisablePressure" MouseLeftButtonDown="ToggleSwitch_Click">
<Border x:Name="ToggleSwitchDisablePressure" Style="{StaticResource ToggleSwitchStyle}" Background="#3584e4" Tag="DisablePressure" MouseLeftButtonDown="ToggleSwitch_Click">
<Border Width="19" Height="19" Background="White" CornerRadius="10" HorizontalAlignment="Right" VerticalAlignment="Center">
<Border.Effect>
<DropShadowEffect BlurRadius="4" Direction="-45" Color="Black" Opacity="0.3" ShadowDepth="0"/>
@@ -162,6 +162,20 @@
</Border>
</Border>
</Grid>
<Border Height="1" Background="#ebebeb"/>
<Grid Height="54">
<StackPanel Orientation="Vertical" Margin="18,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Foreground="#2e3436" FontSize="14.5" Text="白板展台按钮启动希沃视频展台" HorizontalAlignment="Left"/>
<TextBlock Foreground="#9a9996" FontSize="11" Margin="0,3.5,0,0" Text="开启后，点击白板工具栏「展台」将打开希沃视频展台（需已安装）；关闭则使用内置展台" HorizontalAlignment="Left" TextWrapping="Wrap" MaxWidth="420"/>
</StackPanel>
<Border x:Name="ToggleSwitchLaunchSeewoVideoShowcaseForWhiteboardBooth" Style="{StaticResource ToggleSwitchStyle}" Background="#e1e1e1" Tag="LaunchSeewoVideoShowcaseForWhiteboardBooth" MouseLeftButtonDown="ToggleSwitch_Click">
<Border Width="19" Height="19" Background="White" CornerRadius="10" HorizontalAlignment="Left" VerticalAlignment="Center">
<Border.Effect>
<DropShadowEffect BlurRadius="4" Direction="-45" Color="Black" Opacity="0.3" ShadowDepth="0"/>
</Border.Effect>
</Border>
</Border>
</Grid>
</StackPanel>
</Border>
Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml.cs
+10
View File
@@ -101,6 +101,9 @@ namespace Ink_Canvas.Windows.SettingsViews
// 插入图片时自动压缩
SetToggleSwitchState(FindToggleSwitch("ToggleSwitchCompressPicturesUploaded"), canvas.IsCompressPicturesUploaded);
// 白板展台按钮启动希沃视频展台
SetToggleSwitchState(FindToggleSwitch("ToggleSwitchLaunchSeewoVideoShowcaseForWhiteboardBooth"), canvas.LaunchSeewoVideoShowcaseForWhiteboardBooth);
// 保留双曲线渐近线
SetOptionButtonState("HyperbolaAsymptote", (int)canvas.HyperbolaAsymptoteOption);
@@ -247,6 +250,8 @@ namespace Ink_Canvas.Windows.SettingsViews
return canvas.EnablePressureTouchMode;
case "DisablePressure":
return canvas.DisablePressure;
case "LaunchSeewoVideoShowcaseForWhiteboardBooth":
return canvas.LaunchSeewoVideoShowcaseForWhiteboardBooth;
case "HideStrokeWhenSelecting":
return canvas.HideStrokeWhenSelecting;
case "ClearCanvasAndClearTimeMachine":
@@ -342,6 +347,11 @@ namespace Ink_Canvas.Windows.SettingsViews
}
break;
case "LaunchSeewoVideoShowcaseForWhiteboardBooth":
MainWindowSettingsHelper.InvokeToggleSwitchToggled(
"ToggleSwitchLaunchSeewoVideoShowcaseForWhiteboardBooth", newState);
break;
case "HideStrokeWhenSelecting":
// 调用 MainWindow 中的方法
MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchHideStrokeWhenSelecting", newState);
Ink Canvas/Windows/SettingsViews/SettingsViews/MainWindowSettingsHelper.cs
+1
View File
@@ -419,6 +419,7 @@ namespace Ink_Canvas.Windows.SettingsViews
{ "ToggleSwitchShowCursor", "CanvasAndInkPanel" },
{ "ToggleSwitchDisablePressure", "CanvasAndInkPanel" },
{ "ToggleSwitchEnablePressureTouchMode", "CanvasAndInkPanel" },
{ "ToggleSwitchLaunchSeewoVideoShowcaseForWhiteboardBooth", "CanvasAndInkPanel" },
{ "ComboBoxEraserSize", "CanvasAndInkPanel" },
{ "ComboBoxHyperbolaAsymptoteOption", "CanvasAndInkPanel" },
{ "ComboBoxAutoSaveStrokesInterval", "CanvasAndInkPanel" },
Ink Canvas/Windows/SettingsViews/SettingsViews/StartupPanel.xaml
-9
View File
@@ -150,15 +150,6 @@
</StackPanel>
</Border>
<!-- 插件管理 -->
<Border Margin="0,25,0,0" BorderBrush="#e6e6e6" BorderThickness="1.25,1.25,1.25,4" CornerRadius="8">
<StackPanel Orientation="Vertical" Margin="18,18,18,18">
<TextBlock Text="通过插件扩展InkCanvas的功能。您可以启用或禁用插件，或加载自定义插件。"
TextWrapping="Wrap" Foreground="#9a9996" FontSize="11" Margin="0,0,0,12"/>
<Button x:Name="BtnOpenPluginManager" Content="打开插件管理器"
HorizontalAlignment="Left" Padding="15,5"/>
</StackPanel>
</Border>
</StackPanel>
</ScrollViewer>
</UserControl>
Ink Canvas/Windows/SettingsViews/SettingsViews/ThemePanel.xaml.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Hardcodet.Wpf.TaskbarNotification;
using H.NotifyIcon;
using iNKORE.UI.WPF.Helpers;
using System;
using System.Collections.Generic;