我也不知道我改了啥
This commit is contained in:
+89
-89
@@ -40,96 +40,96 @@
|
|||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
|
||||||
<c:IsEnabledToOpacityConverter x:Key="IsEnabledToOpacityConverter" />
|
<c:IsEnabledToOpacityConverter x:Key="IsEnabledToOpacityConverter" />
|
||||||
<c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
|
<c:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
|
||||||
<c:IntNumberToString x:Key="IntNumberToString" />
|
<c:IntNumberToString x:Key="IntNumberToString" />
|
||||||
<c:IntNumberToString2 x:Key="IntNumberToString2" />
|
<c:IntNumberToString2 x:Key="IntNumberToString2" />
|
||||||
<RoutedUICommand x:Key="KeyExit" Text=" " />
|
<RoutedUICommand x:Key="KeyExit" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_Command_Undo" Text=" " />
|
<RoutedUICommand x:Key="HotKey_Command_Undo" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_Command_Redo" Text=" " />
|
<RoutedUICommand x:Key="HotKey_Command_Redo" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_Command_Clear" Text=" " />
|
<RoutedUICommand x:Key="HotKey_Command_Clear" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_Capture" Text=" " />
|
<RoutedUICommand x:Key="HotKey_Capture" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_Hide" Text=" " />
|
<RoutedUICommand x:Key="HotKey_Hide" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToDrawTool" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToDrawTool" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToQuitDrawTool" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToQuitDrawTool" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToSelect" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToSelect" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToEraser" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToEraser" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToBoard" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToBoard" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToPen1" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToPen1" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToPen2" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToPen2" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToPen3" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToPen3" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToPen4" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToPen4" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_ChangeToPen5" Text=" " />
|
<RoutedUICommand x:Key="HotKey_ChangeToPen5" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_DrawLine" Text=" " />
|
<RoutedUICommand x:Key="HotKey_DrawLine" Text=" " />
|
||||||
<RoutedUICommand x:Key="HotKey_Paste" Text=" " />
|
<RoutedUICommand x:Key="HotKey_Paste" Text=" " />
|
||||||
<RoutedUICommand x:Key="NothingWillHappened" Text=" " />
|
<RoutedUICommand x:Key="NothingWillHappened" Text=" " />
|
||||||
|
|
||||||
<!-- Navigation Button Style -->
|
<!-- Navigation Button Style -->
|
||||||
<Style x:Key="NavButton" TargetType="Button">
|
<Style x:Key="NavButton" TargetType="Button">
|
||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
<Setter Property="BorderThickness" Value="0"/>
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<Border x:Name="border" Background="{TemplateBinding Background}"
|
<Border x:Name="border" Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter Property="Background" Value="#27272a"/>
|
<Setter Property="Background" Value="#27272a"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsPressed" Value="True">
|
<Trigger Property="IsPressed" Value="True">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<!-- 使用多个DataTrigger替代动态绑定 -->
|
<!-- 使用多个DataTrigger替代动态绑定 -->
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="startup">
|
<DataTrigger Binding="{Binding Tag}" Value="startup">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="canvas">
|
<DataTrigger Binding="{Binding Tag}" Value="canvas">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="gesture">
|
<DataTrigger Binding="{Binding Tag}" Value="gesture">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="inkrecognition">
|
<DataTrigger Binding="{Binding Tag}" Value="inkrecognition">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="crashaction">
|
<DataTrigger Binding="{Binding Tag}" Value="crashaction">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="ppt">
|
<DataTrigger Binding="{Binding Tag}" Value="ppt">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="advanced">
|
<DataTrigger Binding="{Binding Tag}" Value="advanced">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="automation">
|
<DataTrigger Binding="{Binding Tag}" Value="automation">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="randomwindow">
|
<DataTrigger Binding="{Binding Tag}" Value="randomwindow">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="theme">
|
<DataTrigger Binding="{Binding Tag}" Value="theme">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="shortcuts">
|
<DataTrigger Binding="{Binding Tag}" Value="shortcuts">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="about">
|
<DataTrigger Binding="{Binding Tag}" Value="about">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding Tag}" Value="plugins">
|
<DataTrigger Binding="{Binding Tag}" Value="plugins">
|
||||||
<Setter Property="Background" Value="#3b82f6"/>
|
<Setter Property="Background" Value="#3b82f6"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<!--输入命令绑定-->
|
<!--输入命令绑定-->
|
||||||
<Window.InputBindings>
|
<Window.InputBindings>
|
||||||
<KeyBinding Gesture="Escape" Command="{StaticResource KeyExit}" />
|
<KeyBinding Gesture="Escape" Command="{StaticResource KeyExit}" />
|
||||||
|
|||||||
@@ -1467,6 +1467,8 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
#endregion Navigation Sidebar Methods
|
#endregion Navigation Sidebar Methods
|
||||||
|
|
||||||
|
#region 插件???
|
||||||
|
|
||||||
// 添加插件系统初始化方法
|
// 添加插件系统初始化方法
|
||||||
private void InitializePluginSystem()
|
private void InitializePluginSystem()
|
||||||
{
|
{
|
||||||
@@ -1521,6 +1523,7 @@ namespace Ink_Canvas
|
|||||||
MessageBox.Show($"打开插件管理器时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
|
MessageBox.Show($"打开插件管理器时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endregion 插件???
|
||||||
|
|
||||||
// 在MainWindow类中添加:
|
// 在MainWindow类中添加:
|
||||||
private void ApplyCurrentEraserShape()
|
private void ApplyCurrentEraserShape()
|
||||||
@@ -1678,7 +1681,7 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
if (selectedUIElement is Image image)
|
if (selectedUIElement is Image image)
|
||||||
{
|
{
|
||||||
ScaleImage(image, 1.25); // 放大5%
|
ScaleImage(image, 1.25);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1688,7 +1691,7 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
if (selectedUIElement is Image image)
|
if (selectedUIElement is Image image)
|
||||||
{
|
{
|
||||||
ScaleImage(image, 0.8); // 缩小5%
|
ScaleImage(image, 0.8);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user