From 96c01500a95193165878d32b488392406564ab26 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sun, 28 Oct 2018 16:44:10 +0800 Subject: [PATCH] add brush example and label style --- HandyControl/HandyControl.csproj | 8 ++++ HandyControl/Themes/Basic/Colors/Colors.xaml | 10 ++-- .../Themes/Basic/Colors/ColorsDark.xaml | 2 +- HandyControl/Themes/Basic/Paths.xaml | 38 ++++++++-------- .../Themes/Styles/Base/BaseStyle.xaml | 2 +- .../Styles/Base/ButtonBaseBaseStyle.xaml | 2 +- .../Themes/Styles/Base/ButtonBaseStyle.xaml | 5 +- .../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 6 +-- .../Styles/Base/ContextMenuBaseStyle.xaml | 14 +++--- .../Themes/Styles/Base/LabelBaseStyle.xaml | 35 ++++++++++++++ .../Themes/Styles/Base/ListBoxBaseStyle.xaml | 10 ++-- .../Styles/Base/PasswordBoxBaseStyle.xaml | 2 +- .../Styles/Base/ProgressBarBaseStyle.xaml | 4 +- .../Styles/Base/ScrollViewerBaseStyle.xaml | 18 ++++---- .../Styles/Base/TabControlBaseStyle.xaml | 8 ++-- .../Styles/Base/TextBlockBaseStyle.xaml | 4 +- .../Styles/Base/ToggleButtonBaseStyle.xaml | 10 ++-- HandyControl/Themes/Styles/Border.xaml | 6 +-- HandyControl/Themes/Styles/Button.xaml | 22 ++++----- HandyControl/Themes/Styles/Calendar.xaml | 18 ++++---- .../Themes/Styles/ContentControl.xaml | 2 +- HandyControl/Themes/Styles/ContextMenu.xaml | 4 +- HandyControl/Themes/Styles/DataGrid.xaml | 30 ++++++------ HandyControl/Themes/Styles/Expander.xaml | 4 +- HandyControl/Themes/Styles/Label.xaml | 33 ++++++++++++++ HandyControl/Themes/Styles/ListBox.xaml | 12 ++--- HandyControl/Themes/Styles/Pagination.xaml | 4 +- HandyControl/Themes/Styles/ProgressBar.xaml | 24 +++++----- HandyControl/Themes/Styles/Slider.xaml | 20 ++++---- HandyControl/Themes/Styles/Style.xaml | 1 + HandyControl/Themes/Styles/TabControl.xaml | 8 ++-- HandyControl/Themes/Styles/TextBlock.xaml | 32 ++++++------- HandyControl/Themes/Styles/ToggleButton.xaml | 38 ++++++++-------- HandyControl/Themes/Styles/ToolTip.xaml | 4 +- HandyControl/Themes/Styles/TreeView.xaml | 10 ++-- HandyControl/Themes/Styles/Window.xaml | 2 +- HandyControlDemo/Data/MessageToken.cs | 2 + HandyControlDemo/Data/MessageToken.tt | 3 +- HandyControlDemo/HandyControlDemo.csproj | 16 +++++-- .../Properties/Langs/Lang.Designer.cs | 9 ++++ .../Properties/Langs/Lang.en.resx | 3 ++ HandyControlDemo/Properties/Langs/Lang.resx | 3 ++ .../Img/LeftMainContent/Brush_16x.png | Bin 0 -> 224 bytes HandyControlDemo/Resources/Img/icon.ico | Bin 0 -> 432254 bytes .../Resources/Themes/Styles/Button.xaml | 2 +- .../Resources/Themes/Styles/Label.xaml | 19 -------- .../Resources/Themes/Styles/ListBoxItem.xaml | 4 +- .../Resources/Themes/Styles/Style.xaml | 1 - .../Controls/TabControlDemoCtl.xaml | 10 ++-- .../UserControl/Main/LeftMainContent.xaml | 15 ++++-- .../UserControl/Styles/BrushDemoCtl.xaml | 43 ++++++++++++++++++ .../UserControl/Styles/BrushDemoCtl.xaml.cs | 11 +++++ README.md | 30 ++++-------- Resources/DarkTheme.png | Bin 0 -> 55898 bytes 54 files changed, 375 insertions(+), 248 deletions(-) create mode 100644 HandyControl/Themes/Styles/Base/LabelBaseStyle.xaml create mode 100644 HandyControl/Themes/Styles/Label.xaml create mode 100644 HandyControlDemo/Resources/Img/LeftMainContent/Brush_16x.png create mode 100644 HandyControlDemo/Resources/Img/icon.ico delete mode 100644 HandyControlDemo/Resources/Themes/Styles/Label.xaml create mode 100644 HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml create mode 100644 HandyControlDemo/UserControl/Styles/BrushDemoCtl.xaml.cs create mode 100644 Resources/DarkTheme.png diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj index 1840a0a5..787b92a2 100644 --- a/HandyControl/HandyControl.csproj +++ b/HandyControl/HandyControl.csproj @@ -204,6 +204,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -340,6 +344,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/HandyControl/Themes/Basic/Colors/Colors.xaml b/HandyControl/Themes/Basic/Colors/Colors.xaml index afa14852..ce8e4aad 100644 --- a/HandyControl/Themes/Basic/Colors/Colors.xaml +++ b/HandyControl/Themes/Basic/Colors/Colors.xaml @@ -7,8 +7,8 @@ #ff8792 #ff4c9f - #ffd07a - #ff9133 + #ffd180 + #ff9100 #4dd0e1 #00bcd4 @@ -23,16 +23,16 @@ White #e0e0e0 - #a0a0a0 + #757575 #eeeeee #ffffff #eeeeee - White + #9e9e9e #73a5ff #5477f5 White - #f4f4f4 + #f5f5f5 #ff5722 #d43f3a diff --git a/HandyControl/Themes/Basic/Colors/ColorsDark.xaml b/HandyControl/Themes/Basic/Colors/ColorsDark.xaml index 764efce2..30831972 100644 --- a/HandyControl/Themes/Basic/Colors/ColorsDark.xaml +++ b/HandyControl/Themes/Basic/Colors/ColorsDark.xaml @@ -27,7 +27,7 @@ #eeeeee #1c1c1c #2d2d30 - #2d2d30 + #424242 #3f3f46 #2d2d30 diff --git a/HandyControl/Themes/Basic/Paths.xaml b/HandyControl/Themes/Basic/Paths.xaml index ece30805..5afdad94 100644 --- a/HandyControl/Themes/Basic/Paths.xaml +++ b/HandyControl/Themes/Basic/Paths.xaml @@ -5,91 +5,91 @@ - - - - - - - - - - - - - - - - - - diff --git a/HandyControl/Themes/Styles/Base/BaseStyle.xaml b/HandyControl/Themes/Styles/Base/BaseStyle.xaml index 428a2e1e..083712a6 100644 --- a/HandyControl/Themes/Styles/Base/BaseStyle.xaml +++ b/HandyControl/Themes/Styles/Base/BaseStyle.xaml @@ -5,7 +5,7 @@ - diff --git a/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml index 60c0150b..455f44ce 100644 --- a/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml +++ b/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml @@ -6,7 +6,7 @@ - - - + + \ No newline at end of file diff --git a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml index 4ec69915..083f7e7a 100644 --- a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml +++ b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml @@ -3,7 +3,7 @@ xmlns:controls="clr-namespace:HandyControl.Controls"> - - - - - - - diff --git a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml index bc3e45fb..9fae3f1d 100644 --- a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml +++ b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml @@ -7,12 +7,12 @@ - - - - - - - - - - - - - - - diff --git a/HandyControl/Themes/Styles/ContextMenu.xaml b/HandyControl/Themes/Styles/ContextMenu.xaml index 9b848fa5..b32349e1 100644 --- a/HandyControl/Themes/Styles/ContextMenu.xaml +++ b/HandyControl/Themes/Styles/ContextMenu.xaml @@ -6,9 +6,9 @@ - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/HandyControl/Themes/Styles/ListBox.xaml b/HandyControl/Themes/Styles/ListBox.xaml index 10f371e4..85937b3d 100644 --- a/HandyControl/Themes/Styles/ListBox.xaml +++ b/HandyControl/Themes/Styles/ListBox.xaml @@ -6,9 +6,9 @@ - - @@ -45,7 +45,7 @@ - diff --git a/HandyControl/Themes/Styles/Pagination.xaml b/HandyControl/Themes/Styles/Pagination.xaml index 857b2511..5f4b74b2 100644 --- a/HandyControl/Themes/Styles/Pagination.xaml +++ b/HandyControl/Themes/Styles/Pagination.xaml @@ -8,7 +8,7 @@ - - - - - - - - - - - - + - + @@ -53,7 +53,7 @@ - + @@ -82,7 +82,7 @@ - - + @@ -241,7 +241,7 @@ - + diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml index 749ca064..a48ec931 100644 --- a/HandyControl/Themes/Styles/Style.xaml +++ b/HandyControl/Themes/Styles/Style.xaml @@ -36,6 +36,7 @@ + \ No newline at end of file diff --git a/HandyControl/Themes/Styles/TabControl.xaml b/HandyControl/Themes/Styles/TabControl.xaml index 7591b4a7..2786f569 100644 --- a/HandyControl/Themes/Styles/TabControl.xaml +++ b/HandyControl/Themes/Styles/TabControl.xaml @@ -113,17 +113,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs index 69ec1060..75a5dc4a 100644 --- a/HandyControlDemo/Data/MessageToken.cs +++ b/HandyControlDemo/Data/MessageToken.cs @@ -74,6 +74,8 @@ public static readonly string NaiveScrollViewerDemoCtl = nameof(NaiveScrollViewerDemoCtl); + public static readonly string BrushDemoCtl = nameof(BrushDemoCtl); + public static readonly string CommonWindow = nameof(CommonWindow); public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow); diff --git a/HandyControlDemo/Data/MessageToken.tt b/HandyControlDemo/Data/MessageToken.tt index c7618e6e..d5e3e8f6 100644 --- a/HandyControlDemo/Data/MessageToken.tt +++ b/HandyControlDemo/Data/MessageToken.tt @@ -42,7 +42,8 @@ var styleList = new List "TreeViewDemoCtl", "BorderDemoCtl", "RadioButtonDemoCtl", - "NaiveScrollViewerDemoCtl" + "NaiveScrollViewerDemoCtl", + "BrushDemoCtl" }; var windowList = new List { diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj index 93b8a8ad..8cf607b6 100644 --- a/HandyControlDemo/HandyControlDemo.csproj +++ b/HandyControlDemo/HandyControlDemo.csproj @@ -33,6 +33,9 @@ prompt 4 + + Resources\Img\icon.ico + ..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll @@ -135,6 +138,9 @@ BorderDemoCtl.xaml + + BrushDemoCtl.xaml + ButtonDemoCtl.xaml @@ -261,10 +267,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile @@ -349,6 +351,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -477,6 +483,8 @@ TextTemplatingFileGenerator MessageToken.cs + + diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs index be057c72..4a2ac7fa 100644 --- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs +++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs @@ -114,6 +114,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 画刷 的本地化字符串。 + /// + public static string Brush { + get { + return ResourceManager.GetString("Brush", resourceCulture); + } + } + /// /// 查找类似 按钮 的本地化字符串。 /// diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx index ea6efc40..f90716fe 100644 --- a/HandyControlDemo/Properties/Langs/Lang.en.resx +++ b/HandyControlDemo/Properties/Langs/Lang.en.resx @@ -375,4 +375,7 @@ Blog + + Brush + \ No newline at end of file diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx index 447ef853..13670a58 100644 --- a/HandyControlDemo/Properties/Langs/Lang.resx +++ b/HandyControlDemo/Properties/Langs/Lang.resx @@ -355,4 +355,7 @@ 博客 + + 画刷 + \ No newline at end of file diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/Brush_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/Brush_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..5da71961ef5afcbe77a4b14eaed05df91e26200f GIT binary patch literal 224 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 z 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 literal 0 HcmV?d00001 diff --git a/HandyControlDemo/Resources/Themes/Styles/Button.xaml b/HandyControlDemo/Resources/Themes/Styles/Button.xaml index 076d5b4c..1f5de5d6 100644 --- a/HandyControlDemo/Resources/Themes/Styles/Button.xaml +++ b/HandyControlDemo/Resources/Themes/Styles/Button.xaml @@ -11,7 +11,7 @@ - + diff --git a/HandyControlDemo/Resources/Themes/Styles/Label.xaml b/HandyControlDemo/Resources/Themes/Styles/Label.xaml deleted file mode 100644 index b3010b9a..00000000 --- a/HandyControlDemo/Resources/Themes/Styles/Label.xaml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/HandyControlDemo/Resources/Themes/Styles/ListBoxItem.xaml b/HandyControlDemo/Resources/Themes/Styles/ListBoxItem.xaml index c19fbc87..91811af6 100644 --- a/HandyControlDemo/Resources/Themes/Styles/ListBoxItem.xaml +++ b/HandyControlDemo/Resources/Themes/Styles/ListBoxItem.xaml @@ -9,7 +9,7 @@