This commit is contained in:
2026-02-23 14:31:48 +08:00
parent 1704ad37d2
commit 4c874fa50b
6 changed files with 277 additions and 60 deletions
+38 -49
View File
@@ -9,6 +9,7 @@
xmlns:controls="clr-namespace:Ink_Canvas.Controls"
xmlns:Windows="clr-namespace:Ink_Canvas.Windows"
xmlns:props="clr-namespace:Ink_Canvas.Properties"
xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
mc:Ignorable="d"
AllowsTransparency="True"
WindowStyle="None"
@@ -161,7 +162,7 @@
<!-- Startup -->
<Button Width="40" Height="40" Margin="0,10,0,0" Style="{StaticResource NavButton}"
Click="NavStartup_Click" Tag="startup" ToolTip="启动设置">
Click="NavStartup_Click" Tag="startup" ToolTip="{x:Static props:Strings.Nav_Startup}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -176,7 +177,7 @@
<!-- Canvas -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavCanvas_Click" Tag="canvas" ToolTip="画布设置">
Click="NavCanvas_Click" Tag="canvas" ToolTip="{x:Static props:Strings.Nav_Canvas}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -191,7 +192,7 @@
<!-- Crash Action -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavCrashAction_Click" Tag="crashaction" ToolTip="崩溃处理">
Click="NavCrashAction_Click" Tag="crashaction" ToolTip="{x:Static props:Strings.Nav_CrashAction}">
<Image Width="22" Height="22">
<Image.Source>
<DrawingImage>
@@ -212,7 +213,7 @@
<!-- Gesture -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavGesture_Click" Tag="gesture" ToolTip="手势设置">
Click="NavGesture_Click" Tag="gesture" ToolTip="{i18n:I18n Key=Nav_Gesture_Settings}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -227,7 +228,7 @@
<!-- Ink Recognition -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavInkRecognition_Click" Tag="inkrecognition" ToolTip="墨迹识别">
Click="NavInkRecognition_Click" Tag="inkrecognition" ToolTip="{x:Static props:Strings.Nav_InkRecognition}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -242,7 +243,7 @@
<!-- Theme -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavTheme_Click" Tag="theme" ToolTip="个性化设置">
Click="NavTheme_Click" Tag="theme" ToolTip="{i18n:I18n Key=Nav_Theme_Settings}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -257,7 +258,7 @@
<!-- PPT -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavPPT_Click" Tag="ppt" ToolTip="PPT设置">
Click="NavPPT_Click" Tag="ppt" ToolTip="{i18n:I18n Key=Nav_PPT_Settings}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -272,7 +273,7 @@
<!-- Advanced -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavAdvanced_Click" Tag="advanced" ToolTip="高级设置">
Click="NavAdvanced_Click" Tag="advanced" ToolTip="{i18n:I18n Key=Nav_Advanced_Settings}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -287,7 +288,7 @@
<!-- Automation -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavAutomation_Click" Tag="automation" ToolTip="自动化设置">
Click="NavAutomation_Click" Tag="automation" ToolTip="{i18n:I18n Key=Nav_Automation_Settings}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -302,7 +303,7 @@
<!-- Random Window -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavRandomWindow_Click" Tag="randomwindow" ToolTip="随机窗口设置">
Click="NavRandomWindow_Click" Tag="randomwindow" ToolTip="{i18n:I18n Key=Nav_RandomWindow_Settings}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -317,7 +318,7 @@
<!-- About -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavAbout_Click" Tag="about" ToolTip="关于">
Click="NavAbout_Click" Tag="about" ToolTip="{x:Static props:Strings.Nav_About}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -332,7 +333,7 @@
<!-- 快捷键设置 -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavShortcuts_Click" Tag="shortcuts" ToolTip="快捷键设置">
Click="NavShortcuts_Click" Tag="shortcuts" ToolTip="{i18n:I18n Key=Nav_Shortcuts_Settings}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -354,7 +355,7 @@
<!-- 折叠侧边栏按钮 -->
<Button Width="40" Height="40" Style="{StaticResource NavButton}"
Click="CollapseNavSidebar_Click" ToolTip="折叠侧边栏">
Click="CollapseNavSidebar_Click" ToolTip="{i18n:I18n Key=CollapseNavSidebar}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -384,7 +385,7 @@
<ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center">
<!-- 显示侧边栏按钮 -->
<Button Width="40" Height="40" Margin="10,0,0,0" Style="{StaticResource NavButton}"
Click="ShowNavSidebar_Click" ToolTip="显示侧边栏">
Click="ShowNavSidebar_Click" ToolTip="{i18n:I18n Key=ShowNavSidebar}">
<Image Width="24" Height="24">
<Image.Source>
<DrawingImage>
@@ -396,7 +397,7 @@
</Image.Source>
</Image>
</Button>
<TextBlock Foreground="White" Margin="15,-2,0,0" Text="设置" FontWeight="Bold"
<TextBlock Foreground="White" Margin="15,-2,0,0" Text="{i18n:I18n Key=Settings_Title}" FontWeight="Bold"
FontSize="32" />
</ui:SimpleStackPanel>
</Border>
@@ -443,7 +444,7 @@
<ui:SimpleStackPanel VerticalAlignment="Center">
<TextBlock Foreground="#fafafa" HorizontalAlignment="Center"
VerticalAlignment="Center" FontSize="15" Margin="0,0,0,10"
Text="设置更改将自动保存,部分设置需要重启软件后生效" />
Text="{i18n:I18n Key=Settings_AutoSaveHint}" />
<ui:SimpleStackPanel Spacing="5">
<ui:SimpleStackPanel Spacing="5" Orientation="Horizontal"
HorizontalAlignment="Center">
@@ -471,9 +472,7 @@
</Image>
<Label FontSize="16" Foreground="#fafafa"
VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
FontWeight="Bold">
重启
</Label>
FontWeight="Bold" Content="{i18n:I18n Key=Btn_Restart}"/>
</ui:SimpleStackPanel>
</Button>
<Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
@@ -503,9 +502,7 @@
</Image.Source>
</Image>
<Label Margin="2,0,0,0" FontSize="16" VerticalAlignment="Center"
FontFamily="Microsoft YaHei UI">
重置
</Label>
FontFamily="Microsoft YaHei UI" Content="{i18n:I18n Key=Btn_Reset}"/>
</ui:SimpleStackPanel>
</Button>
<Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
@@ -532,9 +529,7 @@
</Image>
<Label Foreground="#fafafa" FontSize="16"
VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
FontWeight="Bold">
退出
</Label>
FontWeight="Bold" Content="{i18n:I18n Key=Btn_Exit}"/>
</ui:SimpleStackPanel>
</Button>
</ui:SimpleStackPanel>
@@ -543,18 +538,16 @@
</Border>
<GroupBox Name="GroupBoxModeSettings">
<GroupBox.Header>
<TextBlock Margin="0,12,0,0" Text="模式设置" FontWeight="Bold" Foreground="#fafafa"
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_Mode}" FontWeight="Bold" Foreground="#fafafa"
FontSize="26" />
</GroupBox.Header>
<ui:SimpleStackPanel Spacing="6" Margin="0,10,0,0">
<TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa">
选择软件运行模式。仅PPT模式下,软件将完全隐藏,仅在PPT放映时出现。(实验性功能,可能不稳定。)
</TextBlock>
<TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa" Text="{i18n:I18n Key=Settings_ModeDesc}"/>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
<TextBlock Text="正常模式" VerticalAlignment="Center" Foreground="#fafafa"
<TextBlock Text="{i18n:I18n Key=Mode_Normal}" VerticalAlignment="Center" Foreground="#fafafa"
FontSize="14" Margin="0,0,8,0"/>
<ui:ToggleSwitch x:Name="ToggleSwitchMode"
OnContent="仅PPT模式" OffContent="仅PPT模式"
OnContent="{i18n:I18n Key=Mode_PPTOnly}" OffContent="{i18n:I18n Key=Mode_PPTOnly}"
IsOn="False"
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchMode_Toggled"/>
@@ -564,14 +557,12 @@
<GroupBox Name="GroupBoxNewSettings">
<GroupBox.Header>
<TextBlock Margin="0,12,0,0" Text="新设置窗口" FontWeight="Bold" Foreground="#fafafa"
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_NewWindow}" FontWeight="Bold" Foreground="#fafafa"
FontSize="26" />
</GroupBox.Header>
<ui:SimpleStackPanel Spacing="6" Margin="0,10,0,0">
<TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa">
打开新的设置窗口,提供更丰富的设置选项和更好的用户体验。(开发中)
</TextBlock>
<Button x:Name="BtnOpenNewSettings" Content="打开新设置窗口"
<TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa" Text="{i18n:I18n Key=Settings_NewWindowDesc}"/>
<Button x:Name="BtnOpenNewSettings" Content="{i18n:I18n Key=Btn_OpenNewSettings}"
HorizontalAlignment="Left" Click="BtnOpenNewSettings_Click"
Padding="15,5" Margin="0,10,0,0"/>
</ui:SimpleStackPanel>
@@ -579,14 +570,12 @@
<GroupBox Name="GroupBoxPlugins">
<GroupBox.Header>
<TextBlock Margin="0,12,0,0" Text="插件管理" FontWeight="Bold" Foreground="#fafafa"
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_Plugins}" FontWeight="Bold" Foreground="#fafafa"
FontSize="26" />
</GroupBox.Header>
<ui:SimpleStackPanel Spacing="6" Margin="0,10,0,0">
<TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa">
通过插件扩展InkCanvas的功能。您可以启用或禁用插件,或加载自定义插件。
</TextBlock>
<Button x:Name="BtnOpenPluginManager" Content="打开插件管理器"
<TextBlock TextWrapping="Wrap" Margin="0,0,0,10" Foreground="#fafafa" Text="{i18n:I18n Key=Settings_PluginsDesc}"/>
<Button x:Name="BtnOpenPluginManager" Content="{i18n:I18n Key=Btn_OpenPluginManager}"
HorizontalAlignment="Left" Click="BtnOpenPluginManager_Click"
Padding="15,5" Margin="0,10,0,0"/>
</ui:SimpleStackPanel>
@@ -594,33 +583,33 @@
<GroupBox>
<GroupBox.Header>
<TextBlock Margin="0,12,0,0" Text="启动" FontWeight="Bold" Foreground="#fafafa"
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Startup_Start}" FontWeight="Bold" Foreground="#fafafa"
FontSize="26" />
</GroupBox.Header>
<ui:SimpleStackPanel Spacing="6">
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Foreground="#fafafa" Text="窗口无焦点模式" VerticalAlignment="Center"
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Startup_NoFocusMode}" VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchNoFocusMode"
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchNoFocusMode_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Foreground="#fafafa" Text="窗口无边框模式" VerticalAlignment="Center"
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Startup_NoBorderMode}" VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchWindowMode"
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchWindowMode_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Foreground="#fafafa" Text="窗口置顶" VerticalAlignment="Center"
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Startup_TopMost}" VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchAlwaysOnTop"
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchAlwaysOnTop_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Name="UIAccessTopMostPanel" Visibility="Collapsed">
<TextBlock Foreground="#fafafa" Text="UIA置顶" VerticalAlignment="Center"
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Startup_UIATopMost}" VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchUIAccessTopMost"
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
@@ -628,7 +617,7 @@
</ui:SimpleStackPanel>
<TextBlock Name="UIAccessTopMostDescription" Text="# 开启UIA置顶后,软件需要管理员启动才能置顶,关闭此功能需要完全关闭软件后再手动启动,无法使用重启来关闭此功能" TextWrapping="Wrap" Foreground="#a1a1aa" Visibility="Collapsed" />
<ui:ToggleSwitch OnContent="" OffContent=""
Name="ToggleSwitchIsAutoUpdate" Header="自动检查更新"
Name="ToggleSwitchIsAutoUpdate" Header="{i18n:I18n Key=Header_AutoUpdate}"
FontFamily="Microsoft YaHei UI"
Toggled="ToggleSwitchIsAutoUpdate_Toggled" />
<ui:ToggleSwitch OnContent="" OffContent=""
@@ -2526,7 +2515,7 @@
<ui:ToggleSwitch OnContent="开" OffContent="关" Name="ToggleSwitchIsEnableUriScheme"
Visibility="Collapsed" IsOn="False"
AutomationProperties.Name="外部协议调用 (icc://)"
ToolTip="通过 icc:// 协议从外部控制软件"
ToolTip="{i18n:I18n Key=Tooltip_IccProtocol}"
Toggled="ToggleSwitchIsEnableUriScheme_Toggled" />
</ui:SimpleStackPanel>
<StackPanel Orientation="Vertical">
@@ -10684,7 +10673,7 @@
<Grid Grid.Row="1" HorizontalAlignment="Center" Margin="10,6,10,4">
<Border Background="{DynamicResource FloatBarBackground}"
CornerRadius="8" BorderThickness="1" BorderBrush="#616161"
Width="282" Height="40" ToolTip="展台/截图分辨率">
Width="282" Height="40" ToolTip="{x:Static props:Strings.Booth_Resolution_Tooltip}">
<Grid>
<Border x:Name="BoothResolutionTabIndicator"
Background="#66CCFF"