diff --git a/软件系统客户端Wpf/MainWindow.xaml b/软件系统客户端Wpf/MainWindow.xaml index df75ed5..c600b0b 100644 --- a/软件系统客户端Wpf/MainWindow.xaml +++ b/软件系统客户端Wpf/MainWindow.xaml @@ -91,6 +91,11 @@ + + + + + diff --git a/软件系统客户端Wpf/MainWindow.xaml.cs b/软件系统客户端Wpf/MainWindow.xaml.cs index e01c179..ef0be09 100644 --- a/软件系统客户端Wpf/MainWindow.xaml.cs +++ b/软件系统客户端Wpf/MainWindow.xaml.cs @@ -297,6 +297,12 @@ namespace 软件系统客户端Wpf SoftUserPortrait.ChangePortrait(); } + + private void MenuItem主题色调_Click(object sender, RoutedEventArgs e) + { + SetShowRenderControl(UIControl_Palette); + } + private void MenuItem关于本软件_Click(object sender, RoutedEventArgs e) { using (FormAbout fa = new FormAbout(Resource.StringResouce.SoftName, @@ -621,6 +627,8 @@ namespace 软件系统客户端Wpf private UserHome UIControl_Home { get; set; } + private UserPaletteSelector UIControl_Palette { get; set; } + /// /// 正在显示的子界面 /// @@ -658,6 +666,11 @@ namespace 软件系统客户端Wpf UIControl_Home = new UserHome(); all_main_render.Add(UIControl_Home); + + UIControl_Palette = new UserPaletteSelector(); + all_main_render.Add(UIControl_Palette); + + } private void SetShowRenderControl(UserControl control) @@ -710,5 +723,7 @@ namespace 软件系统客户端Wpf { SetShowRenderControl(UIControl_Home); } + + } } diff --git a/软件系统客户端Wpf/Views/Palette.xaml b/软件系统客户端Wpf/Views/Palette.xaml new file mode 100644 index 0000000..5b3b205 --- /dev/null +++ b/软件系统客户端Wpf/Views/Palette.xaml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + Primary - Mid + + + Light + + + Mid + + + Dark + + + Accent + + + diff --git a/软件系统客户端Wpf/Views/Palette.xaml.cs b/软件系统客户端Wpf/Views/Palette.xaml.cs new file mode 100644 index 0000000..8430ec2 --- /dev/null +++ b/软件系统客户端Wpf/Views/Palette.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace 软件系统客户端Wpf.Views +{ + /// + /// Palette.xaml 的交互逻辑 + /// + public partial class Palette : UserControl + { + public Palette() + { + InitializeComponent(); + } + } +} diff --git a/软件系统客户端Wpf/Views/UserPaletteSelector.xaml b/软件系统客户端Wpf/Views/UserPaletteSelector.xaml new file mode 100644 index 0000000..2d8e351 --- /dev/null +++ b/软件系统客户端Wpf/Views/UserPaletteSelector.xaml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This is your current palette. Configure your initial palette in App.xaml, but palettes can be changed at runtime. + + + + + + + + + Light + + Dark + + + + + + + + + + + + + diff --git a/软件系统客户端Wpf/Views/UserPaletteSelector.xaml.cs b/软件系统客户端Wpf/Views/UserPaletteSelector.xaml.cs new file mode 100644 index 0000000..9a155c5 --- /dev/null +++ b/软件系统客户端Wpf/Views/UserPaletteSelector.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace 软件系统客户端Wpf.Views +{ + /// + /// UserPaletteSelector.xaml 的交互逻辑 + /// + public partial class UserPaletteSelector : UserControl + { + public UserPaletteSelector() + { + InitializeComponent(); + } + } +} diff --git a/软件系统客户端Wpf/软件系统客户端Wpf.csproj b/软件系统客户端Wpf/软件系统客户端Wpf.csproj index 3ebd5bc..8add0dd 100644 --- a/软件系统客户端Wpf/软件系统客户端Wpf.csproj +++ b/软件系统客户端Wpf/软件系统客户端Wpf.csproj @@ -73,12 +73,18 @@ MSBuild:Compile Designer + + Palette.xaml + UserChat.xaml UserHome.xaml + + UserPaletteSelector.xaml + MSBuild:Compile Designer @@ -98,6 +104,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -106,6 +116,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile +