From f789a919e11d0007354a80d535eabcd9c3592f1c Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Sat, 25 Apr 2026 11:32:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E8=AE=BE=E7=BD=AE):=20=E6=B8=85?= =?UTF-8?q?=E7=90=86=E5=B9=B6=E9=87=8D=E6=9E=84=E8=AE=BE=E7=BD=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除未使用的设置页面文件，包括外观、设计、字体、主题等页面 简化主页导航逻辑，移除动态生成导航项代码 更新导航菜单项图标和跳转逻辑 优化页面布局和代码结构 --- .../SettingsViews/Pages/AppearancePage.xaml | 49 ------- .../Pages/AppearancePage.xaml.cs | 40 ------ .../SettingsViews/Pages/BasicPage.xaml | 58 -------- .../SettingsViews/Pages/BasicPage.xaml.cs | 125 ------------------ .../SettingsViews/Pages/CanvasPage.xaml | 5 +- .../SettingsViews/Pages/ColorsPage.xaml | 17 --- .../SettingsViews/Pages/ColorsPage.xaml.cs | 12 -- .../SettingsViews/Pages/DesignPage.xaml | 38 ------ .../SettingsViews/Pages/DesignPage.xaml.cs | 31 ----- .../SettingsViews/Pages/FontsPage.xaml | 17 --- .../SettingsViews/Pages/FontsPage.xaml.cs | 12 -- .../Windows/SettingsViews/Pages/HomePage.xaml | 123 ++++++++++------- .../SettingsViews/Pages/HomePage.xaml.cs | 99 -------------- .../Pages/MainInterfacePage.xaml | 58 -------- .../Pages/MainInterfacePage.xaml.cs | 116 ---------------- .../SettingsViews/Pages/Page2Page.xaml | 14 -- .../SettingsViews/Pages/Page2Page.xaml.cs | 15 --- .../SettingsViews/Pages/StartupPage.xaml | 2 +- .../SettingsViews/Pages/ThemePage.xaml | 17 --- .../SettingsViews/Pages/ThemePage.xaml.cs | 12 -- .../SettingsViews/Pages/TypographyPage.xaml | 17 --- .../Pages/TypographyPage.xaml.cs | 12 -- .../Windows/SettingsViews/SettingsWindow.xaml | 10 +- .../SettingsViews/SettingsWindow.xaml.cs | 2 - 24 files changed, 85 insertions(+), 816 deletions(-) delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml.cs diff --git a/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml deleted file mode 100644 index f91ec8a5..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml.cs deleted file mode 100644 index 1e36520a..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/AppearancePage.xaml.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Windows; -using System.Windows.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class AppearancePage : Page - { - public AppearancePage() - { - InitializeComponent(); - } - - private void SettingsCard_Click(object sender, RoutedEventArgs e) - { - SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow != null) - { - settingsWindow.NavigateToPage("ThemePage"); - } - } - - private void SettingsCard_Click_1(object sender, RoutedEventArgs e) - { - SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow != null) - { - settingsWindow.NavigateToPage("ColorsPage"); - } - } - - private void SettingsCard_Click_2(object sender, RoutedEventArgs e) - { - SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow != null) - { - settingsWindow.NavigateToPage("FontsPage"); - } - } - } -} diff --git a/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml deleted file mode 100644 index 4c1eb914..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml.cs deleted file mode 100644 index de09d950..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/BasicPage.xaml.cs +++ /dev/null @@ -1,125 +0,0 @@ -using iNKORE.UI.WPF.Modern.Common.IconKeys; -using iNKORE.UI.WPF.Modern.Controls; -using System.Collections.ObjectModel; -using System.Reflection; -using System.Windows; -using System.Windows.Media; -using SWC = System.Windows.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public class SubPageNavItem - { - public string Header { get; set; } - public string Description { get; set; } - public string PageTag { get; set; } - public string IconGlyph { get; set; } - public FontFamily IconFontFamily { get; set; } - } - - public partial class BasicPage : SWC.Page - { - private readonly ObservableCollection _subPageItems = new(); - - public BasicPage() - { - InitializeComponent(); - SubPageItems.ItemsSource = _subPageItems; - Loaded += BasicPage_Loaded; - } - - private void BasicPage_Loaded(object sender, RoutedEventArgs e) - { - LoadSubPages(); - } - - private void LoadSubPages() - { - _subPageItems.Clear(); - - var settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow == null) return; - - var navView = settingsWindow.GetNavigationView(); - if (navView == null) return; - - foreach (var item in navView.MenuItems) - { - if (item is NavigationViewItem navItem) - { - string tag = navItem.Tag as string; - if (tag == "BasicPage" && navItem.MenuItems.Count > 0) - { - foreach (var child in navItem.MenuItems) - { - if (child is NavigationViewItem childItem) - { - string childTag = childItem.Tag as string; - if (!string.IsNullOrEmpty(childTag)) - { - (string glyph, FontFamily fontFamily) = ExtractIconInfo(childItem); - string description = SWC.ToolTipService.GetToolTip(childItem) as string - ?? $"点击跳转到{childItem.Content}"; - - _subPageItems.Add(new SubPageNavItem - { - Header = childItem.Content?.ToString() ?? "", - Description = description, - PageTag = childTag, - IconGlyph = glyph, - IconFontFamily = fontFamily - }); - } - } - } - break; - } - } - } - } - - private (string glyph, FontFamily fontFamily) ExtractIconInfo(NavigationViewItem navItem) - { - if (navItem.Icon is FontIcon fontIcon) - { - string glyph = fontIcon.Glyph ?? "\uE713"; - FontFamily fontFamily = fontIcon.FontFamily ?? new FontFamily("Segoe Fluent Icons"); - - if (fontIcon.Icon != null) - { - string iconStr = fontIcon.Icon.ToString(); - if (iconStr.Contains("_20_")) - { - string key24 = iconStr.Replace("_20_", "_24_"); - var field = typeof(FluentSystemIcons).GetField(key24, BindingFlags.Public | BindingFlags.Static); - if (field != null) - { - var value = field.GetValue(null); - if (value is FontIconData data24) - { - glyph = data24.Glyph ?? glyph; - fontFamily = data24.FontFamily ?? fontFamily; - } - } - } - } - - return (glyph, fontFamily); - } - - if (navItem.Icon is SymbolIcon symbolIcon) - return (char.ConvertFromUtf32((int)symbolIcon.Symbol), new FontFamily("Segoe Fluent Icons")); - - return ("\uE713", new FontFamily("Segoe Fluent Icons")); - } - - private void SubPageCard_Click(object sender, RoutedEventArgs e) - { - if (sender is FrameworkElement element && element.Tag is string pageTag) - { - var settingsWindow = Window.GetWindow(this) as SettingsWindow; - settingsWindow?.NavigateToPage(pageTag); - } - } - } -} diff --git a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml index ba9eb663..3a5107e6 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml @@ -11,9 +11,7 @@ xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls" xmlns:c="clr-namespace:Ink_Canvas.Converter" mc:Ignorable="d" - Title="画板"> - @@ -28,8 +26,7 @@ - - - - - - - - \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml.cs deleted file mode 100644 index d2b357b1..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/ColorsPage.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using iNKORE.UI.WPF.Modern.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class ColorsPage : Page - { - public ColorsPage() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml deleted file mode 100644 index 29ce04d3..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml.cs deleted file mode 100644 index 01d5e7c8..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/DesignPage.xaml.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Windows; -using System.Windows.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class DesignPage : Page - { - public DesignPage() - { - InitializeComponent(); - } - - private void SettingsCard_Click(object sender, RoutedEventArgs e) - { - SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow != null) - { - settingsWindow.NavigateToPage("IconographyPage"); - } - } - - private void SettingsCard_Click_1(object sender, RoutedEventArgs e) - { - SettingsWindow settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow != null) - { - settingsWindow.NavigateToPage("TypographyPage"); - } - } - } -} diff --git a/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml deleted file mode 100644 index 6102e77c..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml.cs deleted file mode 100644 index cb1b9d5d..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/FontsPage.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using iNKORE.UI.WPF.Modern.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class FontsPage : Page - { - public FontsPage() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml index 6c43e434..85c34126 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml @@ -1,57 +1,90 @@ - - - - 4 - - - - - + + + + 4 + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml.cs index a3041fdb..8ba08d8f 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml.cs +++ b/Ink Canvas/Windows/SettingsViews/Pages/HomePage.xaml.cs @@ -1,111 +1,12 @@ -using iNKORE.UI.WPF.Modern.Common.IconKeys; -using iNKORE.UI.WPF.Modern.Controls; -using System.Collections.ObjectModel; -using System.Reflection; using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; namespace Ink_Canvas.Windows.SettingsViews.Pages { - public class QuickNavItem - { - public string Header { get; set; } - public string Description { get; set; } - public string PageTag { get; set; } - public string IconGlyph { get; set; } - public FontFamily IconFontFamily { get; set; } - } - public partial class HomePage { - private readonly ObservableCollection _navItems = new(); - public HomePage() { InitializeComponent(); - QuickNavItems.ItemsSource = _navItems; - Loaded += HomePage_Loaded; - } - - private void HomePage_Loaded(object sender, RoutedEventArgs e) - { - LoadNavigationItems(); - } - - private void LoadNavigationItems() - { - _navItems.Clear(); - - var settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow == null) return; - - var navView = settingsWindow.GetNavigationView(); - if (navView == null) return; - - CollectNavItems(navView.MenuItems); - CollectNavItems(navView.FooterMenuItems); - } - - private void CollectNavItems(System.Collections.IEnumerable items) - { - foreach (var item in items) - { - if (item is NavigationViewItem navItem) - { - string tag = navItem.Tag as string; - if (!string.IsNullOrEmpty(tag) && tag != "HomePage") - { - (string glyph, FontFamily fontFamily) = ExtractIconInfo(navItem); - string description = ToolTipService.GetToolTip(navItem) as string - ?? $"点击跳转到{navItem.Content}"; - - _navItems.Add(new QuickNavItem - { - Header = navItem.Content?.ToString() ?? "", - Description = description, - PageTag = tag, - IconGlyph = glyph, - IconFontFamily = fontFamily - }); - } - } - } - } - - private (string glyph, FontFamily fontFamily) ExtractIconInfo(NavigationViewItem navItem) - { - if (navItem.Icon is FontIcon fontIcon) - { - string glyph = fontIcon.Glyph ?? "\uE713"; - FontFamily fontFamily = fontIcon.FontFamily ?? new FontFamily("Segoe Fluent Icons"); - - if (fontIcon.Icon != null) - { - string iconStr = fontIcon.Icon.ToString(); - if (iconStr.Contains("_20_")) - { - string key24 = iconStr.Replace("_20_", "_24_"); - var field = typeof(FluentSystemIcons).GetField(key24, BindingFlags.Public | BindingFlags.Static); - if (field != null) - { - var value = field.GetValue(null); - if (value is FontIconData data24) - { - glyph = data24.Glyph ?? glyph; - fontFamily = data24.FontFamily ?? fontFamily; - } - } - } - } - - return (glyph, fontFamily); - } - - if (navItem.Icon is SymbolIcon symbolIcon) - return (char.ConvertFromUtf32((int)symbolIcon.Symbol), new FontFamily("Segoe Fluent Icons")); - - return ("\uE713", new FontFamily("Segoe Fluent Icons")); } private void QuickNavCard_Click(object sender, RoutedEventArgs e) diff --git a/Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml deleted file mode 100644 index 0cdee00f..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml.cs deleted file mode 100644 index 5ccb8287..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/MainInterfacePage.xaml.cs +++ /dev/null @@ -1,116 +0,0 @@ -using iNKORE.UI.WPF.Modern.Common.IconKeys; -using iNKORE.UI.WPF.Modern.Controls; -using System.Collections.ObjectModel; -using System.Reflection; -using System.Windows; -using System.Windows.Media; -using SWC = System.Windows.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class MainInterfacePage : SWC.Page - { - private readonly ObservableCollection _subPageItems = new(); - - public MainInterfacePage() - { - InitializeComponent(); - SubPageItems.ItemsSource = _subPageItems; - Loaded += MainInterfacePage_Loaded; - } - - private void MainInterfacePage_Loaded(object sender, RoutedEventArgs e) - { - LoadSubPages(); - } - - private void LoadSubPages() - { - _subPageItems.Clear(); - - var settingsWindow = Window.GetWindow(this) as SettingsWindow; - if (settingsWindow == null) return; - - var navView = settingsWindow.GetNavigationView(); - if (navView == null) return; - - foreach (var item in navView.MenuItems) - { - if (item is NavigationViewItem navItem) - { - string tag = navItem.Tag as string; - if (tag == "MainInterfacePage" && navItem.MenuItems.Count > 0) - { - foreach (var child in navItem.MenuItems) - { - if (child is NavigationViewItem childItem) - { - string childTag = childItem.Tag as string; - if (!string.IsNullOrEmpty(childTag)) - { - (string glyph, FontFamily fontFamily) = ExtractIconInfo(childItem); - string description = SWC.ToolTipService.GetToolTip(childItem) as string - ?? $"点击跳转到{childItem.Content}"; - - _subPageItems.Add(new SubPageNavItem - { - Header = childItem.Content?.ToString() ?? "", - Description = description, - PageTag = childTag, - IconGlyph = glyph, - IconFontFamily = fontFamily - }); - } - } - } - break; - } - } - } - } - - private (string glyph, FontFamily fontFamily) ExtractIconInfo(NavigationViewItem navItem) - { - if (navItem.Icon is FontIcon fontIcon) - { - string glyph = fontIcon.Glyph ?? "\uE737"; - FontFamily fontFamily = fontIcon.FontFamily ?? new FontFamily("Segoe Fluent Icons"); - - if (fontIcon.Icon != null) - { - string iconStr = fontIcon.Icon.ToString(); - if (iconStr.Contains("_20_")) - { - string key24 = iconStr.Replace("_20_", "_24_"); - var field = typeof(FluentSystemIcons).GetField(key24, BindingFlags.Public | BindingFlags.Static); - if (field != null) - { - var value = field.GetValue(null); - if (value is FontIconData data24) - { - glyph = data24.Glyph ?? glyph; - fontFamily = data24.FontFamily ?? fontFamily; - } - } - } - } - - return (glyph, fontFamily); - } - - if (navItem.Icon is SymbolIcon symbolIcon) - return (char.ConvertFromUtf32((int)symbolIcon.Symbol), new FontFamily("Segoe Fluent Icons")); - - return ("\uE737", new FontFamily("Segoe Fluent Icons")); - } - - private void SubPageCard_Click(object sender, RoutedEventArgs e) - { - if (sender is FrameworkElement element && element.Tag is string pageTag) - { - var settingsWindow = Window.GetWindow(this) as SettingsWindow; - settingsWindow?.NavigateToPage(pageTag); - } - } - } -} diff --git a/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml b/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml deleted file mode 100644 index d9f3124f..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml.cs deleted file mode 100644 index d221d279..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/Page2Page.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Windows.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - /// - /// Page2.xaml 的交互逻辑 - /// - public partial class Page2Page : Page - { - public Page2Page() - { - InitializeComponent(); - } - } -} diff --git a/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml index ffac5edd..96b262e4 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml @@ -54,7 +54,7 @@ diff --git a/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml deleted file mode 100644 index 7ba46eab..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml.cs deleted file mode 100644 index bb1fc2c6..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/ThemePage.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using iNKORE.UI.WPF.Modern.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class ThemePage : Page - { - public ThemePage() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml deleted file mode 100644 index 0308f095..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml.cs deleted file mode 100644 index 9728509b..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/TypographyPage.xaml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using iNKORE.UI.WPF.Modern.Controls; - -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class TypographyPage : Page - { - public TypographyPage() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml index df5d3f56..81a304cd 100644 --- a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml +++ b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml @@ -128,7 +128,7 @@ @@ -160,10 +160,10 @@ - + - + @@ -196,7 +196,7 @@ Tag="ExperimentalPage" ToolTipService.ToolTip="实验性选项"> - + diff --git a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs index 7e462177..c4530740 100644 --- a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs +++ b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs @@ -37,10 +37,8 @@ namespace Ink_Canvas.Windows.SettingsViews _pageTypes = new Dictionary { { "HomePage", typeof(HomePage) }, - { "BasicPage", typeof(BasicPage) }, { "StartupPage", typeof(StartupPage) }, { "PrivacyPage", typeof(PrivacyPage) }, - { "MainInterfacePage", typeof(MainInterfacePage) }, { "WindowPage", typeof(WindowPage) }, { "UpdatePage", typeof(UpdatePage) }, { "ExperimentalPage", typeof(ExperimentalPage) },