[update] 美化了设置页面，浮动工具栏的图标自定义，白板工具栏相关优化
This commit is contained in:
parent
f172318ca9
commit
4d41e6ae34
@ -60,6 +60,60 @@ namespace Ink_Canvas.Converter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class IntNumberToString : IValueConverter
|
||||||
|
{
|
||||||
|
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
|
||||||
|
{
|
||||||
|
if ((double)value == 0)
|
||||||
|
{
|
||||||
|
return "无限制";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return ((double)value).ToString() + "人";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
|
||||||
|
{
|
||||||
|
if ((double)value == 0)
|
||||||
|
{
|
||||||
|
return "无限制";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return ((double)value).ToString() + "人";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class IntNumberToString2 : IValueConverter
|
||||||
|
{
|
||||||
|
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
|
||||||
|
{
|
||||||
|
if ((double)value == 0)
|
||||||
|
{
|
||||||
|
return "自动截图";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return ((double)value).ToString() + "条";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
|
||||||
|
{
|
||||||
|
if ((double)value == 0)
|
||||||
|
{
|
||||||
|
return "自动截图";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return ((double)value).ToString() + "条";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public class IsEnabledToOpacityConverter : IValueConverter
|
public class IsEnabledToOpacityConverter : IValueConverter
|
||||||
{
|
{
|
||||||
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
|
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
|
||||||
|
|||||||
@ -138,6 +138,7 @@
|
|||||||
<None Include="app.manifest" />
|
<None Include="app.manifest" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" />
|
||||||
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.26.3" />
|
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.26.3" />
|
||||||
<PackageReference Include="MdXaml" Version="1.27.0" />
|
<PackageReference Include="MdXaml" Version="1.27.0" />
|
||||||
<PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1018" />
|
<PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1018" />
|
||||||
@ -181,16 +182,30 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="Resources\Cursors\Cursor.cur" />
|
<Resource Include="Resources\Cursors\Cursor.cur" />
|
||||||
<Resource Include="Resources\Cursors\Pen.cur" />
|
<Resource Include="Resources\Cursors\Pen.cur" />
|
||||||
|
<Resource Include="Resources\DeveloperAvatars\aaaaaaccd.jpg" />
|
||||||
|
<Resource Include="Resources\DeveloperAvatars\Alan-CRL.png" />
|
||||||
|
<Resource Include="Resources\DeveloperAvatars\NetheriteBowl.png" />
|
||||||
|
<Resource Include="Resources\DeveloperAvatars\NotYoojun.png" />
|
||||||
|
<Resource Include="Resources\DeveloperAvatars\RaspberryKan.jpg" />
|
||||||
|
<Resource Include="Resources\DeveloperAvatars\wwei.png" />
|
||||||
|
<Resource Include="Resources\DeveloperAvatars\yuwenhui2020.png" />
|
||||||
<Resource Include="Resources\Icons-png\check-box-background.png" />
|
<Resource Include="Resources\Icons-png\check-box-background.png" />
|
||||||
<Resource Include="Resources\Icons-png\eraser-line.png" />
|
<Resource Include="Resources\Icons-png\eraser-line.png" />
|
||||||
<Resource Include="Resources\Icons-png\eraser-outline.png" />
|
<Resource Include="Resources\Icons-png\eraser-outline.png" />
|
||||||
<Resource Include="Resources\Icons-png\HiteLightBoard.png" />
|
<Resource Include="Resources\Icons-png\HiteLightBoard.png" />
|
||||||
|
<Resource Include="Resources\Icons-png\icc-transparent-dark-small.png" />
|
||||||
<Resource Include="Resources\Icons-png\icc-transparent-dark.png" />
|
<Resource Include="Resources\Icons-png\icc-transparent-dark.png" />
|
||||||
<Resource Include="Resources\Icons-png\icc-transparent.png" />
|
<Resource Include="Resources\Icons-png\icc-transparent.png" />
|
||||||
<Resource Include="Resources\Icons-png\icc.png" />
|
<Resource Include="Resources\Icons-png\icc.png" />
|
||||||
|
<Resource Include="Resources\Icons-png\kuanciya.png" />
|
||||||
|
<Resource Include="Resources\Icons-png\kuandogeyuanliangwo.png" />
|
||||||
|
<Resource Include="Resources\Icons-png\kuandoujiyanhuaji.png" />
|
||||||
|
<Resource Include="Resources\Icons-png\kuanneikuhuaji.png" />
|
||||||
|
<Resource Include="Resources\Icons-png\kuanshounvhuaji.png" />
|
||||||
<Resource Include="Resources\Icons-png\playCircle.png" />
|
<Resource Include="Resources\Icons-png\playCircle.png" />
|
||||||
<Resource Include="Resources\Icons-png\redo.png" />
|
<Resource Include="Resources\Icons-png\redo.png" />
|
||||||
<Resource Include="Resources\Icons-png\setting.png" />
|
<Resource Include="Resources\Icons-png\setting.png" />
|
||||||
|
<Resource Include="Resources\Icons-png\tiebahuaji.png" />
|
||||||
<Resource Include="Resources\Icons-png\transparent-grid.png" />
|
<Resource Include="Resources\Icons-png\transparent-grid.png" />
|
||||||
<Resource Include="Resources\Icons-png\undo.png" />
|
<Resource Include="Resources\Icons-png\undo.png" />
|
||||||
<Resource Include="Resources\Icons-png\minimize.png" />
|
<Resource Include="Resources\Icons-png\minimize.png" />
|
||||||
@ -209,7 +224,6 @@
|
|||||||
<Resource Include="Resources\DeveloperAvatars\CN-Ironegg.jpg" />
|
<Resource Include="Resources\DeveloperAvatars\CN-Ironegg.jpg" />
|
||||||
<Resource Include="Resources\DeveloperAvatars\jiajiaxd.jpg" />
|
<Resource Include="Resources\DeveloperAvatars\jiajiaxd.jpg" />
|
||||||
<Resource Include="Resources\DeveloperAvatars\kengwang.png" />
|
<Resource Include="Resources\DeveloperAvatars\kengwang.png" />
|
||||||
<Resource Include="Resources\DeveloperAvatars\Raspberry-Monster.jpg" />
|
|
||||||
<Resource Include="Resources\DeveloperAvatars\STBBRD.png" />
|
<Resource Include="Resources\DeveloperAvatars\STBBRD.png" />
|
||||||
<Resource Include="Resources\DeveloperAvatars\WXRIW.png" />
|
<Resource Include="Resources\DeveloperAvatars\WXRIW.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@ -456,11 +470,25 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="Resources\Cursors\Cursor.cur" />
|
<None Remove="Resources\Cursors\Cursor.cur" />
|
||||||
<None Remove="Resources\Cursors\Pen.cur" />
|
<None Remove="Resources\Cursors\Pen.cur" />
|
||||||
|
<None Remove="Resources\DeveloperAvatars\aaaaaaccd.jpg" />
|
||||||
|
<None Remove="Resources\DeveloperAvatars\Alan-CRL.png" />
|
||||||
|
<None Remove="Resources\DeveloperAvatars\NetheriteBowl.png" />
|
||||||
|
<None Remove="Resources\DeveloperAvatars\NotYoojun.png" />
|
||||||
|
<None Remove="Resources\DeveloperAvatars\RaspberryKan.jpg" />
|
||||||
|
<None Remove="Resources\DeveloperAvatars\wwei.png" />
|
||||||
|
<None Remove="Resources\DeveloperAvatars\yuwenhui2020.png" />
|
||||||
<None Remove="Resources\Icons-png\HiteAnnotation.png" />
|
<None Remove="Resources\Icons-png\HiteAnnotation.png" />
|
||||||
<None Remove="Resources\Icons-png\HiteLightBoard.png" />
|
<None Remove="Resources\Icons-png\HiteLightBoard.png" />
|
||||||
|
<None Remove="Resources\Icons-png\icc-transparent-dark-small.png" />
|
||||||
<None Remove="Resources\Icons-png\icc-transparent-dark.png" />
|
<None Remove="Resources\Icons-png\icc-transparent-dark.png" />
|
||||||
<None Remove="Resources\Icons-png\icc-transparent.png" />
|
<None Remove="Resources\Icons-png\icc-transparent.png" />
|
||||||
<None Remove="Resources\Icons-png\icc.png" />
|
<None Remove="Resources\Icons-png\icc.png" />
|
||||||
|
<None Remove="Resources\Icons-png\kuanciya.png" />
|
||||||
|
<None Remove="Resources\Icons-png\kuandogeyuanliangwo.png" />
|
||||||
|
<None Remove="Resources\Icons-png\kuandoujiyanhuaji.png" />
|
||||||
|
<None Remove="Resources\Icons-png\kuanneikuhuaji.png" />
|
||||||
|
<None Remove="Resources\Icons-png\kuanshounvhuaji.png" />
|
||||||
|
<None Remove="Resources\Icons-png\tiebahuaji.png" />
|
||||||
<None Remove="Resources\Icons-png\transparent-grid.png" />
|
<None Remove="Resources\Icons-png\transparent-grid.png" />
|
||||||
<None Remove="Resources\Icons-png\WenXiang.png" />
|
<None Remove="Resources\Icons-png\WenXiang.png" />
|
||||||
<None Remove="Resources\new-icons\chevron-left.png" />
|
<None Remove="Resources\new-icons\chevron-left.png" />
|
||||||
|
|||||||
@ -29,6 +29,8 @@
|
|||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<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: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=" " />
|
||||||
@ -111,7 +113,7 @@
|
|||||||
Name="SettingsPanelScrollViewer">
|
Name="SettingsPanelScrollViewer">
|
||||||
<StackPanel Margin="20,20,20,20">
|
<StackPanel Margin="20,20,20,20">
|
||||||
|
|
||||||
<Border Margin="0,0,0,10" Height="100" CornerRadius="5" BorderBrush="#fafafa"
|
<Border Margin="0,0,0,10" Height="100" CornerRadius="5" BorderBrush="#a1a1aa"
|
||||||
BorderThickness="1">
|
BorderThickness="1">
|
||||||
<ui:SimpleStackPanel VerticalAlignment="Center">
|
<ui:SimpleStackPanel VerticalAlignment="Center">
|
||||||
<TextBlock Foreground="#fafafa" HorizontalAlignment="Center"
|
<TextBlock Foreground="#fafafa" HorizontalAlignment="Center"
|
||||||
@ -128,37 +130,13 @@
|
|||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
HorizontalAlignment="Center" Spacing="0">
|
HorizontalAlignment="Center" Spacing="0">
|
||||||
<Image RenderOptions.BitmapScalingMode="HighQuality"
|
<Image RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
Margin="0,0,6,0" Height="18" Width="18">
|
Margin="0,0,6,0" Height="20" Width="20">
|
||||||
<Image.Source>
|
<Image.Source>
|
||||||
<DrawingImage>
|
<DrawingImage>
|
||||||
<DrawingImage.Drawing>
|
<DrawingImage.Drawing>
|
||||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||||
<DrawingGroup Opacity="1">
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M6.34315,6.34315C7.84299,4.8433 9.87707,4.0005 11.9981,4 14.2527,4.00897 16.4167,4.88785 18.039,6.45324L18.5858,7 16,7C15.4477,7 15,7.44772 15,8 15,8.55228 15.4477,9 16,9L21,9C21.1356,9 21.2649,8.97301 21.3828,8.92412 21.5007,8.87532 21.6112,8.80298 21.7071,8.70711 21.8902,8.52405 21.9874,8.28768 21.9989,8.04797 21.9996,8.03199 22,8.016 22,8L22,3C22,2.44772 21.5523,2 21,2 20.4477,2 20,2.44772 20,3L20,5.58579 19.4471,5.03289 19.435,5.02103C17.4405,3.09289,14.7779,2.01044,12.0038,2L12,2C9.34784,2 6.8043,3.05357 4.92893,4.92893 3.05357,6.8043 2,9.34784 2,12 2,12.5523 2.44772,13 3,13 3.55228,13 4,12.5523 4,12 4,9.87827 4.84285,7.84344 6.34315,6.34315z" />
|
||||||
<DrawingGroup.ClipGeometry>
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M22,12C22,14.6522 20.9464,17.1957 19.0711,19.0711 17.1957,20.9464 14.6522,22 12,22L11.9962,22C9.22213,21.9896,6.55946,20.9071,4.56496,18.979L4.55289,18.9671 4,18.4142 4,21C4,21.5523 3.55228,22 3,22 2.44772,22 2,21.5523 2,21L2,16.0002C2,15.8646 2.02699,15.7351 2.07588,15.6172 2.12432,15.5001 2.19595,15.3904 2.29078,15.295 2.29219,15.2936 2.2936,15.2922 2.29502,15.2908 2.48924,15.0977 2.74301,15.0008 2.997,15 2.998,15 2.999,15 3,15L8,15C8.55228,15 9,15.4477 9,16 9,16.5523 8.55228,17 8,17L5.41421,17 5.96095,17.5467C7.5833,19.1122 9.74736,19.9911 12.002,20 14.123,19.9995 16.157,19.1567 17.6569,17.6569 19.1571,16.1566 20,14.1217 20,12 20,11.4477 20.4477,11 21,11 21.5523,11 22,11.4477 22,12z" />
|
||||||
<RectangleGeometry RadiusX="0"
|
|
||||||
RadiusY="0" Rect="0,0,24,24" />
|
|
||||||
</DrawingGroup.ClipGeometry>
|
|
||||||
<GeometryDrawing
|
|
||||||
Geometry="F1 M24,24z M0,0z M19.933,13.041C19.7442,14.4809 19.1669,15.8423 18.2632,16.9792 17.3594,18.116 16.1633,18.9853 14.803,19.494 13.4427,20.0027 11.9696,20.1315 10.5417,19.8666 9.11374,19.6017 7.78486,18.953 6.69755,17.9903 5.61024,17.0275 4.80551,15.787 4.36967,14.4016 3.93383,13.0163 3.88332,11.5384 4.22355,10.1266 4.56379,8.7147 5.28194,7.42208 6.30097,6.38734 7.32001,5.3526 8.6015,4.61477 10.008,4.25298 13.907,3.25298 17.943,5.25998 19.433,8.99998">
|
|
||||||
<GeometryDrawing.Pen>
|
|
||||||
<Pen Brush="#FFFFFFFF"
|
|
||||||
Thickness="2"
|
|
||||||
StartLineCap="Round"
|
|
||||||
EndLineCap="Round"
|
|
||||||
LineJoin="Round" MiterLimit="1" />
|
|
||||||
</GeometryDrawing.Pen>
|
|
||||||
</GeometryDrawing>
|
|
||||||
<GeometryDrawing
|
|
||||||
Geometry="F1 M24,24z M0,0z M20,4L20,9 15,9">
|
|
||||||
<GeometryDrawing.Pen>
|
|
||||||
<Pen Brush="#FFFFFFFF"
|
|
||||||
Thickness="2"
|
|
||||||
StartLineCap="Round"
|
|
||||||
EndLineCap="Round"
|
|
||||||
LineJoin="Round" MiterLimit="1" />
|
|
||||||
</GeometryDrawing.Pen>
|
|
||||||
</GeometryDrawing>
|
|
||||||
</DrawingGroup>
|
|
||||||
</DrawingGroup>
|
</DrawingGroup>
|
||||||
</DrawingImage.Drawing>
|
</DrawingImage.Drawing>
|
||||||
</DrawingImage>
|
</DrawingImage>
|
||||||
@ -167,23 +145,35 @@
|
|||||||
<Label FontSize="16" Foreground="#fafafa"
|
<Label FontSize="16" Foreground="#fafafa"
|
||||||
VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
|
VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
|
||||||
FontWeight="Bold">
|
FontWeight="Bold">
|
||||||
重启软件
|
重启
|
||||||
</Label>
|
</Label>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
|
<Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
|
||||||
FontWeight="Bold" Click="BtnResetToSuggestion_Click"
|
Click="BtnResetToSuggestion_Click"
|
||||||
Margin="0,0,0,0">
|
Margin="0,0,0,0">
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal"
|
<ui:SimpleStackPanel Orientation="Horizontal"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
HorizontalAlignment="Center" Spacing="0">
|
HorizontalAlignment="Center" Spacing="0">
|
||||||
<Image
|
<Image
|
||||||
Source="/Resources/Icons-Fluent/ic_fluent_calendar_sync_24_regular.png"
|
|
||||||
Margin="0,0,4,0" RenderOptions.BitmapScalingMode="HighQuality"
|
Margin="0,0,4,0" RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
Height="26" Width="26" />
|
Height="20" Width="20" >
|
||||||
|
<Image.Source>
|
||||||
|
<DrawingImage>
|
||||||
|
<DrawingImage.Drawing>
|
||||||
|
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||||
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M2,6C2,5.44772,2.44772,5,3,5L21,5C21.5523,5 22,5.44772 22,6 22,6.55228 21.5523,7 21,7L3,7C2.44772,7,2,6.55228,2,6z" />
|
||||||
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M2,12C2,11.4477,2.44772,11,3,11L7,11C7.55228,11 8,11.4477 8,12 8,12.5523 7.55228,13 7,13L3,13C2.44772,13,2,12.5523,2,12z" />
|
||||||
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M3,17C2.44772,17 2,17.4477 2,18 2,18.5523 2.44772,19 3,19L7,19C7.55228,19 8,18.5523 8,18 8,17.4477 7.55228,17 7,17L3,17z" />
|
||||||
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M12.3829,11.2029C13.4335,10.1522 14.8952,9.5 16.5,9.5 17.9587,9.5 19.3576,10.0795 20.3891,11.1109 21.4205,12.1424 22,13.5413 22,15 22,16.2593 21.6038,17.4867 20.8675,18.5083 20.1311,19.5299 19.092,20.2939 17.8974,20.6921 16.7027,21.0903 15.413,21.1026 14.211,20.7271 13.009,20.3516 11.9556,19.6074 11.2,18.6 10.8686,18.1582 10.9582,17.5314 11.4,17.2 11.8418,16.8686 12.4686,16.9582 12.8,17.4 13.3037,18.0716 14.006,18.5677 14.8073,18.8181 15.6087,19.0684 16.4685,19.0602 17.2649,18.7947 18.0614,18.5292 18.7541,18.0199 19.245,17.3388 19.7359,16.6578 20,15.8395 20,15 20,14.0717 19.6313,13.1815 18.9749,12.5251 18.3185,11.8687 17.4283,11.5 16.5,11.5 15.4448,11.5 14.4865,11.9278 13.7971,12.6171L13.4142,13 15,13C15.5523,13 16,13.4477 16,14 16,14.5523 15.5523,15 15,15L11.0007,15C10.9997,15 10.998,15 10.997,15 10.8625,14.9996 10.7343,14.9727 10.6172,14.9241 10.5001,14.8757 10.3904,14.804 10.295,14.7092 10.2936,14.7078 10.2922,14.7064 10.2908,14.705 10.196,14.6096 10.1243,14.4999 10.0759,14.3828 10.027,14.2649 10,14.1356 10,14L10,10C10,9.44772 10.4477,9 11,9 11.5523,9 12,9.44772 12,10L12,11.5858 12.3829,11.2029z" />
|
||||||
|
</DrawingGroup>
|
||||||
|
</DrawingImage.Drawing>
|
||||||
|
</DrawingImage>
|
||||||
|
</Image.Source>
|
||||||
|
</Image>
|
||||||
<Label Margin="2,0,0,0" FontSize="16" VerticalAlignment="Center"
|
<Label Margin="2,0,0,0" FontSize="16" VerticalAlignment="Center"
|
||||||
FontFamily="Microsoft YaHei UI" FontWeight="Bold">
|
FontFamily="Microsoft YaHei UI">
|
||||||
重置设置
|
重置
|
||||||
</Label>
|
</Label>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
@ -195,37 +185,13 @@
|
|||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
HorizontalAlignment="Center" Spacing="0">
|
HorizontalAlignment="Center" Spacing="0">
|
||||||
<Image RenderOptions.BitmapScalingMode="HighQuality"
|
<Image RenderOptions.BitmapScalingMode="HighQuality"
|
||||||
Margin="0,0,6,0" Height="18" Width="18">
|
Margin="0,0,6,0" Height="20" Width="20">
|
||||||
<Image.Source>
|
<Image.Source>
|
||||||
<DrawingImage>
|
<DrawingImage>
|
||||||
<DrawingImage.Drawing>
|
<DrawingImage.Drawing>
|
||||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||||
<DrawingGroup Opacity="1">
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M13,2C13,1.44772 12.5523,1 12,1 11.4477,1 11,1.44772 11,2L11,12C11,12.5523 11.4477,13 12,13 12.5523,13 13,12.5523 13,12L13,2z" />
|
||||||
<DrawingGroup.ClipGeometry>
|
<GeometryDrawing Brush="White" Geometry="F1 M24,24z M0,0z M19.1073,5.89303C18.7168,5.50243 18.0837,5.50232 17.6931,5.89277 17.3025,6.28322 17.3024,6.91639 17.6928,7.30698 18.8098,8.42441 19.571,9.84758 19.8802,11.397 20.1894,12.9464 20.0329,14.5528 19.4305,16.0134 18.828,17.474 17.8065,18.7235 16.4948,19.6043 15.1831,20.4851 13.64,20.9578 12.06,20.9628 10.48,20.9677 8.93392,20.5047 7.61674,19.6321 6.29956,18.7595 5.27025,17.5164 4.65863,16.0596 4.04701,14.6028 3.88046,12.9975 4.17999,11.4462 4.47952,9.89485 5.23171,8.46694 6.3417,7.34254 6.7297,6.9495 6.72562,6.31635 6.33258,5.92835 5.93955,5.54036 5.3064,5.54444 4.9184,5.93747 3.5309,7.34298 2.59067,9.12786 2.21626,11.067 1.84185,13.0062 2.05003,15.0128 2.81456,16.8338 3.57909,18.6549 4.86572,20.2087 6.5122,21.2994 8.15867,22.3902 10.0913,22.9689 12.0662,22.9627 14.0412,22.9566 15.9701,22.3657 17.6098,21.2647 19.2494,20.1637 20.5262,18.6018 21.2793,16.776 22.0324,14.9502 22.2281,12.9424 21.8415,11.0056 21.455,9.06878 20.5036,7.28981 19.1073,5.89303z" />
|
||||||
<RectangleGeometry RadiusX="0"
|
|
||||||
RadiusY="0" Rect="0,0,24,24" />
|
|
||||||
</DrawingGroup.ClipGeometry>
|
|
||||||
<GeometryDrawing
|
|
||||||
Geometry="F1 M24,24z M0,0z M7,6C5.78639,7.02477 4.91697,8.39771 4.50943,9.93294 4.10189,11.4682 4.17592,13.0915 4.7215,14.5833 5.26708,16.0751 6.25786,17.3632 7.55971,18.2732 8.86156,19.1833 10.4116,19.6714 12,19.6714 13.5884,19.6714 15.1384,19.1833 16.4403,18.2732 17.7421,17.3632 18.7329,16.0751 19.2785,14.5833 19.8241,13.0915 19.8981,11.4682 19.4906,9.93294 19.083,8.39771 18.2136,7.02477 17,6">
|
|
||||||
<GeometryDrawing.Pen>
|
|
||||||
<Pen Brush="#FFFFFFFF"
|
|
||||||
Thickness="2"
|
|
||||||
StartLineCap="Round"
|
|
||||||
EndLineCap="Round"
|
|
||||||
LineJoin="Round" MiterLimit="1" />
|
|
||||||
</GeometryDrawing.Pen>
|
|
||||||
</GeometryDrawing>
|
|
||||||
<GeometryDrawing
|
|
||||||
Geometry="F1 M24,24z M0,0z M12,4L12,12">
|
|
||||||
<GeometryDrawing.Pen>
|
|
||||||
<Pen Brush="#FFFFFFFF"
|
|
||||||
Thickness="2"
|
|
||||||
StartLineCap="Round"
|
|
||||||
EndLineCap="Round"
|
|
||||||
LineJoin="Round" MiterLimit="1" />
|
|
||||||
</GeometryDrawing.Pen>
|
|
||||||
</GeometryDrawing>
|
|
||||||
</DrawingGroup>
|
|
||||||
</DrawingGroup>
|
</DrawingGroup>
|
||||||
</DrawingImage.Drawing>
|
</DrawingImage.Drawing>
|
||||||
</DrawingImage>
|
</DrawingImage>
|
||||||
@ -234,7 +200,7 @@
|
|||||||
<Label Foreground="#fafafa" FontSize="16"
|
<Label Foreground="#fafafa" FontSize="16"
|
||||||
VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
|
VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
|
||||||
FontWeight="Bold">
|
FontWeight="Bold">
|
||||||
关闭软件
|
退出
|
||||||
</Label>
|
</Label>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
@ -490,9 +456,21 @@
|
|||||||
FontSize="26" />
|
FontSize="26" />
|
||||||
</GroupBox.Header>
|
</GroupBox.Header>
|
||||||
<ui:SimpleStackPanel Spacing="6">
|
<ui:SimpleStackPanel Spacing="6">
|
||||||
<!--
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
<ui:ToggleSwitch OnContent="" OffContent="" Header="显示“橡皮”按钮" IsOn="{Binding ElementName=ToggleSwitchShowButtonEraser, Path=IsOn}" FontFamily="Microsoft YaHei UI"/>
|
<TextBlock Foreground="#fafafa" Text="浮动工具栏图标" VerticalAlignment="Center"
|
||||||
-->
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
|
<ComboBox Name="ComboBoxFloatingBarImg" FontFamily="Microsoft YaHei UI"
|
||||||
|
SelectedIndex="0" SelectionChanged="ComboBoxFloatingBarImg_SelectionChanged">
|
||||||
|
<ComboBoxItem Content="“icc!”默认蓝色" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="“icc!”黑色透明版" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="酷安斗鸡眼滑稽" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="酷安受虐滑稽" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="酷安呲牙笑" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="酷安头戴内裤滑稽" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="酷安绿帽Doge" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="贴吧滑稽" FontFamily="Microsoft YaHei UI" />
|
||||||
|
</ComboBox>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
<TextBlock Foreground="#fafafa" Text="浮动工具栏缩放" VerticalAlignment="Center"
|
<TextBlock Foreground="#fafafa" Text="浮动工具栏缩放" VerticalAlignment="Center"
|
||||||
FontSize="14" Margin="0,0,16,0" />
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
@ -765,29 +743,31 @@
|
|||||||
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
Toggled="ToggleSwitchIsSpecialScreen_OnToggled" />
|
Toggled="ToggleSwitchIsSpecialScreen_OnToggled" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<StackPanel Orientation="Horizontal"
|
<StackPanel Orientation="Vertical">
|
||||||
Visibility="{Binding Visibility,ElementName=TouchMultiplierSlider}">
|
<TextBlock Foreground="#fafafa" Text="触摸倍数" VerticalAlignment="Center"
|
||||||
<Slider x:Name="TouchMultiplierSlider"
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
Minimum="0" Maximum="2"
|
<StackPanel Orientation="Horizontal"
|
||||||
Width="340" FontFamily="Microsoft YaHei UI"
|
Visibility="{Binding Visibility,ElementName=TouchMultiplierSlider}">
|
||||||
ui:ControlHelper.Header="触摸大小倍数"
|
<Slider x:Name="TouchMultiplierSlider"
|
||||||
IsSnapToTickEnabled="True"
|
Minimum="0" Maximum="2"
|
||||||
TickFrequency="0.01" TickPlacement="None"
|
Width="340" FontFamily="Microsoft YaHei UI"
|
||||||
ValueChanged="TouchMultiplierSlider_ValueChanged"
|
IsSnapToTickEnabled="True"
|
||||||
Visibility="Visible" />
|
TickFrequency="0.01" TickPlacement="None"
|
||||||
<TextBlock
|
ValueChanged="TouchMultiplierSlider_ValueChanged"
|
||||||
Text="{Binding Value, ElementName=TouchMultiplierSlider, Mode=OneWay}"
|
Visibility="Visible" />
|
||||||
VerticalAlignment="Bottom" Margin="10,0,0,8"
|
<TextBlock
|
||||||
FontSize="14" Width="30" HorizontalAlignment="Center"
|
Text="{Binding Value, ElementName=TouchMultiplierSlider, Mode=OneWay}"
|
||||||
Visibility="{Binding Path=Visibility, ElementName=TouchMultiplierSlider, Mode=OneWay}" />
|
VerticalAlignment="Bottom" Margin="10,0,0,8"
|
||||||
|
FontSize="14" Width="30" HorizontalAlignment="Center"
|
||||||
|
Visibility="{Binding Path=Visibility, ElementName=TouchMultiplierSlider, Mode=OneWay}" />
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<ui:SimpleStackPanel Spacing="8" Margin="0,4,0,4"
|
<ui:SimpleStackPanel Spacing="8" Margin="0,4,0,4"
|
||||||
Visibility="{Binding Visibility,ElementName=TouchMultiplierSlider}">
|
Visibility="{Binding Visibility,ElementName=TouchMultiplierSlider}">
|
||||||
<TextBlock FontSize="14" Text="在下方区域内用笔尖点击以估计触摸大小倍数" />
|
<TextBlock FontSize="14" Text="在下方区域内用笔尖点击以估计触摸大小倍数" />
|
||||||
<TextBlock Text="# 数值仅供参考" Foreground="#a1a1aa" />
|
<TextBlock Text="# 数值仅供参考" Foreground="#a1a1aa" />
|
||||||
<Border Margin="0,0,20,0" CornerRadius="4" Height="48" Background="White"
|
<Border Margin="0,0,20,0" CornerRadius="4" Height="48" Background="Transparent"
|
||||||
BorderBrush="Black" BorderThickness="2"
|
BorderBrush="#a1a1aa" BorderThickness="2"
|
||||||
TouchDown="BorderCalculateMultiplier_TouchDown" />
|
TouchDown="BorderCalculateMultiplier_TouchDown" />
|
||||||
<TextBlock Name="TextBlockShowCalculatedMultiplier" FontSize="14" />
|
<TextBlock Name="TextBlockShowCalculatedMultiplier" FontSize="14" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
@ -801,6 +781,8 @@
|
|||||||
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled" />
|
Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||||
|
StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
<TextBlock Text="# BoundsWidth 参数作为接触面积区分界限，用来区分橡皮和书写模式。笔尖模式参数值应较小。"
|
<TextBlock Text="# BoundsWidth 参数作为接触面积区分界限，用来区分橡皮和书写模式。笔尖模式参数值应较小。"
|
||||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
<StackPanel Orientation="Horizontal"
|
<StackPanel Orientation="Horizontal"
|
||||||
@ -808,7 +790,7 @@
|
|||||||
<Slider x:Name="NibModeBoundsWidthSlider" Minimum="1" Maximum="50" Width="340"
|
<Slider x:Name="NibModeBoundsWidthSlider" Minimum="1" Maximum="50" Width="340"
|
||||||
FontFamily="Microsoft YaHei UI"
|
FontFamily="Microsoft YaHei UI"
|
||||||
ui:ControlHelper.Header="笔尖模式 BoundsWidth"
|
ui:ControlHelper.Header="笔尖模式 BoundsWidth"
|
||||||
FontSize="15" IsSnapToTickEnabled="True" TickFrequency="1" Value="5"
|
FontSize="14" IsSnapToTickEnabled="True" TickFrequency="1" Value="5"
|
||||||
TickPlacement="None"
|
TickPlacement="None"
|
||||||
ValueChanged="NibModeBoundsWidthSlider_ValueChanged" />
|
ValueChanged="NibModeBoundsWidthSlider_ValueChanged" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
@ -820,7 +802,7 @@
|
|||||||
<Slider x:Name="FingerModeBoundsWidthSlider" Minimum="1" Maximum="50"
|
<Slider x:Name="FingerModeBoundsWidthSlider" Minimum="1" Maximum="50"
|
||||||
Width="340" FontFamily="Microsoft YaHei UI"
|
Width="340" FontFamily="Microsoft YaHei UI"
|
||||||
ui:ControlHelper.Header="手指模式 BoundsWidth"
|
ui:ControlHelper.Header="手指模式 BoundsWidth"
|
||||||
FontSize="15" IsSnapToTickEnabled="True" TickFrequency="1" Value="20"
|
FontSize="14" IsSnapToTickEnabled="True" TickFrequency="1" Value="20"
|
||||||
TickPlacement="None"
|
TickPlacement="None"
|
||||||
ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" />
|
ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
@ -1053,37 +1035,43 @@
|
|||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||||
StrokeThickness="1" Margin="0,4,0,4" />
|
StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
<StackPanel Orientation="Horizontal">
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
<Slider x:Name="SideControlMinimumAutomationSlider"
|
<TextBlock Foreground="#fafafa" Text="自动截图最小墨迹量" VerticalAlignment="Center"
|
||||||
HorizontalAlignment="Left"
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
Minimum="0" Maximum="10"
|
<Slider x:Name="SideControlMinimumAutomationSlider" Minimum="0.3"
|
||||||
Width="335" FontFamily="Microsoft YaHei UI"
|
Maximum="1" Width="168" FontFamily="Microsoft YaHei UI"
|
||||||
ui:ControlHelper.Header="自动截图最小墨迹量(数值为 0 即有墨迹时会自动截图)"
|
FontSize="20" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
|
||||||
IsSnapToTickEnabled="True" Value="0"
|
TickPlacement="None" AutoToolTipPlacement="None"
|
||||||
TickFrequency="1" TickPlacement="None"
|
|
||||||
ValueChanged="SideControlMinimumAutomationSlider_ValueChanged" />
|
ValueChanged="SideControlMinimumAutomationSlider_ValueChanged" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Text="{Binding Value, ElementName=SideControlMinimumAutomationSlider, Mode=OneWay}"
|
Text="{Binding ElementName=SideControlMinimumAutomationSlider, Path=Value, Converter={StaticResource IntNumberToString2} }"
|
||||||
VerticalAlignment="Bottom" Margin="10,0,0,8"
|
VerticalAlignment="Center" FontSize="14" FontFamily="Consolas"
|
||||||
FontSize="14" Width="25" HorizontalAlignment="Center" />
|
Margin="12,0,16,0" />
|
||||||
</StackPanel>
|
|
||||||
<TextBlock FontSize="15">墨迹、截图自动保存位置:</TextBlock>
|
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="10">
|
|
||||||
<TextBox Width="320" x:Name="AutoSavedStrokesLocation" Text="D:\Ink Canvas"
|
|
||||||
TextWrapping="Wrap"
|
|
||||||
TextChanged="AutoSavedStrokesLocationTextBox_TextChanged" />
|
|
||||||
<Button Name="AutoSavedStrokesLocationButton" Content="浏览"
|
|
||||||
Click="AutoSavedStrokesLocationButton_Click" />
|
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="12">
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||||
<Button Name="SetAutoSavedStrokesLocationToDiskDButton"
|
StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
Content="设置保存到 D:\Ink Canvas"
|
<ui:SimpleStackPanel Orientation="Vertical" HorizontalAlignment="Left" Spacing="8">
|
||||||
Click="SetAutoSavedStrokesLocationToDiskDButton_Click" />
|
<TextBlock Foreground="#fafafa" Text="墨迹与截图的保存路径" VerticalAlignment="Center"
|
||||||
<Button Name="SetAutoSavedStrokesLocationToDocumentFolderButton"
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
Content="设置保存到 文档"
|
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="10">
|
||||||
Click="SetAutoSavedStrokesLocationToDocumentFolderButton_Click" />
|
<TextBox Width="320" x:Name="AutoSavedStrokesLocation" Text="D:\Ink Canvas"
|
||||||
|
TextWrapping="Wrap"
|
||||||
|
TextChanged="AutoSavedStrokesLocationTextBox_TextChanged" />
|
||||||
|
<Button Name="AutoSavedStrokesLocationButton" Content="浏览"
|
||||||
|
Click="AutoSavedStrokesLocationButton_Click" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="12">
|
||||||
|
<Button Name="SetAutoSavedStrokesLocationToDiskDButton"
|
||||||
|
Content="设置保存到 D:\Ink Canvas"
|
||||||
|
Click="SetAutoSavedStrokesLocationToDiskDButton_Click" />
|
||||||
|
<Button Name="SetAutoSavedStrokesLocationToDocumentFolderButton"
|
||||||
|
Content="设置保存到 文档"
|
||||||
|
Click="SetAutoSavedStrokesLocationToDocumentFolderButton_Click" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<TextBlock Text="# 请注意检查保存文件夹是否有写入权限" TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<TextBlock Text="* 请注意检查保存文件夹是否有写入权限" TextWrapping="Wrap" Foreground="#a1a1aa" />
|
|
||||||
|
|
||||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||||
StrokeThickness="1" Margin="0,4,0,4" />
|
StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
@ -1094,22 +1082,74 @@
|
|||||||
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
Toggled="ToggleSwitchAutoDelSavedFiles_Toggled" />
|
Toggled="ToggleSwitchAutoDelSavedFiles_Toggled" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<TextBlock Text="！请注意自动删除功能将会删除自动保存目录下所有后缀名为 .icstk 和 .png 的文件！"
|
<TextBlock Text="# 请注意如果开启自动删除功能，将会删除自动保存目录下所有后缀名为 .icstk 和 .png 的文件！"
|
||||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
<TextBlock Foreground="#fafafa" FontSize="15">保存时间设置（Days）:</TextBlock>
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||||
<ComboBox Name="ComboBoxAutoDelSavedFilesDaysThreshold"
|
StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
FontFamily="Microsoft YaHei UI" SelectedIndex="4"
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
SelectionChanged="ComboBoxAutoDelSavedFilesDaysThreshold_SelectionChanged">
|
<TextBlock Foreground="#fafafa" Text="保存时长" VerticalAlignment="Center"
|
||||||
<ComboBoxItem Content="1" />
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
<ComboBoxItem Content="3" />
|
<ComboBox Name="ComboBoxAutoDelSavedFilesDaysThreshold"
|
||||||
<ComboBoxItem Content="5" />
|
FontFamily="Microsoft YaHei UI"
|
||||||
<ComboBoxItem Content="7" />
|
SelectedIndex="4"
|
||||||
<ComboBoxItem Content="15" />
|
SelectionChanged="ComboBoxAutoDelSavedFilesDaysThreshold_SelectionChanged">
|
||||||
<ComboBoxItem Content="30" />
|
<ComboBoxItem Content="1" FontFamily="Microsoft YaHei UI" />
|
||||||
<ComboBoxItem Content="60" />
|
<ComboBoxItem Content="3" FontFamily="Microsoft YaHei UI" />
|
||||||
<ComboBoxItem Content="100" />
|
<ComboBoxItem Content="5" FontFamily="Microsoft YaHei UI" />
|
||||||
<ComboBoxItem Content="365" />
|
<ComboBoxItem Content="7" FontFamily="Microsoft YaHei UI" />
|
||||||
</ComboBox>
|
<ComboBoxItem Content="15" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="30" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="60" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="100" FontFamily="Microsoft YaHei UI" />
|
||||||
|
<ComboBoxItem Content="365" FontFamily="Microsoft YaHei UI" />
|
||||||
|
</ComboBox>
|
||||||
|
<TextBlock Foreground="#fafafa" Text="天" VerticalAlignment="Center"
|
||||||
|
FontSize="14" Margin="8,0,0,0" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
</GroupBox>
|
||||||
|
<GroupBox Name="GroupBoxRandWindow">
|
||||||
|
<GroupBox.Header>
|
||||||
|
<TextBlock Margin="0,12,0,0" Text="随机点名" FontWeight="Bold" Foreground="#fafafa"
|
||||||
|
FontSize="26" />
|
||||||
|
</GroupBox.Header>
|
||||||
|
<ui:SimpleStackPanel Spacing="6">
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
|
<TextBlock Foreground="#fafafa" Text="显示修改随机点名名单的按钮"
|
||||||
|
VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
|
||||||
|
<ui:ToggleSwitch OnContent="" OffContent=""
|
||||||
|
Name="ToggleSwitchDisplayRandWindowNamesInputBtn"
|
||||||
|
IsOn="True" FontFamily="Microsoft YaHei UI"
|
||||||
|
FontWeight="Bold" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||||
|
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
|
<TextBlock Foreground="#fafafa" Text="单次抽人窗口关闭延迟" VerticalAlignment="Center"
|
||||||
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
|
<Slider x:Name="RandWindowOnceCloseLatencySlider" Minimum="0.5"
|
||||||
|
Maximum="8" Width="168" FontFamily="Microsoft YaHei UI"
|
||||||
|
FontSize="20" IsSnapToTickEnabled="True" Value="2.5"
|
||||||
|
TickFrequency="0.1"
|
||||||
|
TickPlacement="None" AutoToolTipPlacement="None" />
|
||||||
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center"
|
||||||
|
Margin="12,0,16,0">
|
||||||
|
<TextBlock FontSize="14" FontFamily="Consolas"
|
||||||
|
Text="{Binding ElementName=RandWindowOnceCloseLatencySlider, Path=Value}" />
|
||||||
|
<TextBlock FontSize="14" FontFamily="Consolas">s</TextBlock>
|
||||||
|
</StackPanel>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
|
<TextBlock Foreground="#fafafa" Text="单次随机点名人数上限" VerticalAlignment="Center"
|
||||||
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
|
<Slider x:Name="RandWindowOnceMaxStudentsSlider" Minimum="0"
|
||||||
|
Maximum="20" Width="168" FontFamily="Microsoft YaHei UI"
|
||||||
|
FontSize="20" IsSnapToTickEnabled="True" Value="10" TickFrequency="1"
|
||||||
|
TickPlacement="None" AutoToolTipPlacement="None" />
|
||||||
|
<TextBlock VerticalAlignment="Center" Margin="12,0,16,0" FontSize="14"
|
||||||
|
FontFamily="Consolas"
|
||||||
|
Text="{Binding ElementName=RandWindowOnceMaxStudentsSlider, Path=Value, Converter={StaticResource IntNumberToString}}" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
<GroupBox>
|
<GroupBox>
|
||||||
@ -1126,146 +1166,338 @@
|
|||||||
<TextBlock
|
<TextBlock
|
||||||
Text="* 使用和分发本软件前，请您应当且务必知晓相关开源协议，且您应当知晓本软件基于 https://github.com/WXRIW/Ink-Canvas 修改而成。"
|
Text="* 使用和分发本软件前，请您应当且务必知晓相关开源协议，且您应当知晓本软件基于 https://github.com/WXRIW/Ink-Canvas 修改而成。"
|
||||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
|
<Border BorderBrush="#a1a1aa" BorderThickness="1" CornerRadius="8" Background="#18181b">
|
||||||
|
<ui:SimpleStackPanel Orientation="Vertical" Margin="8">
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal">
|
||||||
|
<Image Width="32" Height="32" VerticalAlignment="Top">
|
||||||
|
<Image.Source>
|
||||||
|
<DrawingImage>
|
||||||
|
<DrawingImage.Drawing>
|
||||||
|
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||||
|
<GeometryDrawing Brush="White" Geometry="F0 M24,24z M0,0z M12.875,3C12.875,2.51675 12.4832,2.125 12,2.125 11.5168,2.125 11.125,2.51675 11.125,3L11.125,4.25876 5.86249,5.13585C5.84299,5.13895 5.82367,5.1427 5.80454,5.14708 5.62042,5.1891 5.46195,5.28735 5.34446,5.4204 5.31167,5.45747 5.28185,5.49755 5.25544,5.54036 5.23979,5.56568 5.22542,5.59181 5.2124,5.61865L2.21738,11.6087C2.15663,11.7302 2.125,11.8642 2.125,12 2.125,13.0277 2.53326,14.0133 3.25996,14.74 3.98667,15.4667 4.97229,15.875 6,15.875 7.02771,15.875 8.01334,15.4667 8.74004,14.74 9.46674,14.0133 9.875,13.0277 9.875,12 9.875,11.8642 9.84337,11.7302 9.78262,11.6087L7.31244,6.66833 11.125,6.0329 11.125,19.125 7,19.125C6.51675,19.125 6.125,19.5168 6.125,20 6.125,20.4832 6.51675,20.875 7,20.875L17,20.875C17.4832,20.875 17.875,20.4832 17.875,20 17.875,19.5168 17.4832,19.125 17,19.125L12.875,19.125 12.875,6.0329 16.6876,6.66833 14.2174,11.6087C14.1566,11.7302 14.125,11.8642 14.125,12 14.125,13.0277 14.5333,14.0133 15.26,14.74 15.9867,15.4667 16.9723,15.875 18,15.875 19.0277,15.875 20.0133,15.4667 20.74,14.74 21.4667,14.0133 21.875,13.0277 21.875,12 21.875,11.8642 21.8434,11.7302 21.7826,11.6087L18.7876,5.61864C18.7746,5.5918 18.7602,5.56567 18.7446,5.54036 18.7182,5.49755 18.6883,5.45747 18.6555,5.4204 18.538,5.28735 18.3796,5.1891 18.1955,5.14708 18.1763,5.1427 18.157,5.13895 18.1375,5.13585L12.875,4.25876 12.875,3z M3.88347,12.1896C3.92772,12.6837 4.14382,13.149 4.4974,13.5026 4.89591,13.9011 5.43641,14.125 6,14.125 6.56359,14.125 7.10409,13.9011 7.5026,13.5026 7.85618,13.149 8.07228,12.6837 8.11653,12.1896L6,7.95656 3.88347,12.1896z M16.4974,13.5026C16.1438,13.149,15.9277,12.6837,15.8835,12.1896L18,7.95656 20.1165,12.1896C20.0723,12.6837 19.8562,13.149 19.5026,13.5026 19.1041,13.9011 18.5636,14.125 18,14.125 17.4364,14.125 16.8959,13.9011 16.4974,13.5026z" />
|
||||||
|
</DrawingGroup>
|
||||||
|
</DrawingImage.Drawing>
|
||||||
|
</DrawingImage>
|
||||||
|
</Image.Source>
|
||||||
|
</Image>
|
||||||
|
<StackPanel Orientation="Vertical" Margin="4,0,0,0">
|
||||||
|
<TextBlock
|
||||||
|
Text="本软件和ICA，Ink Canvas均基于许可证开源" Margin="0,0,0,-1"
|
||||||
|
TextWrapping="Wrap" Foreground="#a1a1aa" FontWeight="Bold"/>
|
||||||
|
<TextBlock
|
||||||
|
Text="GNU General Public License v3.0" FontSize="20"
|
||||||
|
TextWrapping="Wrap" Foreground="White" />
|
||||||
|
</StackPanel>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<TextBlock
|
||||||
|
Text="本强许可协议的许可条件是，在相同许可协议下，提供许可作品的完整源代码和修改，包括使用许可作品的大型作品。版权和许可声明必须保留。贡献者明确授予专利权。" Margin="0,2,0,1" TextWrapping="Wrap" Foreground="#a1a1aa" FontSize="11" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
</Border>
|
||||||
|
<TextBlock FontSize="18" FontWeight="Bold" Margin="0,0,0,4" Text="开发者：" />
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition />
|
||||||
|
<ColumnDefinition />
|
||||||
|
<ColumnDefinition />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<ui:SimpleStackPanel Grid.Column="0" Orientation="Vertical">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/dubi906w.jpg"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="64"
|
||||||
|
Margin="0,0,0,6" Height="64">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="32,32" RadiusX="32" RadiusY="32" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="18" Foreground="#fde047"
|
||||||
|
FontWeight="Bold">
|
||||||
|
Dubi906w
|
||||||
|
</TextBlock>
|
||||||
|
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
FontSize="12" Foreground="White">
|
||||||
|
ICC 的开发者
|
||||||
|
</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Grid.Column="1" Orientation="Vertical">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/ChangSakura.png"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="64"
|
||||||
|
Margin="0,0,0,6" Height="64">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="32,32" RadiusX="32" RadiusY="32" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="18" Foreground="#fde047"
|
||||||
|
FontWeight="Bold">
|
||||||
|
ChangSakura
|
||||||
|
</TextBlock>
|
||||||
|
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
FontSize="12" Foreground="White">
|
||||||
|
ICA 的开发者
|
||||||
|
</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Grid.Column="2" Orientation="Vertical">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/WXRIW.png"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="64"
|
||||||
|
Margin="0,0,0,6" Height="64">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="32,32" RadiusX="32" RadiusY="32" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="18" Foreground="#fde047"
|
||||||
|
FontWeight="Bold">
|
||||||
|
WXRIW
|
||||||
|
</TextBlock>
|
||||||
|
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
FontSize="12" Foreground="White">Ink Canvas 的开发者</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
</Grid>
|
||||||
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||||
|
StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
<TextBlock FontSize="15">
|
<TextBlock FontSize="15">
|
||||||
<Bold>ICC仓库源:</Bold>
|
<Bold>ICC 仓库源:</Bold>
|
||||||
<Hyperlink Click="HyperlinkSourceToICCRepository_Click">
|
<Hyperlink Click="HyperlinkSourceToICCRepository_Click">
|
||||||
<TextBlock Margin="2,0" Text="gitea:kriastans/InkCanvasForClass"
|
<TextBlock Margin="2,0" Text="gitea:kriastans/InkCanvasForClass"
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
</Hyperlink>
|
</Hyperlink>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
|
|
||||||
<TextBlock Text="ICC开发者: " FontSize="15" FontWeight="Bold" />
|
|
||||||
<Image Source="/Resources/DeveloperAvatars/dubi906w.jpg"
|
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0" Width="20"
|
|
||||||
Height="20">
|
|
||||||
<Image.Clip>
|
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
|
||||||
</Image.Clip>
|
|
||||||
</Image>
|
|
||||||
<TextBlock Text="Dubi906w (Kriastans)" FontSize="15" />
|
|
||||||
</WrapPanel>
|
|
||||||
|
|
||||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="350" Y2="0" Stroke="Black"
|
|
||||||
StrokeThickness="2" />
|
|
||||||
<TextBlock FontSize="15">
|
<TextBlock FontSize="15">
|
||||||
<Bold>ICA仓库源:</Bold>
|
<Bold>ICA 仓库源:</Bold>
|
||||||
<Hyperlink Click="HyperlinkSourceToPresentRepository_Click">
|
<Hyperlink Click="HyperlinkSourceToPresentRepository_Click">
|
||||||
<TextBlock Margin="2,0" Text="ChangSakura/Ink-Canvas" TextWrapping="Wrap" />
|
<TextBlock Margin="2,0" Text="ChangSakura/Ink-Canvas" TextWrapping="Wrap" />
|
||||||
</Hyperlink>
|
</Hyperlink>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
|
|
||||||
<TextBlock Text="ICA开发者: " FontSize="15" FontWeight="Bold" />
|
|
||||||
<Image Source="/Resources/DeveloperAvatars/ChangSakura.png"
|
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Width="20" Height="20" />
|
|
||||||
<TextBlock Text="CJ Wu (ChangSakura)" FontSize="15" />
|
|
||||||
</WrapPanel>
|
|
||||||
|
|
||||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="350" Y2="0" Stroke="Black"
|
|
||||||
StrokeThickness="2" />
|
|
||||||
|
|
||||||
<TextBlock FontSize="15">
|
<TextBlock FontSize="15">
|
||||||
<Bold>IC仓库源:</Bold>
|
<Bold>Ink Canvas 仓库源:</Bold>
|
||||||
<Hyperlink Click="HyperlinkSourceToOringinalRepository_Click">
|
<Hyperlink Click="HyperlinkSourceToOringinalRepository_Click">
|
||||||
<TextBlock Margin="2,0" Text="https://github.com/WXRIW/Ink-Canvas" />
|
<TextBlock Margin="2,0" Text="WXRIW/Ink-Canvas" />
|
||||||
</Hyperlink>
|
</Hyperlink>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
|
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
|
||||||
<TextBlock Text="IC开发者: " FontSize="15" FontWeight="Bold" />
|
StrokeThickness="1" Margin="0,4,0,4" />
|
||||||
<Image Source="/Resources/DeveloperAvatars/WXRIW.png"
|
<TextBlock FontSize="18" FontWeight="Bold" Margin="0,0,0,4" Text="感谢下列贡献者：" />
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0" Width="20"
|
<Grid Margin="8,0">
|
||||||
Height="20">
|
<Grid.ColumnDefinitions>
|
||||||
<Image.Clip>
|
<ColumnDefinition />
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
<ColumnDefinition />
|
||||||
</Image.Clip>
|
<ColumnDefinition />
|
||||||
</Image>
|
<ColumnDefinition />
|
||||||
<TextBlock Text="XY Wang (WXRIW)" FontSize="15" />
|
</Grid.ColumnDefinitions>
|
||||||
</WrapPanel>
|
<Grid.RowDefinitions>
|
||||||
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
|
<RowDefinition/>
|
||||||
<TextBlock Text="IC贡献者: " FontSize="15" FontWeight="Bold" Margin="0,0,0,5" />
|
<RowDefinition/>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
|
<RowDefinition/>
|
||||||
<Image Source="/Resources/DeveloperAvatars/Kengwang.png"
|
</Grid.RowDefinitions>
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0"
|
<ui:SimpleStackPanel Grid.Column="0" Grid.Row="0" Orientation="Vertical">
|
||||||
Width="20" Height="20">
|
<Image Source="/Resources/DeveloperAvatars/RaspberryKan.jpg"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
<Image.Clip>
|
<Image.Clip>
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
</Image.Clip>
|
</Image.Clip>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="Kengwang" FontSize="15" />
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Raspberry Kan
|
||||||
|
</TextBlock>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
|
<ui:SimpleStackPanel Grid.Column="1" Grid.Row="0" Orientation="Vertical">
|
||||||
<Image Source="/Resources/DeveloperAvatars/Raspberry-Monster.jpg"
|
<Image Source="/Resources/DeveloperAvatars/kengwang.png"
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0"
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Width="20" Height="20">
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
<Image.Clip>
|
<Image.Clip>
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
</Image.Clip>
|
</Image.Clip>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="Raspberry Kan " FontSize="15" />
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Kengwang
|
||||||
|
</TextBlock>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
|
<ui:SimpleStackPanel Grid.Column="2" Grid.Row="0" Orientation="Vertical">
|
||||||
<Image Source="/Resources/DeveloperAvatars/jiajiaxd.jpg"
|
<Image Source="/Resources/DeveloperAvatars/jiajiaxd.jpg"
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0"
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Width="20" Height="20">
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
<Image.Clip>
|
<Image.Clip>
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
</Image.Clip>
|
</Image.Clip>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="jiajiaxd" FontSize="15" />
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Charles Jia
|
||||||
|
</TextBlock>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
|
<ui:SimpleStackPanel Grid.Column="3" Grid.Row="0" Orientation="Vertical">
|
||||||
<Image Source="/Resources/DeveloperAvatars/CN-Ironegg.jpg"
|
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0"
|
|
||||||
Width="20" Height="20">
|
|
||||||
<Image.Clip>
|
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
|
||||||
</Image.Clip>
|
|
||||||
</Image>
|
|
||||||
<TextBlock Text="CN-Ironegg" FontSize="15" />
|
|
||||||
</ui:SimpleStackPanel>
|
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
|
|
||||||
<Image Source="/Resources/DeveloperAvatars/clover-yan.png"
|
<Image Source="/Resources/DeveloperAvatars/clover-yan.png"
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0"
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Width="20" Height="20">
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
<Image.Clip>
|
<Image.Clip>
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
</Image.Clip>
|
</Image.Clip>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="Clover Yan" FontSize="15" />
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
clover_yan
|
||||||
|
</TextBlock>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
|
<ui:SimpleStackPanel Grid.Column="0" Grid.Row="1" Orientation="Vertical" Margin="0,16,0,0">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/NetheriteBowl.png"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Netherite_Bowl
|
||||||
|
</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Grid.Column="1" Grid.Row="1" Orientation="Vertical" Margin="0,16,0,0">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/NotYoojun.png"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Yoojun Zhou
|
||||||
|
</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Grid.Column="2" Grid.Row="1" Orientation="Vertical" Margin="0,16,0,0">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/yuwenhui2020.png"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
YuWenHui2020
|
||||||
|
</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Grid.Column="3" Grid.Row="1" Orientation="Vertical" Margin="0,16,0,0">
|
||||||
<Image Source="/Resources/DeveloperAvatars/STBBRD.png"
|
<Image Source="/Resources/DeveloperAvatars/STBBRD.png"
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0"
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Width="20" Height="20">
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
<Image.Clip>
|
<Image.Clip>
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
</Image.Clip>
|
</Image.Clip>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="STBBRD" FontSize="15" />
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
ZongziTEK
|
||||||
|
</TextBlock>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
|
<ui:SimpleStackPanel Grid.Column="0" Grid.Row="2" Orientation="Vertical" Margin="0,16,0,0">
|
||||||
<Image Source="/Resources/DeveloperAvatars/ChangSakura.png"
|
<Image Source="/Resources/DeveloperAvatars/aaaaaaccd.jpg"
|
||||||
RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0"
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Width="20" Height="20">
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
<Image.Clip>
|
<Image.Clip>
|
||||||
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
</Image.Clip>
|
</Image.Clip>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="ChangSakura" FontSize="15" />
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Aesthed
|
||||||
|
</TextBlock>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</WrapPanel>
|
<ui:SimpleStackPanel Grid.Column="1" Grid.Row="2" Orientation="Vertical" Margin="0,16,0,0">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/wwei.png"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Wei
|
||||||
|
</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Grid.Column="2" Grid.Row="2" Orientation="Vertical" Margin="0,16,0,0">
|
||||||
|
<Image Source="/Resources/DeveloperAvatars/Alan-CRL.png"
|
||||||
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
|
RenderOptions.BitmapScalingMode="HighQuality" Width="48"
|
||||||
|
Margin="0,0,0,6" Height="48">
|
||||||
|
<Image.Clip>
|
||||||
|
<EllipseGeometry Center="24,24" RadiusX="24" RadiusY="24" />
|
||||||
|
</Image.Clip>
|
||||||
|
</Image>
|
||||||
|
<TextBlock Margin="0,0,0,2" VerticalAlignment="Center"
|
||||||
|
HorizontalAlignment="Center" FontSize="12" Foreground="White">
|
||||||
|
Alan-CRL
|
||||||
|
</TextBlock>
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
</Grid>
|
||||||
|
<ui:SimpleStackPanel Spacing="3" Orientation="Vertical">
|
||||||
|
<TextBlock
|
||||||
|
Text="© 2024 Dubi906w(Kriastans) 版权所有" FontWeight="Bold"
|
||||||
|
TextWrapping="Wrap" Foreground="White" />
|
||||||
|
<TextBlock
|
||||||
|
Text="© 2022-2024 HarkoTek Studio 提供技术支持"
|
||||||
|
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
|
<TextBlock
|
||||||
|
Text="We love Open-Source forever!" FontWeight="Bold"
|
||||||
|
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
|
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</ui:ScrollViewerEx>
|
</ui:ScrollViewerEx>
|
||||||
<Grid Margin="0,0,0,0" Height="80" VerticalAlignment="Top">
|
<Grid ClipToBounds="True" Margin="0,0,0,0" Height="80" VerticalAlignment="Top">
|
||||||
<Border Background="#18181b" CornerRadius="0" Margin="-1,-1,-1,0">
|
<Border Background="#18181b" CornerRadius="0" Margin="-1,-1,-1,0">
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
<ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
<TextBlock Foreground="White" Margin="25,-2,0,0" Text="设置" FontWeight="Bold"
|
<TextBlock Foreground="White" Margin="25,-2,0,0" Text="设置" FontWeight="Bold"
|
||||||
FontSize="32" />
|
FontSize="32" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
<Canvas>
|
||||||
|
<Image Canvas.Top="12" Canvas.Right="-16" Width="98" Height="98" Opacity="0.4">
|
||||||
|
<Image.RenderTransform>
|
||||||
|
<!-- giving the transform a name tells the framework not to freeze it -->
|
||||||
|
<RotateTransform CenterX="49" CenterY="49" />
|
||||||
|
</Image.RenderTransform>
|
||||||
|
<Image.Source>
|
||||||
|
<DrawingImage>
|
||||||
|
<DrawingImage.Drawing>
|
||||||
|
<DrawingGroup ClipGeometry="M0,0 V257 H257 V0 H0 Z">
|
||||||
|
<GeometryDrawing Brush="GhostWhite" Geometry="F0 M257,257z M0,0z M93.339,256.594L88.2444,215.634C85.4849,214.567 82.8846,213.287 80.4434,211.794 78.0023,210.301 75.6142,208.701 73.2793,206.994L35.3887,222.994 0.363831,162.194 33.1598,137.234C32.9476,135.741,32.8414,134.301,32.8414,132.914L32.8414,124.274C32.8414,122.887,32.9476,121.447,33.1598,119.954L0.363831,94.9941 35.3887,34.1941 73.2793,50.1941C75.6142,48.4874 78.0554,46.8874 80.6026,45.3941 83.1499,43.9007 85.6972,42.6207 88.2444,41.5541L93.339,0.594055 163.389,0.594055 168.483,41.5541C171.243,42.6207 173.843,43.9007 176.284,45.3941 178.725,46.8874 181.113,48.4874 183.448,50.1941L221.339,34.1941 256.364,94.9941 223.568,119.954C223.78,121.447,223.886,122.887,223.886,124.274L223.886,132.914C223.886,134.301,223.674,135.741,223.249,137.234L256.045,162.194 221.021,222.994 183.448,206.994C181.113,208.701 178.672,210.301 176.125,211.794 173.578,213.287 171.031,214.567 168.483,215.634L163.389,256.594 93.339,256.594z M160.523,160.274C151.82,169.021 141.312,173.394 129.001,173.394 116.477,173.394 105.916,169.021 97.3191,160.274 88.722,151.527 84.4235,140.967 84.4235,128.594 84.4235,116.221 88.722,105.661 97.3191,96.9141 105.916,88.1674 116.477,83.7941 129.001,83.7941 141.312,83.7941 151.82,88.1674 160.523,96.9141 169.226,105.661 173.578,116.221 173.578,128.594 173.578,140.967 169.226,151.527 160.523,160.274z" />
|
||||||
|
</DrawingGroup>
|
||||||
|
</DrawingImage.Drawing>
|
||||||
|
</DrawingImage>
|
||||||
|
</Image.Source>
|
||||||
|
<Image.Triggers>
|
||||||
|
<EventTrigger RoutedEvent="Loaded">
|
||||||
|
<BeginStoryboard>
|
||||||
|
<Storyboard>
|
||||||
|
<DoubleAnimation
|
||||||
|
Storyboard.TargetProperty="(Image.RenderTransform).(RotateTransform.Angle)"
|
||||||
|
To="-360" Duration="0:0:3" RepeatBehavior="Forever" />
|
||||||
|
</Storyboard>
|
||||||
|
</BeginStoryboard>
|
||||||
|
</EventTrigger>
|
||||||
|
</Image.Triggers>
|
||||||
|
</Image>
|
||||||
|
</Canvas>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid VerticalAlignment="Bottom" Height="50">
|
<Grid VerticalAlignment="Bottom" Height="50">
|
||||||
<Button FontFamily="Microsoft YaHei UI"
|
<Button FontFamily="Microsoft YaHei UI"
|
||||||
@ -1486,7 +1718,7 @@
|
|||||||
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
|
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
|
||||||
<Border CornerRadius="5,5,5,5" Background="#f4f4f5" Margin="0,0,0,0">
|
<Border CornerRadius="5,5,5,5" Background="#f4f4f5" Margin="0,0,0,0">
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal">
|
<ui:SimpleStackPanel Orientation="Horizontal">
|
||||||
<Border Width="60" Height="50"
|
<Border Width="60" Height="50" IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchPrevious, Path=IsEnabled}"
|
||||||
BorderThickness="1,1,0,1" BorderBrush="#a1a1aa"
|
BorderThickness="1,1,0,1" BorderBrush="#a1a1aa"
|
||||||
MouseUp="BtnWhiteBoardSwitchPrevious_Click" CornerRadius="5,0,0,5"
|
MouseUp="BtnWhiteBoardSwitchPrevious_Click" CornerRadius="5,0,0,5"
|
||||||
Background="#f4f4f5"
|
Background="#f4f4f5"
|
||||||
@ -1498,7 +1730,7 @@
|
|||||||
<DrawingImage>
|
<DrawingImage>
|
||||||
<DrawingImage.Drawing>
|
<DrawingImage.Drawing>
|
||||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||||
<GeometryDrawing Brush="#18181b"
|
<GeometryDrawing Brush="#18181b" x:Name="BtnLeftWhiteBoardSwitchPreviousGeometry"
|
||||||
Geometry="F1 M24,24z M0,0z M7.40091,10.456L14.5033,3.35357 12.3198,1.17001 1.48978,12 12.3198,22.83 14.5033,20.6465 7.40089,13.544 22.5102,13.544 22.5102,10.456 7.40091,10.456z" />
|
Geometry="F1 M24,24z M0,0z M7.40091,10.456L14.5033,3.35357 12.3198,1.17001 1.48978,12 12.3198,22.83 14.5033,20.6465 7.40089,13.544 22.5102,13.544 22.5102,10.456 7.40091,10.456z" />
|
||||||
</DrawingGroup>
|
</DrawingGroup>
|
||||||
</DrawingImage.Drawing>
|
</DrawingImage.Drawing>
|
||||||
@ -1506,7 +1738,7 @@
|
|||||||
</Image.Source>
|
</Image.Source>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="上一页" Foreground="#18181b" VerticalAlignment="Bottom"
|
<TextBlock Text="上一页" Foreground="#18181b" VerticalAlignment="Bottom"
|
||||||
HorizontalAlignment="Center" FontSize="12" />
|
HorizontalAlignment="Center" FontSize="12" x:Name="BtnLeftWhiteBoardSwitchPreviousLabel"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
<Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
|
<Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
|
||||||
@ -1527,18 +1759,38 @@
|
|||||||
CornerRadius="8"
|
CornerRadius="8"
|
||||||
Background="#fafafa" Opacity="1" BorderBrush="#a1a1aa"
|
Background="#fafafa" Opacity="1" BorderBrush="#a1a1aa"
|
||||||
BorderThickness="1">
|
BorderThickness="1">
|
||||||
<Grid>
|
<ui:ScrollViewerEx Name="BlackBoardLeftSidePageListScrollViewer" Height="460"
|
||||||
<ListView ScrollViewer.CanContentScroll="True" VirtualizingStackPanel.VirtualizationMode="Recycling" VirtualizingPanel.IsVirtualizing="True" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Hidden" Name="BlackBoardLeftSidePageListView">
|
VerticalScrollBarVisibility="Hidden"
|
||||||
|
ForceUseSmoothScroll="True">
|
||||||
|
<ListView ScrollViewer.CanContentScroll="False" SelectionMode="Single"
|
||||||
|
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||||
|
ScrollViewer.VerticalScrollBarVisibility="Disabled"
|
||||||
|
Name="BlackBoardLeftSidePageListView">
|
||||||
<ListView.ItemTemplate>
|
<ListView.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<ui:SimpleStackPanel Orientation="Vertical" MouseUp="BlackBoardLeftSidePageListView_OnMouseUp">
|
<ui:SimpleStackPanel Orientation="Vertical"
|
||||||
<Border Margin="0,4" Width="160" BorderBrush="#a1a1aa" BorderThickness="1">
|
MouseUp="BlackBoardLeftSidePageListView_OnMouseUp">
|
||||||
|
<Border Margin="0,4" Width="160" BorderBrush="#a1a1aa"
|
||||||
|
BorderThickness="1">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Viewbox Width="160">
|
<Viewbox Width="160">
|
||||||
<InkCanvas EditingMode="None" Background="{Binding ElementName=GridBackgroundCover, Path=Background}" Strokes="{Binding Strokes}" Width="{Binding ElementName=inkCanvas, Path=ActualWidth}" Height="{Binding ElementName=inkCanvas, Path=ActualHeight}"></InkCanvas>
|
<InkCanvas EditingMode="None"
|
||||||
|
Background="{Binding ElementName=GridBackgroundCover, Path=Background}"
|
||||||
|
Strokes="{Binding Strokes}"
|
||||||
|
Width="{Binding ElementName=inkCanvas, Path=ActualWidth}"
|
||||||
|
Height="{Binding ElementName=inkCanvas, Path=ActualHeight}">
|
||||||
|
</InkCanvas>
|
||||||
</Viewbox>
|
</Viewbox>
|
||||||
<Border Margin="4" Width="36" Height="20" CornerRadius="3" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#cc09090b">
|
<Border Margin="4" Width="36" Height="20"
|
||||||
<TextBlock FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center" FontFamily="Consolas" Foreground="White" Text="{Binding Index}"></TextBlock>
|
CornerRadius="3" HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Background="#cc09090b">
|
||||||
|
<TextBlock FontSize="14"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
FontFamily="Consolas" Foreground="White"
|
||||||
|
Text="{Binding Index}">
|
||||||
|
</TextBlock>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
@ -1546,11 +1798,11 @@
|
|||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListView.ItemTemplate>
|
</ListView.ItemTemplate>
|
||||||
</ListView>
|
</ListView>
|
||||||
</Grid>
|
</ui:ScrollViewerEx>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Border Width="60" Height="50" MouseUp="BtnWhiteBoardSwitchNext_Click"
|
<Border Width="60" Height="50" MouseUp="BtnWhiteBoardSwitchNext_Click"
|
||||||
CornerRadius="0,5,5,0"
|
CornerRadius="0,5,5,0" IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchNext, Path=IsEnabled}"
|
||||||
BorderThickness="0,1,1,1" BorderBrush="#a1a1aa"
|
BorderThickness="0,1,1,1" BorderBrush="#a1a1aa"
|
||||||
Background="#f4f4f5" Opacity="0.95">
|
Background="#f4f4f5" Opacity="0.95">
|
||||||
<Grid Margin="6,6,6,4">
|
<Grid Margin="6,6,6,4">
|
||||||
@ -1560,7 +1812,7 @@
|
|||||||
<DrawingImage>
|
<DrawingImage>
|
||||||
<DrawingImage.Drawing>
|
<DrawingImage.Drawing>
|
||||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||||
<GeometryDrawing Brush="#18181b"
|
<GeometryDrawing Brush="#18181b" x:Name="BtnLeftWhiteBoardSwitchNextGeometry"
|
||||||
Geometry="F1 M24,24z M0,0z M16.5991,10.456L9.49667,3.35357 11.6802,1.17001 22.5102,12 11.6802,22.83 9.49667,20.6465 16.5991,13.544 1.48978,13.544 1.48978,10.456 16.5991,10.456z" />
|
Geometry="F1 M24,24z M0,0z M16.5991,10.456L9.49667,3.35357 11.6802,1.17001 22.5102,12 11.6802,22.83 9.49667,20.6465 16.5991,13.544 1.48978,13.544 1.48978,10.456 16.5991,10.456z" />
|
||||||
</DrawingGroup>
|
</DrawingGroup>
|
||||||
</DrawingImage.Drawing>
|
</DrawingImage.Drawing>
|
||||||
@ -1568,7 +1820,7 @@
|
|||||||
</Image.Source>
|
</Image.Source>
|
||||||
</Image>
|
</Image>
|
||||||
<TextBlock Text="下一页" Foreground="Black" VerticalAlignment="Bottom"
|
<TextBlock Text="下一页" Foreground="Black" VerticalAlignment="Bottom"
|
||||||
HorizontalAlignment="Center" FontSize="12" />
|
HorizontalAlignment="Center" FontSize="12" x:Name="BtnLeftWhiteBoardSwitchNextLabel" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
@ -3644,7 +3896,7 @@
|
|||||||
MouseDown="SymbolIconEmoji_MouseDown" MouseUp="SymbolIconEmoji_MouseUp">
|
MouseDown="SymbolIconEmoji_MouseDown" MouseUp="SymbolIconEmoji_MouseUp">
|
||||||
<ui:SimpleStackPanel Margin="0,2,0,2" Orientation="Horizontal"
|
<ui:SimpleStackPanel Margin="0,2,0,2" Orientation="Horizontal"
|
||||||
HorizontalAlignment="Center">
|
HorizontalAlignment="Center">
|
||||||
<Image Source="/Resources/Icons-png/icc.png" />
|
<Image Margin="0" Name="FloatingbarHeadIconImg" Source="/Resources/Icons-png/icc.png"/>
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
<Border Margin="2,0,0,0" Padding="2" Visibility="Visible" Height="36"
|
<Border Margin="2,0,0,0" Padding="2" Visibility="Visible" Height="36"
|
||||||
|
|||||||
@ -3,12 +3,16 @@ using System;
|
|||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Ink;
|
using System.Windows.Ink;
|
||||||
|
using System.Windows.Input;
|
||||||
using System.Windows.Media.Animation;
|
using System.Windows.Media.Animation;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using System.Windows.Media.Imaging;
|
using System.Windows.Media.Imaging;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using Xceed.Wpf.Toolkit.Core.Utilities;
|
||||||
|
|
||||||
namespace Ink_Canvas {
|
namespace Ink_Canvas {
|
||||||
public partial class MainWindow : Window {
|
public partial class MainWindow : Window {
|
||||||
@ -25,8 +29,7 @@ namespace Ink_Canvas {
|
|||||||
var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
|
var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
|
||||||
TimeMachineHistories[0] = timeMachineHistory;
|
TimeMachineHistories[0] = timeMachineHistory;
|
||||||
timeMachine.ClearStrokeHistory();
|
timeMachine.ClearStrokeHistory();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
|
var timeMachineHistory = timeMachine.ExportTimeMachineHistory();
|
||||||
TimeMachineHistories[CurrentWhiteboardIndex] = timeMachineHistory;
|
TimeMachineHistories[CurrentWhiteboardIndex] = timeMachineHistory;
|
||||||
timeMachine.ClearStrokeHistory();
|
timeMachine.ClearStrokeHistory();
|
||||||
@ -46,8 +49,7 @@ namespace Ink_Canvas {
|
|||||||
if (isBackupMain) {
|
if (isBackupMain) {
|
||||||
timeMachine.ImportTimeMachineHistory(TimeMachineHistories[0]);
|
timeMachine.ImportTimeMachineHistory(TimeMachineHistories[0]);
|
||||||
foreach (var item in TimeMachineHistories[0]) ApplyHistoryToCanvas(item);
|
foreach (var item in TimeMachineHistories[0]) ApplyHistoryToCanvas(item);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
timeMachine.ImportTimeMachineHistory(TimeMachineHistories[CurrentWhiteboardIndex]);
|
timeMachine.ImportTimeMachineHistory(TimeMachineHistories[CurrentWhiteboardIndex]);
|
||||||
foreach (var item in TimeMachineHistories[CurrentWhiteboardIndex]) ApplyHistoryToCanvas(item);
|
foreach (var item in TimeMachineHistories[CurrentWhiteboardIndex]) ApplyHistoryToCanvas(item);
|
||||||
}
|
}
|
||||||
@ -57,19 +59,17 @@ namespace Ink_Canvas {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnWhiteBoardPageIndex_Click(object sender, EventArgs e) {
|
private async void BtnWhiteBoardPageIndex_Click(object sender, EventArgs e) {
|
||||||
if (BoardBorderLeftPageListView.Visibility == Visibility.Visible) {
|
if (BoardBorderLeftPageListView.Visibility == Visibility.Visible) {
|
||||||
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
|
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
|
||||||
} else {
|
} else {
|
||||||
RefreshBlackBoardLeftSidePageListView();
|
RefreshBlackBoardLeftSidePageListView();
|
||||||
|
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
var sb = new Storyboard();
|
var sb = new Storyboard();
|
||||||
|
|
||||||
// 渐变动画
|
// 渐变动画
|
||||||
var fadeInAnimation = new DoubleAnimation
|
var fadeInAnimation = new DoubleAnimation {
|
||||||
{
|
|
||||||
From = 0.5,
|
From = 0.5,
|
||||||
To = 1,
|
To = 1,
|
||||||
Duration = TimeSpan.FromSeconds(0.15)
|
Duration = TimeSpan.FromSeconds(0.15)
|
||||||
@ -79,31 +79,31 @@ namespace Ink_Canvas {
|
|||||||
Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty));
|
Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty));
|
||||||
|
|
||||||
// 滑动动画
|
// 滑动动画
|
||||||
var slideAnimation = new DoubleAnimation
|
var slideAnimation = new DoubleAnimation {
|
||||||
{
|
|
||||||
From = BoardBorderLeftPageListView.RenderTransform.Value.OffsetY + 10, // 滑动距离
|
From = BoardBorderLeftPageListView.RenderTransform.Value.OffsetY + 10, // 滑动距离
|
||||||
To = 0,
|
To = 0,
|
||||||
Duration = TimeSpan.FromSeconds(0.15)
|
Duration = TimeSpan.FromSeconds(0.15)
|
||||||
};
|
};
|
||||||
Storyboard.SetTargetProperty(slideAnimation, new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)"));
|
Storyboard.SetTargetProperty(slideAnimation,
|
||||||
|
new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)"));
|
||||||
|
|
||||||
slideAnimation.EasingFunction = new CubicEase();
|
slideAnimation.EasingFunction = new CubicEase();
|
||||||
|
|
||||||
sb.Children.Add(fadeInAnimation);
|
sb.Children.Add(fadeInAnimation);
|
||||||
sb.Children.Add(slideAnimation);
|
sb.Children.Add(slideAnimation);
|
||||||
|
|
||||||
sb.Completed += (_,__) => {
|
|
||||||
BlackBoardLeftSidePageListView.ScrollIntoView(BlackBoardLeftSidePageListView.SelectedItem);
|
|
||||||
};
|
|
||||||
|
|
||||||
BoardBorderLeftPageListView.Visibility = Visibility.Visible;
|
BoardBorderLeftPageListView.Visibility = Visibility.Visible;
|
||||||
BoardBorderLeftPageListView.RenderTransform = new TranslateTransform();
|
BoardBorderLeftPageListView.RenderTransform = new TranslateTransform();
|
||||||
|
|
||||||
sb.Begin((FrameworkElement)BoardBorderLeftPageListView);
|
sb.Begin((FrameworkElement)BoardBorderLeftPageListView);
|
||||||
}
|
}
|
||||||
catch { }
|
catch { }
|
||||||
|
|
||||||
|
await Task.Delay(1);
|
||||||
|
ScrollViewToVerticalTop(
|
||||||
|
(ListViewItem)BlackBoardLeftSidePageListView.ItemContainerGenerator.ContainerFromIndex(
|
||||||
|
CurrentWhiteboardIndex - 1), BlackBoardLeftSidePageListScrollViewer);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnWhiteBoardSwitchPrevious_Click(object sender, EventArgs e) {
|
private void BtnWhiteBoardSwitchPrevious_Click(object sender, EventArgs e) {
|
||||||
@ -154,6 +154,10 @@ namespace Ink_Canvas {
|
|||||||
UpdateIndexInfoDisplay();
|
UpdateIndexInfoDisplay();
|
||||||
|
|
||||||
if (WhiteboardTotalCount >= 99) BtnWhiteBoardAdd.IsEnabled = false;
|
if (WhiteboardTotalCount >= 99) BtnWhiteBoardAdd.IsEnabled = false;
|
||||||
|
|
||||||
|
if (BlackBoardLeftSidePageListView.Visibility == Visibility.Visible) {
|
||||||
|
RefreshBlackBoardLeftSidePageListView();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnWhiteBoardDelete_Click(object sender, RoutedEventArgs e) {
|
private void BtnWhiteBoardDelete_Click(object sender, RoutedEventArgs e) {
|
||||||
@ -188,8 +192,7 @@ namespace Ink_Canvas {
|
|||||||
//BoardRightPannelNextPage.Source = newImageSource;
|
//BoardRightPannelNextPage.Source = newImageSource;
|
||||||
//BoardRightPannelNextPageTextBlock.Text = "加页";
|
//BoardRightPannelNextPageTextBlock.Text = "加页";
|
||||||
//BoardLeftPannelNextPageTextBlock.Text = "加页";
|
//BoardLeftPannelNextPageTextBlock.Text = "加页";
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
var newImageSource = new BitmapImage();
|
var newImageSource = new BitmapImage();
|
||||||
newImageSource.BeginInit();
|
newImageSource.BeginInit();
|
||||||
newImageSource.UriSource =
|
newImageSource.UriSource =
|
||||||
@ -203,8 +206,22 @@ namespace Ink_Canvas {
|
|||||||
}
|
}
|
||||||
|
|
||||||
BtnWhiteBoardSwitchPrevious.IsEnabled = CurrentWhiteboardIndex != 1;
|
BtnWhiteBoardSwitchPrevious.IsEnabled = CurrentWhiteboardIndex != 1;
|
||||||
|
if (CurrentWhiteboardIndex == 1) {
|
||||||
|
BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
|
||||||
|
BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
|
||||||
|
} else {
|
||||||
|
BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
|
||||||
|
BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 1;
|
||||||
|
}
|
||||||
|
|
||||||
BtnWhiteBoardSwitchNext.IsEnabled = CurrentWhiteboardIndex != WhiteboardTotalCount;
|
BtnWhiteBoardSwitchNext.IsEnabled = CurrentWhiteboardIndex != WhiteboardTotalCount;
|
||||||
|
if (CurrentWhiteboardIndex == WhiteboardTotalCount) {
|
||||||
|
BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
|
||||||
|
BtnLeftWhiteBoardSwitchNextLabel.Opacity = 0.5;
|
||||||
|
} else {
|
||||||
|
BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
|
||||||
|
BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
|
||||||
|
}
|
||||||
|
|
||||||
BtnWhiteBoardDelete.IsEnabled = WhiteboardTotalCount != 1;
|
BtnWhiteBoardDelete.IsEnabled = WhiteboardTotalCount != 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,8 +8,11 @@ using System.Text;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Forms;
|
||||||
using System.Windows.Ink;
|
using System.Windows.Ink;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using Ink_Canvas.Helpers;
|
||||||
|
|
||||||
namespace Ink_Canvas
|
namespace Ink_Canvas
|
||||||
{
|
{
|
||||||
@ -31,37 +34,52 @@ namespace Ink_Canvas
|
|||||||
if (blackBoardLeftSidePageListViewObservableCollection.Count == WhiteboardTotalCount) {
|
if (blackBoardLeftSidePageListViewObservableCollection.Count == WhiteboardTotalCount) {
|
||||||
foreach (int index in Enumerable.Range(1, WhiteboardTotalCount))
|
foreach (int index in Enumerable.Range(1, WhiteboardTotalCount))
|
||||||
{
|
{
|
||||||
|
var st = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[index]);
|
||||||
|
st.Clip(new Rect(0, 0, (int)inkCanvas.ActualWidth, (int)inkCanvas.ActualHeight));
|
||||||
var pitem = new PageListViewItem()
|
var pitem = new PageListViewItem()
|
||||||
{
|
{
|
||||||
Index = index,
|
Index = index,
|
||||||
Strokes = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[index]),
|
Strokes = st,
|
||||||
};
|
};
|
||||||
blackBoardLeftSidePageListViewObservableCollection[index-1] = pitem;
|
blackBoardLeftSidePageListViewObservableCollection[index-1] = pitem;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
blackBoardLeftSidePageListViewObservableCollection.Clear();
|
blackBoardLeftSidePageListViewObservableCollection.Clear();
|
||||||
foreach (int index in Enumerable.Range(1, WhiteboardTotalCount))
|
foreach (int index in Enumerable.Range(1, WhiteboardTotalCount)) {
|
||||||
{
|
var st = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[index]);
|
||||||
|
st.Clip(new Rect(0,0, (int)inkCanvas.ActualWidth, (int)inkCanvas.ActualHeight));
|
||||||
var pitem = new PageListViewItem()
|
var pitem = new PageListViewItem()
|
||||||
{
|
{
|
||||||
Index = index,
|
Index = index,
|
||||||
Strokes = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[index]),
|
Strokes = st,
|
||||||
};
|
};
|
||||||
blackBoardLeftSidePageListViewObservableCollection.Add(pitem);
|
blackBoardLeftSidePageListViewObservableCollection.Add(pitem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var _st = inkCanvas.Strokes.Clone();
|
||||||
|
_st.Clip(new Rect(0, 0, (int)inkCanvas.ActualWidth, (int)inkCanvas.ActualHeight));
|
||||||
var _pitem = new PageListViewItem()
|
var _pitem = new PageListViewItem()
|
||||||
{
|
{
|
||||||
Index = CurrentWhiteboardIndex,
|
Index = CurrentWhiteboardIndex,
|
||||||
Strokes = inkCanvas.Strokes,
|
Strokes = _st,
|
||||||
};
|
};
|
||||||
blackBoardLeftSidePageListViewObservableCollection[CurrentWhiteboardIndex - 1] = _pitem;
|
blackBoardLeftSidePageListViewObservableCollection[CurrentWhiteboardIndex - 1] = _pitem;
|
||||||
|
|
||||||
BlackBoardLeftSidePageListView.SelectedIndex = CurrentWhiteboardIndex -1;
|
BlackBoardLeftSidePageListView.SelectedIndex = CurrentWhiteboardIndex -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void ScrollViewToVerticalTop(FrameworkElement element, ScrollViewer scrollViewer)
|
||||||
|
{
|
||||||
|
var scrollViewerOffset = scrollViewer.VerticalOffset;
|
||||||
|
var point = new Point(0, scrollViewerOffset);
|
||||||
|
var tarPos = element.TransformToVisual(scrollViewer).Transform(point);
|
||||||
|
scrollViewer.ScrollToVerticalOffset(tarPos.Y);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void BlackBoardLeftSidePageListView_OnMouseUp(object sender, MouseButtonEventArgs e) {
|
private void BlackBoardLeftSidePageListView_OnMouseUp(object sender, MouseButtonEventArgs e) {
|
||||||
|
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
|
||||||
var item = BlackBoardLeftSidePageListView.SelectedItem;
|
var item = BlackBoardLeftSidePageListView.SelectedItem;
|
||||||
var index = BlackBoardLeftSidePageListView.SelectedIndex;
|
var index = BlackBoardLeftSidePageListView.SelectedIndex;
|
||||||
if (item != null)
|
if (item != null)
|
||||||
@ -74,5 +92,6 @@ namespace Ink_Canvas
|
|||||||
BlackBoardLeftSidePageListView.SelectedIndex = index;
|
BlackBoardLeftSidePageListView.SelectedIndex = index;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -145,16 +145,14 @@ namespace Ink_Canvas {
|
|||||||
ViewboxFloatingBarMarginAnimation(100, true);
|
ViewboxFloatingBarMarginAnimation(100, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ViewboxFloatingBarOpacityValueSlider_ValueChanged(object sender, RoutedEventArgs e)
|
private void ViewboxFloatingBarOpacityValueSlider_ValueChanged(object sender, RoutedEventArgs e) {
|
||||||
{
|
|
||||||
if (!isLoaded) return;
|
if (!isLoaded) return;
|
||||||
Settings.Appearance.ViewboxFloatingBarOpacityValue = ViewboxFloatingBarOpacityValueSlider.Value;
|
Settings.Appearance.ViewboxFloatingBarOpacityValue = ViewboxFloatingBarOpacityValueSlider.Value;
|
||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
ViewboxFloatingBar.Opacity = Settings.Appearance.ViewboxFloatingBarOpacityValue;
|
ViewboxFloatingBar.Opacity = Settings.Appearance.ViewboxFloatingBarOpacityValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged(object sender, RoutedEventArgs e)
|
private void ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged(object sender, RoutedEventArgs e) {
|
||||||
{
|
|
||||||
if (!isLoaded) return;
|
if (!isLoaded) return;
|
||||||
Settings.Appearance.ViewboxFloatingBarOpacityInPPTValue = ViewboxFloatingBarOpacityInPPTValueSlider.Value;
|
Settings.Appearance.ViewboxFloatingBarOpacityInPPTValue = ViewboxFloatingBarOpacityInPPTValueSlider.Value;
|
||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
@ -189,23 +187,17 @@ namespace Ink_Canvas {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ComboBoxChickenSoupSource_SelectionChanged(object sender, RoutedEventArgs e)
|
private void ComboBoxChickenSoupSource_SelectionChanged(object sender, RoutedEventArgs e) {
|
||||||
{
|
|
||||||
if (!isLoaded) return;
|
if (!isLoaded) return;
|
||||||
Settings.Appearance.ChickenSoupSource = ComboBoxChickenSoupSource.SelectedIndex;
|
Settings.Appearance.ChickenSoupSource = ComboBoxChickenSoupSource.SelectedIndex;
|
||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
if (Settings.Appearance.ChickenSoupSource == 0)
|
if (Settings.Appearance.ChickenSoupSource == 0) {
|
||||||
{
|
|
||||||
int randChickenSoupIndex = new Random().Next(ChickenSoup.OSUPlayerYuLu.Length);
|
int randChickenSoupIndex = new Random().Next(ChickenSoup.OSUPlayerYuLu.Length);
|
||||||
BlackBoardWaterMark.Text = ChickenSoup.OSUPlayerYuLu[randChickenSoupIndex];
|
BlackBoardWaterMark.Text = ChickenSoup.OSUPlayerYuLu[randChickenSoupIndex];
|
||||||
}
|
} else if (Settings.Appearance.ChickenSoupSource == 1) {
|
||||||
else if (Settings.Appearance.ChickenSoupSource == 1)
|
|
||||||
{
|
|
||||||
int randChickenSoupIndex = new Random().Next(ChickenSoup.MingYanJingJu.Length);
|
int randChickenSoupIndex = new Random().Next(ChickenSoup.MingYanJingJu.Length);
|
||||||
BlackBoardWaterMark.Text = ChickenSoup.MingYanJingJu[randChickenSoupIndex];
|
BlackBoardWaterMark.Text = ChickenSoup.MingYanJingJu[randChickenSoupIndex];
|
||||||
}
|
} else if (Settings.Appearance.ChickenSoupSource == 2) {
|
||||||
else if (Settings.Appearance.ChickenSoupSource == 2)
|
|
||||||
{
|
|
||||||
int randChickenSoupIndex = new Random().Next(ChickenSoup.GaoKaoPhrases.Length);
|
int randChickenSoupIndex = new Random().Next(ChickenSoup.GaoKaoPhrases.Length);
|
||||||
BlackBoardWaterMark.Text = ChickenSoup.GaoKaoPhrases[randChickenSoupIndex];
|
BlackBoardWaterMark.Text = ChickenSoup.GaoKaoPhrases[randChickenSoupIndex];
|
||||||
}
|
}
|
||||||
@ -219,6 +211,46 @@ namespace Ink_Canvas {
|
|||||||
LoadSettings();
|
LoadSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ComboBoxFloatingBarImg_SelectionChanged(object sender, RoutedEventArgs e) {
|
||||||
|
if (!isLoaded) return;
|
||||||
|
Settings.Appearance.FloatingBarImg = ComboBoxFloatingBarImg.SelectedIndex;
|
||||||
|
if (ComboBoxFloatingBarImg.SelectedIndex == 0) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/icc.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(0.5);
|
||||||
|
} else if (ComboBoxFloatingBarImg.SelectedIndex == 1) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(
|
||||||
|
new Uri("pack://application:,,,/Resources/Icons-png/icc-transparent-dark-small.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(1.2);
|
||||||
|
} else if (ComboBoxFloatingBarImg.SelectedIndex == 2) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandoujiyanhuaji.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
|
||||||
|
} else if (ComboBoxFloatingBarImg.SelectedIndex == 3) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanshounvhuaji.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
|
||||||
|
} else if (ComboBoxFloatingBarImg.SelectedIndex == 4) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanciya.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
|
||||||
|
} else if (ComboBoxFloatingBarImg.SelectedIndex == 5) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuanneikuhuaji.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
|
||||||
|
} else if (ComboBoxFloatingBarImg.SelectedIndex == 6) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/kuandogeyuanliangwo.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1.5);
|
||||||
|
} else if (ComboBoxFloatingBarImg.SelectedIndex == 7) {
|
||||||
|
FloatingbarHeadIconImg.Source =
|
||||||
|
new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/tiebahuaji.png"));
|
||||||
|
FloatingbarHeadIconImg.Margin = new Thickness(2, 2, 2, 1);
|
||||||
|
}
|
||||||
|
SaveSettingsToFile();
|
||||||
|
}
|
||||||
|
|
||||||
private void ToggleSwitchEnableTimeDisplayInWhiteboardMode_Toggled(object sender, RoutedEventArgs e) {
|
private void ToggleSwitchEnableTimeDisplayInWhiteboardMode_Toggled(object sender, RoutedEventArgs e) {
|
||||||
if (!isLoaded) return;
|
if (!isLoaded) return;
|
||||||
Settings.Appearance.EnableTimeDisplayInWhiteboardMode = ToggleSwitchEnableTimeDisplayInWhiteboardMode.IsOn;
|
Settings.Appearance.EnableTimeDisplayInWhiteboardMode = ToggleSwitchEnableTimeDisplayInWhiteboardMode.IsOn;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -7,6 +7,7 @@ using System.Windows.Ink;
|
|||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
|
||||||
namespace Ink_Canvas {
|
namespace Ink_Canvas {
|
||||||
public partial class MainWindow : Window {
|
public partial class MainWindow : Window {
|
||||||
|
|||||||
@ -49,5 +49,5 @@ using System.Windows;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("5.0.5.0")]
|
[assembly: AssemblyVersion("5.0.4.1")]
|
||||||
[assembly: AssemblyFileVersion("5.0.5.0")]
|
[assembly: AssemblyFileVersion("5.0.4.1")]
|
||||||
BIN
Ink Canvas/Resources/DeveloperAvatars/Alan-CRL.png
Normal file
BIN
Ink Canvas/Resources/DeveloperAvatars/Alan-CRL.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 172 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 914 B After Width: | Height: | Size: 4.3 KiB |
BIN
Ink Canvas/Resources/DeveloperAvatars/NetheriteBowl.png
Normal file
BIN
Ink Canvas/Resources/DeveloperAvatars/NetheriteBowl.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 90 KiB |
BIN
Ink Canvas/Resources/DeveloperAvatars/NotYoojun.png
Normal file
BIN
Ink Canvas/Resources/DeveloperAvatars/NotYoojun.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 280 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
BIN
Ink Canvas/Resources/DeveloperAvatars/RaspberryKan.jpg
Normal file
BIN
Ink Canvas/Resources/DeveloperAvatars/RaspberryKan.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 270 KiB |
BIN
Ink Canvas/Resources/DeveloperAvatars/aaaaaaccd.jpg
Normal file
BIN
Ink Canvas/Resources/DeveloperAvatars/aaaaaaccd.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 53 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 347 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 196 KiB |
BIN
Ink Canvas/Resources/DeveloperAvatars/wwei.png
Normal file
BIN
Ink Canvas/Resources/DeveloperAvatars/wwei.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
Ink Canvas/Resources/DeveloperAvatars/yuwenhui2020.png
Normal file
BIN
Ink Canvas/Resources/DeveloperAvatars/yuwenhui2020.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
Ink Canvas/Resources/Icons-png/icc-transparent-dark-small.png
Normal file
BIN
Ink Canvas/Resources/Icons-png/icc-transparent-dark-small.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.8 KiB |
BIN
Ink Canvas/Resources/Icons-png/kuanciya.png
Normal file
BIN
Ink Canvas/Resources/Icons-png/kuanciya.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
BIN
Ink Canvas/Resources/Icons-png/kuandogeyuanliangwo.png
Normal file
BIN
Ink Canvas/Resources/Icons-png/kuandogeyuanliangwo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
Ink Canvas/Resources/Icons-png/kuandoujiyanhuaji.png
Normal file
BIN
Ink Canvas/Resources/Icons-png/kuandoujiyanhuaji.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
BIN
Ink Canvas/Resources/Icons-png/kuanneikuhuaji.png
Normal file
BIN
Ink Canvas/Resources/Icons-png/kuanneikuhuaji.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
BIN
Ink Canvas/Resources/Icons-png/kuanshounvhuaji.png
Normal file
BIN
Ink Canvas/Resources/Icons-png/kuanshounvhuaji.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
Ink Canvas/Resources/Icons-png/tiebahuaji.png
Normal file
BIN
Ink Canvas/Resources/Icons-png/tiebahuaji.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.2 KiB |
@ -115,6 +115,8 @@ namespace Ink_Canvas
|
|||||||
// public bool EnableViewboxFloatingBarScaleTransform { get; set; } = false;
|
// public bool EnableViewboxFloatingBarScaleTransform { get; set; } = false;
|
||||||
[JsonProperty("viewboxFloatingBarScaleTransformValue")]
|
[JsonProperty("viewboxFloatingBarScaleTransformValue")]
|
||||||
public double ViewboxFloatingBarScaleTransformValue { get; set; } = 1.0;
|
public double ViewboxFloatingBarScaleTransformValue { get; set; } = 1.0;
|
||||||
|
[JsonProperty("floatingBarImg")]
|
||||||
|
public int FloatingBarImg { get; set; } = 0;
|
||||||
[JsonProperty("viewboxFloatingBarOpacityValue")]
|
[JsonProperty("viewboxFloatingBarOpacityValue")]
|
||||||
public double ViewboxFloatingBarOpacityValue { get; set; } = 1.0;
|
public double ViewboxFloatingBarOpacityValue { get; set; } = 1.0;
|
||||||
[JsonProperty("viewboxFloatingBarOpacityInPPTValue")]
|
[JsonProperty("viewboxFloatingBarOpacityInPPTValue")]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user