优化
This commit is contained in:
PrefacedCorg
+18
-360
@@ -6430,192 +6430,21 @@
|
||||
</ikw:SimpleStackPanel.Resources>
|
||||
<ikw:SimpleStackPanel Margin="0,0,0,0" Height="40"
|
||||
Orientation="Horizontal">
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="ImageCountdownTimer_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.TimerIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Timer}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel x:Name="RandomDrawPanel" Visibility="Collapsed" MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconRand_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.RandomDrawIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_RandomDraw}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel x:Name="SingleDrawPanel" Visibility="Collapsed" MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconRandOne_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.SingleDrawIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_SingleDraw}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<controls:ToolbarImageButton x:Name="BoardTimerToolBtn" ButtonMouseUp="ImageCountdownTimer_MouseUp" Label="{i18n:I18n Key=Tools_Timer}" />
|
||||
<controls:ToolbarImageButton x:Name="BoardRandomDrawToolBtn" Visibility="Collapsed" ButtonMouseUp="SymbolIconRand_MouseUp" Label="{i18n:I18n Key=Tools_RandomDraw}" />
|
||||
<controls:ToolbarImageButton x:Name="BoardSingleDrawToolBtn" Visibility="Collapsed" ButtonMouseUp="SymbolIconRandOne_MouseUp" Label="{i18n:I18n Key=Tools_SingleDraw}" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Margin="0,0,0,0" Height="40"
|
||||
Orientation="Horizontal">
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconSaveStrokes_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.SaveIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Save}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconOpenStrokes_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.OpenIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Open}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="GridInkReplayButton_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.ReplayIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Replay}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<controls:ToolbarImageButton x:Name="BoardSaveToolBtn" ButtonMouseUp="SymbolIconSaveStrokes_MouseUp" Label="{i18n:I18n Key=Tools_Save}" />
|
||||
<controls:ToolbarImageButton x:Name="BoardOpenToolBtn" ButtonMouseUp="SymbolIconOpenStrokes_MouseUp" Label="{i18n:I18n Key=Tools_Open}" />
|
||||
<controls:ToolbarImageButton x:Name="BoardReplayToolBtn" ButtonMouseUp="GridInkReplayButton_MouseUp" Label="{i18n:I18n Key=Tools_Replay}" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Margin="0,0,0,0" Height="40"
|
||||
Orientation="Horizontal">
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconScreenshot_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.ScreenshotIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Screenshot}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="OperatingGuideWindowIcon_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.ManualIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Manual}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconSettings_Click"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.SettingsIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Settings}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<controls:ToolbarImageButton x:Name="BoardScreenshotToolBtn" ButtonMouseUp="SymbolIconScreenshot_MouseUp" Label="{i18n:I18n Key=Tools_Screenshot}" />
|
||||
<controls:ToolbarImageButton x:Name="BoardManualToolBtn" ButtonMouseUp="OperatingGuideWindowIcon_MouseUp" Label="{i18n:I18n Key=Tools_Manual}" />
|
||||
<controls:ToolbarImageButton x:Name="BoardSettingsToolBtn" ButtonMouseUp="SymbolIconSettings_Click" Label="{i18n:I18n Key=Tools_Settings}" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
@@ -9161,192 +8990,21 @@
|
||||
</ikw:SimpleStackPanel.Resources>
|
||||
<ikw:SimpleStackPanel Margin="0,0,0,0" Height="40"
|
||||
Orientation="Horizontal">
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="ImageCountdownTimer_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.TimerIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Timer}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconRand_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.RandomDrawIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_RandomDraw}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconRandOne_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.SingleDrawIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_SingleDraw}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<controls:ToolbarImageButton x:Name="TimerToolBtn" ButtonMouseUp="ImageCountdownTimer_MouseUp" Label="{i18n:I18n Key=Tools_Timer}" />
|
||||
<controls:ToolbarImageButton x:Name="RandomDrawToolBtn" ButtonMouseUp="SymbolIconRand_MouseUp" Label="{i18n:I18n Key=Tools_RandomDraw}" />
|
||||
<controls:ToolbarImageButton x:Name="SingleDrawToolBtn" ButtonMouseUp="SymbolIconRandOne_MouseUp" Label="{i18n:I18n Key=Tools_SingleDraw}" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Margin="0,0,0,0" Height="40"
|
||||
Orientation="Horizontal">
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconSaveStrokes_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.SaveIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Save}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconOpenStrokes_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.OpenIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Open}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="GridInkReplayButton_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.ReplayIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Replay}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<controls:ToolbarImageButton x:Name="SaveToolBtn" ButtonMouseUp="SymbolIconSaveStrokes_MouseUp" Label="{i18n:I18n Key=Tools_Save}" />
|
||||
<controls:ToolbarImageButton x:Name="OpenToolBtn" ButtonMouseUp="SymbolIconOpenStrokes_MouseUp" Label="{i18n:I18n Key=Tools_Open}" />
|
||||
<controls:ToolbarImageButton x:Name="ReplayToolBtn" ButtonMouseUp="GridInkReplayButton_MouseUp" Label="{i18n:I18n Key=Tools_Replay}" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Margin="0,0,0,0" Height="40"
|
||||
Orientation="Horizontal">
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconScreenshot_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.ScreenshotIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Screenshot}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="OperatingGuideWindowIcon_MouseUp"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.ManualIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Manual}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel MouseDown="Border_MouseDown"
|
||||
MouseUp="SymbolIconSettings_Click"
|
||||
Margin="0,0,0,0" Height="38" Width="32"
|
||||
Orientation="Vertical">
|
||||
<Image Margin="0,4,0,2" Height="19" Width="19">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup
|
||||
ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="{DynamicResource IconForeground}"
|
||||
Geometry="{Binding Source={x:Static icons:XamlGraphicsIconGeometries.SettingsIconGeometry}, Converter={StaticResource StringToGeometryConverter}}"/>
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label Content="{i18n:I18n Key=Tools_Settings}" FontSize="8"
|
||||
HorizontalAlignment="Center" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<controls:ToolbarImageButton x:Name="ScreenshotToolBtn" ButtonMouseUp="SymbolIconScreenshot_MouseUp" Label="{i18n:I18n Key=Tools_Screenshot}" />
|
||||
<controls:ToolbarImageButton x:Name="ManualToolBtn" ButtonMouseUp="OperatingGuideWindowIcon_MouseUp" Label="{i18n:I18n Key=Tools_Manual}" />
|
||||
<controls:ToolbarImageButton x:Name="SettingsToolBtn" ButtonMouseUp="SymbolIconSettings_Click" Label="{i18n:I18n Key=Tools_Settings}" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
@@ -168,6 +168,26 @@ namespace Ink_Canvas
|
||||
ToolsFloatingBarBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ToolsFloatingBarBtnIcon);
|
||||
Fold_Icon.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.FoldIcon);
|
||||
|
||||
TimerToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.TimerIconGeometry);
|
||||
RandomDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.RandomDrawIconGeometry);
|
||||
SingleDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SingleDrawIconGeometry);
|
||||
SaveToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SaveIconGeometry);
|
||||
OpenToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.OpenIconGeometry);
|
||||
ReplayToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ReplayIconGeometry);
|
||||
ScreenshotToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ScreenshotIconGeometry);
|
||||
ManualToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ManualIconGeometry);
|
||||
SettingsToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SettingsIconGeometry);
|
||||
|
||||
BoardTimerToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.TimerIconGeometry);
|
||||
BoardRandomDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.RandomDrawIconGeometry);
|
||||
BoardSingleDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SingleDrawIconGeometry);
|
||||
BoardSaveToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SaveIconGeometry);
|
||||
BoardOpenToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.OpenIconGeometry);
|
||||
BoardReplayToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ReplayIconGeometry);
|
||||
BoardScreenshotToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ScreenshotIconGeometry);
|
||||
BoardManualToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ManualIconGeometry);
|
||||
BoardSettingsToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SettingsIconGeometry);
|
||||
|
||||
bool isDarkTheme = IsCurrentThemeDark();
|
||||
Color selectedColor = isDarkTheme ? Color.FromRgb(102, 204, 255) : Color.FromRgb(30, 58, 138);
|
||||
|
||||
|
||||
@@ -1101,8 +1101,8 @@ namespace Ink_Canvas
|
||||
/// 截图图标点击事件处理
|
||||
/// </summary>
|
||||
/// <param name="sender">发送者</param>
|
||||
/// <param name="e">鼠标按钮事件参数</param>
|
||||
private async void SymbolIconScreenshot_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
/// <param name="e">路由事件参数</param>
|
||||
private async void SymbolIconScreenshot_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
HideSubPanelsImmediately();
|
||||
await Task.Delay(50);
|
||||
@@ -1122,8 +1122,8 @@ namespace Ink_Canvas
|
||||
/// 倒计时计时器图标点击事件处理
|
||||
/// </summary>
|
||||
/// <param name="sender">发送者</param>
|
||||
/// <param name="e">鼠标按钮事件参数</param>
|
||||
private void ImageCountdownTimer_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
/// <param name="e">路由事件参数</param>
|
||||
private void ImageCountdownTimer_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
@@ -1176,8 +1176,8 @@ namespace Ink_Canvas
|
||||
/// 操作指南窗口图标点击事件处理
|
||||
/// </summary>
|
||||
/// <param name="sender">发送者</param>
|
||||
/// <param name="e">鼠标按钮事件参数</param>
|
||||
private void OperatingGuideWindowIcon_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
/// <param name="e">路由事件参数</param>
|
||||
private void OperatingGuideWindowIcon_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
|
||||
@@ -1190,11 +1190,11 @@ namespace Ink_Canvas
|
||||
/// 随机点名图标点击事件处理
|
||||
/// </summary>
|
||||
/// <param name="sender">发送者</param>
|
||||
/// <param name="e">鼠标按钮事件参数</param>
|
||||
private void SymbolIconRand_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
/// <param name="e">路由事件参数</param>
|
||||
private void SymbolIconRand_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
// 如果控件被隐藏，不处理事件
|
||||
if (RandomDrawPanel.Visibility != Visibility.Visible) return;
|
||||
if (BoardRandomDrawToolBtn.Visibility != Visibility.Visible) return;
|
||||
|
||||
LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
@@ -1323,11 +1323,11 @@ namespace Ink_Canvas
|
||||
/// 单次点名图标点击事件处理
|
||||
/// </summary>
|
||||
/// <param name="sender">发送者</param>
|
||||
/// <param name="e">鼠标按钮事件参数</param>
|
||||
private void SymbolIconRandOne_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
/// <param name="e">路由事件参数</param>
|
||||
private void SymbolIconRandOne_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
// 如果控件被隐藏，不处理事件
|
||||
if (SingleDrawPanel.Visibility != Visibility.Visible) return;
|
||||
if (BoardSingleDrawToolBtn.Visibility != Visibility.Visible) return;
|
||||
|
||||
LeftUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
RightUnFoldButtonQuickPanel.Visibility = Visibility.Collapsed;
|
||||
@@ -1398,8 +1398,8 @@ namespace Ink_Canvas
|
||||
/// 墨迹重播按钮点击事件处理
|
||||
/// </summary>
|
||||
/// <param name="sender">发送者</param>
|
||||
/// <param name="e">鼠标按钮事件参数</param>
|
||||
private void GridInkReplayButton_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
/// <param name="e">路由事件参数</param>
|
||||
private void GridInkReplayButton_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//if (lastBorderMouseDownObject != sender) return;
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ namespace Ink_Canvas
|
||||
/// 3. 隐藏通知面板
|
||||
/// 4. 调用SaveInkCanvasStrokes方法保存墨迹
|
||||
/// </remarks>
|
||||
private void SymbolIconSaveStrokes_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
private void SymbolIconSaveStrokes_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (lastBorderMouseDownObject != sender || inkCanvas.Visibility != Visibility.Visible) return;
|
||||
|
||||
@@ -901,7 +901,7 @@ namespace Ink_Canvas
|
||||
/// - 其他：处理单个墨迹文件（二进制格式）
|
||||
/// 5. 如果墨迹画布不可见，切换到鼠标模式
|
||||
/// </remarks>
|
||||
private void SymbolIconOpenStrokes_MouseUp(object sender, MouseButtonEventArgs e)
|
||||
private void SymbolIconOpenStrokes_MouseUp(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (lastBorderMouseDownObject != sender) return;
|
||||
AnimationsHelper.HideWithSlideAndFade(BorderTools);
|
||||
|
||||
@@ -29,16 +29,16 @@ namespace Ink_Canvas
|
||||
/// <param name="sender">事件发送者</param>
|
||||
/// <param name="e">鼠标按钮事件参数</param>
|
||||
/// <remarks>
|
||||
/// 如果发送者是 RandomDrawPanel 或 SingleDrawPanel，且它们被隐藏，则不处理事件
|
||||
/// 如果发送者是 BoardRandomDrawToolBtn 或 BoardSingleDrawToolBtn，且它们被隐藏，则不处理事件
|
||||
/// 否则存储当前鼠标按下的对象
|
||||
/// </remarks>
|
||||
private void Border_MouseDown(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
// 如果发送者是 RandomDrawPanel 或 SingleDrawPanel，且它们被隐藏，则不处理事件
|
||||
if (sender is SimpleStackPanel panel)
|
||||
// 如果发送者是 BoardRandomDrawToolBtn 或 BoardSingleDrawToolBtn，且它们被隐藏，则不处理事件
|
||||
if (sender is FrameworkElement element)
|
||||
{
|
||||
if ((panel == RandomDrawPanel || panel == SingleDrawPanel) &&
|
||||
panel.Visibility != Visibility.Visible)
|
||||
if ((element == BoardRandomDrawToolBtn || element == BoardSingleDrawToolBtn) &&
|
||||
element.Visibility != Visibility.Visible)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4675,8 +4675,8 @@ namespace Ink_Canvas
|
||||
Settings.RandSettings.ShowRandomAndSingleDraw = isToggled;
|
||||
|
||||
// 更新UI显示
|
||||
RandomDrawPanel.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
|
||||
SingleDrawPanel.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
|
||||
BoardRandomDrawToolBtn.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
|
||||
BoardSingleDrawToolBtn.Visibility = isToggled ? Visibility.Visible : Visibility.Collapsed;
|
||||
|
||||
// 保存设置到文件
|
||||
SaveSettingsToFile();
|
||||
|
||||
@@ -1100,8 +1100,8 @@ namespace Ink_Canvas
|
||||
ToggleSwitchEnableQuickDraw.IsOn = Settings.RandSettings.EnableQuickDraw;
|
||||
ToggleSwitchExternalCaller.IsOn = Settings.RandSettings.DirectCallCiRand;
|
||||
ComboBoxExternalCallerType.SelectedIndex = Settings.RandSettings.ExternalCallerType;
|
||||
RandomDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
|
||||
SingleDrawPanel.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
|
||||
BoardRandomDrawToolBtn.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
|
||||
BoardSingleDrawToolBtn.Visibility = Settings.RandSettings.ShowRandomAndSingleDraw ? Visibility.Visible : Visibility.Collapsed;
|
||||
|
||||
// 计时器设置
|
||||
ToggleSwitchUseLegacyTimerUI.IsOn = Settings.RandSettings.UseLegacyTimerUI;
|
||||
|
||||
Reference in New Issue
Block a user