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/MainWindow.xaml
+47 -50
View File
@@ -134,6 +134,7 @@
<Style x:Key="AutoFitGestureOptionLabel10" TargetType="Label">
<Setter Property="Foreground" Value="{DynamicResource FloatBarForeground}" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Padding" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Center" />
@@ -143,6 +144,11 @@
<Setter Property="helpers:AutoFontSizeHelper.Step" Value="0.25" />
</Style>
<Style x:Key="AutoFitBoardGestureOptionLabel10" TargetType="Label" BasedOn="{StaticResource AutoFitGestureOptionLabel10}">
<Setter Property="helpers:AutoFontSizeHelper.MinFontSize" Value="5" />
<Setter Property="helpers:AutoFontSizeHelper.MaxFontSize" Value="10" />
</Style>
<!-- Navigation Button Style -->
<Style x:Key="NavButton" TargetType="Button">
<Setter Property="Background" Value="Transparent"/>
@@ -241,21 +247,6 @@
<!-- 主要导航按钮 -->
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<StackPanel>
<!-- Plugins -->
<Button Width="40" Height="40" Margin="0,5,0,0" Style="{StaticResource NavButton}"
Click="NavPlugins_Click" Tag="plugins" ToolTip="{x:Static props:Strings.Nav_Plugins}">
<Image Width="20" Height="20">
<Image.Source>
<DrawingImage>
<DrawingImage.Drawing>
<GeometryDrawing Brush="White"
Geometry="M342.826667 213.333333a149.333333 149.333333 0 0 1 295.68 0H682.666667a128 128 0 0 1 128 128v44.16a149.333333 149.333333 0 0 1 0 295.68V725.333333a128 128 0 0 1-128 128h-128v-21.333333a64 64 0 0 0-128 0v21.333333H298.666667a128 128 0 0 1-128-128v-128h21.333333a64 64 0 0 0 0-128H170.666667V341.333333a128 128 0 0 1 128-128h44.16zM426.666667 234.666667V298.666667H298.666667q-17.664 0-30.165334 12.501333T256 341.333333v56.576q22.528 10.752 41.6 29.866667Q341.333333 471.466667 341.333333 533.333333q0 61.866667-43.733333 105.6-19.072 19.072-41.6 29.824V725.333333q0 17.664 12.501333 30.165334T298.666667 768h56.576q10.752-22.528 29.866666-41.6Q428.8 682.666667 490.666667 682.666667q61.866667 0 105.6 43.733333 19.072 19.072 29.824 41.6H682.666667q17.664 0 30.165333-12.501333T725.333333 725.333333v-128h64a64 64 0 0 0 0-128H725.333333V341.333333q0-17.664-12.501333-30.165333T682.666667 298.666667h-128V234.666667a64 64 0 1 0-128 0z"/>
</DrawingImage.Drawing>
</DrawingImage>
</Image.Source>
</Image>
</Button>
<!-- Startup -->
<Button Width="40" Height="40" Margin="0,10,0,0" Style="{StaticResource NavButton}"
Click="NavStartup_Click" Tag="startup" ToolTip="{x:Static props:Strings.Nav_Startup}">
@@ -668,19 +659,6 @@
</ikw:SimpleStackPanel>
</GroupBox>
<GroupBox Name="GroupBoxPlugins">
<GroupBox.Header>
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Settings_Plugins}" FontWeight="Bold" Foreground="#fafafa"
FontSize="26" />
</GroupBox.Header>
<ikw:SimpleStackPanel Spacing="6" Margin="0,10,0,0">
<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"/>
</ikw:SimpleStackPanel>
</GroupBox>
<GroupBox Name="GroupBoxStartup">
<GroupBox.Header>
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Startup_Start}" FontWeight="Bold" Foreground="#fafafa"
@@ -900,6 +878,15 @@
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchCompressPicturesUploaded_Toggled" />
</ikw:SimpleStackPanel>
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Canvas_LaunchSeewoVideoShowcaseForWhiteboardBooth}" VerticalAlignment="Center"
FontSize="14" Margin="0,0,8,0" Width="320"
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchLaunchSeewoVideoShowcaseForWhiteboardBooth"
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchLaunchSeewoVideoShowcaseForWhiteboardBooth_Toggled" />
</ikw:SimpleStackPanel>
<TextBlock Text="{i18n:I18n Key=Canvas_LaunchSeewoVideoShowcaseForWhiteboardBoothHint}" TextWrapping="Wrap" Foreground="#a1a1aa" />
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
StrokeThickness="1" Margin="0,4,0,4" />
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -1140,6 +1127,16 @@
</ikw:SimpleStackPanel>
<TextBlock Text="{i18n:I18n Key=InkRecog_ShapeEngineHint}" TextWrapping="Wrap"
Foreground="#a1a1aa" MaxWidth="520" HorizontalAlignment="Left" />
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=InkRecog_HandwritingBeautify}"
VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent=""
Name="ToggleSwitchEnableWinRtHandwritingStrokeBeautify"
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchEnableWinRtHandwritingStrokeBeautify_Toggled" />
</ikw:SimpleStackPanel>
<TextBlock Text="{i18n:I18n Key=InkRecog_HandwritingBeautifyHint}" TextWrapping="Wrap"
Foreground="#a1a1aa" MaxWidth="520" HorizontalAlignment="Left" />
<ikw:SimpleStackPanel Spacing="6"
Visibility="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn, Converter={StaticResource BooleanToVisibilityConverter}}">
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -1428,7 +1425,7 @@
FontSize="14" Margin="0,0,0,6" />
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<ComboBox Name="ComboBoxChickenSoupSource" FontFamily="Microsoft YaHei UI"
SelectedIndex="1" Width="240"
Width="240"
SelectionChanged="ComboBoxChickenSoupSource_SelectionChanged">
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuoteSource_OsuQuotes}" FontFamily="Microsoft YaHei UI" />
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuoteSource_Mottos}" FontFamily="Microsoft YaHei UI" />
@@ -5287,7 +5284,7 @@
<Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1"
CornerRadius="8,8,0,0"
Background="#2563eb" Margin="-1,-1,-1,1">
<Canvas Height="36" ClipToBounds="True">
<Canvas Height="38" ClipToBounds="True">
<TextBlock Text="{i18n:I18n Key=Board_GestureOptions}" Canvas.Left="12" Foreground="White"
Padding="0,7"
FontSize="17" FontWeight="Bold"
@@ -5310,10 +5307,10 @@
RenderOptions.BitmapScalingMode="HighQuality"
Height="16"
Width="16" />
<Label Content="{i18n:I18n Key=Board_MultiTouchWriting}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Label Content="{i18n:I18n Key=Board_MultiTouchWriting}" FontSize="10"
VerticalAlignment="Center" Width="62"
Style="{StaticResource AutoFitBoardGestureOptionLabel10}" />
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
x:Name="BoardToggleSwitchEnableMultiTouchMode"
FontFamily="Microsoft YaHei UI"
@@ -5342,10 +5339,10 @@
RenderOptions.BitmapScalingMode="HighQuality"
Height="16"
Width="16" />
<Label Content="{i18n:I18n Key=Board_TwoFingerMove}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Label Content="{i18n:I18n Key=Board_TwoFingerMove}" FontSize="10"
VerticalAlignment="Center" Width="62"
Style="{StaticResource AutoFitBoardGestureOptionLabel10}" />
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
x:Name="BoardToggleSwitchEnableTwoFingerTranslate"
FontFamily="Microsoft YaHei UI"
@@ -5374,10 +5371,10 @@
RenderOptions.BitmapScalingMode="HighQuality"
Height="16"
Width="16" />
<Label Content="{i18n:I18n Key=Board_TwoFingerZoom}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Label Content="{i18n:I18n Key=Board_TwoFingerZoom}" FontSize="10"
VerticalAlignment="Center" Width="62"
Style="{StaticResource AutoFitBoardGestureOptionLabel10}" />
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
FontFamily="Microsoft YaHei UI"
IsOn="False" OnContent="" OffContent=""
@@ -5404,10 +5401,10 @@
RenderOptions.BitmapScalingMode="HighQuality"
Height="16"
Width="16" />
<Label Content="{i18n:I18n Key=Board_TwoFingerRotate}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Label Content="{i18n:I18n Key=Board_TwoFingerRotate}" FontSize="10"
VerticalAlignment="Center" Width="62"
Style="{StaticResource AutoFitBoardGestureOptionLabel10}" />
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
FontFamily="Microsoft YaHei UI"
IsOn="False" OnContent="" OffContent=""
@@ -10285,7 +10282,7 @@
<Label Content="{i18n:I18n Key=FloatingBar_Gesture_MultiTouchWriting}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
Name="ToggleSwitchEnableMultiTouchMode"
FontFamily="Microsoft YaHei UI" IsOn="False" OnContent=""
@@ -10311,7 +10308,7 @@
<Label Content="{i18n:I18n Key=FloatingBar_Gesture_TwoFingerMove}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
Name="ToggleSwitchEnableTwoFingerTranslate"
FontFamily="Microsoft YaHei UI" IsOn="False" OnContent=""
@@ -10338,7 +10335,7 @@
<Label Content="{i18n:I18n Key=FloatingBar_Gesture_TwoFingerZoom}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
FontFamily="Microsoft YaHei UI"
IsOn="False" OnContent="" OffContent=""
@@ -10365,7 +10362,7 @@
<Label Content="{i18n:I18n Key=FloatingBar_Gesture_TwoFingerRotate}" FontSize="8"
VerticalAlignment="Center" Width="56"
Style="{StaticResource AutoFitGestureOptionLabel10}" />
<Viewbox Width="36" Height="18" Margin="2,0,0,0">
<Viewbox Width="36" Height="20" Margin="2,0,0,0">
<ui:ToggleSwitch MinWidth="0" Margin="0,-6,0,-6"
FontFamily="Microsoft YaHei UI"
IsOn="False" OnContent="" OffContent=""