From 4d41e6ae34a680ed5e9724834e20d36519163a15 Mon Sep 17 00:00:00 2001 From: kriastans Date: Mon, 10 Jun 2024 18:05:32 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E7=BE=8E=E5=8C=96=E4=BA=86=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B5=AE=E5=8A=A8=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E7=9A=84=E5=9B=BE=E6=A0=87=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=EF=BC=8C=E7=99=BD=E6=9D=BF=E5=B7=A5=E5=85=B7=E6=A0=8F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/Helpers/Converters.cs | 54 ++ Ink Canvas/InkCanvasForClass.csproj | 30 +- Ink Canvas/MainWindow.xaml | 712 ++++++++++----- Ink Canvas/MainWindow_cs/MW_BoardControls.cs | 55 +- Ink Canvas/MainWindow_cs/MW_PageListView.cs | 29 +- Ink Canvas/MainWindow_cs/MW_Settings.cs | 60 +- Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 844 +++++------------- Ink Canvas/MainWindow_cs/MW_TimeMachine.cs | 1 + Ink Canvas/Properties/AssemblyInfo.cs | 4 +- .../Resources/DeveloperAvatars/Alan-CRL.png | Bin 0 -> 176630 bytes .../DeveloperAvatars/ChangSakura.png | Bin 914 -> 4443 bytes .../DeveloperAvatars/NetheriteBowl.png | Bin 0 -> 92698 bytes .../Resources/DeveloperAvatars/NotYoojun.png | Bin 0 -> 286838 bytes .../DeveloperAvatars/Raspberry-Monster.jpg | Bin 1900 -> 0 bytes .../DeveloperAvatars/RaspberryKan.jpg | Bin 0 -> 52231 bytes .../Resources/DeveloperAvatars/STBBRD.png | Bin 1977 -> 30519 bytes .../Resources/DeveloperAvatars/WXRIW.png | Bin 10526 -> 276711 bytes .../Resources/DeveloperAvatars/aaaaaaccd.jpg | Bin 0 -> 53922 bytes .../Resources/DeveloperAvatars/clover-yan.png | Bin 10222 -> 354895 bytes .../Resources/DeveloperAvatars/jiajiaxd.jpg | Bin 1813 -> 39538 bytes .../Resources/DeveloperAvatars/kengwang.png | Bin 8836 -> 200153 bytes .../Resources/DeveloperAvatars/wwei.png | Bin 0 -> 1553 bytes .../DeveloperAvatars/yuwenhui2020.png | Bin 0 -> 1550 bytes .../Icons-png/icc-transparent-dark-small.png | Bin 0 -> 8960 bytes Ink Canvas/Resources/Icons-png/kuanciya.png | Bin 0 -> 9475 bytes .../Icons-png/kuandogeyuanliangwo.png | Bin 0 -> 11113 bytes .../Resources/Icons-png/kuandoujiyanhuaji.png | Bin 0 -> 10646 bytes .../Resources/Icons-png/kuanneikuhuaji.png | Bin 0 -> 10561 bytes .../Resources/Icons-png/kuanshounvhuaji.png | Bin 0 -> 11429 bytes Ink Canvas/Resources/Icons-png/tiebahuaji.png | Bin 0 -> 6347 bytes Ink Canvas/Resources/Settings.cs | 2 + 31 files changed, 913 insertions(+), 878 deletions(-) create mode 100644 Ink Canvas/Resources/DeveloperAvatars/Alan-CRL.png create mode 100644 Ink Canvas/Resources/DeveloperAvatars/NetheriteBowl.png create mode 100644 Ink Canvas/Resources/DeveloperAvatars/NotYoojun.png delete mode 100644 Ink Canvas/Resources/DeveloperAvatars/Raspberry-Monster.jpg create mode 100644 Ink Canvas/Resources/DeveloperAvatars/RaspberryKan.jpg create mode 100644 Ink Canvas/Resources/DeveloperAvatars/aaaaaaccd.jpg create mode 100644 Ink Canvas/Resources/DeveloperAvatars/wwei.png create mode 100644 Ink Canvas/Resources/DeveloperAvatars/yuwenhui2020.png create mode 100644 Ink Canvas/Resources/Icons-png/icc-transparent-dark-small.png create mode 100644 Ink Canvas/Resources/Icons-png/kuanciya.png create mode 100644 Ink Canvas/Resources/Icons-png/kuandogeyuanliangwo.png create mode 100644 Ink Canvas/Resources/Icons-png/kuandoujiyanhuaji.png create mode 100644 Ink Canvas/Resources/Icons-png/kuanneikuhuaji.png create mode 100644 Ink Canvas/Resources/Icons-png/kuanshounvhuaji.png create mode 100644 Ink Canvas/Resources/Icons-png/tiebahuaji.png diff --git a/Ink Canvas/Helpers/Converters.cs b/Ink Canvas/Helpers/Converters.cs index 4b7f47f..1d21995 100644 --- a/Ink Canvas/Helpers/Converters.cs +++ b/Ink Canvas/Helpers/Converters.cs @@ -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 object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index 4c051c7..137bf09 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -138,6 +138,7 @@ + @@ -181,16 +182,30 @@ + + + + + + + + + + + + + + @@ -209,7 +224,6 @@ - @@ -456,11 +470,25 @@ + + + + + + + + + + + + + + diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 20753e3..f4980a3 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -29,6 +29,8 @@ + + @@ -111,7 +113,7 @@ Name="SettingsPanelScrollViewer"> - + Margin="0,0,6,0" Height="20" Width="20"> - - - - - - - - - - - - - - - + + @@ -167,23 +145,35 @@ @@ -195,37 +185,13 @@ VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="0"> + Margin="0,0,6,0" Height="20" Width="20"> - - - - - - - - - - - - - - - + + @@ -234,7 +200,7 @@ @@ -490,9 +456,21 @@ FontSize="26" /> - + + + + + + + + + + + + + @@ -765,29 +743,31 @@ IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" Toggled="ToggleSwitchIsSpecialScreen_OnToggled" /> - - - + + + + + + - - @@ -801,6 +781,8 @@ FontFamily="Microsoft YaHei UI" FontWeight="Bold" Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled" /> + - - + + - - 墨迹、截图自动保存位置: - - -