From 225d2fa9cd04a2fd4f5bc03df45f3241732b50f5 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 21 Nov 2018 18:58:20 +0800
Subject: [PATCH 1/2] add ToolBar style
---
HandyControl/HandyControl.csproj | 8 +
HandyControl/Themes/Basic/Geometries.xaml | 1 +
.../Styles/Base/ContextMenuBaseStyle.xaml | 26 ++-
.../Themes/Styles/Base/ToolBarBaseStyle.xaml | 161 ++++++++++++++++++
HandyControl/Themes/Styles/ContextMenu.xaml | 2 +
HandyControl/Themes/Styles/Style.xaml | 1 +
HandyControl/Themes/Styles/ToolBar.xaml | 11 ++
HandyControlDemo/Data/MessageToken.cs | 2 +
HandyControlDemo/Data/MessageToken.tt | 3 +-
HandyControlDemo/HandyControlDemo.csproj | 8 +
.../Properties/Langs/Lang.Designer.cs | 9 +
.../Properties/Langs/Lang.en.resx | 3 +
HandyControlDemo/Properties/Langs/Lang.resx | 3 +
.../Img/LeftMainContent/ToolBar_16x.png | Bin 0 -> 164 bytes
.../UserControl/Main/LeftMainContent.xaml | 7 +-
.../UserControl/Styles/ToolBarDemoCtl.xaml | 61 +++++++
.../UserControl/Styles/ToolBarDemoCtl.xaml.cs | 10 ++
README.md | 12 +-
Resources/ToolBar.png | Bin 0 -> 6387 bytes
19 files changed, 319 insertions(+), 9 deletions(-)
create mode 100644 HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml
create mode 100644 HandyControl/Themes/Styles/ToolBar.xaml
create mode 100644 HandyControlDemo/Resources/Img/LeftMainContent/ToolBar_16x.png
create mode 100644 HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml
create mode 100644 HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml.cs
create mode 100644 Resources/ToolBar.png
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index cd722d9c..d9df1754 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -267,6 +267,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -507,6 +511,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/HandyControl/Themes/Basic/Geometries.xaml b/HandyControl/Themes/Basic/Geometries.xaml
index 31309607..ee433bd3 100644
--- a/HandyControl/Themes/Basic/Geometries.xaml
+++ b/HandyControl/Themes/Basic/Geometries.xaml
@@ -32,5 +32,6 @@
M716.8 375.466667l34.133333 34.133333c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133334-34.133334 34.133334-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733334 0l-34.133333 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133334 34.133333-34.133334 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733334 0l34.133333-34.133333z m-426.666667 0l34.133334 34.133333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133333-34.133334 34.133333-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0l-34.133334 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133333 34.133333-34.133333 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0l34.133333-34.133333zM0 85.333333c0-51.2 42.666667-85.333333 85.333333-85.333333h853.333334c51.2 0 85.333333 42.666667 85.333333 85.333333v853.333334c0 51.2-42.666667 85.333333-85.333333 85.333333H85.333333c-51.2 0-85.333333-42.666667-85.333333-85.333333V85.333333z m512 469.333334c-136.533333 0-230.4 68.266667-290.133333 196.266666-8.533333 17.066667 0 42.666667 17.066666 59.733334s42.666667 0 59.733334-17.066667c51.2-93.866667 110.933333-145.066667 221.866666-145.066667 102.4 0 170.666667 51.2 221.866667 145.066667 8.533333 17.066667 34.133333 25.6 59.733333 17.066667 17.066667-8.533333 25.6-34.133333 17.066667-59.733334-76.8-128-170.666667-196.266667-307.2-196.266666z
M512 0 30.11843 240.941297l0 542.117406 481.88157 240.941297 481.88157-240.941297L993.88157 240.941297 512 0zM575.776472 768.799969 460.188012 768.799969 460.188012 656.222073l115.588459 0L575.776472 768.799969zM623.335603 509.329685c-52.375829 36.723353-59.600363 55.988096-59.600363 84.885211l0 19.866447L468.616977 614.081343l0-26.489278c0-45.754021 13.846342-80.67124 61.406497-116.791866 46.957428-36.723353 57.79423-62.0082 57.79423-84.282484 0-25.284848-21.67258-54.181962-55.386393-54.181962-42.743457 0-70.436142 26.489278-82.477374 85.486914l-105.956088-21.67258c24.683144-111.976192 82.477374-157.127486 205.289345-157.127486 98.12985 0 157.72919 63.212631 157.72919 131.842639C707.017407 423.240044 688.956071 461.76953 623.335603 509.329685z
M 721.005 638.949 C 758.74 638.949 789.333 669.56 789.333 707.312 C 789.333 745.047 758.74 775.657 721.005 775.657 C 683.253 775.657 652.66 745.047 652.66 707.312 C 652.66 669.56 683.253 638.949 721.005 638.949 Z M 512.017 638.949 C 549.77 638.949 580.38 669.56 580.38 707.312 C 580.38 745.047 549.77 775.657 512.017 775.657 C 474.265 775.657 443.672 745.047 443.672 707.312 C 443.672 669.56 474.265 638.949 512.017 638.949 Z M 303.029 638.949 C 340.781 638.949 371.392 669.56 371.392 707.312 C 371.392 745.047 340.781 775.657 303.029 775.657 C 265.277 775.657 234.667 745.047 234.667 707.312 C 234.667 669.56 265.277 638.949 303.029 638.949 Z M 721.005 443.655 C 758.74 443.655 789.333 474.265 789.333 512.017 C 789.333 549.769 758.74 580.363 721.005 580.363 C 683.253 580.363 652.66 549.769 652.66 512.017 C 652.66 474.265 683.253 443.655 721.005 443.655 Z M 512.017 443.655 C 549.77 443.655 580.38 474.265 580.38 512.017 C 580.38 549.769 549.77 580.363 512.017 580.363 C 474.265 580.363 443.672 549.769 443.672 512.017 C 443.672 474.265 474.265 443.655 512.017 443.655 Z M 303.029 443.655 C 340.781 443.655 371.392 474.265 371.392 512.017 C 371.392 549.769 340.781 580.363 303.029 580.363 C 265.277 580.363 234.667 549.769 234.667 512.017 C 234.667 474.265 265.277 443.655 303.029 443.655 Z M 721.005 248.343 C 758.74 248.343 789.333 278.953 789.333 316.688 C 789.333 354.44 758.74 385.051 721.005 385.051 C 683.253 385.051 652.66 354.44 652.66 316.688 C 652.66 278.953 683.253 248.343 721.005 248.343 Z M 512.017 248.343 C 549.77 248.343 580.38 278.953 580.38 316.688 C 580.38 354.44 549.77 385.051 512.017 385.051 C 474.265 385.051 443.672 354.44 443.672 316.688 C 443.672 278.953 474.265 248.343 512.017 248.343 Z M 303.029 248.343 C 340.781 248.343 371.392 278.953 371.392 316.688 C 371.392 354.44 340.781 385.051 303.029 385.051 C 265.277 385.051 234.667 354.44 234.667 316.688 C 234.667 278.953 265.277 248.343 303.029 248.343 Z
+ M384 896C384 825.307552 440.814697 768 512 768 582.692448 768 640 824.814694 640 896 640 966.692448 583.185303 1024 512 1024 441.307552 1024 384 967.185306 384 896ZM384 512C384 441.307552 440.814697 384 512 384 582.692448 384 640 440.814697 640 512 640 582.692448 583.185303 640 512 640 441.307552 640 384 583.185303 384 512ZM384 128C384 57.307552 440.814697 0 512 0 582.692448 0 640 56.814697 640 128 640 198.692448 583.185303 256 512 256 441.307552 256 384 199.185303 384 128Z
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
index d970596e..330158e3 100644
--- a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
@@ -53,7 +53,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -130,7 +130,7 @@
-
+
@@ -216,4 +216,24 @@
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml
new file mode 100644
index 00000000..67758e68
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/ToolBarBaseStyle.xaml
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/ContextMenu.xaml b/HandyControl/Themes/Styles/ContextMenu.xaml
index b32349e1..1d4d1b6b 100644
--- a/HandyControl/Themes/Styles/ContextMenu.xaml
+++ b/HandyControl/Themes/Styles/ContextMenu.xaml
@@ -11,4 +11,6 @@
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index 57517335..35f9dabb 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -43,6 +43,7 @@
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/ToolBar.xaml b/HandyControl/Themes/Styles/ToolBar.xaml
new file mode 100644
index 00000000..e5298fa5
--- /dev/null
+++ b/HandyControl/Themes/Styles/ToolBar.xaml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index b0db94c4..fd0ce471 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -100,6 +100,8 @@
public static readonly string RichTextBoxDemoCtl = nameof(RichTextBoxDemoCtl);
+ public static readonly string ToolBarDemoCtl = nameof(ToolBarDemoCtl);
+
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 84eb2a8f..8d6d728b 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -55,7 +55,8 @@ var styleList = new List
"SliderDemoCtl",
"GroupBoxDemoCtl",
"ListViewDemoCtl",
- "RichTextBoxDemoCtl"
+ "RichTextBoxDemoCtl",
+ "ToolBarDemoCtl"
};
var windowList = new List
{
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 475ce3aa..c07458a4 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -252,6 +252,9 @@
ToggleButtonDemoCtl.xaml
+
+ ToolBarDemoCtl.xaml
+
TreeViewDemoCtl.xaml
@@ -538,6 +541,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -578,6 +585,7 @@
TextTemplatingFileGenerator
MessageToken.cs
+
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index 647cbab7..7d02a48c 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -906,6 +906,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
+ ///
+ /// 查找类似 工具条 的本地化字符串。
+ ///
+ public static string ToolBar {
+ get {
+ return ResourceManager.GetString("ToolBar", resourceCulture);
+ }
+ }
+
///
/// 查找类似 树视图 的本地化字符串。
///
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index 107eea8b..4157fa8d 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -411,4 +411,7 @@
ListView
+
+ ToolBar
+
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index c1310c4c..5db2c98a 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -394,4 +394,7 @@
富文本框
+
+ 工具条
+
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/ToolBar_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/ToolBar_16x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb4d2459797fb41a1d9ba02c52fb1cd2b2682fb7
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMpkSD%
zi(^Pd+|@}3xfm2VTz;F`TiEB8>&J1kI3DpZ=@6A;Ud&Ux;jX-rl&A#*gV7Jh_n%uY
zGUjB6ZdiP`b9;`$uCF=FtFK+&!Ry7i`f*6J2K)a7PQU;Ayy<4noKvg)9%uuDr>mdK
II;Vst03IDRXaE2J
literal 0
HcmV?d00001
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index 1c9a5200..1645bf92 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -110,7 +110,7 @@
-
+
@@ -130,6 +130,11 @@
+
+
+
+
+
diff --git a/HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml
new file mode 100644
index 00000000..327e0e47
--- /dev/null
+++ b/HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml.cs
new file mode 100644
index 00000000..42e88b98
--- /dev/null
+++ b/HandyControlDemo/UserControl/Styles/ToolBarDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+ public partial class ToolBarDemoCtl
+ {
+ public ToolBarDemoCtl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/README.md b/README.md
index 90276de0..1eede8b1 100644
--- a/README.md
+++ b/README.md
@@ -6,19 +6,23 @@
## Latest examples
-### 1、Slider
+### 1、ToolBar
+
+
+
+### 2、Slider
-### 2、CircleProgressBar
+### 3、CircleProgressBar
-### 3、DataGrid
+### 4、DataGrid
-### 4、Now you can switch to dark theme
+### 5、Now you can switch to dark theme
diff --git a/Resources/ToolBar.png b/Resources/ToolBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e42d3234385a7492b657e6fd99a51eb31cf70a7
GIT binary patch
literal 6387
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
literal 0
HcmV?d00001
From d97d848cc65c67474c8c84dcb6b76613176bc2db Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 21 Nov 2018 19:02:46 +0800
Subject: [PATCH 2/2] Update ContextMenuBaseStyle.xaml
---
HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
index 330158e3..f660e804 100644
--- a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
@@ -108,7 +108,7 @@
-
+