diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 60886f13..fca70629 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -267,6 +267,14 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/HandyControl/Themes/Styles/Base/GroupBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/GroupBoxBaseStyle.xaml
new file mode 100644
index 00000000..69d1f5fa
--- /dev/null
+++ b/HandyControl/Themes/Styles/Base/GroupBoxBaseStyle.xaml
@@ -0,0 +1,35 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/GroupBox.xaml b/HandyControl/Themes/Styles/GroupBox.xaml
new file mode 100644
index 00000000..eda414ae
--- /dev/null
+++ b/HandyControl/Themes/Styles/GroupBox.xaml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index 6c487bf3..cb06d590 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -40,6 +40,7 @@
+
\ No newline at end of file
diff --git a/HandyControlDemo/Data/MessageToken.cs b/HandyControlDemo/Data/MessageToken.cs
index d1ca4a80..25063999 100644
--- a/HandyControlDemo/Data/MessageToken.cs
+++ b/HandyControlDemo/Data/MessageToken.cs
@@ -94,6 +94,8 @@
public static readonly string SliderDemoCtl = nameof(SliderDemoCtl);
+ public static readonly string GroupBoxDemoCtl = nameof(GroupBoxDemoCtl);
+
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 de08920d..e8167844 100644
--- a/HandyControlDemo/Data/MessageToken.tt
+++ b/HandyControlDemo/Data/MessageToken.tt
@@ -52,7 +52,8 @@ var styleList = new List
"RadioButtonDemoCtl",
"NaiveScrollViewerDemoCtl",
"BrushDemoCtl",
- "SliderDemoCtl"
+ "SliderDemoCtl",
+ "GroupBoxDemoCtl"
};
var windowList = new List
{
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 7cc7a554..07803abd 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -183,6 +183,9 @@
CheckBoxDemoCtl.xaml
+
+ GroupBoxDemoCtl.xaml
+
NaiveComboBoxDemoCtl.xaml
@@ -437,6 +440,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -557,6 +564,7 @@
TextTemplatingFileGenerator
MessageToken.cs
+
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index f1b96921..68444cd4 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -375,6 +375,15 @@ namespace HandyControlDemo.Properties.Langs {
}
}
+ ///
+ /// 查找类似 分组框 的本地化字符串。
+ ///
+ public static string GroupBox {
+ get {
+ return ResourceManager.GetString("GroupBox", resourceCulture);
+ }
+ }
+
///
/// 查找类似 信息通知 的本地化字符串。
///
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index 454724c4..f8dd5ef9 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -405,4 +405,7 @@
DateTimePicker
+
+ GroupBox
+
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index e4f29540..1940e084 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -385,4 +385,7 @@
日期时间选择器
+
+ 分组框
+
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Img/LeftMainContent/GroupBox_16x.png b/HandyControlDemo/Resources/Img/LeftMainContent/GroupBox_16x.png
new file mode 100644
index 00000000..fe5d1ce5
Binary files /dev/null and b/HandyControlDemo/Resources/Img/LeftMainContent/GroupBox_16x.png differ
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index fd426cf5..19955c37 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -110,6 +110,11 @@
+
+
+
+
+
diff --git a/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml
new file mode 100644
index 00000000..e33235c7
--- /dev/null
+++ b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml.cs b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
new file mode 100644
index 00000000..0489fb71
--- /dev/null
+++ b/HandyControlDemo/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
@@ -0,0 +1,10 @@
+namespace HandyControlDemo.UserControl
+{
+ public partial class GroupBoxDemoCtl
+ {
+ public GroupBoxDemoCtl()
+ {
+ InitializeComponent();
+ }
+ }
+}