From 1798018edd012cebff07da37da0f0f452869a1c4 Mon Sep 17 00:00:00 2001 From: dathlin Date: Sun, 16 Jul 2017 09:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=BB=E9=A2=98=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=8F=AF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=B5=85=E8=89=B2=EF=BC=8C=E6=9A=97=E8=89=B2=EF=BC=8C=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=85=B6=E4=BB=96=E8=89=B2=E8=B0=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++ 软件系统客户端Wpf/MainWindow.xaml | 18 ++++-- 软件系统客户端Wpf/MainWindow.xaml.cs | 2 +- .../Views/AnotherCommandImplementation.cs | 57 ++++++++++++++++++ .../Views/PaletteSelectorViewModel.cs | 42 +++++++++++++ .../Views/UserPaletteSelector.xaml | 10 ++- 软件系统客户端Wpf/screenshots/client3.png | Bin 0 -> 108589 bytes 软件系统客户端Wpf/软件系统客户端Wpf.csproj | 2 + 8 files changed, 126 insertions(+), 9 deletions(-) create mode 100644 软件系统客户端Wpf/Views/AnotherCommandImplementation.cs create mode 100644 软件系统客户端Wpf/Views/PaletteSelectorViewModel.cs create mode 100644 软件系统客户端Wpf/screenshots/client3.png diff --git a/README.md b/README.md index af1fab3..ebabb26 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,10 @@ using HslCommunication.Profinet; ![](https://github.com/dathlin/C-S-/raw/master/软件系统客户端Wpf/screenshots/client2.png) +###### 主窗口的暗色主题 + +![](https://github.com/dathlin/C-S-/raw/master/软件系统客户端Wpf/screenshots/client3.png) + ###### 其他功能等待添加
diff --git a/软件系统客户端Wpf/MainWindow.xaml b/软件系统客户端Wpf/MainWindow.xaml index c600b0b..eac8270 100644 --- a/软件系统客户端Wpf/MainWindow.xaml +++ b/软件系统客户端Wpf/MainWindow.xaml @@ -8,7 +8,13 @@ xmlns:y="clr-namespace:ClientsLibrary;assembly=ClientsLibrary" mc:Ignorable="d" Title="MainWindow" Height="550" Width="825" WindowState="Maximized" Activated="Window_Activated" Closing="Window_Closing" ContentRendered="Window_ContentRendered" Initialized="Window_Initialized" - Loaded="Window_Loaded"> + Loaded="Window_Loaded" + TextElement.Foreground="{DynamicResource MaterialDesignBody}" + TextElement.FontWeight="Regular" + TextElement.FontSize="13" + TextOptions.TextFormattingMode="Ideal" + TextOptions.TextRenderingMode="Auto" + Background="{DynamicResource MaterialDesignPaper}"> @@ -20,6 +26,8 @@ + +