From 94e55af5b827b5e526d835c867d59e680fbb8b28 Mon Sep 17 00:00:00 2001 From: Tom <17379620@qq.com> Date: Wed, 13 Nov 2024 10:53:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A71.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AntdUIDemo.csproj | 108 ++-- MainWindow.Designer.cs | 34 +- MainWindow.cs | 3 +- Models/DataUtil.cs | 6 +- Models/MenuItems.cs | 8 +- Models/User.cs | 6 - Program.cs | 3 + Views/AlertDemo.Designer.cs | 74 +-- Views/AvatarDemo.Designer.cs | 71 +-- Views/BadgeDemo.Designer.cs | 69 +- Views/BatteryDemo.Designer.cs | 73 +-- Views/BreadcrumbDemo.Designer.cs | 118 ++-- Views/ButtonDemo.Designer.cs | 96 ++- Views/CalendarDemo.Designer.cs | 63 +- Views/CarouselDemo.Designer.cs | 64 +- Views/ChatListDemo.Designer.cs | 73 +-- Views/CheckBoxDemo.Designer.cs | 65 +- Views/CollapseDemo.Designer.cs | 65 +- Views/ColorPickerDemo.Designer.cs | 73 +-- Views/ContextMenuStripDemo.Designer.cs | 68 +- Views/DatePickerDemo.Designer.cs | 76 +-- Views/DatePickerRangeDemo.Designer.cs | 64 +- Views/DividerDemo.Designer.cs | 60 +- Views/DrawerDemo.Designer.cs | 64 +- Views/DropDownDemo.Designer.cs | 105 ++-- Views/FloatButtonDemo.Designer.cs | 80 +-- Views/FloatButtonDemo.cs | 6 +- Views/FlowPanelDemo.Designer.cs | 58 +- Views/FlowPanelDemo.cs | 2 +- Views/GridPanelDemo.Designer.cs | 57 +- Views/IconDemo.Designer.cs | 106 ++-- Views/IconDemo.cs | 42 +- Views/Image3DDemo.Designer.cs | 64 +- Views/InputDemo.Designer.cs | 123 ++-- Views/InputDemo.cs | 6 +- Views/InputNumberDemo.Designer.cs | 68 +- Views/LabelDemo.Designer.cs | 60 +- Views/MenuDemo.Designer.cs | 837 +++++++++++-------------- Views/MessageDemo.Designer.cs | 68 +- Views/ModalDemo.Designer.cs | 68 +- Views/MsgListDemo.Designer.cs | 77 +-- Views/NotificationDemo.Designer.cs | 68 +- Views/PageHeaderDemo.Designer.cs | 72 +-- Views/PaginationDemo.Designer.cs | 73 +-- Views/PaginationDemo.cs | 2 +- Views/PanelDemo.Designer.cs | 569 ++++++++--------- Views/PanelDemo.cs | 2 +- Views/PopoverDemo.Designer.cs | 74 +-- Views/PreviewDemo.Designer.cs | 56 +- Views/PreviewDemo.cs | 2 +- Views/ProgressDemo.Designer.cs | 93 ++- Views/RadioDemo.Designer.cs | 60 +- Views/RadioDemo.cs | 2 +- Views/RateDemo.Designer.cs | 72 +-- Views/SegmentedDemo.Designer.cs | 381 ++++++----- Views/SelectDemo.Designer.cs | 72 +-- Views/SelectMultipleDemo.Designer.cs | 79 +-- Views/SignalDemo.Designer.cs | 70 +-- Views/SliderDemo.Designer.cs | 68 +- Views/SliderRangeDemo.Designer.cs | 276 ++++---- Views/SpinDemo.Designer.cs | 62 +- Views/SpinDemo.cs | 2 +- Views/StackPanelDemo.Designer.cs | 54 +- Views/StepsDemo.Designer.cs | 60 +- Views/SubView/Demo.Designer.cs | 2 +- Views/SubView/SystemSet.Designer.cs | 2 +- Views/SubView/UserEdit.Designer.cs | 2 +- Views/SubView/Wellcome.Designer.cs | 2 - Views/SwitchDemo.Designer.cs | 64 +- Views/TableDemo.Designer.cs | 81 +-- Views/TableDemo.cs | 4 +- Views/TabsDemo.Designer.cs | 97 ++- Views/TagDemo.Designer.cs | 64 +- Views/TimePickerDemo.Designer.cs | 68 +- Views/TimelineDemo.Designer.cs | 56 +- Views/TimelineDemo.cs | 2 +- Views/TooltipDemo.Designer.cs | 62 +- Views/TreeDemo.Designer.cs | 56 +- Views/UploadDraggerDemo.Designer.cs | 78 +-- Views/UploadDraggerDemo.cs | 9 +- Views/WindowBarDemo.Designer.cs | 68 +- 81 files changed, 2501 insertions(+), 3716 deletions(-) diff --git a/AntdUIDemo.csproj b/AntdUIDemo.csproj index 14870be..94f2286 100644 --- a/AntdUIDemo.csproj +++ b/AntdUIDemo.csproj @@ -1,62 +1,62 @@  - - WinExe - net48 - true - SystemAware - true - false - app.manifest - assets\icon.ico - AnyCPU - Copyright © 2024 czz_y - $(Version) - $(Version) - 1.6.13 - czz_y - 基于 Winform UI 框架 AntdUI 设计的 Demo - https://gitee.com/mubaiyanghua/antd-uidemo - logo.png - README.md - https://gitee.com/mubaiyanghua/antd-uidemo - git - AntdUIDemo;Winform;WinformUI;AntDesign;控件演示 - True - + + WinExe + net48 + true + SystemAware + true + false + app.manifest + assets\icon.ico + AnyCPU + Copyright © 2024 czz_y + $(Version) + $(Version) + 1.7.1 + czz_y + 基于 Winform UI 框架 AntdUI 设计的 Demo + https://gitee.com/mubaiyanghua/antd-uidemo + logo.png + README.md + https://gitee.com/mubaiyanghua/antd-uidemo + git + AntdUIDemo;Winform;WinformUI;AntDesign;控件演示 + True + - - - + + + - - - - - - - - - True - True - Resources.resx - - + + + + + - - - ResXFileCodeGenerator - Resources.Designer.cs - - + + + True + True + Resources.resx + + - - - PreserveNewest - - - PreserveNewest - - + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + PreserveNewest + + + PreserveNewest + + \ No newline at end of file diff --git a/MainWindow.Designer.cs b/MainWindow.Designer.cs index 63302b9..9f03f8e 100644 --- a/MainWindow.Designer.cs +++ b/MainWindow.Designer.cs @@ -33,9 +33,8 @@ this.input_search = new AntdUI.Input(); this.button_color = new AntdUI.Button(); this.buttonSZ = new AntdUI.Button(); - this.divider = new AntdUI.Divider(); this.menu = new AntdUI.Menu(); - this.panel_content = new AntdUI.StackPanel(); + this.panel_content = new AntdUI.Panel(); this.titlebar.SuspendLayout(); this.SuspendLayout(); // @@ -44,6 +43,7 @@ this.titlebar.Controls.Add(this.input_search); this.titlebar.Controls.Add(this.button_color); this.titlebar.Controls.Add(this.buttonSZ); + this.titlebar.DividerShow = true; this.titlebar.Dock = System.Windows.Forms.DockStyle.Top; this.titlebar.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.titlebar.IsMax = false; @@ -91,45 +91,34 @@ this.buttonSZ.TabIndex = 0; this.buttonSZ.WaveSize = 0; // - // divider - // - this.divider.Dock = System.Windows.Forms.DockStyle.Top; - this.divider.Location = new System.Drawing.Point(6, 40); - this.divider.Name = "divider"; - this.divider.Size = new System.Drawing.Size(1018, 12); - this.divider.TabIndex = 8; - // // menu // this.menu.AutoCollapse = true; this.menu.Dock = System.Windows.Forms.DockStyle.Left; this.menu.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.menu.Indent = true; - this.menu.Location = new System.Drawing.Point(6, 52); + this.menu.Location = new System.Drawing.Point(6, 40); this.menu.Name = "menu"; - this.menu.Size = new System.Drawing.Size(277, 582); - this.menu.TabIndex = 9; + this.menu.Size = new System.Drawing.Size(277, 594); + this.menu.TabIndex = 1; this.menu.Unique = true; // // panel_content // - this.panel_content.AutoScroll = true; + this.panel_content.Back = System.Drawing.Color.Transparent; this.panel_content.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel_content.Location = new System.Drawing.Point(283, 52); + this.panel_content.Location = new System.Drawing.Point(283, 40); this.panel_content.Name = "panel_content"; - this.panel_content.Size = new System.Drawing.Size(741, 582); - this.panel_content.TabIndex = 10; - this.panel_content.Text = "stackPanel1"; - this.panel_content.Vertical = true; + this.panel_content.Radius = 0; + this.panel_content.Size = new System.Drawing.Size(741, 594); + this.panel_content.TabIndex = 2; // // MainWindow // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1024, 640); this.ControlBox = false; this.Controls.Add(this.panel_content); this.Controls.Add(this.menu); - this.Controls.Add(this.divider); this.Controls.Add(this.titlebar); this.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -146,11 +135,10 @@ #endregion private AntdUI.WindowBar titlebar; - private AntdUI.Divider divider; private AntdUI.Menu menu; private AntdUI.Button buttonSZ; private AntdUI.Button button_color; private AntdUI.Input input_search; - private AntdUI.StackPanel panel_content; + private AntdUI.Panel panel_content; } } \ No newline at end of file diff --git a/MainWindow.cs b/MainWindow.cs index 5898abe..9757397 100644 --- a/MainWindow.cs +++ b/MainWindow.cs @@ -28,7 +28,7 @@ namespace AntdUIDemo private void InitData() { - control = new Wellcome(); + control = new Wellcome { Dock = DockStyle.Fill }; AutoDpi(control); panel_content.Controls.Add(control); } @@ -358,6 +358,7 @@ namespace AntdUIDemo if (control != null) { //容器添加控件，需要调整dpi + control.Dock = DockStyle.Fill; AutoDpi(control); panel_content.Controls.Add(control); } diff --git a/Models/DataUtil.cs b/Models/DataUtil.cs index 1a275dc..c2e6445 100644 --- a/Models/DataUtil.cs +++ b/Models/DataUtil.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace AntdUIDemo.Models { diff --git a/Models/MenuItems.cs b/Models/MenuItems.cs index 05cb06c..f7f9b3d 100644 --- a/Models/MenuItems.cs +++ b/Models/MenuItems.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AntdUIDemo.Models +namespace AntdUIDemo.Models { public class MenuItems { diff --git a/Models/User.cs b/Models/User.cs index a5615f2..f66718c 100644 --- a/Models/User.cs +++ b/Models/User.cs @@ -1,10 +1,4 @@ using AntdUI; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AntdUIDemo.Models { diff --git a/Program.cs b/Program.cs index 8688a15..b98b0a2 100644 --- a/Program.cs +++ b/Program.cs @@ -16,6 +16,9 @@ namespace AntdUIDemo Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException); AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); + AntdUI.Localization.DefaultLanguage = "zh-CN"; + AntdUI.Config.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit; + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); mainWindow = new MainWindow(); diff --git a/Views/AlertDemo.Designer.cs b/Views/AlertDemo.Designer.cs index ccc3de2..67f6313 100644 --- a/Views/AlertDemo.Designer.cs +++ b/Views/AlertDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.alert9 = new AntdUI.Alert(); this.label6 = new AntdUI.Label(); @@ -46,17 +47,29 @@ this.alert2 = new AntdUI.Alert(); this.alert1 = new AntdUI.Alert(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel3.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "警告提示，展现需要关注的信息。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 0; + this.header1.Text = "Alert 警告提示"; + this.header1.UseTitleFont = true; + // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.alert9); this.stackPanel1.Controls.Add(this.label6); this.stackPanel1.Controls.Add(this.flowPanel3); @@ -65,13 +78,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 505); + this.stackPanel1.Size = new System.Drawing.Size(750, 431); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -80,7 +90,7 @@ // this.alert9.BackColor = System.Drawing.Color.Pink; this.alert9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.alert9.Location = new System.Drawing.Point(3, 381); + this.alert9.Location = new System.Drawing.Point(3, 287); this.alert9.Loop = true; this.alert9.Name = "alert9"; this.alert9.Size = new System.Drawing.Size(744, 32); @@ -90,7 +100,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 351); + this.label6.Location = new System.Drawing.Point(3, 257); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 44; @@ -99,7 +109,7 @@ // flowPanel3 // this.flowPanel3.Controls.Add(this.alert12); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 70); this.flowPanel3.TabIndex = 43; @@ -120,7 +130,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 42; @@ -132,7 +142,7 @@ this.flowPanel1.Controls.Add(this.alert6); this.flowPanel1.Controls.Add(this.alert7); this.flowPanel1.Controls.Add(this.alert8); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 41; @@ -185,7 +195,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 40; @@ -197,7 +207,7 @@ this.flowPanel2.Controls.Add(this.alert3); this.flowPanel2.Controls.Add(this.alert2); this.flowPanel2.Controls.Add(this.alert1); - this.flowPanel2.Location = new System.Drawing.Point(3, 127); + this.flowPanel2.Location = new System.Drawing.Point(3, 33); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 39; @@ -246,41 +256,17 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 21; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 20; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 19; - this.label2.Text = "警告提示，展现需要关注的信息。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 18; - this.label1.Text = "Alert 警告提示"; - // // AlertDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "AlertDemo"; this.Size = new System.Drawing.Size(750, 505); this.stackPanel1.ResumeLayout(false); @@ -293,10 +279,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel2; private AntdUI.Alert alert1; diff --git a/Views/AvatarDemo.Designer.cs b/Views/AvatarDemo.Designer.cs index 5722a0e..25d00cf 100644 --- a/Views/AvatarDemo.Designer.cs +++ b/Views/AvatarDemo.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AvatarDemo)); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel2 = new AntdUI.FlowPanel(); this.avatar5 = new AntdUI.Avatar(); @@ -41,27 +42,35 @@ this.avatar3 = new AntdUI.Avatar(); this.avatar1 = new AntdUI.Avatar(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "用来代表用户或事物，支持图片、图标或字符展示。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 21; + this.header1.Text = "Avatar 头像"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 463); + this.stackPanel1.Size = new System.Drawing.Size(750, 389); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -70,7 +79,7 @@ // this.flowPanel2.Controls.Add(this.avatar5); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 239); + this.flowPanel2.Location = new System.Drawing.Point(3, 145); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 76); this.flowPanel2.TabIndex = 29; @@ -82,7 +91,7 @@ this.avatar5.Image = ((System.Drawing.Image)(resources.GetObject("avatar5.Image"))); this.avatar5.Location = new System.Drawing.Point(3, 3); this.avatar5.Name = "avatar5"; - this.avatar5.Padding = new System.Windows.Forms.Padding(6); + this.avatar5.Padding = new System.Windows.Forms.Padding(8, 6, 8, 10); this.avatar5.Round = true; this.avatar5.Shadow = 8; this.avatar5.Size = new System.Drawing.Size(70, 70); @@ -92,7 +101,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 209); + this.label4.Location = new System.Drawing.Point(3, 115); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 28; @@ -107,7 +116,7 @@ this.flowPanel1.Controls.Add(this.avatar3); this.flowPanel1.Controls.Add(this.avatar1); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 76); this.flowPanel1.TabIndex = 27; @@ -142,7 +151,7 @@ this.avatar7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(106)))), ((int)(((byte)(0))))); this.avatar7.Location = new System.Drawing.Point(249, 3); this.avatar7.Name = "avatar7"; - this.avatar7.Padding = new System.Windows.Forms.Padding(6); + this.avatar7.Padding = new System.Windows.Forms.Padding(8, 6, 8, 10); this.avatar7.Round = true; this.avatar7.Shadow = 8; this.avatar7.ShadowOffsetY = 4; @@ -158,7 +167,7 @@ this.avatar6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(106)))), ((int)(((byte)(0))))); this.avatar6.Location = new System.Drawing.Point(167, 3); this.avatar6.Name = "avatar6"; - this.avatar6.Padding = new System.Windows.Forms.Padding(6); + this.avatar6.Padding = new System.Windows.Forms.Padding(8); this.avatar6.Radius = 6; this.avatar6.Shadow = 8; this.avatar6.Size = new System.Drawing.Size(70, 70); @@ -194,41 +203,17 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 26; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 25; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 24; - this.label2.Text = "用来代表用户或事物，支持图片、图标或字符展示。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 23; - this.label1.Text = "Avatar 头像"; - // // AvatarDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "AvatarDemo"; this.Size = new System.Drawing.Size(750, 463); this.stackPanel1.ResumeLayout(false); @@ -240,10 +225,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Avatar avatar1; diff --git a/Views/BadgeDemo.Designer.cs b/Views/BadgeDemo.Designer.cs index 3c9441a..d1aae33 100644 --- a/Views/BadgeDemo.Designer.cs +++ b/Views/BadgeDemo.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BadgeDemo)); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel9 = new AntdUI.FlowPanel(); this.button30 = new AntdUI.Button(); @@ -54,9 +55,6 @@ this.badge1 = new AntdUI.Badge(); this.badge6 = new AntdUI.Badge(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel9.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -64,6 +62,20 @@ this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "图标右上角的圆形徽标数字。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 21; + this.header1.Text = "Badge 徽标数"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel9); @@ -72,13 +84,10 @@ this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 467); + this.stackPanel1.Size = new System.Drawing.Size(750, 393); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -91,7 +100,7 @@ this.flowPanel9.Controls.Add(this.button38); this.flowPanel9.Controls.Add(this.button40); this.flowPanel9.Controls.Add(this.button41); - this.flowPanel9.Location = new System.Drawing.Point(3, 289); + this.flowPanel9.Location = new System.Drawing.Point(3, 195); this.flowPanel9.Name = "flowPanel9"; this.flowPanel9.Size = new System.Drawing.Size(744, 44); this.flowPanel9.TabIndex = 31; @@ -168,7 +177,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 259); + this.label4.Location = new System.Drawing.Point(3, 165); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 30; @@ -182,7 +191,7 @@ this.flowPanel3.Controls.Add(this.badge9); this.flowPanel3.Controls.Add(this.badge10); this.flowPanel3.Controls.Add(this.badge11); - this.flowPanel3.Location = new System.Drawing.Point(3, 215); + this.flowPanel3.Location = new System.Drawing.Point(3, 121); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 29; @@ -244,7 +253,7 @@ // flowPanel2 // this.flowPanel2.Controls.Add(this.badge7); - this.flowPanel2.Location = new System.Drawing.Point(3, 171); + this.flowPanel2.Location = new System.Drawing.Point(3, 77); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 28; @@ -267,7 +276,7 @@ this.flowPanel1.Controls.Add(this.badge2); this.flowPanel1.Controls.Add(this.badge1); this.flowPanel1.Controls.Add(this.badge6); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 27; @@ -325,41 +334,17 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 26; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 25; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 24; - this.label2.Text = "图标右上角的圆形徽标数字。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 23; - this.label1.Text = "Badge 徽标数"; - // // BadgeDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "BadgeDemo"; this.Size = new System.Drawing.Size(750, 467); this.stackPanel1.ResumeLayout(false); @@ -373,10 +358,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Badge badge6; diff --git a/Views/BatteryDemo.Designer.cs b/Views/BatteryDemo.Designer.cs index f876473..501f071 100644 --- a/Views/BatteryDemo.Designer.cs +++ b/Views/BatteryDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel2 = new AntdUI.FlowPanel(); this.battery14 = new AntdUI.Battery(); @@ -57,9 +58,6 @@ this.battery6 = new AntdUI.Battery(); this.battery5 = new AntdUI.Battery(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -67,6 +65,20 @@ this.flowPanel.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "电量显示"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 23; + this.header1.Text = "Battery 电池"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel2); @@ -77,13 +89,10 @@ this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.flowPanel); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 481); + this.stackPanel1.Size = new System.Drawing.Size(750, 407); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -95,7 +104,7 @@ this.flowPanel2.Controls.Add(this.battery12); this.flowPanel2.Controls.Add(this.battery11); this.flowPanel2.Controls.Add(this.battery15); - this.flowPanel2.Location = new System.Drawing.Point(3, 349); + this.flowPanel2.Location = new System.Drawing.Point(3, 255); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 61; @@ -174,7 +183,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 319); + this.label5.Location = new System.Drawing.Point(3, 225); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 60; @@ -187,7 +196,7 @@ this.flowPanel3.Controls.Add(this.battery18); this.flowPanel3.Controls.Add(this.battery19); this.flowPanel3.Controls.Add(this.battery20); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 59; @@ -255,7 +264,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 245); + this.label6.Location = new System.Drawing.Point(3, 151); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 58; @@ -268,7 +277,7 @@ this.flowPanel1.Controls.Add(this.battery8); this.flowPanel1.Controls.Add(this.battery9); this.flowPanel1.Controls.Add(this.battery10); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 55; @@ -332,7 +341,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 171); + this.label3.Location = new System.Drawing.Point(3, 77); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 54; @@ -345,7 +354,7 @@ this.flowPanel.Controls.Add(this.battery4); this.flowPanel.Controls.Add(this.battery6); this.flowPanel.Controls.Add(this.battery5); - this.flowPanel.Location = new System.Drawing.Point(3, 127); + this.flowPanel.Location = new System.Drawing.Point(3, 33); this.flowPanel.Name = "flowPanel"; this.flowPanel.Size = new System.Drawing.Size(744, 38); this.flowPanel.TabIndex = 52; @@ -404,41 +413,17 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 51; this.label4.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 34; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 33; - this.label2.Text = "电量显示"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 32; - this.label1.Text = "Battery 电池"; - // // BatteryDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "BatteryDemo"; this.Size = new System.Drawing.Size(750, 481); this.stackPanel1.ResumeLayout(false); @@ -452,10 +437,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel; private AntdUI.Label label4; private AntdUI.Battery battery5; diff --git a/Views/BreadcrumbDemo.Designer.cs b/Views/BreadcrumbDemo.Designer.cs index 663d2db..9272050 100644 --- a/Views/BreadcrumbDemo.Designer.cs +++ b/Views/BreadcrumbDemo.Designer.cs @@ -28,37 +28,46 @@ /// private void InitializeComponent() { - AntdUI.BreadcrumbItem breadcrumbItem1 = new AntdUI.BreadcrumbItem(); - AntdUI.BreadcrumbItem breadcrumbItem2 = new AntdUI.BreadcrumbItem(); - AntdUI.BreadcrumbItem breadcrumbItem3 = new AntdUI.BreadcrumbItem(); - AntdUI.BreadcrumbItem breadcrumbItem4 = new AntdUI.BreadcrumbItem(); - AntdUI.BreadcrumbItem breadcrumbItem5 = new AntdUI.BreadcrumbItem(); - AntdUI.BreadcrumbItem breadcrumbItem6 = new AntdUI.BreadcrumbItem(); - AntdUI.BreadcrumbItem breadcrumbItem7 = new AntdUI.BreadcrumbItem(); + AntdUI.BreadcrumbItem breadcrumbItem8 = new AntdUI.BreadcrumbItem(); + AntdUI.BreadcrumbItem breadcrumbItem9 = new AntdUI.BreadcrumbItem(); + AntdUI.BreadcrumbItem breadcrumbItem10 = new AntdUI.BreadcrumbItem(); + AntdUI.BreadcrumbItem breadcrumbItem11 = new AntdUI.BreadcrumbItem(); + AntdUI.BreadcrumbItem breadcrumbItem12 = new AntdUI.BreadcrumbItem(); + AntdUI.BreadcrumbItem breadcrumbItem13 = new AntdUI.BreadcrumbItem(); + AntdUI.BreadcrumbItem breadcrumbItem14 = new AntdUI.BreadcrumbItem(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.breadcrumb2 = new AntdUI.Breadcrumb(); this.label3 = new AntdUI.Label(); this.breadcrumb1 = new AntdUI.Breadcrumb(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "显示当前页面在系统层级结构中的位置，并能向上返回。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 25; + this.header1.Text = "Breadcrumb 面包屑"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.breadcrumb2); this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.breadcrumb1); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 505); + this.stackPanel1.Size = new System.Drawing.Size(750, 431); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -66,18 +75,15 @@ // breadcrumb2 // this.breadcrumb2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - breadcrumbItem1.IconSvg = "HomeOutlined"; - breadcrumbItem1.ID = null; - breadcrumbItem1.Text = ""; - breadcrumbItem2.IconSvg = "UserOutlined"; - breadcrumbItem2.ID = null; - breadcrumbItem2.Text = "Application Center"; - breadcrumbItem3.ID = null; - breadcrumbItem3.Text = "Application"; - this.breadcrumb2.Items.Add(breadcrumbItem1); - this.breadcrumb2.Items.Add(breadcrumbItem2); - this.breadcrumb2.Items.Add(breadcrumbItem3); - this.breadcrumb2.Location = new System.Drawing.Point(3, 195); + breadcrumbItem8.IconSvg = "HomeOutlined"; + breadcrumbItem8.Text = ""; + breadcrumbItem9.IconSvg = "UserOutlined"; + breadcrumbItem9.Text = "Application Center"; + breadcrumbItem10.Text = "Application"; + this.breadcrumb2.Items.Add(breadcrumbItem8); + this.breadcrumb2.Items.Add(breadcrumbItem9); + this.breadcrumb2.Items.Add(breadcrumbItem10); + this.breadcrumb2.Location = new System.Drawing.Point(3, 101); this.breadcrumb2.Name = "breadcrumb2"; this.breadcrumb2.Size = new System.Drawing.Size(744, 32); this.breadcrumb2.TabIndex = 49; @@ -86,7 +92,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 165); + this.label3.Location = new System.Drawing.Point(3, 71); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 48; @@ -95,19 +101,15 @@ // breadcrumb1 // this.breadcrumb1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - breadcrumbItem4.ID = null; - breadcrumbItem4.Text = "Home"; - breadcrumbItem5.ID = null; - breadcrumbItem5.Text = "Application Center"; - breadcrumbItem6.ID = null; - breadcrumbItem6.Text = "Application List"; - breadcrumbItem7.ID = null; - breadcrumbItem7.Text = "An Application"; - this.breadcrumb1.Items.Add(breadcrumbItem4); - this.breadcrumb1.Items.Add(breadcrumbItem5); - this.breadcrumb1.Items.Add(breadcrumbItem6); - this.breadcrumb1.Items.Add(breadcrumbItem7); - this.breadcrumb1.Location = new System.Drawing.Point(3, 127); + breadcrumbItem11.Text = "Home"; + breadcrumbItem12.Text = "Application Center"; + breadcrumbItem13.Text = "Application List"; + breadcrumbItem14.Text = "An Application"; + this.breadcrumb1.Items.Add(breadcrumbItem11); + this.breadcrumb1.Items.Add(breadcrumbItem12); + this.breadcrumb1.Items.Add(breadcrumbItem13); + this.breadcrumb1.Items.Add(breadcrumbItem14); + this.breadcrumb1.Location = new System.Drawing.Point(3, 33); this.breadcrumb1.Name = "breadcrumb1"; this.breadcrumb1.Size = new System.Drawing.Size(744, 32); this.breadcrumb1.TabIndex = 47; @@ -116,41 +118,17 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 46; this.label4.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 45; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 44; - this.label2.Text = "显示当前页面在系统层级结构中的位置，并能向上返回。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 43; - this.label1.Text = "Breadcrumb 面包屑"; - // // BreadcrumbDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "BreadcrumbDemo"; this.Size = new System.Drawing.Size(750, 505); this.stackPanel1.ResumeLayout(false); @@ -160,11 +138,9 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; private AntdUI.Label label4; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Breadcrumb breadcrumb1; private AntdUI.Breadcrumb breadcrumb2; private AntdUI.Label label3; diff --git a/Views/ButtonDemo.Designer.cs b/Views/ButtonDemo.Designer.cs index 71e00b9..82f689b 100644 --- a/Views/ButtonDemo.Designer.cs +++ b/Views/ButtonDemo.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ButtonDemo)); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel8 = new AntdUI.FlowPanel(); this.button_toggle3 = new AntdUI.Button(); @@ -104,9 +105,6 @@ this.button2 = new AntdUI.Button(); this.button1 = new AntdUI.Button(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel8.SuspendLayout(); this.flowPanel7.SuspendLayout(); @@ -122,8 +120,23 @@ this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "按钮用于开始一个即时操作。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 26; + this.header1.Text = "Button 按钮"; + this.header1.UseTitleFont = true; + // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.flowPanel8); this.stackPanel1.Controls.Add(this.label10); this.stackPanel1.Controls.Add(this.flowPanel7); @@ -144,13 +157,10 @@ this.stackPanel1.Controls.Add(this.label11); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 914); + this.stackPanel1.Size = new System.Drawing.Size(750, 840); this.stackPanel1.TabIndex = 1; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -160,7 +170,7 @@ this.flowPanel8.Controls.Add(this.button_toggle3); this.flowPanel8.Controls.Add(this.button_toggle2); this.flowPanel8.Controls.Add(this.button_toggle); - this.flowPanel8.Location = new System.Drawing.Point(3, 835); + this.flowPanel8.Location = new System.Drawing.Point(3, 741); this.flowPanel8.Name = "flowPanel8"; this.flowPanel8.Size = new System.Drawing.Size(744, 44); this.flowPanel8.TabIndex = 52; @@ -211,7 +221,7 @@ // label10 // this.label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(3, 805); + this.label10.Location = new System.Drawing.Point(3, 711); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(744, 24); this.label10.TabIndex = 51; @@ -222,7 +232,7 @@ this.flowPanel7.Controls.Add(this.button49); this.flowPanel7.Controls.Add(this.button48); this.flowPanel7.Controls.Add(this.button39); - this.flowPanel7.Location = new System.Drawing.Point(3, 755); + this.flowPanel7.Location = new System.Drawing.Point(3, 661); this.flowPanel7.Name = "flowPanel7"; this.flowPanel7.Size = new System.Drawing.Size(744, 44); this.flowPanel7.TabIndex = 50; @@ -272,7 +282,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(3, 725); + this.label9.Location = new System.Drawing.Point(3, 631); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(744, 24); this.label9.TabIndex = 49; @@ -282,7 +292,7 @@ // this.flowPanel6.Controls.Add(this.panel3); this.flowPanel6.Controls.Add(this.panel2); - this.flowPanel6.Location = new System.Drawing.Point(3, 675); + this.flowPanel6.Location = new System.Drawing.Point(3, 581); this.flowPanel6.Name = "flowPanel6"; this.flowPanel6.Size = new System.Drawing.Size(744, 44); this.flowPanel6.TabIndex = 48; @@ -377,7 +387,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 645); + this.label8.Location = new System.Drawing.Point(3, 551); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(744, 24); this.label8.TabIndex = 47; @@ -390,7 +400,7 @@ this.flowPanel5.Controls.Add(this.button26); this.flowPanel5.Controls.Add(this.button25); this.flowPanel5.Controls.Add(this.button29); - this.flowPanel5.Location = new System.Drawing.Point(3, 595); + this.flowPanel5.Location = new System.Drawing.Point(3, 501); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 44); this.flowPanel5.TabIndex = 46; @@ -462,7 +472,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 565); + this.label7.Location = new System.Drawing.Point(3, 471); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 45; @@ -476,7 +486,7 @@ this.flowPanel4.Controls.Add(this.button20); this.flowPanel4.Controls.Add(this.button23); this.flowPanel4.Controls.Add(this.button24); - this.flowPanel4.Location = new System.Drawing.Point(3, 515); + this.flowPanel4.Location = new System.Drawing.Point(3, 421); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 44); this.flowPanel4.TabIndex = 44; @@ -556,7 +566,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 485); + this.label6.Location = new System.Drawing.Point(3, 391); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 43; @@ -570,7 +580,7 @@ this.flowPanel3.Controls.Add(this.button16); this.flowPanel3.Controls.Add(this.button17); this.flowPanel3.Controls.Add(this.button18); - this.flowPanel3.Location = new System.Drawing.Point(3, 435); + this.flowPanel3.Location = new System.Drawing.Point(3, 341); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 44); this.flowPanel3.TabIndex = 42; @@ -650,7 +660,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 405); + this.label5.Location = new System.Drawing.Point(3, 311); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 41; @@ -664,7 +674,7 @@ this.flowPanel2.Controls.Add(this.button10); this.flowPanel2.Controls.Add(this.button11); this.flowPanel2.Controls.Add(this.button12); - this.flowPanel2.Location = new System.Drawing.Point(3, 355); + this.flowPanel2.Location = new System.Drawing.Point(3, 261); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 44); this.flowPanel2.TabIndex = 40; @@ -738,7 +748,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 325); + this.label4.Location = new System.Drawing.Point(3, 231); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 39; @@ -752,7 +762,7 @@ this.flowPanel10.Controls.Add(this.button45); this.flowPanel10.Controls.Add(this.button46); this.flowPanel10.Controls.Add(this.button47); - this.flowPanel10.Location = new System.Drawing.Point(3, 281); + this.flowPanel10.Location = new System.Drawing.Point(3, 187); this.flowPanel10.Name = "flowPanel10"; this.flowPanel10.Size = new System.Drawing.Size(744, 38); this.flowPanel10.TabIndex = 38; @@ -857,7 +867,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(3, 251); + this.label12.Location = new System.Drawing.Point(3, 157); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(744, 24); this.label12.TabIndex = 37; @@ -871,7 +881,7 @@ this.flowPanel9.Controls.Add(this.button38); this.flowPanel9.Controls.Add(this.button40); this.flowPanel9.Controls.Add(this.button41); - this.flowPanel9.Location = new System.Drawing.Point(3, 201); + this.flowPanel9.Location = new System.Drawing.Point(3, 107); this.flowPanel9.Name = "flowPanel9"; this.flowPanel9.Size = new System.Drawing.Size(744, 44); this.flowPanel9.TabIndex = 22; @@ -940,7 +950,7 @@ // label11 // this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(3, 171); + this.label11.Location = new System.Drawing.Point(3, 77); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(744, 24); this.label11.TabIndex = 21; @@ -954,7 +964,7 @@ this.flowPanel1.Controls.Add(this.button3); this.flowPanel1.Controls.Add(this.button2); this.flowPanel1.Controls.Add(this.button1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 6; @@ -1029,40 +1039,16 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 5; this.label3.Text = "按钮类型"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 4; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 1; - this.label2.Text = "按钮用于开始一个即时操作。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 0; - this.label1.Text = "Button 按钮"; - // // ButtonDemo // this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "ButtonDemo"; this.Size = new System.Drawing.Size(750, 914); this.stackPanel1.ResumeLayout(false); @@ -1084,9 +1070,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Button button6; private AntdUI.Button button5; @@ -1095,7 +1080,6 @@ private AntdUI.Button button2; private AntdUI.Button button1; private AntdUI.Label label3; - private AntdUI.Divider divider1; private AntdUI.Label label11; private AntdUI.FlowPanel flowPanel9; private AntdUI.Button button30; diff --git a/Views/CalendarDemo.Designer.cs b/Views/CalendarDemo.Designer.cs index a4cdb52..8763be7 100644 --- a/Views/CalendarDemo.Designer.cs +++ b/Views/CalendarDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.calendar = new AntdUI.Calendar(); this.flowPanel1 = new AntdUI.FlowPanel(); @@ -36,25 +37,33 @@ this.switch_showtoday = new AntdUI.Switch(); this.label6 = new AntdUI.Label(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "按照日历形式展示数据的容器。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Calendar 日历"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.calendar); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 550); + this.stackPanel1.Size = new System.Drawing.Size(750, 476); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -63,7 +72,7 @@ // this.calendar.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); this.calendar.Full = true; - this.calendar.Location = new System.Drawing.Point(3, 165); + this.calendar.Location = new System.Drawing.Point(3, 71); this.calendar.Name = "calendar"; this.calendar.ShowChinese = true; this.calendar.Size = new System.Drawing.Size(744, 376); @@ -77,7 +86,7 @@ this.flowPanel1.Controls.Add(this.label4); this.flowPanel1.Controls.Add(this.switch_showtoday); this.flowPanel1.Controls.Add(this.label6); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 32); this.flowPanel1.TabIndex = 25; @@ -124,41 +133,17 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 23; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 22; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 21; - this.label2.Text = "按照日历形式展示数据的容器。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 20; - this.label1.Text = "Calendar 日历"; - // // CalendarDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "CalendarDemo"; this.Size = new System.Drawing.Size(750, 550); this.stackPanel1.ResumeLayout(false); @@ -169,10 +154,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.Calendar calendar; private AntdUI.FlowPanel flowPanel1; diff --git a/Views/CarouselDemo.Designer.cs b/Views/CarouselDemo.Designer.cs index cdef9a2..0c30d44 100644 --- a/Views/CarouselDemo.Designer.cs +++ b/Views/CarouselDemo.Designer.cs @@ -37,6 +37,7 @@ AntdUI.CarouselItem carouselItem7 = new AntdUI.CarouselItem(); AntdUI.CarouselItem carouselItem8 = new AntdUI.CarouselItem(); AntdUI.CarouselItem carouselItem9 = new AntdUI.CarouselItem(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel2 = new AntdUI.FlowPanel(); this.carousel3 = new AntdUI.Carousel(); @@ -45,27 +46,35 @@ this.carousel2 = new AntdUI.Carousel(); this.carousel1 = new AntdUI.Carousel(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "一组轮播的区域。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Carousel 走马灯"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 499); + this.stackPanel1.Size = new System.Drawing.Size(750, 425); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -73,7 +82,7 @@ // flowPanel2 // this.flowPanel2.Controls.Add(this.carousel3); - this.flowPanel2.Location = new System.Drawing.Point(3, 331); + this.flowPanel2.Location = new System.Drawing.Point(3, 237); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 168); this.flowPanel2.TabIndex = 29; @@ -100,7 +109,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 301); + this.label4.Location = new System.Drawing.Point(3, 207); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 28; @@ -110,7 +119,7 @@ // this.flowPanel1.Controls.Add(this.carousel2); this.flowPanel1.Controls.Add(this.carousel1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 168); this.flowPanel1.TabIndex = 27; @@ -151,41 +160,16 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 26; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 25; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 24; - this.label2.Text = "一组轮播的区域。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 23; - this.label1.Text = "Carousel 走马灯"; - // // CarouselDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "CarouselDemo"; this.Size = new System.Drawing.Size(750, 499); this.stackPanel1.ResumeLayout(false); @@ -197,10 +181,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Carousel carousel1; diff --git a/Views/ChatListDemo.Designer.cs b/Views/ChatListDemo.Designer.cs index a565f1e..a1b8a99 100644 --- a/Views/ChatListDemo.Designer.cs +++ b/Views/ChatListDemo.Designer.cs @@ -28,37 +28,35 @@ /// private void InitializeComponent() { - this.stackPanel1 = new AntdUI.StackPanel(); + this.header1 = new AntdUI.PageHeader(); this.panel1 = new AntdUI.Panel(); this.chatList = new AntdUI.Chat.ChatList(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.stackPanel1.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); // - // stackPanel1 + // header1 // - this.stackPanel1.Controls.Add(this.panel1); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); - this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); - this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 557); - this.stackPanel1.TabIndex = 0; - this.stackPanel1.Text = "stackPanel1"; - this.stackPanel1.Vertical = true; + this.header1.Description = "气泡聊天列表。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "ChatList 气泡聊天列表"; + this.header1.UseTitleFont = true; // // panel1 // this.panel1.Controls.Add(this.chatList); - this.panel1.Location = new System.Drawing.Point(3, 97); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 74); this.panel1.Name = "panel1"; + this.panel1.Radius = 0; this.panel1.Shadow = 12; - this.panel1.Size = new System.Drawing.Size(744, 457); + this.panel1.Size = new System.Drawing.Size(750, 483); this.panel1.TabIndex = 32; this.panel1.Text = "panel1"; // @@ -67,42 +65,16 @@ this.chatList.Dock = System.Windows.Forms.DockStyle.Fill; this.chatList.Location = new System.Drawing.Point(12, 12); this.chatList.Name = "chatList"; - this.chatList.Size = new System.Drawing.Size(720, 433); + this.chatList.Size = new System.Drawing.Size(726, 459); this.chatList.TabIndex = 0; this.chatList.Text = "chatList1"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 31; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 30; - this.label2.Text = "气泡聊天列表。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 29; - this.label1.Text = "ChatList 气泡聊天列表"; - // // ChatListDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.panel1); + this.Controls.Add(this.header1); this.Name = "ChatListDemo"; this.Size = new System.Drawing.Size(750, 557); - this.stackPanel1.ResumeLayout(false); this.panel1.ResumeLayout(false); this.ResumeLayout(false); @@ -110,10 +82,7 @@ #endregion - private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; + private AntdUI.PageHeader header1; private AntdUI.Panel panel1; private AntdUI.Chat.ChatList chatList; } diff --git a/Views/CheckBoxDemo.Designer.cs b/Views/CheckBoxDemo.Designer.cs index 6f520b5..954963a 100644 --- a/Views/CheckBoxDemo.Designer.cs +++ b/Views/CheckBoxDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel2 = new AntdUI.FlowPanel(); this.checkbox3 = new AntdUI.Checkbox(); @@ -39,27 +40,35 @@ this.checkbox2 = new AntdUI.Checkbox(); this.checkbox1 = new AntdUI.Checkbox(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "收集用户的多项选择。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Checkbox 多选框"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 451); + this.stackPanel1.Size = new System.Drawing.Size(750, 377); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -68,7 +77,7 @@ // this.flowPanel2.Controls.Add(this.checkbox3); this.flowPanel2.Controls.Add(this.checkbox4); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 11; @@ -100,7 +109,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 10; @@ -112,7 +121,7 @@ this.flowPanel1.Controls.Add(this.checkbox6); this.flowPanel1.Controls.Add(this.checkbox2); this.flowPanel1.Controls.Add(this.checkbox1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 9; @@ -165,41 +174,17 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 8; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 7; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 6; - this.label2.Text = "收集用户的多项选择。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 5; - this.label1.Text = "Checkbox 多选框"; - // // CheckBoxDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "CheckBoxDemo"; this.Size = new System.Drawing.Size(750, 451); this.stackPanel1.ResumeLayout(false); @@ -211,10 +196,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Checkbox checkbox1; diff --git a/Views/CollapseDemo.Designer.cs b/Views/CollapseDemo.Designer.cs index ce12d44..8706117 100644 --- a/Views/CollapseDemo.Designer.cs +++ b/Views/CollapseDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.collapse3 = new AntdUI.Collapse(); this.collapseItem6 = new AntdUI.CollapseItem(); @@ -51,9 +52,6 @@ this.button15 = new AntdUI.Button(); this.button16 = new AntdUI.Button(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.collapse3.SuspendLayout(); this.collapseItem6.SuspendLayout(); @@ -66,19 +64,30 @@ this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "可以折叠/展开的内容区域。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Collapse 折叠面板"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.collapse3); this.stackPanel1.Controls.Add(this.label8); this.stackPanel1.Controls.Add(this.collapse1); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 682); + this.stackPanel1.Size = new System.Drawing.Size(750, 608); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -91,7 +100,7 @@ this.collapse3.Items.Add(this.collapseItem6); this.collapse3.Items.Add(this.collapseItem7); this.collapse3.Items.Add(this.collapseItem8); - this.collapse3.Location = new System.Drawing.Point(3, 429); + this.collapse3.Location = new System.Drawing.Point(3, 335); this.collapse3.Name = "collapse3"; this.collapse3.Size = new System.Drawing.Size(744, 247); this.collapse3.TabIndex = 49; @@ -161,7 +170,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 399); + this.label8.Location = new System.Drawing.Point(3, 305); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(744, 24); this.label8.TabIndex = 48; @@ -174,7 +183,7 @@ this.collapse1.Items.Add(this.collapseItem1); this.collapse1.Items.Add(this.collapseItem2); this.collapse1.Items.Add(this.collapseItem3); - this.collapse1.Location = new System.Drawing.Point(3, 127); + this.collapse1.Location = new System.Drawing.Point(3, 33); this.collapse1.Name = "collapse1"; this.collapse1.Size = new System.Drawing.Size(744, 266); this.collapse1.TabIndex = 47; @@ -315,41 +324,17 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 46; this.label4.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 45; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 44; - this.label2.Text = "可以折叠/展开的内容区域。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 43; - this.label1.Text = "Collapse 折叠面板"; - // // CollapseDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "CollapseDemo"; this.Size = new System.Drawing.Size(750, 682); this.stackPanel1.ResumeLayout(false); @@ -368,11 +353,9 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; private AntdUI.Label label4; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Collapse collapse1; private AntdUI.CollapseItem collapseItem1; private AntdUI.CollapseItem collapseItem2; diff --git a/Views/ColorPickerDemo.Designer.cs b/Views/ColorPickerDemo.Designer.cs index ba198fb..d332d96 100644 --- a/Views/ColorPickerDemo.Designer.cs +++ b/Views/ColorPickerDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel4 = new AntdUI.FlowPanel(); this.colorPicker11 = new AntdUI.ColorPicker(); @@ -53,9 +54,6 @@ this.colorPicker2 = new AntdUI.ColorPicker(); this.colorPicker1 = new AntdUI.ColorPicker(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -63,6 +61,20 @@ this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "用于选择颜色。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "ColorPicker 颜色选择器"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel4); @@ -73,13 +85,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 435); + this.stackPanel1.Size = new System.Drawing.Size(750, 361); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -92,7 +101,7 @@ this.flowPanel4.Controls.Add(this.colorPicker8); this.flowPanel4.Controls.Add(this.colorPicker7); this.flowPanel4.Controls.Add(this.colorPicker6); - this.flowPanel4.Location = new System.Drawing.Point(3, 349); + this.flowPanel4.Location = new System.Drawing.Point(3, 255); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 15; @@ -184,7 +193,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 319); + this.label6.Location = new System.Drawing.Point(3, 225); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 14; @@ -196,7 +205,7 @@ this.flowPanel3.Controls.Add(this.colorPicker16); this.flowPanel3.Controls.Add(this.colorPicker5); this.flowPanel3.Controls.Add(this.colorPicker13); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 13; @@ -255,7 +264,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 12; @@ -265,7 +274,7 @@ // this.flowPanel2.Controls.Add(this.colorPicker4); this.flowPanel2.Controls.Add(this.colorPicker3); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 11; @@ -299,7 +308,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 10; @@ -311,7 +320,7 @@ this.flowPanel1.Controls.Add(this.colorPicker12); this.flowPanel1.Controls.Add(this.colorPicker2); this.flowPanel1.Controls.Add(this.colorPicker1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 9; @@ -366,41 +375,17 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 8; this.label3.Text = "文字显示"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 7; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 6; - this.label2.Text = "用于选择颜色。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 5; - this.label1.Text = "ColorPicker 颜色选择器"; - // // ColorPickerDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "ColorPickerDemo"; this.Size = new System.Drawing.Size(750, 435); this.stackPanel1.ResumeLayout(false); @@ -414,10 +399,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.ColorPicker colorPicker1; diff --git a/Views/ContextMenuStripDemo.Designer.cs b/Views/ContextMenuStripDemo.Designer.cs index dddfd8e..b612be8 100644 --- a/Views/ContextMenuStripDemo.Designer.cs +++ b/Views/ContextMenuStripDemo.Designer.cs @@ -28,30 +28,38 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel = new AntdUI.FlowPanel(); this.button_base = new AntdUI.Button(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); this.label3 = new AntdUI.Label(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "表示快捷菜单。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "ContextMenuStrip 快捷菜单"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 104); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 498); + this.stackPanel1.Size = new System.Drawing.Size(750, 394); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -59,7 +67,7 @@ // flowPanel // this.flowPanel.Controls.Add(this.button_base); - this.flowPanel.Location = new System.Drawing.Point(3, 157); + this.flowPanel.Location = new System.Drawing.Point(3, 33); this.flowPanel.Name = "flowPanel"; this.flowPanel.Size = new System.Drawing.Size(744, 38); this.flowPanel.TabIndex = 58; @@ -79,50 +87,28 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 127); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 57; this.label4.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 109); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 56; - // // label3 // + this.label3.Dock = System.Windows.Forms.DockStyle.Top; this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label3.Location = new System.Drawing.Point(3, 79); + this.label3.Location = new System.Drawing.Point(0, 74); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(744, 24); + this.label3.Padding = new System.Windows.Forms.Padding(10, 0, 10, 6); + this.label3.Size = new System.Drawing.Size(750, 30); this.label3.TabIndex = 55; this.label3.Text = "ContextMenuStrip没有工具箱控件，使用代码方式调用。"; // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 51; - this.label2.Text = "表示快捷菜单。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 50; - this.label1.Text = "ContextMenuStrip 快捷菜单"; - // // ContextMenuStripDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.label3); + this.Controls.Add(this.header1); this.Name = "ContextMenuStripDemo"; this.Size = new System.Drawing.Size(750, 498); this.stackPanel1.ResumeLayout(false); @@ -133,13 +119,11 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel; private AntdUI.Button button_base; private AntdUI.Label label4; - private AntdUI.Divider divider1; private AntdUI.Label label3; } } diff --git a/Views/DatePickerDemo.Designer.cs b/Views/DatePickerDemo.Designer.cs index 51cc6c5..2304582 100644 --- a/Views/DatePickerDemo.Designer.cs +++ b/Views/DatePickerDemo.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DatePickerDemo)); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel4 = new AntdUI.FlowPanel(); this.datePicker_badge = new AntdUI.DatePicker(); @@ -55,9 +56,6 @@ this.datePicker7 = new AntdUI.DatePicker(); this.datePicker11 = new AntdUI.DatePicker(); this.label5 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel2.SuspendLayout(); @@ -66,6 +64,20 @@ this.flowPanel3.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "输入或选择日期的控件。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "DatePicker 日期选择器"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel4); @@ -78,13 +90,10 @@ this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.flowPanel3); this.stackPanel1.Controls.Add(this.label5); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 513); + this.stackPanel1.Size = new System.Drawing.Size(750, 439); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -92,7 +101,7 @@ // flowPanel4 // this.flowPanel4.Controls.Add(this.datePicker_badge); - this.flowPanel4.Location = new System.Drawing.Point(3, 423); + this.flowPanel4.Location = new System.Drawing.Point(3, 329); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 42; @@ -112,7 +121,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 393); + this.label6.Location = new System.Drawing.Point(3, 299); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 41; @@ -123,7 +132,7 @@ this.flowPanel2.Controls.Add(this.datePicker8); this.flowPanel2.Controls.Add(this.datePicker9); this.flowPanel2.Controls.Add(this.datePicker12); - this.flowPanel2.Location = new System.Drawing.Point(3, 349); + this.flowPanel2.Location = new System.Drawing.Point(3, 255); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 40; @@ -166,7 +175,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 319); + this.label4.Location = new System.Drawing.Point(3, 225); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 39; @@ -176,7 +185,7 @@ // this.flowPanel5.Controls.Add(this.datePicker_maxdate); this.flowPanel5.Controls.Add(this.datePicker_mindate); - this.flowPanel5.Location = new System.Drawing.Point(3, 275); + this.flowPanel5.Location = new System.Drawing.Point(3, 181); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 38; @@ -205,7 +214,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 245); + this.label7.Location = new System.Drawing.Point(3, 151); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 37; @@ -219,7 +228,7 @@ this.flowPanel1.Controls.Add(this.datePicker3); this.flowPanel1.Controls.Add(this.datePicker2); this.flowPanel1.Controls.Add(this.datePicker1); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 34; @@ -293,7 +302,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 171); + this.label3.Location = new System.Drawing.Point(3, 77); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 33; @@ -304,7 +313,7 @@ this.flowPanel3.Controls.Add(this.datePicker10); this.flowPanel3.Controls.Add(this.datePicker7); this.flowPanel3.Controls.Add(this.datePicker11); - this.flowPanel3.Location = new System.Drawing.Point(3, 127); + this.flowPanel3.Location = new System.Drawing.Point(3, 33); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 16; @@ -345,41 +354,16 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 97); + this.label5.Location = new System.Drawing.Point(3, 3); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 15; this.label5.Text = "日期格式化"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 10; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 9; - this.label2.Text = "输入或选择日期的控件。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 8; - this.label1.Text = "DatePicker 日期选择器"; - // // DatePickerDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "DatePickerDemo"; this.Size = new System.Drawing.Size(750, 513); this.stackPanel1.ResumeLayout(false); @@ -394,10 +378,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel3; private AntdUI.DatePicker datePicker7; private AntdUI.DatePicker datePicker11; diff --git a/Views/DatePickerRangeDemo.Designer.cs b/Views/DatePickerRangeDemo.Designer.cs index 87cf255..56982f4 100644 --- a/Views/DatePickerRangeDemo.Designer.cs +++ b/Views/DatePickerRangeDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel1 = new AntdUI.FlowPanel(); this.datePickerRange = new AntdUI.DatePickerRange(); @@ -35,27 +36,35 @@ this.flowPanel2 = new AntdUI.FlowPanel(); this.datePickerRange1 = new AntdUI.DatePickerRange(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "输入或选择范围日期的控件。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "DatePickerRange 日期范围选择器"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 426); + this.stackPanel1.Size = new System.Drawing.Size(750, 352); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -63,7 +72,7 @@ // flowPanel1 // this.flowPanel1.Controls.Add(this.datePickerRange); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 19; @@ -88,7 +97,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 171); + this.label3.Location = new System.Drawing.Point(3, 77); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 18; @@ -97,7 +106,7 @@ // flowPanel2 // this.flowPanel2.Controls.Add(this.datePickerRange1); - this.flowPanel2.Location = new System.Drawing.Point(3, 127); + this.flowPanel2.Location = new System.Drawing.Point(3, 33); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 17; @@ -117,41 +126,16 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 16; this.label4.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 13; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 12; - this.label2.Text = "输入或选择范围日期的控件。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 11; - this.label1.Text = "DatePickerRange 日期范围选择器"; - // // DatePickerRangeDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "DatePickerRangeDemo"; this.Size = new System.Drawing.Size(750, 426); this.stackPanel1.ResumeLayout(false); @@ -163,10 +147,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.DatePickerRange datePickerRange; private AntdUI.Label label3; diff --git a/Views/DividerDemo.Designer.cs b/Views/DividerDemo.Designer.cs index d7c055b..7714305 100644 --- a/Views/DividerDemo.Designer.cs +++ b/Views/DividerDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.panel1 = new AntdUI.Panel(); this.divider_null = new AntdUI.Divider(); @@ -39,24 +40,32 @@ this.divider5 = new AntdUI.Divider(); this.divider3 = new AntdUI.Divider(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "区隔内容的分割线。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Divider 分割线"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.panel1); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 518); + this.stackPanel1.Size = new System.Drawing.Size(750, 444); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -71,7 +80,7 @@ this.panel1.Controls.Add(this.divider6); this.panel1.Controls.Add(this.divider5); this.panel1.Controls.Add(this.divider3); - this.panel1.Location = new System.Drawing.Point(3, 127); + this.panel1.Location = new System.Drawing.Point(3, 33); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(744, 371); this.panel1.TabIndex = 60; @@ -173,41 +182,16 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 57; this.label4.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 56; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 55; - this.label2.Text = "区隔内容的分割线。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 54; - this.label1.Text = "Divider 分割线"; - // // DividerDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "DividerDemo"; this.Size = new System.Drawing.Size(750, 518); this.stackPanel1.ResumeLayout(false); @@ -218,11 +202,9 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; private AntdUI.Label label4; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Panel panel1; private AntdUI.Divider divider4; private AntdUI.Divider divider6; diff --git a/Views/DrawerDemo.Designer.cs b/Views/DrawerDemo.Designer.cs index 3c7a047..e435899 100644 --- a/Views/DrawerDemo.Designer.cs +++ b/Views/DrawerDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.stackPanel3 = new AntdUI.StackPanel(); this.switch_mc = new AntdUI.Switch(); @@ -40,27 +41,35 @@ this.flowPanel1 = new AntdUI.FlowPanel(); this.button = new AntdUI.Button(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.stackPanel3.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "屏幕边缘滑出的浮层面板。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Drawer 抽屉"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.stackPanel3); this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 327); + this.stackPanel1.Size = new System.Drawing.Size(750, 253); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -74,7 +83,7 @@ this.stackPanel3.Controls.Add(this.select_align); this.stackPanel3.Controls.Add(this.label10); this.stackPanel3.Gap = 4; - this.stackPanel3.Location = new System.Drawing.Point(3, 201); + this.stackPanel3.Location = new System.Drawing.Point(3, 107); this.stackPanel3.Name = "stackPanel3"; this.stackPanel3.Size = new System.Drawing.Size(744, 32); this.stackPanel3.TabIndex = 32; @@ -138,7 +147,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 31; @@ -147,7 +156,7 @@ // flowPanel1 // this.flowPanel1.Controls.Add(this.button); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 29; @@ -167,41 +176,16 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 28; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 27; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 26; - this.label2.Text = "屏幕边缘滑出的浮层面板。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 25; - this.label1.Text = "Drawer 抽屉"; - // // DrawerDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "DrawerDemo"; this.Size = new System.Drawing.Size(750, 327); this.stackPanel1.ResumeLayout(false); @@ -213,11 +197,9 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Label label4; private AntdUI.StackPanel stackPanel3; diff --git a/Views/DropDownDemo.Designer.cs b/Views/DropDownDemo.Designer.cs index 091366e..cea3373 100644 --- a/Views/DropDownDemo.Designer.cs +++ b/Views/DropDownDemo.Designer.cs @@ -28,8 +28,7 @@ /// private void InitializeComponent() { - this.label1 = new AntdUI.Label(); - this.label2 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.label3 = new AntdUI.Label(); this.label4 = new AntdUI.Label(); this.label5 = new AntdUI.Label(); @@ -67,7 +66,6 @@ this.dropdown26 = new AntdUI.Dropdown(); this.dropdown25 = new AntdUI.Dropdown(); this.label7 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); this.stackPanel1.SuspendLayout(); this.flowPanel7.SuspendLayout(); this.flowPanel4.SuspendLayout(); @@ -78,53 +76,56 @@ this.flowPanel5.SuspendLayout(); this.SuspendLayout(); // - // label1 + // header1 // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 1; - this.label1.Text = "Dropdown 下拉菜单"; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 2; - this.label2.Text = "向下弹出的列表。"; + this.header1.Description = "向下弹出的列表。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Dropdown 下拉菜单"; + this.header1.UseTitleFont = true; // // label3 // + this.label3.Dock = System.Windows.Forms.DockStyle.Top; this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label3.Location = new System.Drawing.Point(3, 79); + this.label3.Location = new System.Drawing.Point(0, 74); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(744, 39); + this.label3.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); + this.label3.Size = new System.Drawing.Size(750, 39); this.label3.TabIndex = 18; this.label3.Text = "当页面上的操作命令过多时，用此组件可以收纳操作元素。点击或移入触点，会出现一个下拉菜单。可在列表中进行选择，并执行相应的命令。"; // // label4 // + this.label4.Dock = System.Windows.Forms.DockStyle.Top; this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label4.Location = new System.Drawing.Point(3, 124); + this.label4.Location = new System.Drawing.Point(0, 113); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(744, 24); + this.label4.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); + this.label4.Size = new System.Drawing.Size(750, 24); this.label4.TabIndex = 24; this.label4.Text = "○ 用于收罗一组命令操作"; // // label5 // + this.label5.Dock = System.Windows.Forms.DockStyle.Top; this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label5.Location = new System.Drawing.Point(3, 154); + this.label5.Location = new System.Drawing.Point(0, 137); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(744, 24); + this.label5.Padding = new System.Windows.Forms.Padding(10, 0, 10, 6); + this.label5.Size = new System.Drawing.Size(750, 30); this.label5.TabIndex = 30; this.label5.Text = "○ Select 用于选择，而 Dropdown 是命令集合"; // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.flowPanel7); this.stackPanel1.Controls.Add(this.label12); this.stackPanel1.Controls.Add(this.flowPanel4); @@ -139,16 +140,10 @@ this.stackPanel1.Controls.Add(this.label8); this.stackPanel1.Controls.Add(this.flowPanel5); this.stackPanel1.Controls.Add(this.label7); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label5); - this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 167); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 730); + this.stackPanel1.Size = new System.Drawing.Size(750, 563); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -158,7 +153,7 @@ this.flowPanel7.Controls.Add(this.dropdown_custom); this.flowPanel7.Controls.Add(this.dropdown_enable); this.flowPanel7.Controls.Add(this.dropdown_online); - this.flowPanel7.Location = new System.Drawing.Point(3, 676); + this.flowPanel7.Location = new System.Drawing.Point(3, 477); this.flowPanel7.Name = "flowPanel7"; this.flowPanel7.Size = new System.Drawing.Size(744, 38); this.flowPanel7.TabIndex = 45; @@ -206,7 +201,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(3, 646); + this.label12.Location = new System.Drawing.Point(3, 447); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(744, 24); this.label12.TabIndex = 44; @@ -215,7 +210,7 @@ // flowPanel4 // this.flowPanel4.Controls.Add(this.dropdown_icon); - this.flowPanel4.Location = new System.Drawing.Point(3, 602); + this.flowPanel4.Location = new System.Drawing.Point(3, 403); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 43; @@ -237,7 +232,7 @@ // label11 // this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(3, 572); + this.label11.Location = new System.Drawing.Point(3, 373); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(744, 24); this.label11.TabIndex = 42; @@ -246,7 +241,7 @@ // flowPanel3 // this.flowPanel3.Controls.Add(this.dropdown_multi); - this.flowPanel3.Location = new System.Drawing.Point(3, 528); + this.flowPanel3.Location = new System.Drawing.Point(3, 329); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 41; @@ -268,7 +263,7 @@ // label10 // this.label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(3, 498); + this.label10.Location = new System.Drawing.Point(3, 299); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(744, 24); this.label10.TabIndex = 40; @@ -279,7 +274,7 @@ this.flowPanel2.Controls.Add(this.dropdown4); this.flowPanel2.Controls.Add(this.dropdown5); this.flowPanel2.Controls.Add(this.dropdown6); - this.flowPanel2.Location = new System.Drawing.Point(3, 454); + this.flowPanel2.Location = new System.Drawing.Point(3, 255); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 39; @@ -347,7 +342,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(3, 424); + this.label9.Location = new System.Drawing.Point(3, 225); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(744, 24); this.label9.TabIndex = 38; @@ -358,7 +353,7 @@ this.flowPanel1.Controls.Add(this.dropdown3); this.flowPanel1.Controls.Add(this.dropdown1); this.flowPanel1.Controls.Add(this.dropdown2); - this.flowPanel1.Location = new System.Drawing.Point(3, 380); + this.flowPanel1.Location = new System.Drawing.Point(3, 181); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 37; @@ -424,7 +419,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 350); + this.label6.Location = new System.Drawing.Point(3, 151); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 36; @@ -438,7 +433,7 @@ this.flowPanel6.Controls.Add(this.dropdown30); this.flowPanel6.Controls.Add(this.dropdown28); this.flowPanel6.Controls.Add(this.dropdown34); - this.flowPanel6.Location = new System.Drawing.Point(3, 306); + this.flowPanel6.Location = new System.Drawing.Point(3, 107); this.flowPanel6.Name = "flowPanel6"; this.flowPanel6.Size = new System.Drawing.Size(744, 38); this.flowPanel6.TabIndex = 35; @@ -566,7 +561,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 276); + this.label8.Location = new System.Drawing.Point(3, 77); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(744, 24); this.label8.TabIndex = 34; @@ -576,7 +571,7 @@ // this.flowPanel5.Controls.Add(this.dropdown26); this.flowPanel5.Controls.Add(this.dropdown25); - this.flowPanel5.Location = new System.Drawing.Point(3, 232); + this.flowPanel5.Location = new System.Drawing.Point(3, 33); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 33; @@ -622,23 +617,19 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 202); + this.label7.Location = new System.Drawing.Point(3, 3); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 32; this.label7.Text = "触发类型"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 184); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 31; - // // DropDownDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.header1); this.Name = "DropDownDemo"; this.Size = new System.Drawing.Size(750, 730); this.stackPanel1.ResumeLayout(false); @@ -655,8 +646,7 @@ #endregion - private AntdUI.Label label1; - private AntdUI.Label label2; + private AntdUI.PageHeader header1; private AntdUI.Label label3; private AntdUI.Label label4; private AntdUI.Label label5; @@ -673,7 +663,6 @@ private AntdUI.Dropdown dropdown26; private AntdUI.Dropdown dropdown25; private AntdUI.Label label7; - private AntdUI.Divider divider1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Dropdown dropdown1; private AntdUI.Dropdown dropdown2; diff --git a/Views/FloatButtonDemo.Designer.cs b/Views/FloatButtonDemo.Designer.cs index 0292546..20e0bb0 100644 --- a/Views/FloatButtonDemo.Designer.cs +++ b/Views/FloatButtonDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.stackPanel2 = new AntdUI.StackPanel(); this.buttonCZ = new AntdUI.Button(); @@ -65,10 +66,7 @@ this.select_align = new AntdUI.Select(); this.label10 = new AntdUI.Label(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); this.label3 = new AntdUI.Label(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel6.SuspendLayout(); @@ -78,6 +76,20 @@ this.stackPanel3.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "悬浮于页面上方的按钮。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "FloatButton 悬浮按钮"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.stackPanel2); @@ -88,14 +100,10 @@ this.stackPanel1.Controls.Add(this.stackPanel4); this.stackPanel1.Controls.Add(this.stackPanel3); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 104); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 434); + this.stackPanel1.Size = new System.Drawing.Size(750, 330); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -104,7 +112,7 @@ // this.stackPanel2.Controls.Add(this.buttonCZ); this.stackPanel2.Controls.Add(this.buttonClose); - this.stackPanel2.Location = new System.Drawing.Point(3, 377); + this.stackPanel2.Location = new System.Drawing.Point(3, 253); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(744, 38); this.stackPanel2.TabIndex = 26; @@ -141,7 +149,7 @@ this.stackPanel6.Controls.Add(this.input_badge); this.stackPanel6.Controls.Add(this.label17); this.stackPanel6.Gap = 4; - this.stackPanel6.Location = new System.Drawing.Point(3, 339); + this.stackPanel6.Location = new System.Drawing.Point(3, 215); this.stackPanel6.Name = "stackPanel6"; this.stackPanel6.Size = new System.Drawing.Size(744, 32); this.stackPanel6.TabIndex = 25; @@ -225,7 +233,7 @@ this.stackPanel5.Controls.Add(this.input_radius); this.stackPanel5.Controls.Add(this.label12); this.stackPanel5.Gap = 4; - this.stackPanel5.Location = new System.Drawing.Point(3, 301); + this.stackPanel5.Location = new System.Drawing.Point(3, 177); this.stackPanel5.Name = "stackPanel5"; this.stackPanel5.Size = new System.Drawing.Size(744, 32); this.stackPanel5.TabIndex = 24; @@ -300,7 +308,7 @@ // label11 // this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label11.Location = new System.Drawing.Point(3, 271); + this.label11.Location = new System.Drawing.Point(3, 147); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(744, 24); this.label11.TabIndex = 23; @@ -311,7 +319,7 @@ this.stackPanel7.Controls.Add(this.input_gap); this.stackPanel7.Controls.Add(this.label20); this.stackPanel7.Gap = 4; - this.stackPanel7.Location = new System.Drawing.Point(3, 233); + this.stackPanel7.Location = new System.Drawing.Point(3, 109); this.stackPanel7.Name = "stackPanel7"; this.stackPanel7.Size = new System.Drawing.Size(744, 32); this.stackPanel7.TabIndex = 22; @@ -355,7 +363,7 @@ this.stackPanel4.Controls.Add(this.input_size); this.stackPanel4.Controls.Add(this.label9); this.stackPanel4.Gap = 4; - this.stackPanel4.Location = new System.Drawing.Point(3, 195); + this.stackPanel4.Location = new System.Drawing.Point(3, 71); this.stackPanel4.Name = "stackPanel4"; this.stackPanel4.Size = new System.Drawing.Size(744, 32); this.stackPanel4.TabIndex = 17; @@ -447,7 +455,7 @@ this.stackPanel3.Controls.Add(this.select_align); this.stackPanel3.Controls.Add(this.label10); this.stackPanel3.Gap = 4; - this.stackPanel3.Location = new System.Drawing.Point(3, 157); + this.stackPanel3.Location = new System.Drawing.Point(3, 33); this.stackPanel3.Name = "stackPanel3"; this.stackPanel3.Size = new System.Drawing.Size(744, 32); this.stackPanel3.TabIndex = 16; @@ -523,50 +531,28 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label4.Location = new System.Drawing.Point(3, 127); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 15; this.label4.Text = "控件配置"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 109); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 13; - // // label3 // + this.label3.Dock = System.Windows.Forms.DockStyle.Top; this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label3.Location = new System.Drawing.Point(3, 79); + this.label3.Location = new System.Drawing.Point(0, 74); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(744, 24); + this.label3.Padding = new System.Windows.Forms.Padding(0, 0, 0, 6); + this.label3.Size = new System.Drawing.Size(750, 30); this.label3.TabIndex = 4; this.label3.Text = "FloatButton没有工具箱控件，使用代码方式调用。"; // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 3; - this.label2.Text = "悬浮于页面上方的按钮。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 2; - this.label1.Text = "FloatButton 悬浮按钮"; - // // FloatButtonDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.label3); + this.Controls.Add(this.header1); this.Name = "FloatButtonDemo"; this.Size = new System.Drawing.Size(750, 434); this.Load += new System.EventHandler(this.FloatButtonDemo_Load); @@ -583,9 +569,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label1; - private AntdUI.Label label2; private AntdUI.Label label3; private AntdUI.StackPanel stackPanel4; private AntdUI.InputNumber input_my; @@ -596,7 +581,6 @@ private AntdUI.Select select_align; private AntdUI.Label label10; private AntdUI.Label label4; - private AntdUI.Divider divider1; private AntdUI.StackPanel stackPanel2; private AntdUI.Button buttonCZ; private AntdUI.Button buttonClose; diff --git a/Views/FloatButtonDemo.cs b/Views/FloatButtonDemo.cs index 18afa15..5d2dbbb 100644 --- a/Views/FloatButtonDemo.cs +++ b/Views/FloatButtonDemo.cs @@ -8,7 +8,7 @@ namespace AntdUIDemo.Views public partial class FloatButtonDemo : UserControl { private Window window; - private Form floatButtonForm = null; + private FormFloatButton floatButtonForm = null; public FloatButtonDemo(Window _window) { window = _window; @@ -91,7 +91,7 @@ namespace AntdUIDemo.Views // 加载浮动按钮 private void LoadFloatButton() { - if (floatButtonForm == null || floatButtonForm.IsDisposed) + if (floatButtonForm == null) { floatButtonForm = FloatButton.open(new FloatButton.Config(window, new FloatButton.ConfigBtn[] { @@ -137,7 +137,7 @@ namespace AntdUIDemo.Views }, button => { //回调事件 - AntdUI.Message.info(window, "Text:" + button.Text+", Name:" + button.Name, autoClose: 3); + AntdUI.Message.info(window, "Text:" + button.Text + ", Name:" + button.Name, autoClose: 3); }) // 浮动全局配置 { diff --git a/Views/FlowPanelDemo.Designer.cs b/Views/FlowPanelDemo.Designer.cs index d01c62e..e772c02 100644 --- a/Views/FlowPanelDemo.Designer.cs +++ b/Views/FlowPanelDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.stackPanel2 = new AntdUI.StackPanel(); this.flowPanel = new AntdUI.FlowPanel(); @@ -44,9 +45,6 @@ this.stackPanel4 = new AntdUI.StackPanel(); this.select_align = new AntdUI.Select(); this.label10 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel3.SuspendLayout(); @@ -55,16 +53,27 @@ this.stackPanel4.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "用于对齐的弹性布局容器。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "FlowPanel 流动布局"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.stackPanel2); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 496); + this.stackPanel1.Size = new System.Drawing.Size(750, 422); this.stackPanel1.TabIndex = 1; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -73,7 +82,7 @@ // this.stackPanel2.Controls.Add(this.flowPanel); this.stackPanel2.Controls.Add(this.stackPanel3); - this.stackPanel2.Location = new System.Drawing.Point(3, 97); + this.stackPanel2.Location = new System.Drawing.Point(3, 3); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(744, 279); this.stackPanel2.TabIndex = 7; @@ -226,35 +235,10 @@ this.label10.TabIndex = 4; this.label10.Text = "Align"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 6; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 5; - this.label2.Text = "用于对齐的弹性布局容器。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 4; - this.label1.Text = "FlowPanel 流动布局"; - // // FlowPanelDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "FlowPanelDemo"; this.Size = new System.Drawing.Size(750, 496); this.Load += new System.EventHandler(this.FlowPanelDemo_Load); @@ -270,10 +254,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; - private AntdUI.Divider divider1; private AntdUI.StackPanel stackPanel2; private AntdUI.FlowPanel flowPanel; private AntdUI.StackPanel stackPanel3; diff --git a/Views/FlowPanelDemo.cs b/Views/FlowPanelDemo.cs index 2cc3e09..57d4eb1 100644 --- a/Views/FlowPanelDemo.cs +++ b/Views/FlowPanelDemo.cs @@ -95,6 +95,7 @@ namespace AntdUIDemo.Views select_align.Items.Add(align); } } + #region 事件 private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { @@ -152,6 +153,5 @@ namespace AntdUIDemo.Views LoadFlowPanel(); } #endregion - } } diff --git a/Views/GridPanelDemo.Designer.cs b/Views/GridPanelDemo.Designer.cs index 4fd0ec6..063bd68 100644 --- a/Views/GridPanelDemo.Designer.cs +++ b/Views/GridPanelDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.stackPanel2 = new AntdUI.StackPanel(); this.gridPanel = new AntdUI.GridPanel(); @@ -39,9 +40,6 @@ this.stackPanel5 = new AntdUI.StackPanel(); this.input_span = new AntdUI.Input(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel3.SuspendLayout(); @@ -49,16 +47,27 @@ this.stackPanel5.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "精准划分区域的网格布局容器。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(700, 74); + this.header1.TabIndex = 27; + this.header1.Text = "GridPanel 网格布局"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.stackPanel2); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(700, 475); + this.stackPanel1.Size = new System.Drawing.Size(700, 401); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -67,7 +76,7 @@ // this.stackPanel2.Controls.Add(this.gridPanel); this.stackPanel2.Controls.Add(this.stackPanel3); - this.stackPanel2.Location = new System.Drawing.Point(3, 97); + this.stackPanel2.Location = new System.Drawing.Point(3, 3); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(694, 299); this.stackPanel2.TabIndex = 9; @@ -169,34 +178,10 @@ this.label3.TabIndex = 4; this.label3.Text = "Span"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(694, 12); - this.divider1.TabIndex = 8; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(694, 24); - this.label2.TabIndex = 7; - this.label2.Text = "精准划分区域的网格布局容器。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(694, 40); - this.label1.TabIndex = 6; - this.label1.Text = "GridPanel 网格布局"; - // // GridPanelDemo // this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "GridPanelDemo"; this.Size = new System.Drawing.Size(700, 475); this.Load += new System.EventHandler(this.GridPanelDemo_Load); @@ -211,10 +196,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; - private AntdUI.Divider divider1; private AntdUI.StackPanel stackPanel2; private AntdUI.StackPanel stackPanel3; private AntdUI.StackPanel stackPanel5; diff --git a/Views/IconDemo.Designer.cs b/Views/IconDemo.Designer.cs index b3ceba0..b395a3c 100644 --- a/Views/IconDemo.Designer.cs +++ b/Views/IconDemo.Designer.cs @@ -31,57 +31,56 @@ AntdUI.SegmentedItem segmentedItem1 = new AntdUI.SegmentedItem(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(IconDemo)); AntdUI.SegmentedItem segmentedItem2 = new AntdUI.SegmentedItem(); - this.stackPanel1 = new AntdUI.StackPanel(); + this.header1 = new AntdUI.PageHeader(); + this.stackPanel1 = new System.Windows.Forms.Panel(); this.vpanel = new AntdUI.VirtualPanel(); - this.txt_search = new AntdUI.Input(); this.segmented1 = new AntdUI.Segmented(); - this.divider1 = new AntdUI.Divider(); + this.txt_search = new AntdUI.Input(); this.label3 = new AntdUI.Label(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); + this.segmented1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "语义化的矢量图形。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Icon 图标"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.vpanel); - this.stackPanel1.Controls.Add(this.txt_search); this.stackPanel1.Controls.Add(this.segmented1); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 104); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 560); + this.stackPanel1.Padding = new System.Windows.Forms.Padding(3); + this.stackPanel1.Size = new System.Drawing.Size(750, 456); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; - this.stackPanel1.Vertical = true; // // vpanel // - this.vpanel.Location = new System.Drawing.Point(3, 217); + this.vpanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.vpanel.Location = new System.Drawing.Point(3, 41); this.vpanel.Name = "vpanel"; - this.vpanel.Size = new System.Drawing.Size(744, 340); + this.vpanel.Size = new System.Drawing.Size(744, 412); this.vpanel.TabIndex = 20; // - // txt_search - // - this.txt_search.AllowClear = true; - this.txt_search.Dock = System.Windows.Forms.DockStyle.Right; - this.txt_search.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F); - this.txt_search.Location = new System.Drawing.Point(3, 171); - this.txt_search.Name = "txt_search"; - this.txt_search.PlaceholderText = "输入关键字搜索..."; - this.txt_search.PrefixSvg = "SearchOutlined"; - this.txt_search.Size = new System.Drawing.Size(744, 40); - this.txt_search.TabIndex = 19; - // // segmented1 // this.segmented1.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(150)))), ((int)(((byte)(243))))); - this.segmented1.BarStyle = true; + this.segmented1.BarPosition = AntdUI.TAlignMini.Bottom; + this.segmented1.Controls.Add(this.txt_search); + this.segmented1.Dock = System.Windows.Forms.DockStyle.Top; this.segmented1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.segmented1.IconAlign = AntdUI.TAlignMini.Left; segmentedItem1.IconSvg = resources.GetString("segmentedItem1.IconSvg"); @@ -91,64 +90,53 @@ segmentedItem2.Text = "实底风格"; this.segmented1.Items.Add(segmentedItem1); this.segmented1.Items.Add(segmentedItem2); - this.segmented1.Location = new System.Drawing.Point(3, 127); + this.segmented1.Location = new System.Drawing.Point(3, 3); this.segmented1.Name = "segmented1"; this.segmented1.SelectIndex = 0; this.segmented1.Size = new System.Drawing.Size(744, 38); this.segmented1.TabIndex = 18; this.segmented1.Text = "segmented1"; // - // divider1 + // txt_search // - this.divider1.Location = new System.Drawing.Point(3, 109); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 17; + this.txt_search.AllowClear = true; + this.txt_search.Dock = System.Windows.Forms.DockStyle.Right; + this.txt_search.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F); + this.txt_search.Location = new System.Drawing.Point(420, 0); + this.txt_search.Name = "txt_search"; + this.txt_search.PlaceholderText = "输入关键字搜索..."; + this.txt_search.PrefixSvg = "SearchOutlined"; + this.txt_search.Size = new System.Drawing.Size(324, 38); + this.txt_search.TabIndex = 19; // // label3 // + this.label3.Dock = System.Windows.Forms.DockStyle.Top; this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label3.Location = new System.Drawing.Point(3, 79); + this.label3.Location = new System.Drawing.Point(0, 74); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(744, 24); + this.label3.Padding = new System.Windows.Forms.Padding(10, 0, 10, 6); + this.label3.Size = new System.Drawing.Size(750, 30); this.label3.TabIndex = 16; this.label3.Text = "Icon没有工具箱控件，用于Svg属性赋值。"; // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 15; - this.label2.Text = "语义化的矢量图形。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 14; - this.label1.Text = "Icon 图标"; - // // IconDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.label3); + this.Controls.Add(this.header1); this.Name = "IconDemo"; this.Size = new System.Drawing.Size(750, 560); this.stackPanel1.ResumeLayout(false); + this.segmented1.ResumeLayout(false); this.ResumeLayout(false); } #endregion - private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; + private AntdUI.PageHeader header1; + private System.Windows.Forms.Panel stackPanel1; private AntdUI.Label label3; private AntdUI.Segmented segmented1; private AntdUI.VirtualPanel vpanel; diff --git a/Views/IconDemo.cs b/Views/IconDemo.cs index e00caa0..c4070a6 100644 --- a/Views/IconDemo.cs +++ b/Views/IconDemo.cs @@ -148,7 +148,7 @@ namespace AntdUIDemo.Views StringFormat s_f = AntdUI.Helper.SF_NoWrap(lr: StringAlignment.Near); StringFormat s_c = AntdUI.Helper.SF_NoWrap(); - public override void Paint(Graphics g, AntdUI.VirtualPanelArgs e) + public override void Paint(AntdUI.Canvas g, AntdUI.VirtualPanelArgs e) { var dpi = AntdUI.Config.Dpi; @@ -158,26 +158,20 @@ namespace AntdUIDemo.Views using (var font_count = new Font(e.Panel.Font.FontFamily, e.Panel.Font.Size * .74F, e.Panel.Font.Style)) { var size = AntdUI.Helper.Size(g.MeasureString(title, font_title)); - AntdUI.CorrectionTextRendering.DrawStr(g, title, font_title, fore, e.Rect, s_f); + g.String(title, font_title, fore, e.Rect, s_f); var rect_count = new Rectangle(e.Rect.X + size.Width, e.Rect.Y + (e.Rect.Height - size.Height) / 2, size.Height, size.Height); using (var path = AntdUI.Helper.RoundPath(rect_count, e.Radius)) { - using (var brush = new SolidBrush(AntdUI.Style.Db.TagDefaultBg)) - { - g.FillPath(brush, path); - } - using (var pen = new Pen(AntdUI.Style.Db.DefaultBorder, 1 * dpi)) - { - g.DrawPath(pen, path); - } + g.Fill(AntdUI.Style.Db.TagDefaultBg, path); + g.Draw(AntdUI.Style.Db.DefaultBorder, 1 * dpi, path); } - AntdUI.CorrectionTextRendering.DrawStr(g, count, font_count, fore, rect_count, s_c); + g.String(count, font_count, fore, rect_count, s_c); } } } - public override Size Size(Graphics g, AntdUI.VirtualPanelArgs e) + public override Size Size(AntdUI.Canvas g, AntdUI.VirtualPanelArgs e) { var dpi = AntdUI.Config.Dpi; return new Size(e.Rect.Width, (int)(44 * dpi)); @@ -190,7 +184,7 @@ namespace AntdUIDemo.Views StringFormat s_f = AntdUI.Helper.SF_NoWrap(); Bitmap bmp = null, bmp_ac = null; - public override void Paint(Graphics g, AntdUI.VirtualPanelArgs e) + public override void Paint(AntdUI.Canvas g, AntdUI.VirtualPanelArgs e) { var dpi = AntdUI.Config.Dpi; int icon_size = (int)(24 * dpi), text_size = (int)(24 * dpi), y = e.Rect.Y + (e.Rect.Height - (icon_size + text_size)) / 2; @@ -200,31 +194,21 @@ namespace AntdUIDemo.Views { using (var path = AntdUI.Helper.RoundPath(e.Rect, e.Radius)) { - using (var brush = new SolidBrush(AntdUI.Style.Db.Primary)) - { - g.FillPath(brush, path); - } + g.Fill(AntdUI.Style.Db.Primary, path); } if (bmp_ac == null) bmp_ac = AntdUI.SvgExtend.SvgToBmp(Value, icon_size, icon_size, AntdUI.Style.Db.PrimaryColor); - g.DrawImage(bmp_ac, rect_icon); - - using (var fore = new SolidBrush(AntdUI.Style.Db.PrimaryColor)) - { - AntdUI.CorrectionTextRendering.DrawStr(g, Key, e.Panel.Font, fore, rect_text, s_f); - } + g.Image(bmp_ac, rect_icon); + g.String(Key, e.Panel.Font, AntdUI.Style.Db.PrimaryColor, rect_text, s_f); } else { if (bmp == null) bmp = AntdUI.SvgExtend.SvgToBmp(Value, icon_size, icon_size, AntdUI.Style.Db.Text); - g.DrawImage(bmp, rect_icon); - using (var fore = new SolidBrush(AntdUI.Style.Db.Text)) - { - AntdUI.CorrectionTextRendering.DrawStr(g, Key, e.Panel.Font, fore, rect_text, s_f); - } + g.Image(bmp, rect_icon); + g.String(Key, e.Panel.Font, AntdUI.Style.Db.Text, rect_text, s_f); } } - public override Size Size(Graphics g, AntdUI.VirtualPanelArgs e) + public override Size Size(AntdUI.Canvas g, AntdUI.VirtualPanelArgs e) { var dpi = AntdUI.Config.Dpi; return new Size((int)(140 * dpi), (int)(100 * dpi)); diff --git a/Views/Image3DDemo.Designer.cs b/Views/Image3DDemo.Designer.cs index 0c4511d..0f1cc4a 100644 --- a/Views/Image3DDemo.Designer.cs +++ b/Views/Image3DDemo.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel2 = new AntdUI.FlowPanel(); this.image3D_shadowV = new AntdUI.Image3D(); @@ -37,27 +38,35 @@ this.image3D_V = new AntdUI.Image3D(); this.image3D = new AntdUI.Image3D(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "显示3D图片"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Image3D 图片3D"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 554); + this.stackPanel1.Size = new System.Drawing.Size(750, 480); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -66,7 +75,7 @@ // this.flowPanel2.Controls.Add(this.image3D_shadowV); this.flowPanel2.Controls.Add(this.image3D_shadow); - this.flowPanel2.Location = new System.Drawing.Point(3, 331); + this.flowPanel2.Location = new System.Drawing.Point(3, 237); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 168); this.flowPanel2.TabIndex = 65; @@ -101,7 +110,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 301); + this.label3.Location = new System.Drawing.Point(3, 207); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 64; @@ -111,7 +120,7 @@ // this.flowPanel1.Controls.Add(this.image3D_V); this.flowPanel1.Controls.Add(this.image3D); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 168); this.flowPanel1.TabIndex = 62; @@ -142,41 +151,16 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 61; this.label4.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 60; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 59; - this.label2.Text = "显示3D图片"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 58; - this.label1.Text = "Image3D 图片3D"; - // // Image3DDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "Image3DDemo"; this.Size = new System.Drawing.Size(750, 554); this.stackPanel1.ResumeLayout(false); @@ -188,11 +172,9 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; private AntdUI.Label label4; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Image3D image3D; private AntdUI.FlowPanel flowPanel2; diff --git a/Views/InputDemo.Designer.cs b/Views/InputDemo.Designer.cs index 5c5a69f..460cce2 100644 --- a/Views/InputDemo.Designer.cs +++ b/Views/InputDemo.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InputDemo)); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel10 = new AntdUI.FlowPanel(); this.input19 = new AntdUI.Input(); @@ -78,9 +79,6 @@ this.input8 = new AntdUI.Input(); this.input1 = new AntdUI.Input(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.tooltipComponent1 = new AntdUI.TooltipComponent(); this.stackPanel1.SuspendLayout(); this.flowPanel10.SuspendLayout(); @@ -97,8 +95,23 @@ this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "通过鼠标或键盘输入内容，是最基础的表单域的包装。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Input 输入框"; + this.header1.UseTitleFont = true; + // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.flowPanel10); this.stackPanel1.Controls.Add(this.label12); this.stackPanel1.Controls.Add(this.flowPanel9); @@ -119,13 +132,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 882); + this.stackPanel1.Size = new System.Drawing.Size(750, 797); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -135,7 +145,7 @@ this.flowPanel10.Controls.Add(this.input19); this.flowPanel10.Controls.Add(this.input22); this.flowPanel10.Controls.Add(this.input21); - this.flowPanel10.Location = new System.Drawing.Point(3, 831); + this.flowPanel10.Location = new System.Drawing.Point(3, 737); this.flowPanel10.Name = "flowPanel10"; this.flowPanel10.Size = new System.Drawing.Size(744, 38); this.flowPanel10.TabIndex = 30; @@ -144,7 +154,6 @@ // input19 // this.input19.BackExtend = "45, #a8edea, #fed6e3"; - this.input19.Badge = ""; this.input19.BorderWidth = 0F; this.input19.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input19.Location = new System.Drawing.Point(415, 3); @@ -156,7 +165,6 @@ // input22 // this.input22.BackExtend = "135, #8693AB, #BDD4E7"; - this.input22.Badge = ""; this.input22.BorderWidth = 0F; this.input22.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input22.Location = new System.Drawing.Point(209, 3); @@ -168,7 +176,6 @@ // input21 // this.input21.BackExtend = "135, #6253E1, #04BEFE"; - this.input21.Badge = ""; this.input21.BorderWidth = 0F; this.input21.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input21.Location = new System.Drawing.Point(3, 3); @@ -180,7 +187,7 @@ // label12 // this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(3, 801); + this.label12.Location = new System.Drawing.Point(3, 707); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(744, 24); this.label12.TabIndex = 29; @@ -190,7 +197,7 @@ // this.flowPanel9.Controls.Add(this.input18); this.flowPanel9.Controls.Add(this.input20); - this.flowPanel9.Location = new System.Drawing.Point(3, 757); + this.flowPanel9.Location = new System.Drawing.Point(3, 663); this.flowPanel9.Name = "flowPanel9"; this.flowPanel9.Size = new System.Drawing.Size(744, 38); this.flowPanel9.TabIndex = 28; @@ -198,7 +205,6 @@ // // input18 // - this.input18.Badge = ""; this.input18.CaretColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); this.input18.CaretSpeed = 500; this.input18.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -210,7 +216,6 @@ // // input20 // - this.input20.Badge = ""; this.input20.CaretColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(175)))), ((int)(((byte)(80))))); this.input20.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input20.Location = new System.Drawing.Point(3, 3); @@ -222,7 +227,7 @@ // label11 // this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(3, 727); + this.label11.Location = new System.Drawing.Point(3, 633); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(744, 24); this.label11.TabIndex = 27; @@ -233,7 +238,7 @@ this.flowPanel8.Controls.Add(this.input_status); this.flowPanel8.Controls.Add(this.input15); this.flowPanel8.Controls.Add(this.input12); - this.flowPanel8.Location = new System.Drawing.Point(3, 683); + this.flowPanel8.Location = new System.Drawing.Point(3, 589); this.flowPanel8.Name = "flowPanel8"; this.flowPanel8.Size = new System.Drawing.Size(744, 38); this.flowPanel8.TabIndex = 26; @@ -241,7 +246,6 @@ // // input_status // - this.input_status.Badge = ""; this.input_status.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input_status.Location = new System.Drawing.Point(415, 3); this.input_status.Name = "input_status"; @@ -252,7 +256,6 @@ // // input15 // - this.input15.Badge = ""; this.input15.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input15.Location = new System.Drawing.Point(209, 3); this.input15.Name = "input15"; @@ -264,7 +267,6 @@ // // input12 // - this.input12.Badge = ""; this.input12.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input12.Location = new System.Drawing.Point(3, 3); this.input12.Name = "input12"; @@ -277,7 +279,7 @@ // label10 // this.label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(3, 653); + this.label10.Location = new System.Drawing.Point(3, 559); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(744, 24); this.label10.TabIndex = 25; @@ -286,7 +288,7 @@ // flowPanel7 // this.flowPanel7.Controls.Add(this.input16); - this.flowPanel7.Location = new System.Drawing.Point(3, 609); + this.flowPanel7.Location = new System.Drawing.Point(3, 515); this.flowPanel7.Name = "flowPanel7"; this.flowPanel7.Size = new System.Drawing.Size(744, 38); this.flowPanel7.TabIndex = 24; @@ -294,7 +296,6 @@ // // input16 // - this.input16.Badge = ""; this.input16.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input16.Location = new System.Drawing.Point(3, 3); this.input16.Name = "input16"; @@ -307,7 +308,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(3, 579); + this.label9.Location = new System.Drawing.Point(3, 485); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(744, 24); this.label9.TabIndex = 23; @@ -317,7 +318,7 @@ // this.flowPanel3.Controls.Add(this.panel1); this.flowPanel3.Controls.Add(this.panel3); - this.flowPanel3.Location = new System.Drawing.Point(3, 535); + this.flowPanel3.Location = new System.Drawing.Point(3, 441); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 22; @@ -351,7 +352,6 @@ // // input10 // - this.input10.Badge = ""; this.input10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input10.JoinRight = true; this.input10.Location = new System.Drawing.Point(3, 3); @@ -375,7 +375,6 @@ // // input9 // - this.input9.Badge = ""; this.input9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input9.JoinLeft = true; this.input9.Location = new System.Drawing.Point(41, 3); @@ -400,7 +399,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 505); + this.label7.Location = new System.Drawing.Point(3, 411); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 21; @@ -410,7 +409,7 @@ // this.flowPanel6.Controls.Add(this.input11); this.flowPanel6.Controls.Add(this.input13); - this.flowPanel6.Location = new System.Drawing.Point(3, 461); + this.flowPanel6.Location = new System.Drawing.Point(3, 367); this.flowPanel6.Name = "flowPanel6"; this.flowPanel6.Size = new System.Drawing.Size(744, 38); this.flowPanel6.TabIndex = 20; @@ -418,7 +417,6 @@ // // input11 // - this.input11.Badge = ""; this.input11.BorderWidth = 2F; this.input11.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input11.Location = new System.Drawing.Point(209, 3); @@ -430,7 +428,6 @@ // // input13 // - this.input13.Badge = ""; this.input13.BorderWidth = 0F; this.input13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input13.Location = new System.Drawing.Point(3, 3); @@ -443,7 +440,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 431); + this.label8.Location = new System.Drawing.Point(3, 337); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(744, 24); this.label8.TabIndex = 19; @@ -454,7 +451,7 @@ this.flowPanel5.Controls.Add(this.input17); this.flowPanel5.Controls.Add(this.input6); this.flowPanel5.Controls.Add(this.input5); - this.flowPanel5.Location = new System.Drawing.Point(3, 387); + this.flowPanel5.Location = new System.Drawing.Point(3, 293); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 16; @@ -462,7 +459,6 @@ // // input17 // - this.input17.Badge = ""; this.input17.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input17.Location = new System.Drawing.Point(415, 3); this.input17.Name = "input17"; @@ -477,7 +473,6 @@ // // input6 // - this.input6.Badge = ""; this.input6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input6.Location = new System.Drawing.Point(209, 3); this.input6.Name = "input6"; @@ -490,7 +485,6 @@ // // input5 // - this.input5.Badge = ""; this.input5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input5.Location = new System.Drawing.Point(3, 3); this.input5.Name = "input5"; @@ -504,7 +498,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 357); + this.label6.Location = new System.Drawing.Point(3, 263); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 15; @@ -514,7 +508,7 @@ // this.flowPanel4.Controls.Add(this.input14); this.flowPanel4.Controls.Add(this.input3); - this.flowPanel4.Location = new System.Drawing.Point(3, 275); + this.flowPanel4.Location = new System.Drawing.Point(3, 181); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 76); this.flowPanel4.TabIndex = 14; @@ -523,7 +517,6 @@ // input14 // this.input14.AutoScroll = true; - this.input14.Badge = ""; this.input14.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input14.Location = new System.Drawing.Point(209, 3); this.input14.Multiline = true; @@ -535,7 +528,6 @@ // // input3 // - this.input3.Badge = ""; this.input3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input3.Location = new System.Drawing.Point(3, 3); this.input3.Multiline = true; @@ -547,7 +539,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 13; @@ -558,7 +550,7 @@ this.flowPanel2.Controls.Add(this.input23); this.flowPanel2.Controls.Add(this.input2); this.flowPanel2.Controls.Add(this.input4); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 11; @@ -566,7 +558,6 @@ // // input23 // - this.input23.Badge = ""; this.input23.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input23.Location = new System.Drawing.Point(415, 3); this.input23.Name = "input23"; @@ -581,7 +572,6 @@ // // input2 // - this.input2.Badge = ""; this.input2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input2.Location = new System.Drawing.Point(209, 3); this.input2.Name = "input2"; @@ -594,7 +584,6 @@ // // input4 // - this.input4.Badge = ""; this.input4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input4.Location = new System.Drawing.Point(3, 3); this.input4.Name = "input4"; @@ -609,7 +598,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 10; @@ -620,7 +609,7 @@ this.flowPanel1.Controls.Add(this.input7); this.flowPanel1.Controls.Add(this.input8); this.flowPanel1.Controls.Add(this.input1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 9; @@ -628,7 +617,6 @@ // // input7 // - this.input7.Badge = ""; this.input7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input7.Location = new System.Drawing.Point(415, 3); this.input7.Name = "input7"; @@ -641,7 +629,6 @@ // input8 // this.input8.AllowClear = true; - this.input8.Badge = ""; this.input8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input8.Location = new System.Drawing.Point(209, 3); this.input8.Name = "input8"; @@ -652,7 +639,6 @@ // // input1 // - this.input1.Badge = ""; this.input1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.input1.Location = new System.Drawing.Point(3, 3); this.input1.Name = "input1"; @@ -663,37 +649,12 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 8; this.label3.Text = "基本类型"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 7; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 6; - this.label2.Text = "通过鼠标或键盘输入内容，是最基础的表单域的包装。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 5; - this.label1.Text = "Input 输入框"; - // // tooltipComponent1 // this.tooltipComponent1.ArrowAlign = AntdUI.TAlign.TL; @@ -701,10 +662,10 @@ // // InputDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "InputDemo"; - this.Size = new System.Drawing.Size(750, 882); + this.Size = new System.Drawing.Size(750, 871); this.stackPanel1.ResumeLayout(false); this.flowPanel10.ResumeLayout(false); this.flowPanel9.ResumeLayout(false); @@ -724,10 +685,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Input input1; diff --git a/Views/InputDemo.cs b/Views/InputDemo.cs index 3d115c0..097389e 100644 --- a/Views/InputDemo.cs +++ b/Views/InputDemo.cs @@ -25,12 +25,14 @@ namespace AntdUIDemo.Views { var text = input_status.Text; // 判断是否空 - if (string.IsNullOrEmpty(text)) { + if (string.IsNullOrEmpty(text)) + { input_status.Status = TType.None; return; } bool containsLetter = ValidateString(text); - if (!containsLetter) { + if (!containsLetter) + { input_status.Status = TType.Error; } else diff --git a/Views/InputNumberDemo.Designer.cs b/Views/InputNumberDemo.Designer.cs index 3bdaa0d..e228fa5 100644 --- a/Views/InputNumberDemo.Designer.cs +++ b/Views/InputNumberDemo.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InputNumberDemo)); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel3 = new AntdUI.FlowPanel(); this.inputNumber8 = new AntdUI.InputNumber(); @@ -42,15 +43,26 @@ this.inputNumber4 = new AntdUI.InputNumber(); this.inputNumber1 = new AntdUI.InputNumber(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel3.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "通过鼠标或键盘，输入范围内的数值。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "InputNumber 数字输入框"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.flowPanel3); @@ -59,13 +71,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 471); + this.stackPanel1.Size = new System.Drawing.Size(750, 397); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -73,7 +82,7 @@ // flowPanel3 // this.flowPanel3.Controls.Add(this.inputNumber8); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 16; @@ -98,7 +107,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 15; @@ -108,7 +117,7 @@ // this.flowPanel2.Controls.Add(this.inputNumber3); this.flowPanel2.Controls.Add(this.inputNumber2); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 14; @@ -153,7 +162,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 13; @@ -164,7 +173,7 @@ this.flowPanel1.Controls.Add(this.inputNumber5); this.flowPanel1.Controls.Add(this.inputNumber4); this.flowPanel1.Controls.Add(this.inputNumber1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 12; @@ -248,41 +257,16 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 11; this.label3.Text = "基本类型"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 10; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 9; - this.label2.Text = "通过鼠标或键盘，输入范围内的数值。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 8; - this.label1.Text = "InputNumber 数字输入框"; - // // InputNumberDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "InputNumberDemo"; this.Size = new System.Drawing.Size(750, 471); this.stackPanel1.ResumeLayout(false); @@ -295,10 +279,8 @@ #endregion + private AntdUI.PageHeader header1; private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Label label3; private AntdUI.InputNumber inputNumber1; diff --git a/Views/LabelDemo.Designer.cs b/Views/LabelDemo.Designer.cs index 6130399..1f32ee5 100644 --- a/Views/LabelDemo.Designer.cs +++ b/Views/LabelDemo.Designer.cs @@ -39,9 +39,7 @@ this.label5 = new AntdUI.Label(); this.label4 = new AntdUI.Label(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); @@ -53,13 +51,10 @@ this.stackPanel1.Controls.Add(this.label9); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 464); + this.stackPanel1.Size = new System.Drawing.Size(750, 390); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -69,7 +64,7 @@ this.flowPanel2.Controls.Add(this.label10); this.flowPanel2.Controls.Add(this.label11); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 32; @@ -109,7 +104,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(3, 171); + this.label9.Location = new System.Drawing.Point(3, 77); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(744, 24); this.label9.TabIndex = 31; @@ -121,7 +116,7 @@ this.flowPanel1.Controls.Add(this.label5); this.flowPanel1.Controls.Add(this.label4); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 30; @@ -163,41 +158,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 29; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 28; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 27; - this.label2.Text = "字符标签。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 26; - this.label1.Text = "Label 标签"; + this.header1.Description = "字符标签。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Label 标签"; + this.header1.UseTitleFont = true; // // LabelDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "LabelDemo"; this.Size = new System.Drawing.Size(750, 464); this.stackPanel1.ResumeLayout(false); @@ -210,9 +194,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Label label3; private AntdUI.Label label4; @@ -222,5 +203,6 @@ private AntdUI.FlowPanel flowPanel2; private AntdUI.Label label10; private AntdUI.Label label11; + private AntdUI.PageHeader header1; } } diff --git a/Views/MenuDemo.Designer.cs b/Views/MenuDemo.Designer.cs index 3729dde..79567e7 100644 --- a/Views/MenuDemo.Designer.cs +++ b/Views/MenuDemo.Designer.cs @@ -66,107 +66,74 @@ AntdUI.MenuItem menuItem34 = new AntdUI.MenuItem(); AntdUI.MenuItem menuItem35 = new AntdUI.MenuItem(); AntdUI.MenuItem menuItem36 = new AntdUI.MenuItem(); - this.stackPanel1 = new AntdUI.StackPanel(); - this.stackPanel2 = new AntdUI.StackPanel(); + this.stackPanel1 = new AntdUI.Panel(); this.tabs1 = new AntdUI.Tabs(); this.tabPage1 = new AntdUI.TabPage(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label13 = new AntdUI.Label(); + this.label12 = new AntdUI.Label(); + this.colorPicker_backactive = new AntdUI.ColorPicker(); + this.colorPicker_backhover = new AntdUI.ColorPicker(); + this.colorPicker_foreactive = new AntdUI.ColorPicker(); + this.colorPicker_forecolor = new AntdUI.ColorPicker(); + this.label14 = new AntdUI.Label(); + this.input_radius = new AntdUI.InputNumber(); + this.label11 = new AntdUI.Label(); + this.switch_unique = new AntdUI.Switch(); + this.label6 = new AntdUI.Label(); + this.switch_showsubback = new AntdUI.Switch(); + this.label9 = new AntdUI.Label(); + this.switch_round = new AntdUI.Switch(); + this.label8 = new AntdUI.Label(); + this.switch_indent = new AntdUI.Switch(); + this.label7 = new AntdUI.Label(); + this.switch_collapsed = new AntdUI.Switch(); + this.label4 = new AntdUI.Label(); + this.label3 = new AntdUI.Label(); this.menu_inline = new AntdUI.Menu(); this.tabPage2 = new AntdUI.TabPage(); this.menu_vertical = new AntdUI.Menu(); this.tabPage3 = new AntdUI.TabPage(); this.menu_horizontal = new AntdUI.Menu(); this.divider2 = new AntdUI.Divider(); - this.stackPanel3 = new AntdUI.StackPanel(); + this.stackPanel3 = new AntdUI.Panel(); this.buttonCZ = new AntdUI.Button(); - this.stackPanel14 = new AntdUI.StackPanel(); - this.colorPicker_backactive = new AntdUI.ColorPicker(); - this.label13 = new AntdUI.Label(); - this.stackPanel13 = new AntdUI.StackPanel(); - this.colorPicker_backhover = new AntdUI.ColorPicker(); - this.label12 = new AntdUI.Label(); - this.stackPanel16 = new AntdUI.StackPanel(); - this.colorPicker_foreactive = new AntdUI.ColorPicker(); - this.label14 = new AntdUI.Label(); - this.stackPanel12 = new AntdUI.StackPanel(); - this.colorPicker_forecolor = new AntdUI.ColorPicker(); - this.label11 = new AntdUI.Label(); - this.stackPanel8 = new AntdUI.StackPanel(); - this.input_radius = new AntdUI.InputNumber(); - this.label6 = new AntdUI.Label(); - this.stackPanel11 = new AntdUI.StackPanel(); - this.switch_unique = new AntdUI.Switch(); - this.label9 = new AntdUI.Label(); - this.stackPanel10 = new AntdUI.StackPanel(); - this.switch_showsubback = new AntdUI.Switch(); - this.label8 = new AntdUI.Label(); - this.stackPanel9 = new AntdUI.StackPanel(); - this.switch_round = new AntdUI.Switch(); - this.label7 = new AntdUI.Label(); - this.stackPanel6 = new AntdUI.StackPanel(); - this.switch_indent = new AntdUI.Switch(); - this.label4 = new AntdUI.Label(); - this.stackPanel5 = new AntdUI.StackPanel(); - this.switch_collapsed = new AntdUI.Switch(); - this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); - this.stackPanel2.SuspendLayout(); this.tabs1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); this.stackPanel3.SuspendLayout(); - this.stackPanel14.SuspendLayout(); - this.stackPanel13.SuspendLayout(); - this.stackPanel16.SuspendLayout(); - this.stackPanel12.SuspendLayout(); - this.stackPanel8.SuspendLayout(); - this.stackPanel11.SuspendLayout(); - this.stackPanel10.SuspendLayout(); - this.stackPanel9.SuspendLayout(); - this.stackPanel6.SuspendLayout(); - this.stackPanel5.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 // - this.stackPanel1.Controls.Add(this.stackPanel2); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); + this.stackPanel1.Controls.Add(this.tabs1); + this.stackPanel1.Controls.Add(this.divider2); + this.stackPanel1.Controls.Add(this.stackPanel3); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 551); + this.stackPanel1.Radius = 0; + this.stackPanel1.Size = new System.Drawing.Size(750, 477); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; - this.stackPanel1.Vertical = true; - // - // stackPanel2 - // - this.stackPanel2.Controls.Add(this.tabs1); - this.stackPanel2.Controls.Add(this.divider2); - this.stackPanel2.Controls.Add(this.stackPanel3); - this.stackPanel2.Location = new System.Drawing.Point(3, 87); - this.stackPanel2.Name = "stackPanel2"; - this.stackPanel2.Size = new System.Drawing.Size(744, 451); - this.stackPanel2.TabIndex = 5; - this.stackPanel2.Text = "stackPanel2"; // // tabs1 // this.tabs1.Centered = true; - this.tabs1.Cursor = System.Windows.Forms.Cursors.Hand; + this.tabs1.Cursor = System.Windows.Forms.Cursors.Default; + this.tabs1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabs1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tabs1.Gap = 12; - this.tabs1.Location = new System.Drawing.Point(289, 3); + this.tabs1.Location = new System.Drawing.Point(270, 0); this.tabs1.Name = "tabs1"; this.tabs1.Pages.Add(this.tabPage1); this.tabs1.Pages.Add(this.tabPage2); this.tabs1.Pages.Add(this.tabPage3); - this.tabs1.Size = new System.Drawing.Size(402, 445); + this.tabs1.Size = new System.Drawing.Size(480, 477); this.tabs1.Style = styleLine1; this.tabs1.TabIndex = 3; this.tabs1.Text = "tabs1"; @@ -179,10 +146,292 @@ this.tabPage1.Location = new System.Drawing.Point(3, 38); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(9); - this.tabPage1.Size = new System.Drawing.Size(396, 404); + this.tabPage1.Size = new System.Drawing.Size(474, 436); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Inline"; // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Controls.Add(this.label13, 0, 9); + this.tableLayoutPanel1.Controls.Add(this.label12, 0, 8); + this.tableLayoutPanel1.Controls.Add(this.colorPicker_backactive, 1, 9); + this.tableLayoutPanel1.Controls.Add(this.colorPicker_backhover, 1, 8); + this.tableLayoutPanel1.Controls.Add(this.colorPicker_foreactive, 1, 7); + this.tableLayoutPanel1.Controls.Add(this.colorPicker_forecolor, 1, 6); + this.tableLayoutPanel1.Controls.Add(this.label14, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.input_radius, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.label11, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.switch_unique, 1, 4); + this.tableLayoutPanel1.Controls.Add(this.label6, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.switch_showsubback, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.label9, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.switch_round, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.label8, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.switch_indent, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.label7, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.switch_collapsed, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.label4, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 0, 10); + this.tableLayoutPanel1.RowCount = 11; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.Size = new System.Drawing.Size(250, 445); + this.tableLayoutPanel1.TabIndex = 52; + // + // label13 + // + this.label13.Dock = System.Windows.Forms.DockStyle.Fill; + this.label13.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.Location = new System.Drawing.Point(3, 360); + this.label13.Margin = new System.Windows.Forms.Padding(0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(120, 40); + this.label13.TabIndex = 4; + this.label13.Text = "BackActive"; + // + // label12 + // + this.label12.Dock = System.Windows.Forms.DockStyle.Fill; + this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(3, 320); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(120, 40); + this.label12.TabIndex = 4; + this.label12.Text = "BackHover"; + // + // colorPicker_backactive + // + this.colorPicker_backactive.DisabledAlpha = true; + this.colorPicker_backactive.Dock = System.Windows.Forms.DockStyle.Fill; + this.colorPicker_backactive.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.colorPicker_backactive.Location = new System.Drawing.Point(126, 363); + this.colorPicker_backactive.Name = "colorPicker_backactive"; + this.colorPicker_backactive.ShowText = true; + this.colorPicker_backactive.Size = new System.Drawing.Size(121, 34); + this.colorPicker_backactive.TabIndex = 5; + this.colorPicker_backactive.Text = "colorPicker3"; + this.colorPicker_backactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); + this.colorPicker_backactive.WaveSize = 0; + // + // colorPicker_backhover + // + this.colorPicker_backhover.DisabledAlpha = true; + this.colorPicker_backhover.Dock = System.Windows.Forms.DockStyle.Fill; + this.colorPicker_backhover.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.colorPicker_backhover.Location = new System.Drawing.Point(126, 323); + this.colorPicker_backhover.Name = "colorPicker_backhover"; + this.colorPicker_backhover.ShowText = true; + this.colorPicker_backhover.Size = new System.Drawing.Size(121, 34); + this.colorPicker_backhover.TabIndex = 5; + this.colorPicker_backhover.Text = "colorPicker2"; + this.colorPicker_backhover.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); + this.colorPicker_backhover.WaveSize = 0; + // + // colorPicker_foreactive + // + this.colorPicker_foreactive.DisabledAlpha = true; + this.colorPicker_foreactive.Dock = System.Windows.Forms.DockStyle.Fill; + this.colorPicker_foreactive.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.colorPicker_foreactive.Location = new System.Drawing.Point(126, 283); + this.colorPicker_foreactive.Name = "colorPicker_foreactive"; + this.colorPicker_foreactive.ShowText = true; + this.colorPicker_foreactive.Size = new System.Drawing.Size(121, 34); + this.colorPicker_foreactive.TabIndex = 5; + this.colorPicker_foreactive.Text = "colorPicker1"; + this.colorPicker_foreactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); + this.colorPicker_foreactive.WaveSize = 0; + // + // colorPicker_forecolor + // + this.colorPicker_forecolor.DisabledAlpha = true; + this.colorPicker_forecolor.Dock = System.Windows.Forms.DockStyle.Fill; + this.colorPicker_forecolor.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.colorPicker_forecolor.Location = new System.Drawing.Point(126, 243); + this.colorPicker_forecolor.Name = "colorPicker_forecolor"; + this.colorPicker_forecolor.ShowText = true; + this.colorPicker_forecolor.Size = new System.Drawing.Size(121, 34); + this.colorPicker_forecolor.TabIndex = 5; + this.colorPicker_forecolor.Text = "colorPicker1"; + this.colorPicker_forecolor.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); + this.colorPicker_forecolor.WaveSize = 0; + // + // label14 + // + this.label14.Dock = System.Windows.Forms.DockStyle.Fill; + this.label14.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.Location = new System.Drawing.Point(3, 280); + this.label14.Margin = new System.Windows.Forms.Padding(0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(120, 40); + this.label14.TabIndex = 4; + this.label14.Text = "ForeActive"; + // + // input_radius + // + this.input_radius.Dock = System.Windows.Forms.DockStyle.Fill; + this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_radius.Location = new System.Drawing.Point(126, 203); + this.input_radius.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_radius.Name = "input_radius"; + this.input_radius.Size = new System.Drawing.Size(121, 34); + this.input_radius.TabIndex = 5; + this.input_radius.Text = "6"; + this.input_radius.Value = new decimal(new int[] { + 6, + 0, + 0, + 0}); + this.input_radius.WaveSize = 0; + // + // label11 + // + this.label11.Dock = System.Windows.Forms.DockStyle.Fill; + this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label11.Location = new System.Drawing.Point(3, 240); + this.label11.Margin = new System.Windows.Forms.Padding(0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(120, 40); + this.label11.TabIndex = 4; + this.label11.Text = "ForeColor"; + // + // switch_unique + // + this.switch_unique.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.switch_unique.AutoCheck = true; + this.switch_unique.Location = new System.Drawing.Point(126, 167); + this.switch_unique.Name = "switch_unique"; + this.switch_unique.Size = new System.Drawing.Size(50, 26); + this.switch_unique.TabIndex = 8; + this.switch_unique.Text = "switch1"; + // + // label6 + // + this.label6.Dock = System.Windows.Forms.DockStyle.Fill; + this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(3, 200); + this.label6.Margin = new System.Windows.Forms.Padding(0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(120, 40); + this.label6.TabIndex = 4; + this.label6.Text = "Radius"; + // + // switch_showsubback + // + this.switch_showsubback.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.switch_showsubback.AutoCheck = true; + this.switch_showsubback.Location = new System.Drawing.Point(126, 127); + this.switch_showsubback.Name = "switch_showsubback"; + this.switch_showsubback.Size = new System.Drawing.Size(50, 26); + this.switch_showsubback.TabIndex = 7; + this.switch_showsubback.Text = "switch1"; + // + // label9 + // + this.label9.Dock = System.Windows.Forms.DockStyle.Fill; + this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label9.Location = new System.Drawing.Point(3, 160); + this.label9.Margin = new System.Windows.Forms.Padding(0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(120, 40); + this.label9.TabIndex = 4; + this.label9.Text = "Unique"; + // + // switch_round + // + this.switch_round.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.switch_round.AutoCheck = true; + this.switch_round.Location = new System.Drawing.Point(126, 87); + this.switch_round.Name = "switch_round"; + this.switch_round.Size = new System.Drawing.Size(50, 26); + this.switch_round.TabIndex = 6; + this.switch_round.Text = "switch1"; + // + // label8 + // + this.label8.Dock = System.Windows.Forms.DockStyle.Fill; + this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label8.Location = new System.Drawing.Point(3, 120); + this.label8.Margin = new System.Windows.Forms.Padding(0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(120, 40); + this.label8.TabIndex = 4; + this.label8.Text = "ShowSubBack"; + // + // switch_indent + // + this.switch_indent.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.switch_indent.AutoCheck = true; + this.switch_indent.Checked = true; + this.switch_indent.Location = new System.Drawing.Point(126, 47); + this.switch_indent.Name = "switch_indent"; + this.switch_indent.Size = new System.Drawing.Size(50, 26); + this.switch_indent.TabIndex = 6; + this.switch_indent.Text = "switch1"; + // + // label7 + // + this.label7.Dock = System.Windows.Forms.DockStyle.Fill; + this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label7.Location = new System.Drawing.Point(3, 80); + this.label7.Margin = new System.Windows.Forms.Padding(0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(120, 40); + this.label7.TabIndex = 4; + this.label7.Text = "Round"; + // + // switch_collapsed + // + this.switch_collapsed.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.switch_collapsed.AutoCheck = true; + this.switch_collapsed.Location = new System.Drawing.Point(126, 7); + this.switch_collapsed.Name = "switch_collapsed"; + this.switch_collapsed.Size = new System.Drawing.Size(50, 26); + this.switch_collapsed.TabIndex = 5; + this.switch_collapsed.Text = "switch1"; + // + // label4 + // + this.label4.Dock = System.Windows.Forms.DockStyle.Fill; + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(3, 40); + this.label4.Margin = new System.Windows.Forms.Padding(0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(120, 40); + this.label4.TabIndex = 4; + this.label4.Text = "Indent"; + // + // label3 + // + this.label3.Dock = System.Windows.Forms.DockStyle.Fill; + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 0); + this.label3.Margin = new System.Windows.Forms.Padding(0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(120, 40); + this.label3.TabIndex = 4; + this.label3.Text = "Collapsed"; + // // menu_inline // this.menu_inline.AutoCollapse = true; @@ -192,18 +441,14 @@ menuItem1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem1.IconSvg = resources.GetString("menuItem1.IconSvg"); menuItem1.PARENTITEM = null; - menuItem1.Select = false; menuItem2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem2.PARENTITEM = menuItem1; - menuItem2.Select = false; menuItem2.Text = "SVG可以变色"; menuItem3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem3.PARENTITEM = menuItem1; - menuItem3.Select = false; menuItem3.Text = "如果变不了"; menuItem4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem4.PARENTITEM = menuItem1; - menuItem4.Select = false; menuItem4.Text = "调整svg内容"; menuItem1.Sub.Add(menuItem2); menuItem1.Sub.Add(menuItem3); @@ -212,18 +457,14 @@ menuItem5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem5.Icon = global::AntdUIDemo.Properties.Resources.关闭; menuItem5.PARENTITEM = null; - menuItem5.Select = false; menuItem6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem6.PARENTITEM = menuItem5; - menuItem6.Select = false; menuItem6.Text = "不能变色"; menuItem7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem7.PARENTITEM = menuItem5; - menuItem7.Select = false; menuItem7.Text = "不适合使用黑白"; menuItem8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem8.PARENTITEM = menuItem5; - menuItem8.Select = false; menuItem8.Text = "子菜单"; menuItem5.Sub.Add(menuItem6); menuItem5.Sub.Add(menuItem7); @@ -232,18 +473,14 @@ menuItem9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem9.IconSvg = resources.GetString("menuItem9.IconSvg"); menuItem9.PARENTITEM = null; - menuItem9.Select = false; menuItem10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem10.PARENTITEM = menuItem9; - menuItem10.Select = false; menuItem10.Text = "二级菜单"; menuItem11.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem11.PARENTITEM = menuItem9; - menuItem11.Select = false; menuItem11.Text = "二级菜单"; menuItem12.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem12.PARENTITEM = menuItem9; - menuItem12.Select = false; menuItem12.Text = "二级菜单"; menuItem9.Sub.Add(menuItem10); menuItem9.Sub.Add(menuItem11); @@ -254,7 +491,7 @@ this.menu_inline.Items.Add(menuItem9); this.menu_inline.Location = new System.Drawing.Point(9, 9); this.menu_inline.Name = "menu_inline"; - this.menu_inline.Size = new System.Drawing.Size(185, 386); + this.menu_inline.Size = new System.Drawing.Size(185, 418); this.menu_inline.TabIndex = 4; this.menu_inline.Text = "menu1"; // @@ -266,7 +503,7 @@ this.tabPage2.Location = new System.Drawing.Point(3, 38); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(9); - this.tabPage2.Size = new System.Drawing.Size(376, 404); + this.tabPage2.Size = new System.Drawing.Size(470, 436); this.tabPage2.TabIndex = 0; this.tabPage2.Text = "Vertical"; // @@ -279,18 +516,14 @@ menuItem13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem13.IconSvg = resources.GetString("menuItem13.IconSvg"); menuItem13.PARENTITEM = null; - menuItem13.Select = false; menuItem14.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem14.PARENTITEM = menuItem13; - menuItem14.Select = false; menuItem14.Text = "SVG可以变色"; menuItem15.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem15.PARENTITEM = menuItem13; - menuItem15.Select = false; menuItem15.Text = "如果变不了"; menuItem16.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem16.PARENTITEM = menuItem13; - menuItem16.Select = false; menuItem16.Text = "调整svg内容"; menuItem13.Sub.Add(menuItem14); menuItem13.Sub.Add(menuItem15); @@ -299,18 +532,14 @@ menuItem17.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem17.Icon = global::AntdUIDemo.Properties.Resources.关闭; menuItem17.PARENTITEM = null; - menuItem17.Select = false; menuItem18.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem18.PARENTITEM = menuItem17; - menuItem18.Select = false; menuItem18.Text = "不能变色"; menuItem19.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem19.PARENTITEM = menuItem17; - menuItem19.Select = false; menuItem19.Text = "不适合使用黑白"; menuItem20.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem20.PARENTITEM = menuItem17; - menuItem20.Select = false; menuItem20.Text = "子菜单"; menuItem17.Sub.Add(menuItem18); menuItem17.Sub.Add(menuItem19); @@ -319,18 +548,14 @@ menuItem21.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem21.IconSvg = resources.GetString("menuItem21.IconSvg"); menuItem21.PARENTITEM = null; - menuItem21.Select = false; menuItem22.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); menuItem22.PARENTITEM = menuItem21; - menuItem22.Select = false; menuItem22.Text = "二级菜单"; menuItem23.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem23.PARENTITEM = menuItem21; - menuItem23.Select = false; menuItem23.Text = "二级菜单"; menuItem24.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); menuItem24.PARENTITEM = menuItem21; - menuItem24.Select = false; menuItem24.Text = "二级菜单"; menuItem21.Sub.Add(menuItem22); menuItem21.Sub.Add(menuItem23); @@ -342,7 +567,7 @@ this.menu_vertical.Location = new System.Drawing.Point(9, 9); this.menu_vertical.Mode = AntdUI.TMenuMode.Vertical; this.menu_vertical.Name = "menu_vertical"; - this.menu_vertical.Size = new System.Drawing.Size(164, 386); + this.menu_vertical.Size = new System.Drawing.Size(164, 418); this.menu_vertical.TabIndex = 5; this.menu_vertical.Text = "menu1"; // @@ -366,15 +591,11 @@ this.menu_horizontal.Indent = true; menuItem25.IconSvg = resources.GetString("menuItem25.IconSvg"); menuItem25.PARENTITEM = null; - menuItem25.Select = false; menuItem26.PARENTITEM = null; - menuItem26.Select = false; menuItem26.Text = "SVG可以变色"; menuItem27.PARENTITEM = null; - menuItem27.Select = false; menuItem27.Text = "如果变不了"; menuItem28.PARENTITEM = null; - menuItem28.Select = false; menuItem28.Text = "调整svg内容"; menuItem25.Sub.Add(menuItem26); menuItem25.Sub.Add(menuItem27); @@ -382,15 +603,11 @@ menuItem25.Text = "SVG图标菜单"; menuItem29.Icon = global::AntdUIDemo.Properties.Resources.关闭; menuItem29.PARENTITEM = null; - menuItem29.Select = false; menuItem30.PARENTITEM = null; - menuItem30.Select = false; menuItem30.Text = "不能变色"; menuItem31.PARENTITEM = null; - menuItem31.Select = false; menuItem31.Text = "不适合使用黑白"; menuItem32.PARENTITEM = null; - menuItem32.Select = false; menuItem32.Text = "二级菜单"; menuItem29.Sub.Add(menuItem30); menuItem29.Sub.Add(menuItem31); @@ -398,15 +615,11 @@ menuItem29.Text = "图片资源菜单"; menuItem33.IconSvg = resources.GetString("menuItem33.IconSvg"); menuItem33.PARENTITEM = null; - menuItem33.Select = false; menuItem34.PARENTITEM = null; - menuItem34.Select = false; menuItem34.Text = "二级菜单"; menuItem35.PARENTITEM = null; - menuItem35.Select = false; menuItem35.Text = "二级菜单"; menuItem36.PARENTITEM = null; - menuItem36.Select = false; menuItem36.Text = "二级菜单"; menuItem33.Sub.Add(menuItem34); menuItem33.Sub.Add(menuItem35); @@ -424,422 +637,77 @@ // // divider2 // - this.divider2.Location = new System.Drawing.Point(259, 3); + this.divider2.Dock = System.Windows.Forms.DockStyle.Left; + this.divider2.Location = new System.Drawing.Point(250, 0); this.divider2.Name = "divider2"; - this.divider2.Size = new System.Drawing.Size(24, 445); + this.divider2.Size = new System.Drawing.Size(20, 477); this.divider2.TabIndex = 2; this.divider2.Vertical = true; // // stackPanel3 // + this.stackPanel3.Controls.Add(this.tableLayoutPanel1); this.stackPanel3.Controls.Add(this.buttonCZ); - this.stackPanel3.Controls.Add(this.stackPanel14); - this.stackPanel3.Controls.Add(this.stackPanel13); - this.stackPanel3.Controls.Add(this.stackPanel16); - this.stackPanel3.Controls.Add(this.stackPanel12); - this.stackPanel3.Controls.Add(this.stackPanel8); - this.stackPanel3.Controls.Add(this.stackPanel11); - this.stackPanel3.Controls.Add(this.stackPanel10); - this.stackPanel3.Controls.Add(this.stackPanel9); - this.stackPanel3.Controls.Add(this.stackPanel6); - this.stackPanel3.Controls.Add(this.stackPanel5); - this.stackPanel3.Location = new System.Drawing.Point(3, 3); + this.stackPanel3.Dock = System.Windows.Forms.DockStyle.Left; + this.stackPanel3.Location = new System.Drawing.Point(0, 0); this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(250, 445); + this.stackPanel3.Radius = 0; + this.stackPanel3.Size = new System.Drawing.Size(250, 477); this.stackPanel3.TabIndex = 0; - this.stackPanel3.Text = "stackPanel3"; - this.stackPanel3.Vertical = true; // // buttonCZ // + this.buttonCZ.Dock = System.Windows.Forms.DockStyle.Bottom; this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.buttonCZ.Location = new System.Drawing.Point(3, 383); + this.buttonCZ.Location = new System.Drawing.Point(0, 445); this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(244, 32); + this.buttonCZ.Size = new System.Drawing.Size(250, 32); this.buttonCZ.TabIndex = 51; this.buttonCZ.Text = "重 置"; this.buttonCZ.Type = AntdUI.TTypeMini.Warn; this.buttonCZ.WaveSize = 0; // - // stackPanel14 - // - this.stackPanel14.Controls.Add(this.colorPicker_backactive); - this.stackPanel14.Controls.Add(this.label13); - this.stackPanel14.Location = new System.Drawing.Point(3, 345); - this.stackPanel14.Name = "stackPanel14"; - this.stackPanel14.Size = new System.Drawing.Size(244, 32); - this.stackPanel14.TabIndex = 50; - this.stackPanel14.Text = "stackPanel14"; - // - // colorPicker_backactive - // - this.colorPicker_backactive.DisabledAlpha = true; - this.colorPicker_backactive.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.colorPicker_backactive.Location = new System.Drawing.Point(129, 3); - this.colorPicker_backactive.Name = "colorPicker_backactive"; - this.colorPicker_backactive.ShowText = true; - this.colorPicker_backactive.Size = new System.Drawing.Size(115, 26); - this.colorPicker_backactive.TabIndex = 5; - this.colorPicker_backactive.Text = "colorPicker3"; - this.colorPicker_backactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker_backactive.WaveSize = 0; - // - // label13 - // - this.label13.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(3, 3); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(120, 26); - this.label13.TabIndex = 4; - this.label13.Text = "BackActive"; - // - // stackPanel13 - // - this.stackPanel13.Controls.Add(this.colorPicker_backhover); - this.stackPanel13.Controls.Add(this.label12); - this.stackPanel13.Location = new System.Drawing.Point(3, 307); - this.stackPanel13.Name = "stackPanel13"; - this.stackPanel13.Size = new System.Drawing.Size(244, 32); - this.stackPanel13.TabIndex = 49; - this.stackPanel13.Text = "stackPanel13"; - // - // colorPicker_backhover - // - this.colorPicker_backhover.DisabledAlpha = true; - this.colorPicker_backhover.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.colorPicker_backhover.Location = new System.Drawing.Point(129, 3); - this.colorPicker_backhover.Name = "colorPicker_backhover"; - this.colorPicker_backhover.ShowText = true; - this.colorPicker_backhover.Size = new System.Drawing.Size(115, 26); - this.colorPicker_backhover.TabIndex = 5; - this.colorPicker_backhover.Text = "colorPicker2"; - this.colorPicker_backhover.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker_backhover.WaveSize = 0; - // - // label12 - // - this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(3, 3); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(120, 26); - this.label12.TabIndex = 4; - this.label12.Text = "BackHover"; - // - // stackPanel16 - // - this.stackPanel16.Controls.Add(this.colorPicker_foreactive); - this.stackPanel16.Controls.Add(this.label14); - this.stackPanel16.Location = new System.Drawing.Point(3, 269); - this.stackPanel16.Name = "stackPanel16"; - this.stackPanel16.Size = new System.Drawing.Size(244, 32); - this.stackPanel16.TabIndex = 48; - this.stackPanel16.Text = "stackPanel16"; - // - // colorPicker_foreactive - // - this.colorPicker_foreactive.DisabledAlpha = true; - this.colorPicker_foreactive.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.colorPicker_foreactive.Location = new System.Drawing.Point(129, 3); - this.colorPicker_foreactive.Name = "colorPicker_foreactive"; - this.colorPicker_foreactive.ShowText = true; - this.colorPicker_foreactive.Size = new System.Drawing.Size(115, 26); - this.colorPicker_foreactive.TabIndex = 5; - this.colorPicker_foreactive.Text = "colorPicker1"; - this.colorPicker_foreactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker_foreactive.WaveSize = 0; - // - // label14 - // - this.label14.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label14.Location = new System.Drawing.Point(3, 3); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(120, 26); - this.label14.TabIndex = 4; - this.label14.Text = "ForeActive"; - // - // stackPanel12 - // - this.stackPanel12.Controls.Add(this.colorPicker_forecolor); - this.stackPanel12.Controls.Add(this.label11); - this.stackPanel12.Location = new System.Drawing.Point(3, 231); - this.stackPanel12.Name = "stackPanel12"; - this.stackPanel12.Size = new System.Drawing.Size(244, 32); - this.stackPanel12.TabIndex = 47; - this.stackPanel12.Text = "stackPanel12"; - // - // colorPicker_forecolor - // - this.colorPicker_forecolor.DisabledAlpha = true; - this.colorPicker_forecolor.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.colorPicker_forecolor.Location = new System.Drawing.Point(129, 3); - this.colorPicker_forecolor.Name = "colorPicker_forecolor"; - this.colorPicker_forecolor.ShowText = true; - this.colorPicker_forecolor.Size = new System.Drawing.Size(115, 26); - this.colorPicker_forecolor.TabIndex = 5; - this.colorPicker_forecolor.Text = "colorPicker1"; - this.colorPicker_forecolor.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker_forecolor.WaveSize = 0; - // - // label11 - // - this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(3, 3); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(120, 26); - this.label11.TabIndex = 4; - this.label11.Text = "ForeColor"; - // - // stackPanel8 - // - this.stackPanel8.Controls.Add(this.input_radius); - this.stackPanel8.Controls.Add(this.label6); - this.stackPanel8.Location = new System.Drawing.Point(3, 193); - this.stackPanel8.Name = "stackPanel8"; - this.stackPanel8.Size = new System.Drawing.Size(244, 32); - this.stackPanel8.TabIndex = 46; - this.stackPanel8.Text = "stackPanel8"; - // - // input_radius - // - this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_radius.Location = new System.Drawing.Point(129, 3); - this.input_radius.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_radius.Name = "input_radius"; - this.input_radius.Size = new System.Drawing.Size(112, 26); - this.input_radius.TabIndex = 5; - this.input_radius.Text = "6"; - this.input_radius.Value = new decimal(new int[] { - 6, - 0, - 0, - 0}); - this.input_radius.WaveSize = 0; - // - // label6 - // - this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 3); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(120, 26); - this.label6.TabIndex = 4; - this.label6.Text = "Radius"; - // - // stackPanel11 - // - this.stackPanel11.Controls.Add(this.switch_unique); - this.stackPanel11.Controls.Add(this.label9); - this.stackPanel11.Location = new System.Drawing.Point(3, 155); - this.stackPanel11.Name = "stackPanel11"; - this.stackPanel11.Size = new System.Drawing.Size(244, 32); - this.stackPanel11.TabIndex = 17; - this.stackPanel11.Text = "stackPanel11"; - // - // switch_unique - // - this.switch_unique.AutoCheck = true; - this.switch_unique.Location = new System.Drawing.Point(129, 3); - this.switch_unique.Name = "switch_unique"; - this.switch_unique.Size = new System.Drawing.Size(50, 26); - this.switch_unique.TabIndex = 8; - this.switch_unique.Text = "switch1"; - // - // label9 - // - this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(3, 3); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(120, 26); - this.label9.TabIndex = 4; - this.label9.Text = "Unique"; - // - // stackPanel10 - // - this.stackPanel10.Controls.Add(this.switch_showsubback); - this.stackPanel10.Controls.Add(this.label8); - this.stackPanel10.Location = new System.Drawing.Point(3, 117); - this.stackPanel10.Name = "stackPanel10"; - this.stackPanel10.Size = new System.Drawing.Size(244, 32); - this.stackPanel10.TabIndex = 16; - this.stackPanel10.Text = "stackPanel10"; - // - // switch_showsubback - // - this.switch_showsubback.AutoCheck = true; - this.switch_showsubback.Location = new System.Drawing.Point(129, 3); - this.switch_showsubback.Name = "switch_showsubback"; - this.switch_showsubback.Size = new System.Drawing.Size(50, 26); - this.switch_showsubback.TabIndex = 7; - this.switch_showsubback.Text = "switch1"; - // - // label8 - // - this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 3); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(120, 26); - this.label8.TabIndex = 4; - this.label8.Text = "ShowSubBack"; - // - // stackPanel9 - // - this.stackPanel9.Controls.Add(this.switch_round); - this.stackPanel9.Controls.Add(this.label7); - this.stackPanel9.Location = new System.Drawing.Point(3, 79); - this.stackPanel9.Name = "stackPanel9"; - this.stackPanel9.Size = new System.Drawing.Size(244, 32); - this.stackPanel9.TabIndex = 15; - this.stackPanel9.Text = "stackPanel9"; - // - // switch_round - // - this.switch_round.AutoCheck = true; - this.switch_round.Location = new System.Drawing.Point(129, 3); - this.switch_round.Name = "switch_round"; - this.switch_round.Size = new System.Drawing.Size(50, 26); - this.switch_round.TabIndex = 6; - this.switch_round.Text = "switch1"; - // - // label7 - // - this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 3); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(120, 26); - this.label7.TabIndex = 4; - this.label7.Text = "Round"; - // - // stackPanel6 - // - this.stackPanel6.Controls.Add(this.switch_indent); - this.stackPanel6.Controls.Add(this.label4); - this.stackPanel6.Location = new System.Drawing.Point(3, 41); - this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(244, 32); - this.stackPanel6.TabIndex = 12; - this.stackPanel6.Text = "stackPanel6"; - // - // switch_indent - // - this.switch_indent.AutoCheck = true; - this.switch_indent.Checked = true; - this.switch_indent.Location = new System.Drawing.Point(129, 3); - this.switch_indent.Name = "switch_indent"; - this.switch_indent.Size = new System.Drawing.Size(50, 26); - this.switch_indent.TabIndex = 6; - this.switch_indent.Text = "switch1"; - // - // label4 - // - this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 3); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(120, 26); - this.label4.TabIndex = 4; - this.label4.Text = "Indent"; - // - // stackPanel5 - // - this.stackPanel5.Controls.Add(this.switch_collapsed); - this.stackPanel5.Controls.Add(this.label3); - this.stackPanel5.Location = new System.Drawing.Point(3, 3); - this.stackPanel5.Name = "stackPanel5"; - this.stackPanel5.Size = new System.Drawing.Size(244, 32); - this.stackPanel5.TabIndex = 11; - this.stackPanel5.Text = "stackPanel5"; - // - // switch_collapsed - // - this.switch_collapsed.AutoCheck = true; - this.switch_collapsed.Location = new System.Drawing.Point(129, 3); - this.switch_collapsed.Name = "switch_collapsed"; - this.switch_collapsed.Size = new System.Drawing.Size(50, 26); - this.switch_collapsed.TabIndex = 5; - this.switch_collapsed.Text = "switch1"; - // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 3); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(120, 26); - this.label3.TabIndex = 4; - this.label3.Text = "Collapsed"; - // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 2); - this.divider1.TabIndex = 4; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 3; - this.label2.Text = "为页面和功能提供导航的菜单列表。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 2; - this.label1.Text = "Menu 导航菜单"; + // header1 + // + this.header1.Description = "为页面和功能提供导航的菜单列表。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Menu 导航菜单"; + this.header1.UseTitleFont = true; // // MenuDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "MenuDemo"; this.Size = new System.Drawing.Size(750, 551); this.stackPanel1.ResumeLayout(false); - this.stackPanel2.ResumeLayout(false); this.tabs1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); this.tabPage3.ResumeLayout(false); this.stackPanel3.ResumeLayout(false); - this.stackPanel14.ResumeLayout(false); - this.stackPanel13.ResumeLayout(false); - this.stackPanel16.ResumeLayout(false); - this.stackPanel12.ResumeLayout(false); - this.stackPanel8.ResumeLayout(false); - this.stackPanel11.ResumeLayout(false); - this.stackPanel10.ResumeLayout(false); - this.stackPanel9.ResumeLayout(false); - this.stackPanel6.ResumeLayout(false); - this.stackPanel5.ResumeLayout(false); this.ResumeLayout(false); } #endregion - private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label1; - private AntdUI.Label label2; - private AntdUI.StackPanel stackPanel2; + private AntdUI.Panel stackPanel1; private AntdUI.Divider divider2; - private AntdUI.StackPanel stackPanel3; - private AntdUI.StackPanel stackPanel11; + private AntdUI.Panel stackPanel3; private AntdUI.Label label9; - private AntdUI.StackPanel stackPanel10; private AntdUI.Label label8; - private AntdUI.StackPanel stackPanel9; private AntdUI.Label label7; - private AntdUI.StackPanel stackPanel6; private AntdUI.Label label4; - private AntdUI.StackPanel stackPanel5; private AntdUI.Label label3; - private AntdUI.Divider divider1; private AntdUI.Tabs tabs1; private AntdUI.TabPage tabPage1; private AntdUI.Menu menu_inline; @@ -853,20 +721,17 @@ private AntdUI.Switch switch_indent; private AntdUI.Switch switch_collapsed; private AntdUI.Button buttonCZ; - private AntdUI.StackPanel stackPanel14; private AntdUI.ColorPicker colorPicker_backactive; private AntdUI.Label label13; - private AntdUI.StackPanel stackPanel13; private AntdUI.ColorPicker colorPicker_backhover; private AntdUI.Label label12; - private AntdUI.StackPanel stackPanel16; private AntdUI.ColorPicker colorPicker_foreactive; private AntdUI.Label label14; - private AntdUI.StackPanel stackPanel12; private AntdUI.ColorPicker colorPicker_forecolor; private AntdUI.Label label11; - private AntdUI.StackPanel stackPanel8; private AntdUI.InputNumber input_radius; private AntdUI.Label label6; + private AntdUI.PageHeader header1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } diff --git a/Views/MessageDemo.Designer.cs b/Views/MessageDemo.Designer.cs index 2b8958a..d1117c5 100644 --- a/Views/MessageDemo.Designer.cs +++ b/Views/MessageDemo.Designer.cs @@ -52,9 +52,7 @@ this.button_error = new AntdUI.Button(); this.button_sucess = new AntdUI.Button(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -72,13 +70,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 411); + this.stackPanel1.Size = new System.Drawing.Size(750, 337); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -86,7 +81,7 @@ // flowPanel4 // this.flowPanel4.Controls.Add(this.button_clickclose); - this.flowPanel4.Location = new System.Drawing.Point(3, 349); + this.flowPanel4.Location = new System.Drawing.Point(3, 255); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 49; @@ -106,7 +101,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 319); + this.label6.Location = new System.Drawing.Point(3, 225); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 48; @@ -120,7 +115,7 @@ this.flowPanel3.Controls.Add(this.button_TR); this.flowPanel3.Controls.Add(this.button_Top); this.flowPanel3.Controls.Add(this.button_TL); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 47; @@ -195,7 +190,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 46; @@ -207,7 +202,7 @@ this.flowPanel1.Controls.Add(this.button_w); this.flowPanel1.Controls.Add(this.button_e); this.flowPanel1.Controls.Add(this.button_s); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 42; @@ -269,7 +264,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 41; @@ -281,7 +276,7 @@ this.flowPanel2.Controls.Add(this.button_warn); this.flowPanel2.Controls.Add(this.button_error); this.flowPanel2.Controls.Add(this.button_sucess); - this.flowPanel2.Location = new System.Drawing.Point(3, 127); + this.flowPanel2.Location = new System.Drawing.Point(3, 33); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 40; @@ -334,41 +329,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 25; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 24; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 23; - this.label2.Text = "全局展示操作反馈信息。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 22; - this.label1.Text = "Message 全局提示"; + this.header1.Description = "全局展示操作反馈信息。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Message 全局提示"; + this.header1.UseTitleFont = true; // // MessageDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "MessageDemo"; this.Size = new System.Drawing.Size(750, 411); this.stackPanel1.ResumeLayout(false); @@ -384,9 +368,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel2; private AntdUI.Button button_info; private AntdUI.Button button_warn; @@ -409,5 +390,6 @@ private AntdUI.FlowPanel flowPanel4; private AntdUI.Button button_clickclose; private AntdUI.Label label6; + private AntdUI.PageHeader header1; } } diff --git a/Views/ModalDemo.Designer.cs b/Views/ModalDemo.Designer.cs index 5b29e33..7b762a5 100644 --- a/Views/ModalDemo.Designer.cs +++ b/Views/ModalDemo.Designer.cs @@ -44,9 +44,7 @@ this.flowPanel2 = new AntdUI.FlowPanel(); this.button_base = new AntdUI.Button(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -64,13 +62,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 475); + this.stackPanel1.Size = new System.Drawing.Size(750, 401); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -78,7 +73,7 @@ // flowPanel4 // this.flowPanel4.Controls.Add(this.button_sys); - this.flowPanel4.Location = new System.Drawing.Point(3, 349); + this.flowPanel4.Location = new System.Drawing.Point(3, 255); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 47; @@ -98,7 +93,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 319); + this.label6.Location = new System.Drawing.Point(3, 225); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 46; @@ -109,7 +104,7 @@ this.flowPanel3.Controls.Add(this.button_close); this.flowPanel3.Controls.Add(this.button_noclose); this.flowPanel3.Controls.Add(this.button_nomask); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 45; @@ -151,7 +146,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 44; @@ -161,7 +156,7 @@ // this.flowPanel1.Controls.Add(this.button_custombutton); this.flowPanel1.Controls.Add(this.button_nobutton); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 43; @@ -192,7 +187,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 42; @@ -201,7 +196,7 @@ // flowPanel2 // this.flowPanel2.Controls.Add(this.button_base); - this.flowPanel2.Location = new System.Drawing.Point(3, 127); + this.flowPanel2.Location = new System.Drawing.Point(3, 33); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 41; @@ -221,41 +216,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 29; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 28; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 27; - this.label2.Text = "展示一个对话框，提供标题、内容区、操作区。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 26; - this.label1.Text = "Modal 对话框"; + this.header1.Description = "展示一个对话框，提供标题、内容区、操作区。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Modal 对话框"; + this.header1.UseTitleFont = true; // // ModalDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "ModalDemo"; this.Size = new System.Drawing.Size(750, 475); this.stackPanel1.ResumeLayout(false); @@ -271,9 +255,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel2; private AntdUI.Button button_base; private AntdUI.Label label4; @@ -288,5 +269,6 @@ private AntdUI.FlowPanel flowPanel4; private AntdUI.Button button_sys; private AntdUI.Label label6; + private AntdUI.PageHeader header1; } } diff --git a/Views/MsgListDemo.Designer.cs b/Views/MsgListDemo.Designer.cs index 9ade37d..d877ba5 100644 --- a/Views/MsgListDemo.Designer.cs +++ b/Views/MsgListDemo.Designer.cs @@ -28,93 +28,62 @@ /// private void InitializeComponent() { - this.stackPanel1 = new AntdUI.StackPanel(); this.panel1 = new AntdUI.Panel(); this.msgList = new AntdUI.Chat.MsgList(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.stackPanel1.SuspendLayout(); + this.header1 = new AntdUI.PageHeader(); this.panel1.SuspendLayout(); this.SuspendLayout(); // - // stackPanel1 - // - this.stackPanel1.Controls.Add(this.panel1); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); - this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); - this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 471); - this.stackPanel1.TabIndex = 1; - this.stackPanel1.Text = "stackPanel1"; - this.stackPanel1.Vertical = true; - // // panel1 // this.panel1.Controls.Add(this.msgList); - this.panel1.Location = new System.Drawing.Point(3, 97); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 74); this.panel1.Name = "panel1"; + this.panel1.Radius = 0; this.panel1.Shadow = 12; - this.panel1.Size = new System.Drawing.Size(744, 371); - this.panel1.TabIndex = 32; + this.panel1.Size = new System.Drawing.Size(750, 397); + this.panel1.TabIndex = 0; this.panel1.Text = "panel1"; // // msgList // + this.msgList.BackColor = System.Drawing.Color.Transparent; this.msgList.Dock = System.Windows.Forms.DockStyle.Left; this.msgList.Location = new System.Drawing.Point(12, 12); this.msgList.Name = "msgList"; - this.msgList.Size = new System.Drawing.Size(220, 347); + this.msgList.Size = new System.Drawing.Size(220, 373); this.msgList.TabIndex = 0; this.msgList.Text = "msgList1"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 31; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 30; - this.label2.Text = "好友消息列表。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 29; - this.label1.Text = "MsgList 好友消息列表"; + this.header1.Description = "好友消息列表。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 0; + this.header1.Text = "MsgList 好友消息列表"; + this.header1.UseTitleFont = true; // // MsgListDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; - this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.panel1); + this.Controls.Add(this.header1); this.Name = "MsgListDemo"; this.Size = new System.Drawing.Size(750, 471); - this.stackPanel1.ResumeLayout(false); this.panel1.ResumeLayout(false); this.ResumeLayout(false); } #endregion - - private AntdUI.StackPanel stackPanel1; private AntdUI.Panel panel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Chat.MsgList msgList; + private AntdUI.PageHeader header1; } } diff --git a/Views/NotificationDemo.Designer.cs b/Views/NotificationDemo.Designer.cs index e2f65dd..c1958ea 100644 --- a/Views/NotificationDemo.Designer.cs +++ b/Views/NotificationDemo.Designer.cs @@ -50,9 +50,7 @@ this.button_error = new AntdUI.Button(); this.button_success = new AntdUI.Button(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -70,13 +68,10 @@ this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 505); + this.stackPanel1.Size = new System.Drawing.Size(750, 431); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -84,7 +79,7 @@ // flowPanel4 // this.flowPanel4.Controls.Add(this.button_link); - this.flowPanel4.Location = new System.Drawing.Point(3, 349); + this.flowPanel4.Location = new System.Drawing.Point(3, 255); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 49; @@ -104,7 +99,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 319); + this.label6.Location = new System.Drawing.Point(3, 225); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 48; @@ -114,7 +109,7 @@ // this.flowPanel3.Controls.Add(this.button_clickclose); this.flowPanel3.Controls.Add(this.button_close); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 47; @@ -145,7 +140,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 46; @@ -159,7 +154,7 @@ this.flowPanel2.Controls.Add(this.button_TR); this.flowPanel2.Controls.Add(this.button_Top); this.flowPanel2.Controls.Add(this.button_TL); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 45; @@ -234,7 +229,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 171); + this.label3.Location = new System.Drawing.Point(3, 77); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 44; @@ -246,7 +241,7 @@ this.flowPanel1.Controls.Add(this.button_warn); this.flowPanel1.Controls.Add(this.button_error); this.flowPanel1.Controls.Add(this.button_success); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 43; @@ -299,41 +294,30 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 42; this.label4.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 28; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 27; - this.label2.Text = "全局展示通知提醒信息。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 26; - this.label1.Text = "Notification 通知提醒框"; + this.header1.Description = "全局展示通知提醒信息。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Notification 通知提醒框"; + this.header1.UseTitleFont = true; // // NotificationDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "NotificationDemo"; this.Size = new System.Drawing.Size(750, 505); this.stackPanel1.ResumeLayout(false); @@ -348,9 +332,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label4; private AntdUI.FlowPanel flowPanel2; private AntdUI.Button button_BL; @@ -372,5 +353,6 @@ private AntdUI.FlowPanel flowPanel4; private AntdUI.Button button_link; private AntdUI.Button button_clickclose; + private AntdUI.PageHeader header1; } } diff --git a/Views/PageHeaderDemo.Designer.cs b/Views/PageHeaderDemo.Designer.cs index c9aa50f..a22dbe1 100644 --- a/Views/PageHeaderDemo.Designer.cs +++ b/Views/PageHeaderDemo.Designer.cs @@ -39,9 +39,7 @@ this.label4 = new AntdUI.Label(); this.PageHeader = new AntdUI.PageHeader(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -57,13 +55,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.PageHeader); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 497); + this.stackPanel1.Size = new System.Drawing.Size(750, 423); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -72,7 +67,7 @@ // this.pageHeader_click.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.pageHeader_click.Icon = global::AntdUIDemo.Properties.Resources.logo; - this.pageHeader_click.Location = new System.Drawing.Point(3, 399); + this.pageHeader_click.Location = new System.Drawing.Point(3, 305); this.pageHeader_click.Name = "pageHeader_click"; this.pageHeader_click.ShowBack = true; this.pageHeader_click.ShowIcon = true; @@ -84,7 +79,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 369); + this.label6.Location = new System.Drawing.Point(3, 275); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 76; @@ -97,7 +92,7 @@ this.pageHeader3.DividerShow = true; this.pageHeader3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.pageHeader3.Icon = global::AntdUIDemo.Properties.Resources.logo; - this.pageHeader3.Location = new System.Drawing.Point(3, 331); + this.pageHeader3.Location = new System.Drawing.Point(3, 237); this.pageHeader3.Name = "pageHeader3"; this.pageHeader3.ShowIcon = true; this.pageHeader3.Size = new System.Drawing.Size(744, 32); @@ -108,7 +103,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 301); + this.label7.Location = new System.Drawing.Point(3, 207); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 74; @@ -118,7 +113,7 @@ // this.pageHeader2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.pageHeader2.Icon = global::AntdUIDemo.Properties.Resources.logo; - this.pageHeader2.Location = new System.Drawing.Point(3, 263); + this.pageHeader2.Location = new System.Drawing.Point(3, 169); this.pageHeader2.Name = "pageHeader2"; this.pageHeader2.ShowIcon = true; this.pageHeader2.Size = new System.Drawing.Size(744, 32); @@ -129,7 +124,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 233); + this.label5.Location = new System.Drawing.Point(3, 139); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 71; @@ -140,7 +135,7 @@ this.pageHeader1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.pageHeader1.Icon = global::AntdUIDemo.Properties.Resources.logo; this.pageHeader1.Loading = true; - this.pageHeader1.Location = new System.Drawing.Point(3, 195); + this.pageHeader1.Location = new System.Drawing.Point(3, 101); this.pageHeader1.Name = "pageHeader1"; this.pageHeader1.ShowButton = true; this.pageHeader1.ShowIcon = true; @@ -152,7 +147,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 165); + this.label4.Location = new System.Drawing.Point(3, 71); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 27; @@ -162,7 +157,7 @@ // this.PageHeader.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.PageHeader.Icon = global::AntdUIDemo.Properties.Resources.logo; - this.PageHeader.Location = new System.Drawing.Point(3, 127); + this.PageHeader.Location = new System.Drawing.Point(3, 33); this.PageHeader.Name = "PageHeader"; this.PageHeader.ShowButton = true; this.PageHeader.ShowIcon = true; @@ -174,41 +169,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 25; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 24; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 23; - this.label2.Text = "替代WindowBar的标题栏。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 22; - this.label1.Text = "PageHeader 页头"; + this.header1.Description = "替代WindowBar的标题栏。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "PageHeader 页头"; + this.header1.UseTitleFont = true; // // PageHeaderDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "PageHeaderDemo"; this.Size = new System.Drawing.Size(750, 497); this.stackPanel1.ResumeLayout(false); @@ -220,9 +204,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.PageHeader PageHeader; private AntdUI.PageHeader pageHeader1; private AntdUI.Label label4; @@ -232,5 +213,6 @@ private AntdUI.Label label7; private AntdUI.PageHeader pageHeader_click; private AntdUI.Label label6; + private AntdUI.PageHeader header1; } } diff --git a/Views/PaginationDemo.Designer.cs b/Views/PaginationDemo.Designer.cs index 65bffd7..1abbb5f 100644 --- a/Views/PaginationDemo.Designer.cs +++ b/Views/PaginationDemo.Designer.cs @@ -28,9 +28,6 @@ /// private void InitializeComponent() { - this.label1 = new AntdUI.Label(); - this.label2 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); this.label12 = new AntdUI.Label(); this.stackPanel1 = new AntdUI.StackPanel(); this.pagination = new AntdUI.Pagination(); @@ -65,6 +62,7 @@ this.label3 = new AntdUI.Label(); this.input_current = new AntdUI.InputNumber(); this.label7 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.stackPanel7.SuspendLayout(); this.stackPanel6.SuspendLayout(); @@ -74,35 +72,10 @@ this.stackPanel2.SuspendLayout(); this.SuspendLayout(); // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 3; - this.label1.Text = "Pagination 分页"; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 4; - this.label2.Text = "采用分页的形式分隔长列表，每次只加载一个页面。"; - // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 32; - // // label12 // this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label12.Location = new System.Drawing.Point(3, 97); + this.label12.Location = new System.Drawing.Point(3, 3); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(744, 24); this.label12.TabIndex = 41; @@ -118,20 +91,17 @@ this.stackPanel1.Controls.Add(this.stackPanel3); this.stackPanel1.Controls.Add(this.stackPanel2); this.stackPanel1.Controls.Add(this.label12); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 535); + this.stackPanel1.Size = new System.Drawing.Size(750, 461); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // // pagination // - this.pagination.Location = new System.Drawing.Point(3, 361); + this.pagination.Location = new System.Drawing.Point(3, 267); this.pagination.Name = "pagination"; this.pagination.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.pagination.Size = new System.Drawing.Size(744, 38); @@ -142,7 +112,7 @@ // stackPanel7 // this.stackPanel7.Controls.Add(this.buttonCZ); - this.stackPanel7.Location = new System.Drawing.Point(3, 317); + this.stackPanel7.Location = new System.Drawing.Point(3, 223); this.stackPanel7.Name = "stackPanel7"; this.stackPanel7.Size = new System.Drawing.Size(744, 38); this.stackPanel7.TabIndex = 49; @@ -163,7 +133,7 @@ // this.stackPanel6.Controls.Add(this.switch_right); this.stackPanel6.Controls.Add(this.label15); - this.stackPanel6.Location = new System.Drawing.Point(3, 279); + this.stackPanel6.Location = new System.Drawing.Point(3, 185); this.stackPanel6.Name = "stackPanel6"; this.stackPanel6.Size = new System.Drawing.Size(744, 32); this.stackPanel6.TabIndex = 47; @@ -197,7 +167,7 @@ this.stackPanel5.Controls.Add(this.label13); this.stackPanel5.Controls.Add(this.selectMultiple); this.stackPanel5.Controls.Add(this.label14); - this.stackPanel5.Location = new System.Drawing.Point(3, 241); + this.stackPanel5.Location = new System.Drawing.Point(3, 147); this.stackPanel5.Name = "stackPanel5"; this.stackPanel5.Size = new System.Drawing.Size(744, 32); this.stackPanel5.TabIndex = 45; @@ -266,7 +236,7 @@ this.stackPanel4.Controls.Add(this.label10); this.stackPanel4.Controls.Add(this.input_radius); this.stackPanel4.Controls.Add(this.label11); - this.stackPanel4.Location = new System.Drawing.Point(3, 203); + this.stackPanel4.Location = new System.Drawing.Point(3, 109); this.stackPanel4.Name = "stackPanel4"; this.stackPanel4.Size = new System.Drawing.Size(744, 32); this.stackPanel4.TabIndex = 44; @@ -349,7 +319,7 @@ this.stackPanel3.Controls.Add(this.label6); this.stackPanel3.Controls.Add(this.input_max); this.stackPanel3.Controls.Add(this.label8); - this.stackPanel3.Location = new System.Drawing.Point(3, 165); + this.stackPanel3.Location = new System.Drawing.Point(3, 71); this.stackPanel3.Name = "stackPanel3"; this.stackPanel3.Size = new System.Drawing.Size(744, 32); this.stackPanel3.TabIndex = 43; @@ -437,7 +407,7 @@ this.stackPanel2.Controls.Add(this.label3); this.stackPanel2.Controls.Add(this.input_current); this.stackPanel2.Controls.Add(this.label7); - this.stackPanel2.Location = new System.Drawing.Point(3, 127); + this.stackPanel2.Location = new System.Drawing.Point(3, 33); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(744, 32); this.stackPanel2.TabIndex = 42; @@ -530,10 +500,24 @@ this.label7.TabIndex = 8; this.label7.Text = "Current"; // + // header1 + // + this.header1.Description = "采用分页的形式分隔长列表，每次只加载一个页面。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Pagination 分页"; + this.header1.UseTitleFont = true; + // // PaginationDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "PaginationDemo"; this.Size = new System.Drawing.Size(750, 535); this.stackPanel1.ResumeLayout(false); @@ -548,10 +532,6 @@ } #endregion - - private AntdUI.Label label1; - private AntdUI.Label label2; - private AntdUI.Divider divider1; private AntdUI.Label label12; private AntdUI.StackPanel stackPanel1; private AntdUI.StackPanel stackPanel5; @@ -586,5 +566,6 @@ private AntdUI.Button buttonCZ; private AntdUI.Switch switch_right; private AntdUI.Label label15; + private AntdUI.PageHeader header1; } } diff --git a/Views/PaginationDemo.cs b/Views/PaginationDemo.cs index 948efdb..6179486 100644 --- a/Views/PaginationDemo.cs +++ b/Views/PaginationDemo.cs @@ -122,7 +122,7 @@ namespace AntdUIDemo.Views switch_show.Checked = true; switch_right.Checked = true; - selectMultiple.SelectedValue = new object[] { "1", "2", "5", "10" }; + selectMultiple.SelectedValue = new object[] { "1", "2", "5", "10" }; } } } diff --git a/Views/PanelDemo.Designer.cs b/Views/PanelDemo.Designer.cs index 5ae5ca0..4bdf826 100644 --- a/Views/PanelDemo.Designer.cs +++ b/Views/PanelDemo.Designer.cs @@ -31,6 +31,8 @@ this.stackPanel1 = new AntdUI.StackPanel(); this.stackPanel2 = new AntdUI.StackPanel(); this.stackPanel15 = new AntdUI.StackPanel(); + this.panel = new AntdUI.Panel(); + this.buttonCZ = new AntdUI.Button(); this.stackPanel13 = new AntdUI.StackPanel(); this.input_shadowOH = new AntdUI.InputNumber(); this.label12 = new AntdUI.Label(); @@ -38,29 +40,6 @@ this.switch_shadowOA = new AntdUI.Switch(); this.label13 = new AntdUI.Label(); this.stackPanel3 = new AntdUI.StackPanel(); - this.stackPanel17 = new AntdUI.StackPanel(); - this.input_borderwidth = new AntdUI.InputNumber(); - this.label15 = new AntdUI.Label(); - this.stackPanel16 = new AntdUI.StackPanel(); - this.colorPicker_border = new AntdUI.ColorPicker(); - this.label14 = new AntdUI.Label(); - this.stackPanel6 = new AntdUI.StackPanel(); - this.input_radius = new AntdUI.InputNumber(); - this.label4 = new AntdUI.Label(); - this.stackPanel5 = new AntdUI.StackPanel(); - this.input_arrowsize = new AntdUI.InputNumber(); - this.label3 = new AntdUI.Label(); - this.stackPanel4 = new AntdUI.StackPanel(); - this.select_arrowalign = new AntdUI.Select(); - this.label10 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.buttonCZ = new AntdUI.Button(); - this.panel = new AntdUI.Panel(); - this.stackPanel18 = new AntdUI.StackPanel(); - this.select_borderstyle = new AntdUI.Select(); - this.label16 = new AntdUI.Label(); this.stackPanel12 = new AntdUI.StackPanel(); this.input_shadowO = new AntdUI.InputNumber(); this.label11 = new AntdUI.Label(); @@ -79,36 +58,52 @@ this.stackPanel7 = new AntdUI.StackPanel(); this.input_shadow = new AntdUI.InputNumber(); this.label5 = new AntdUI.Label(); + this.stackPanel18 = new AntdUI.StackPanel(); + this.select_borderstyle = new AntdUI.Select(); + this.label16 = new AntdUI.Label(); + this.stackPanel17 = new AntdUI.StackPanel(); + this.input_borderwidth = new AntdUI.InputNumber(); + this.label15 = new AntdUI.Label(); + this.stackPanel16 = new AntdUI.StackPanel(); + this.colorPicker_border = new AntdUI.ColorPicker(); + this.label14 = new AntdUI.Label(); + this.stackPanel6 = new AntdUI.StackPanel(); + this.input_radius = new AntdUI.InputNumber(); + this.label4 = new AntdUI.Label(); + this.stackPanel5 = new AntdUI.StackPanel(); + this.input_arrowsize = new AntdUI.InputNumber(); + this.label3 = new AntdUI.Label(); + this.stackPanel4 = new AntdUI.StackPanel(); + this.select_arrowalign = new AntdUI.Select(); + this.label10 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel15.SuspendLayout(); this.stackPanel13.SuspendLayout(); this.stackPanel14.SuspendLayout(); this.stackPanel3.SuspendLayout(); - this.stackPanel17.SuspendLayout(); - this.stackPanel16.SuspendLayout(); - this.stackPanel6.SuspendLayout(); - this.stackPanel5.SuspendLayout(); - this.stackPanel4.SuspendLayout(); - this.stackPanel18.SuspendLayout(); this.stackPanel12.SuspendLayout(); this.stackPanel11.SuspendLayout(); this.stackPanel10.SuspendLayout(); this.stackPanel9.SuspendLayout(); this.stackPanel8.SuspendLayout(); this.stackPanel7.SuspendLayout(); + this.stackPanel18.SuspendLayout(); + this.stackPanel17.SuspendLayout(); + this.stackPanel16.SuspendLayout(); + this.stackPanel6.SuspendLayout(); + this.stackPanel5.SuspendLayout(); + this.stackPanel4.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 // this.stackPanel1.Controls.Add(this.stackPanel2); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 560); + this.stackPanel1.Size = new System.Drawing.Size(750, 486); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -117,7 +112,7 @@ // this.stackPanel2.Controls.Add(this.stackPanel15); this.stackPanel2.Controls.Add(this.stackPanel3); - this.stackPanel2.Location = new System.Drawing.Point(3, 97); + this.stackPanel2.Location = new System.Drawing.Point(3, 3); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(744, 469); this.stackPanel2.TabIndex = 9; @@ -136,6 +131,28 @@ this.stackPanel15.Text = "stackPanel15"; this.stackPanel15.Vertical = true; // + // panel + // + this.panel.BackColor = System.Drawing.Color.Transparent; + this.panel.Location = new System.Drawing.Point(3, 117); + this.panel.Name = "panel"; + this.panel.Shadow = 12; + this.panel.ShadowOpacityAnimation = true; + this.panel.Size = new System.Drawing.Size(456, 298); + this.panel.TabIndex = 37; + this.panel.Text = "panel1"; + // + // buttonCZ + // + this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Location = new System.Drawing.Point(3, 79); + this.buttonCZ.Name = "buttonCZ"; + this.buttonCZ.Size = new System.Drawing.Size(456, 32); + this.buttonCZ.TabIndex = 36; + this.buttonCZ.Text = "重 置"; + this.buttonCZ.Type = AntdUI.TTypeMini.Warn; + this.buttonCZ.WaveSize = 0; + // // stackPanel13 // this.stackPanel13.Controls.Add(this.input_shadowOH); @@ -236,255 +253,6 @@ this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; // - // stackPanel17 - // - this.stackPanel17.Controls.Add(this.input_borderwidth); - this.stackPanel17.Controls.Add(this.label15); - this.stackPanel17.Location = new System.Drawing.Point(3, 155); - this.stackPanel17.Name = "stackPanel17"; - this.stackPanel17.Size = new System.Drawing.Size(244, 32); - this.stackPanel17.TabIndex = 28; - this.stackPanel17.Text = "stackPanel17"; - // - // input_borderwidth - // - this.input_borderwidth.DecimalPlaces = 2; - this.input_borderwidth.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_borderwidth.Location = new System.Drawing.Point(139, 3); - this.input_borderwidth.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_borderwidth.Name = "input_borderwidth"; - this.input_borderwidth.Size = new System.Drawing.Size(100, 26); - this.input_borderwidth.TabIndex = 5; - this.input_borderwidth.Text = "0.00"; - this.input_borderwidth.WaveSize = 0; - // - // label15 - // - this.label15.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(3, 3); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(130, 26); - this.label15.TabIndex = 4; - this.label15.Text = "BorderWidth"; - // - // stackPanel16 - // - this.stackPanel16.Controls.Add(this.colorPicker_border); - this.stackPanel16.Controls.Add(this.label14); - this.stackPanel16.Location = new System.Drawing.Point(3, 117); - this.stackPanel16.Name = "stackPanel16"; - this.stackPanel16.Size = new System.Drawing.Size(244, 32); - this.stackPanel16.TabIndex = 27; - this.stackPanel16.Text = "stackPanel16"; - // - // colorPicker_border - // - this.colorPicker_border.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.colorPicker_border.Location = new System.Drawing.Point(139, 3); - this.colorPicker_border.Name = "colorPicker_border"; - this.colorPicker_border.ShowText = true; - this.colorPicker_border.Size = new System.Drawing.Size(100, 26); - this.colorPicker_border.TabIndex = 5; - this.colorPicker_border.Text = "colorPicker1"; - this.colorPicker_border.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker_border.WaveSize = 0; - // - // label14 - // - this.label14.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label14.Location = new System.Drawing.Point(3, 3); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(130, 26); - this.label14.TabIndex = 4; - this.label14.Text = "BorderColor"; - // - // stackPanel6 - // - this.stackPanel6.Controls.Add(this.input_radius); - this.stackPanel6.Controls.Add(this.label4); - this.stackPanel6.Location = new System.Drawing.Point(3, 79); - this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(244, 32); - this.stackPanel6.TabIndex = 12; - this.stackPanel6.Text = "stackPanel6"; - // - // input_radius - // - this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_radius.Location = new System.Drawing.Point(139, 3); - this.input_radius.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_radius.Name = "input_radius"; - this.input_radius.Size = new System.Drawing.Size(100, 26); - this.input_radius.TabIndex = 5; - this.input_radius.Text = "6"; - this.input_radius.Value = new decimal(new int[] { - 6, - 0, - 0, - 0}); - this.input_radius.WaveSize = 0; - // - // label4 - // - this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 3); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(130, 26); - this.label4.TabIndex = 4; - this.label4.Text = "Radius"; - // - // stackPanel5 - // - this.stackPanel5.Controls.Add(this.input_arrowsize); - this.stackPanel5.Controls.Add(this.label3); - this.stackPanel5.Location = new System.Drawing.Point(3, 41); - this.stackPanel5.Name = "stackPanel5"; - this.stackPanel5.Size = new System.Drawing.Size(244, 32); - this.stackPanel5.TabIndex = 11; - this.stackPanel5.Text = "stackPanel5"; - // - // input_arrowsize - // - this.input_arrowsize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_arrowsize.Location = new System.Drawing.Point(139, 3); - this.input_arrowsize.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_arrowsize.Name = "input_arrowsize"; - this.input_arrowsize.Size = new System.Drawing.Size(100, 26); - this.input_arrowsize.TabIndex = 5; - this.input_arrowsize.Text = "8"; - this.input_arrowsize.Value = new decimal(new int[] { - 8, - 0, - 0, - 0}); - this.input_arrowsize.WaveSize = 0; - // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 3); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(130, 26); - this.label3.TabIndex = 4; - this.label3.Text = "ArrowSize"; - // - // stackPanel4 - // - this.stackPanel4.Controls.Add(this.select_arrowalign); - this.stackPanel4.Controls.Add(this.label10); - this.stackPanel4.Location = new System.Drawing.Point(3, 3); - this.stackPanel4.Name = "stackPanel4"; - this.stackPanel4.Size = new System.Drawing.Size(244, 32); - this.stackPanel4.TabIndex = 10; - this.stackPanel4.Text = "stackPanel4"; - // - // select_arrowalign - // - this.select_arrowalign.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_arrowalign.List = true; - this.select_arrowalign.Location = new System.Drawing.Point(139, 3); - this.select_arrowalign.Name = "select_arrowalign"; - this.select_arrowalign.Size = new System.Drawing.Size(100, 26); - this.select_arrowalign.TabIndex = 11; - this.select_arrowalign.WaveSize = 0; - // - // label10 - // - this.label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(3, 3); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(130, 26); - this.label10.TabIndex = 4; - this.label10.Text = "ArrowAlign"; - // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 8; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 7; - this.label2.Text = "普通布局面板"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 6; - this.label1.Text = "Panel 面板"; - // - // buttonCZ - // - this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.buttonCZ.Location = new System.Drawing.Point(3, 79); - this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(456, 32); - this.buttonCZ.TabIndex = 36; - this.buttonCZ.Text = "重 置"; - this.buttonCZ.Type = AntdUI.TTypeMini.Warn; - this.buttonCZ.WaveSize = 0; - // - // panel - // - this.panel.BackColor = System.Drawing.Color.Transparent; - this.panel.Location = new System.Drawing.Point(3, 117); - this.panel.Name = "panel"; - this.panel.Shadow = 12; - this.panel.ShadowOpacityAnimation = true; - this.panel.Size = new System.Drawing.Size(456, 298); - this.panel.TabIndex = 37; - this.panel.Text = "panel1"; - // - // stackPanel18 - // - this.stackPanel18.Controls.Add(this.select_borderstyle); - this.stackPanel18.Controls.Add(this.label16); - this.stackPanel18.Location = new System.Drawing.Point(3, 193); - this.stackPanel18.Name = "stackPanel18"; - this.stackPanel18.Size = new System.Drawing.Size(244, 32); - this.stackPanel18.TabIndex = 35; - this.stackPanel18.Text = "stackPanel18"; - // - // select_borderstyle - // - this.select_borderstyle.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_borderstyle.List = true; - this.select_borderstyle.Location = new System.Drawing.Point(139, 3); - this.select_borderstyle.Name = "select_borderstyle"; - this.select_borderstyle.Size = new System.Drawing.Size(100, 26); - this.select_borderstyle.TabIndex = 11; - this.select_borderstyle.WaveSize = 0; - // - // label16 - // - this.label16.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(3, 3); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(130, 26); - this.label16.TabIndex = 4; - this.label16.Text = "BorderStyle"; - // // stackPanel12 // this.stackPanel12.Controls.Add(this.input_shadowO); @@ -702,9 +470,226 @@ this.label5.TabIndex = 4; this.label5.Text = "Shadow"; // + // stackPanel18 + // + this.stackPanel18.Controls.Add(this.select_borderstyle); + this.stackPanel18.Controls.Add(this.label16); + this.stackPanel18.Location = new System.Drawing.Point(3, 193); + this.stackPanel18.Name = "stackPanel18"; + this.stackPanel18.Size = new System.Drawing.Size(244, 32); + this.stackPanel18.TabIndex = 35; + this.stackPanel18.Text = "stackPanel18"; + // + // select_borderstyle + // + this.select_borderstyle.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.select_borderstyle.List = true; + this.select_borderstyle.Location = new System.Drawing.Point(139, 3); + this.select_borderstyle.Name = "select_borderstyle"; + this.select_borderstyle.Size = new System.Drawing.Size(100, 26); + this.select_borderstyle.TabIndex = 11; + this.select_borderstyle.WaveSize = 0; + // + // label16 + // + this.label16.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label16.Location = new System.Drawing.Point(3, 3); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(130, 26); + this.label16.TabIndex = 4; + this.label16.Text = "BorderStyle"; + // + // stackPanel17 + // + this.stackPanel17.Controls.Add(this.input_borderwidth); + this.stackPanel17.Controls.Add(this.label15); + this.stackPanel17.Location = new System.Drawing.Point(3, 155); + this.stackPanel17.Name = "stackPanel17"; + this.stackPanel17.Size = new System.Drawing.Size(244, 32); + this.stackPanel17.TabIndex = 28; + this.stackPanel17.Text = "stackPanel17"; + // + // input_borderwidth + // + this.input_borderwidth.DecimalPlaces = 2; + this.input_borderwidth.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_borderwidth.Location = new System.Drawing.Point(139, 3); + this.input_borderwidth.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_borderwidth.Name = "input_borderwidth"; + this.input_borderwidth.Size = new System.Drawing.Size(100, 26); + this.input_borderwidth.TabIndex = 5; + this.input_borderwidth.Text = "0.00"; + this.input_borderwidth.WaveSize = 0; + // + // label15 + // + this.label15.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(3, 3); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(130, 26); + this.label15.TabIndex = 4; + this.label15.Text = "BorderWidth"; + // + // stackPanel16 + // + this.stackPanel16.Controls.Add(this.colorPicker_border); + this.stackPanel16.Controls.Add(this.label14); + this.stackPanel16.Location = new System.Drawing.Point(3, 117); + this.stackPanel16.Name = "stackPanel16"; + this.stackPanel16.Size = new System.Drawing.Size(244, 32); + this.stackPanel16.TabIndex = 27; + this.stackPanel16.Text = "stackPanel16"; + // + // colorPicker_border + // + this.colorPicker_border.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.colorPicker_border.Location = new System.Drawing.Point(139, 3); + this.colorPicker_border.Name = "colorPicker_border"; + this.colorPicker_border.ShowText = true; + this.colorPicker_border.Size = new System.Drawing.Size(100, 26); + this.colorPicker_border.TabIndex = 5; + this.colorPicker_border.Text = "colorPicker1"; + this.colorPicker_border.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); + this.colorPicker_border.WaveSize = 0; + // + // label14 + // + this.label14.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.Location = new System.Drawing.Point(3, 3); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(130, 26); + this.label14.TabIndex = 4; + this.label14.Text = "BorderColor"; + // + // stackPanel6 + // + this.stackPanel6.Controls.Add(this.input_radius); + this.stackPanel6.Controls.Add(this.label4); + this.stackPanel6.Location = new System.Drawing.Point(3, 79); + this.stackPanel6.Name = "stackPanel6"; + this.stackPanel6.Size = new System.Drawing.Size(244, 32); + this.stackPanel6.TabIndex = 12; + this.stackPanel6.Text = "stackPanel6"; + // + // input_radius + // + this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_radius.Location = new System.Drawing.Point(139, 3); + this.input_radius.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_radius.Name = "input_radius"; + this.input_radius.Size = new System.Drawing.Size(100, 26); + this.input_radius.TabIndex = 5; + this.input_radius.Text = "6"; + this.input_radius.Value = new decimal(new int[] { + 6, + 0, + 0, + 0}); + this.input_radius.WaveSize = 0; + // + // label4 + // + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(3, 3); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(130, 26); + this.label4.TabIndex = 4; + this.label4.Text = "Radius"; + // + // stackPanel5 + // + this.stackPanel5.Controls.Add(this.input_arrowsize); + this.stackPanel5.Controls.Add(this.label3); + this.stackPanel5.Location = new System.Drawing.Point(3, 41); + this.stackPanel5.Name = "stackPanel5"; + this.stackPanel5.Size = new System.Drawing.Size(244, 32); + this.stackPanel5.TabIndex = 11; + this.stackPanel5.Text = "stackPanel5"; + // + // input_arrowsize + // + this.input_arrowsize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_arrowsize.Location = new System.Drawing.Point(139, 3); + this.input_arrowsize.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_arrowsize.Name = "input_arrowsize"; + this.input_arrowsize.Size = new System.Drawing.Size(100, 26); + this.input_arrowsize.TabIndex = 5; + this.input_arrowsize.Text = "8"; + this.input_arrowsize.Value = new decimal(new int[] { + 8, + 0, + 0, + 0}); + this.input_arrowsize.WaveSize = 0; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 3); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(130, 26); + this.label3.TabIndex = 4; + this.label3.Text = "ArrowSize"; + // + // stackPanel4 + // + this.stackPanel4.Controls.Add(this.select_arrowalign); + this.stackPanel4.Controls.Add(this.label10); + this.stackPanel4.Location = new System.Drawing.Point(3, 3); + this.stackPanel4.Name = "stackPanel4"; + this.stackPanel4.Size = new System.Drawing.Size(244, 32); + this.stackPanel4.TabIndex = 10; + this.stackPanel4.Text = "stackPanel4"; + // + // select_arrowalign + // + this.select_arrowalign.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.select_arrowalign.List = true; + this.select_arrowalign.Location = new System.Drawing.Point(139, 3); + this.select_arrowalign.Name = "select_arrowalign"; + this.select_arrowalign.Size = new System.Drawing.Size(100, 26); + this.select_arrowalign.TabIndex = 11; + this.select_arrowalign.WaveSize = 0; + // + // label10 + // + this.label10.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label10.Location = new System.Drawing.Point(3, 3); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(130, 26); + this.label10.TabIndex = 4; + this.label10.Text = "ArrowAlign"; + // + // header1 + // + this.header1.Description = "普通布局面板"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Panel 面板"; + this.header1.UseTitleFont = true; + // // PanelDemo // this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "PanelDemo"; this.Size = new System.Drawing.Size(750, 560); this.Load += new System.EventHandler(this.PanelDemo_Load); @@ -714,18 +699,18 @@ this.stackPanel13.ResumeLayout(false); this.stackPanel14.ResumeLayout(false); this.stackPanel3.ResumeLayout(false); - this.stackPanel17.ResumeLayout(false); - this.stackPanel16.ResumeLayout(false); - this.stackPanel6.ResumeLayout(false); - this.stackPanel5.ResumeLayout(false); - this.stackPanel4.ResumeLayout(false); - this.stackPanel18.ResumeLayout(false); this.stackPanel12.ResumeLayout(false); this.stackPanel11.ResumeLayout(false); this.stackPanel10.ResumeLayout(false); this.stackPanel9.ResumeLayout(false); this.stackPanel8.ResumeLayout(false); this.stackPanel7.ResumeLayout(false); + this.stackPanel18.ResumeLayout(false); + this.stackPanel17.ResumeLayout(false); + this.stackPanel16.ResumeLayout(false); + this.stackPanel6.ResumeLayout(false); + this.stackPanel5.ResumeLayout(false); + this.stackPanel4.ResumeLayout(false); this.ResumeLayout(false); } @@ -733,9 +718,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; - private AntdUI.Divider divider1; private AntdUI.StackPanel stackPanel2; private AntdUI.StackPanel stackPanel15; private AntdUI.StackPanel stackPanel13; @@ -783,5 +765,6 @@ private AntdUI.StackPanel stackPanel18; private AntdUI.Select select_borderstyle; private AntdUI.Label label16; + private AntdUI.PageHeader header1; } } diff --git a/Views/PanelDemo.cs b/Views/PanelDemo.cs index 7e857ca..b28a3eb 100644 --- a/Views/PanelDemo.cs +++ b/Views/PanelDemo.cs @@ -58,7 +58,7 @@ namespace AntdUIDemo.Views } //初始化边框 select_borderstyle.Items.Clear(); - foreach(DashStyle dashStyle in Enum.GetValues(typeof(DashStyle))) + foreach (DashStyle dashStyle in Enum.GetValues(typeof(DashStyle))) { select_borderstyle.Items.Add(dashStyle); } diff --git a/Views/PopoverDemo.Designer.cs b/Views/PopoverDemo.Designer.cs index 9c3bd30..23286ec 100644 --- a/Views/PopoverDemo.Designer.cs +++ b/Views/PopoverDemo.Designer.cs @@ -53,10 +53,8 @@ this.button_close = new AntdUI.Button(); this.button_base = new AntdUI.Button(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); this.label4 = new AntdUI.Label(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -73,14 +71,10 @@ this.stackPanel1.Controls.Add(this.label8); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 104); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 472); + this.stackPanel1.Size = new System.Drawing.Size(750, 368); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -90,7 +84,7 @@ this.flowPanel4.Controls.Add(this.button_form); this.flowPanel4.Controls.Add(this.button_calendar); this.flowPanel4.Controls.Add(this.button_control); - this.flowPanel4.Location = new System.Drawing.Point(3, 349); + this.flowPanel4.Location = new System.Drawing.Point(3, 225); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 39; @@ -132,7 +126,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 319); + this.label5.Location = new System.Drawing.Point(3, 195); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 38; @@ -146,7 +140,7 @@ this.flowPanel3.Controls.Add(this.buttonTL); this.flowPanel3.Controls.Add(this.buttonTop); this.flowPanel3.Controls.Add(this.buttonTR); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 151); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 37; @@ -226,7 +220,7 @@ this.flowPanel2.Controls.Add(this.buttonBL); this.flowPanel2.Controls.Add(this.buttonBottom); this.flowPanel2.Controls.Add(this.buttonBR); - this.flowPanel2.Location = new System.Drawing.Point(3, 231); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 36; @@ -301,7 +295,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 201); + this.label8.Location = new System.Drawing.Point(3, 77); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(744, 24); this.label8.TabIndex = 35; @@ -311,7 +305,7 @@ // this.flowPanel1.Controls.Add(this.button_close); this.flowPanel1.Controls.Add(this.button_base); - this.flowPanel1.Location = new System.Drawing.Point(3, 157); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 16; @@ -342,50 +336,42 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 127); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 15; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 109); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 14; - // // label4 // + this.label4.Dock = System.Windows.Forms.DockStyle.Top; this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label4.Location = new System.Drawing.Point(3, 79); + this.label4.Location = new System.Drawing.Point(0, 74); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(744, 24); + this.label4.Padding = new System.Windows.Forms.Padding(10, 0, 10, 6); + this.label4.Size = new System.Drawing.Size(750, 30); this.label4.TabIndex = 13; this.label4.Text = "Popover没有工具箱控件，使用代码方式调用。"; // - // label2 + // header1 // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 9; - this.label2.Text = "下拉选择器。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 8; - this.label1.Text = "Popover 气泡卡片"; + this.header1.Description = "弹出气泡式的卡片浮层。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Popover 气泡卡片"; + this.header1.UseTitleFont = true; // // PopoverDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.label4); + this.Controls.Add(this.header1); this.Name = "PopoverDemo"; this.Size = new System.Drawing.Size(750, 472); this.stackPanel1.ResumeLayout(false); @@ -400,12 +386,9 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Button button_base; private AntdUI.Label label3; - private AntdUI.Divider divider1; private AntdUI.Label label4; private AntdUI.FlowPanel flowPanel2; private AntdUI.Button buttonBR; @@ -428,5 +411,6 @@ private AntdUI.Button button_control; private AntdUI.Button button_form; private AntdUI.Button button_calendar; + private AntdUI.PageHeader header1; } } diff --git a/Views/PreviewDemo.Designer.cs b/Views/PreviewDemo.Designer.cs index e69af2e..bc3317a 100644 --- a/Views/PreviewDemo.Designer.cs +++ b/Views/PreviewDemo.Designer.cs @@ -35,8 +35,7 @@ this.label3 = new AntdUI.Label(); this.divider1 = new AntdUI.Divider(); this.label4 = new AntdUI.Label(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); @@ -46,13 +45,10 @@ this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 104); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 222); + this.stackPanel1.Size = new System.Drawing.Size(750, 118); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -61,7 +57,7 @@ // this.flowPanel1.Controls.Add(this.button_views); this.flowPanel1.Controls.Add(this.button_view); - this.flowPanel1.Location = new System.Drawing.Point(3, 157); + this.flowPanel1.Location = new System.Drawing.Point(3, 51); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 19; @@ -92,7 +88,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 127); + this.label3.Location = new System.Drawing.Point(3, 21); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 18; @@ -100,42 +96,41 @@ // // divider1 // - this.divider1.Location = new System.Drawing.Point(3, 109); + this.divider1.Location = new System.Drawing.Point(3, 3); this.divider1.Name = "divider1"; this.divider1.Size = new System.Drawing.Size(744, 12); this.divider1.TabIndex = 17; // // label4 // + this.label4.Dock = System.Windows.Forms.DockStyle.Top; this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label4.Location = new System.Drawing.Point(3, 79); + this.label4.Location = new System.Drawing.Point(0, 74); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(744, 24); + this.label4.Padding = new System.Windows.Forms.Padding(10, 0, 10, 6); + this.label4.Size = new System.Drawing.Size(750, 30); this.label4.TabIndex = 14; this.label4.Text = "Preview没有工具箱控件，使用代码方式调用。"; // - // label2 + // header1 // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 7; - this.label2.Text = "实现简单的图片预览。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 6; - this.label1.Text = "Preview 图片预览"; + this.header1.Description = "实现简单的图片预览。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Preview 图片预览"; + this.header1.UseTitleFont = true; // // PreviewDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.label4); + this.Controls.Add(this.header1); this.Name = "PreviewDemo"; this.Size = new System.Drawing.Size(750, 222); this.stackPanel1.ResumeLayout(false); @@ -147,13 +142,12 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label4; private AntdUI.FlowPanel flowPanel1; private AntdUI.Button button_views; private AntdUI.Button button_view; private AntdUI.Label label3; private AntdUI.Divider divider1; + private AntdUI.PageHeader header1; } } diff --git a/Views/PreviewDemo.cs b/Views/PreviewDemo.cs index 26b0572..9930ef7 100644 --- a/Views/PreviewDemo.cs +++ b/Views/PreviewDemo.cs @@ -24,7 +24,7 @@ namespace AntdUIDemo.Views private void Button_views_Click(object sender, EventArgs e) { - Preview.open(new Preview.Config(window, new List() { + Preview.open(new Preview.Config(window, new List() { Properties.Resources.bg1, Properties.Resources.bg2, Properties.Resources.bg3 })); } diff --git a/Views/ProgressDemo.Designer.cs b/Views/ProgressDemo.Designer.cs index 218964d..136c2c0 100644 --- a/Views/ProgressDemo.Designer.cs +++ b/Views/ProgressDemo.Designer.cs @@ -55,9 +55,7 @@ this.progress2 = new AntdUI.Progress(); this.progress1 = new AntdUI.Progress(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); @@ -65,6 +63,7 @@ // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.progress19); this.stackPanel1.Controls.Add(this.progress18); this.stackPanel1.Controls.Add(this.progress17); @@ -85,13 +84,10 @@ this.stackPanel1.Controls.Add(this.progress2); this.stackPanel1.Controls.Add(this.progress1); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 741); + this.stackPanel1.Size = new System.Drawing.Size(750, 667); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -99,7 +95,7 @@ // progress19 // this.progress19.Loading = true; - this.progress19.Location = new System.Drawing.Point(3, 703); + this.progress19.Location = new System.Drawing.Point(3, 609); this.progress19.Name = "progress19"; this.progress19.Shape = AntdUI.TShapeProgress.Steps; this.progress19.Size = new System.Drawing.Size(744, 23); @@ -113,7 +109,7 @@ // // progress18 // - this.progress18.Location = new System.Drawing.Point(3, 674); + this.progress18.Location = new System.Drawing.Point(3, 580); this.progress18.Name = "progress18"; this.progress18.Shape = AntdUI.TShapeProgress.Steps; this.progress18.Size = new System.Drawing.Size(744, 23); @@ -128,7 +124,7 @@ // progress17 // this.progress17.Loading = true; - this.progress17.Location = new System.Drawing.Point(3, 645); + this.progress17.Location = new System.Drawing.Point(3, 551); this.progress17.Name = "progress17"; this.progress17.Shape = AntdUI.TShapeProgress.Steps; this.progress17.Size = new System.Drawing.Size(744, 23); @@ -141,7 +137,7 @@ // // progress16 // - this.progress16.Location = new System.Drawing.Point(3, 616); + this.progress16.Location = new System.Drawing.Point(3, 522); this.progress16.Name = "progress16"; this.progress16.Shape = AntdUI.TShapeProgress.Steps; this.progress16.Size = new System.Drawing.Size(744, 23); @@ -155,7 +151,7 @@ // progress15 // this.progress15.Loading = true; - this.progress15.Location = new System.Drawing.Point(3, 587); + this.progress15.Location = new System.Drawing.Point(3, 493); this.progress15.Name = "progress15"; this.progress15.Shape = AntdUI.TShapeProgress.Steps; this.progress15.Size = new System.Drawing.Size(744, 23); @@ -169,7 +165,7 @@ // progress14 // this.progress14.Loading = true; - this.progress14.Location = new System.Drawing.Point(3, 558); + this.progress14.Location = new System.Drawing.Point(3, 464); this.progress14.Name = "progress14"; this.progress14.Shape = AntdUI.TShapeProgress.Steps; this.progress14.Size = new System.Drawing.Size(744, 23); @@ -181,7 +177,7 @@ // // progress12 // - this.progress12.Location = new System.Drawing.Point(3, 529); + this.progress12.Location = new System.Drawing.Point(3, 435); this.progress12.Name = "progress12"; this.progress12.Shape = AntdUI.TShapeProgress.Steps; this.progress12.Size = new System.Drawing.Size(744, 23); @@ -195,7 +191,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 499); + this.label7.Location = new System.Drawing.Point(3, 405); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 59; @@ -207,7 +203,7 @@ this.progress13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.progress13.Loading = true; this.progress13.LoadingFull = true; - this.progress13.Location = new System.Drawing.Point(3, 473); + this.progress13.Location = new System.Drawing.Point(3, 379); this.progress13.Name = "progress13"; this.progress13.Size = new System.Drawing.Size(744, 20); this.progress13.TabIndex = 58; @@ -215,7 +211,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 443); + this.label6.Location = new System.Drawing.Point(3, 349); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 56; @@ -227,7 +223,7 @@ this.flowPanel1.Controls.Add(this.progress9); this.flowPanel1.Controls.Add(this.progress11); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 399); + this.flowPanel1.Location = new System.Drawing.Point(3, 305); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 55; @@ -274,7 +270,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 369); + this.label5.Location = new System.Drawing.Point(3, 275); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 54; @@ -286,7 +282,7 @@ this.flowPanel4.Controls.Add(this.progress7); this.flowPanel4.Controls.Add(this.progress6); this.flowPanel4.Gap = 6; - this.flowPanel4.Location = new System.Drawing.Point(3, 287); + this.flowPanel4.Location = new System.Drawing.Point(3, 193); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 76); this.flowPanel4.TabIndex = 53; @@ -333,7 +329,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 257); + this.label3.Location = new System.Drawing.Point(3, 163); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 52; @@ -344,7 +340,7 @@ this.progress5.ContainerControl = this; this.progress5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.progress5.Loading = true; - this.progress5.Location = new System.Drawing.Point(3, 231); + this.progress5.Location = new System.Drawing.Point(3, 137); this.progress5.Name = "progress5"; this.progress5.Size = new System.Drawing.Size(744, 20); this.progress5.State = AntdUI.TType.Warn; @@ -355,7 +351,7 @@ // this.progress4.ContainerControl = this; this.progress4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.progress4.Location = new System.Drawing.Point(3, 205); + this.progress4.Location = new System.Drawing.Point(3, 111); this.progress4.Name = "progress4"; this.progress4.Size = new System.Drawing.Size(744, 20); this.progress4.State = AntdUI.TType.Success; @@ -367,7 +363,7 @@ // this.progress3.ContainerControl = this; this.progress3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.progress3.Location = new System.Drawing.Point(3, 179); + this.progress3.Location = new System.Drawing.Point(3, 85); this.progress3.Name = "progress3"; this.progress3.Size = new System.Drawing.Size(744, 20); this.progress3.State = AntdUI.TType.Error; @@ -380,7 +376,7 @@ this.progress2.ContainerControl = this; this.progress2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.progress2.Loading = true; - this.progress2.Location = new System.Drawing.Point(3, 153); + this.progress2.Location = new System.Drawing.Point(3, 59); this.progress2.Name = "progress2"; this.progress2.Size = new System.Drawing.Size(744, 20); this.progress2.TabIndex = 48; @@ -390,7 +386,7 @@ // this.progress1.ContainerControl = this; this.progress1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.progress1.Location = new System.Drawing.Point(3, 127); + this.progress1.Location = new System.Drawing.Point(3, 33); this.progress1.Name = "progress1"; this.progress1.Size = new System.Drawing.Size(744, 20); this.progress1.TabIndex = 47; @@ -401,41 +397,30 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 46; this.label4.Text = "进度条"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 45; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 44; - this.label2.Text = "展示操作的当前进度。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 43; - this.label1.Text = "Progress 进度条"; + this.header1.Description = "展示操作的当前进度。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Progress 进度条"; + this.header1.UseTitleFont = true; // // ProgressDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "ProgressDemo"; this.Size = new System.Drawing.Size(750, 741); this.stackPanel1.ResumeLayout(false); @@ -449,9 +434,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label4; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Progress progress1; private AntdUI.Progress progress3; private AntdUI.Progress progress2; @@ -477,5 +459,6 @@ private AntdUI.Progress progress15; private AntdUI.Progress progress18; private AntdUI.Progress progress19; + private AntdUI.PageHeader header1; } } diff --git a/Views/RadioDemo.Designer.cs b/Views/RadioDemo.Designer.cs index 70c08ca..3debe39 100644 --- a/Views/RadioDemo.Designer.cs +++ b/Views/RadioDemo.Designer.cs @@ -37,9 +37,7 @@ this.radio2 = new AntdUI.Radio(); this.radio1 = new AntdUI.Radio(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); @@ -51,13 +49,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 451); + this.stackPanel1.Size = new System.Drawing.Size(750, 377); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -66,7 +61,7 @@ // this.flowPanel2.Controls.Add(this.radio3); this.flowPanel2.Controls.Add(this.radio4); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 14; @@ -98,7 +93,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 13; @@ -108,7 +103,7 @@ // this.flowPanel1.Controls.Add(this.radio2); this.flowPanel1.Controls.Add(this.radio1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 12; @@ -138,41 +133,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 11; this.label3.Text = "基本类型"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 10; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 9; - this.label2.Text = "用于在多个备选项中选中单个状态。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 8; - this.label1.Text = "Radio 单选框"; + this.header1.Description = "用于在多个备选项中选中单个状态。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Radio 单选框"; + this.header1.UseTitleFont = true; // // RadioDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "RadioDemo"; this.Size = new System.Drawing.Size(750, 451); this.stackPanel1.ResumeLayout(false); @@ -185,9 +169,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Label label3; private AntdUI.Radio radio1; @@ -196,5 +177,6 @@ private AntdUI.Radio radio3; private AntdUI.Radio radio4; private AntdUI.Label label4; + private AntdUI.PageHeader header1; } } diff --git a/Views/RadioDemo.cs b/Views/RadioDemo.cs index 2fb1d57..ecfc8a6 100644 --- a/Views/RadioDemo.cs +++ b/Views/RadioDemo.cs @@ -2,7 +2,7 @@ namespace AntdUIDemo.Views { - public partial class RadioDemo: UserControl + public partial class RadioDemo : UserControl { public RadioDemo() { diff --git a/Views/RateDemo.Designer.cs b/Views/RateDemo.Designer.cs index a9c4ef2..23ccaa7 100644 --- a/Views/RateDemo.Designer.cs +++ b/Views/RateDemo.Designer.cs @@ -51,9 +51,7 @@ this.rate2 = new AntdUI.Rate(); this.rate1 = new AntdUI.Rate(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -74,13 +72,10 @@ this.stackPanel1.Controls.Add(this.label7); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 494); + this.stackPanel1.Size = new System.Drawing.Size(750, 420); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -90,7 +85,7 @@ this.flowPanel4.Controls.Add(this.rate8); this.flowPanel4.Controls.Add(this.rate6); this.flowPanel4.Controls.Add(this.rate5); - this.flowPanel4.Location = new System.Drawing.Point(3, 423); + this.flowPanel4.Location = new System.Drawing.Point(3, 329); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 26; @@ -129,7 +124,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 393); + this.label6.Location = new System.Drawing.Point(3, 299); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 25; @@ -138,7 +133,7 @@ // flowPanel3 // this.flowPanel3.Controls.Add(this.rate4); - this.flowPanel3.Location = new System.Drawing.Point(3, 349); + this.flowPanel3.Location = new System.Drawing.Point(3, 255); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 24; @@ -162,7 +157,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 319); + this.label5.Location = new System.Drawing.Point(3, 225); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 23; @@ -171,7 +166,7 @@ // flowPanel2 // this.flowPanel2.Controls.Add(this.rate3); - this.flowPanel2.Location = new System.Drawing.Point(3, 275); + this.flowPanel2.Location = new System.Drawing.Point(3, 181); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 22; @@ -190,7 +185,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 245); + this.label4.Location = new System.Drawing.Point(3, 151); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 21; @@ -201,7 +196,7 @@ this.flowPanel5.Controls.Add(this.rate9); this.flowPanel5.Controls.Add(this.rate10); this.flowPanel5.Controls.Add(this.rate11); - this.flowPanel5.Location = new System.Drawing.Point(3, 201); + this.flowPanel5.Location = new System.Drawing.Point(3, 107); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 20; @@ -241,7 +236,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 171); + this.label7.Location = new System.Drawing.Point(3, 77); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 19; @@ -252,7 +247,7 @@ this.flowPanel1.Controls.Add(this.rate7); this.flowPanel1.Controls.Add(this.rate2); this.flowPanel1.Controls.Add(this.rate1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 12; @@ -289,41 +284,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 11; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 10; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 9; - this.label2.Text = "用于对事物进行评分操作。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 8; - this.label1.Text = "Rate 评分"; + this.header1.Description = "用于对事物进行评分操作。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Rate 评分"; + this.header1.UseTitleFont = true; // // RateDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "RateDemo"; this.Size = new System.Drawing.Size(750, 494); this.stackPanel1.ResumeLayout(false); @@ -339,9 +323,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Rate rate1; private AntdUI.Label label3; @@ -363,5 +344,6 @@ private AntdUI.Rate rate10; private AntdUI.Rate rate11; private AntdUI.Label label7; + private AntdUI.PageHeader header1; } } diff --git a/Views/SegmentedDemo.Designer.cs b/Views/SegmentedDemo.Designer.cs index a83bd7e..eb725bd 100644 --- a/Views/SegmentedDemo.Designer.cs +++ b/Views/SegmentedDemo.Designer.cs @@ -28,6 +28,22 @@ /// private void InitializeComponent() { + AntdUI.SegmentedItem segmentedItem1 = new AntdUI.SegmentedItem(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SegmentedDemo)); + AntdUI.SegmentedItem segmentedItem2 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem3 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem4 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem5 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem6 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem7 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem8 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem9 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem10 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem11 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem12 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem13 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem14 = new AntdUI.SegmentedItem(); + AntdUI.SegmentedItem segmentedItem15 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem16 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem17 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem18 = new AntdUI.SegmentedItem(); @@ -53,23 +69,14 @@ AntdUI.SegmentedItem segmentedItem38 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem39 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem40 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem11 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem12 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem13 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem14 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem15 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem6 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem7 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem8 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem9 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem10 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem1 = new AntdUI.SegmentedItem(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SegmentedDemo)); - AntdUI.SegmentedItem segmentedItem2 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem3 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem4 = new AntdUI.SegmentedItem(); - AntdUI.SegmentedItem segmentedItem5 = new AntdUI.SegmentedItem(); this.stackPanel1 = new AntdUI.StackPanel(); + this.flowPanel8 = new AntdUI.FlowPanel(); + this.segmented8 = new AntdUI.Segmented(); + this.flowPanel4 = new AntdUI.FlowPanel(); + this.segmented4 = new AntdUI.Segmented(); + this.label5 = new AntdUI.Label(); + this.flowPanel7 = new AntdUI.FlowPanel(); + this.segmented7 = new AntdUI.Segmented(); this.flowPanel3 = new AntdUI.FlowPanel(); this.segmented3 = new AntdUI.Segmented(); this.flowPanel5 = new AntdUI.FlowPanel(); @@ -83,29 +90,21 @@ this.flowPanel1 = new AntdUI.FlowPanel(); this.segmented1 = new AntdUI.Segmented(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.flowPanel7 = new AntdUI.FlowPanel(); - this.segmented7 = new AntdUI.Segmented(); - this.flowPanel4 = new AntdUI.FlowPanel(); - this.segmented4 = new AntdUI.Segmented(); - this.label5 = new AntdUI.Label(); - this.flowPanel8 = new AntdUI.FlowPanel(); - this.segmented8 = new AntdUI.Segmented(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); + this.flowPanel8.SuspendLayout(); + this.flowPanel4.SuspendLayout(); + this.flowPanel7.SuspendLayout(); this.flowPanel3.SuspendLayout(); this.flowPanel5.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel6.SuspendLayout(); this.flowPanel1.SuspendLayout(); - this.flowPanel7.SuspendLayout(); - this.flowPanel4.SuspendLayout(); - this.flowPanel8.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.flowPanel8); this.stackPanel1.Controls.Add(this.flowPanel4); this.stackPanel1.Controls.Add(this.label5); @@ -118,21 +117,145 @@ this.stackPanel1.Controls.Add(this.label6); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 697); + this.stackPanel1.Size = new System.Drawing.Size(750, 623); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // + // flowPanel8 + // + this.flowPanel8.Controls.Add(this.segmented8); + this.flowPanel8.Location = new System.Drawing.Point(3, 507); + this.flowPanel8.Name = "flowPanel8"; + this.flowPanel8.Size = new System.Drawing.Size(744, 76); + this.flowPanel8.TabIndex = 45; + this.flowPanel8.Text = "flowPanel8"; + // + // segmented8 + // + this.segmented8.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.segmented8.BarPosition = AntdUI.TAlignMini.Bottom; + this.segmented8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.segmented8.Full = true; + segmentedItem1.IconActiveSvg = resources.GetString("segmentedItem1.IconActiveSvg"); + segmentedItem1.IconSvg = resources.GetString("segmentedItem1.IconSvg"); + segmentedItem1.Text = "主页"; + segmentedItem2.IconActiveSvg = resources.GetString("segmentedItem2.IconActiveSvg"); + segmentedItem2.IconSvg = resources.GetString("segmentedItem2.IconSvg"); + segmentedItem2.Text = "消息"; + segmentedItem3.IconActiveSvg = resources.GetString("segmentedItem3.IconActiveSvg"); + segmentedItem3.IconSvg = resources.GetString("segmentedItem3.IconSvg"); + segmentedItem3.Text = "相册"; + segmentedItem4.IconActiveSvg = resources.GetString("segmentedItem4.IconActiveSvg"); + segmentedItem4.IconSvg = resources.GetString("segmentedItem4.IconSvg"); + segmentedItem4.Text = "设置"; + segmentedItem5.IconActiveSvg = resources.GetString("segmentedItem5.IconActiveSvg"); + segmentedItem5.IconSvg = resources.GetString("segmentedItem5.IconSvg"); + segmentedItem5.Text = "收藏"; + this.segmented8.Items.Add(segmentedItem1); + this.segmented8.Items.Add(segmentedItem2); + this.segmented8.Items.Add(segmentedItem3); + this.segmented8.Items.Add(segmentedItem4); + this.segmented8.Items.Add(segmentedItem5); + this.segmented8.Location = new System.Drawing.Point(3, 3); + this.segmented8.Name = "segmented8"; + this.segmented8.SelectIndex = 0; + this.segmented8.Size = new System.Drawing.Size(500, 70); + this.segmented8.TabIndex = 0; + this.segmented8.Text = "segmented8"; + // + // flowPanel4 + // + this.flowPanel4.Controls.Add(this.segmented4); + this.flowPanel4.Location = new System.Drawing.Point(3, 463); + this.flowPanel4.Name = "flowPanel4"; + this.flowPanel4.Size = new System.Drawing.Size(744, 38); + this.flowPanel4.TabIndex = 44; + this.flowPanel4.Text = "flowPanel4"; + // + // segmented4 + // + this.segmented4.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.segmented4.BarPadding = 8; + this.segmented4.BarPosition = AntdUI.TAlignMini.Bottom; + this.segmented4.BarRadius = 4; + this.segmented4.BarSize = 4F; + this.segmented4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.segmented4.Full = true; + segmentedItem6.Text = "Daily"; + segmentedItem7.Text = "Weekly"; + segmentedItem8.Text = "Monthly"; + segmentedItem9.Text = "Quarterly"; + segmentedItem10.Text = "Yearly"; + this.segmented4.Items.Add(segmentedItem6); + this.segmented4.Items.Add(segmentedItem7); + this.segmented4.Items.Add(segmentedItem8); + this.segmented4.Items.Add(segmentedItem9); + this.segmented4.Items.Add(segmentedItem10); + this.segmented4.Location = new System.Drawing.Point(3, 3); + this.segmented4.Name = "segmented4"; + this.segmented4.SelectIndex = 0; + this.segmented4.Size = new System.Drawing.Size(500, 32); + this.segmented4.TabIndex = 0; + this.segmented4.Text = "segmented4"; + // + // label5 + // + this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label5.Location = new System.Drawing.Point(3, 433); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(744, 24); + this.label5.TabIndex = 43; + this.label5.Text = "线条样式"; + // + // flowPanel7 + // + this.flowPanel7.Controls.Add(this.segmented7); + this.flowPanel7.Location = new System.Drawing.Point(3, 351); + this.flowPanel7.Name = "flowPanel7"; + this.flowPanel7.Size = new System.Drawing.Size(744, 76); + this.flowPanel7.TabIndex = 42; + this.flowPanel7.Text = "flowPanel7"; + // + // segmented7 + // + this.segmented7.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.segmented7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.segmented7.Full = true; + segmentedItem11.IconActiveSvg = resources.GetString("segmentedItem11.IconActiveSvg"); + segmentedItem11.IconSvg = resources.GetString("segmentedItem11.IconSvg"); + segmentedItem11.Text = "主页"; + segmentedItem12.IconActiveSvg = resources.GetString("segmentedItem12.IconActiveSvg"); + segmentedItem12.IconSvg = resources.GetString("segmentedItem12.IconSvg"); + segmentedItem12.Text = "消息"; + segmentedItem13.IconActiveSvg = resources.GetString("segmentedItem13.IconActiveSvg"); + segmentedItem13.IconSvg = resources.GetString("segmentedItem13.IconSvg"); + segmentedItem13.Text = "相册"; + segmentedItem14.IconActiveSvg = resources.GetString("segmentedItem14.IconActiveSvg"); + segmentedItem14.IconSvg = resources.GetString("segmentedItem14.IconSvg"); + segmentedItem14.Text = "设置"; + segmentedItem15.IconActiveSvg = resources.GetString("segmentedItem15.IconActiveSvg"); + segmentedItem15.IconSvg = resources.GetString("segmentedItem15.IconSvg"); + segmentedItem15.Text = "收藏"; + this.segmented7.Items.Add(segmentedItem11); + this.segmented7.Items.Add(segmentedItem12); + this.segmented7.Items.Add(segmentedItem13); + this.segmented7.Items.Add(segmentedItem14); + this.segmented7.Items.Add(segmentedItem15); + this.segmented7.Location = new System.Drawing.Point(3, 3); + this.segmented7.Name = "segmented7"; + this.segmented7.SelectIndex = 0; + this.segmented7.Size = new System.Drawing.Size(500, 70); + this.segmented7.TabIndex = 0; + this.segmented7.Text = "segmented7"; + // // flowPanel3 // this.flowPanel3.Controls.Add(this.segmented3); - this.flowPanel3.Location = new System.Drawing.Point(3, 363); + this.flowPanel3.Location = new System.Drawing.Point(3, 269); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 76); this.flowPanel3.TabIndex = 38; @@ -173,7 +296,7 @@ // flowPanel5 // this.flowPanel5.Controls.Add(this.segmented5); - this.flowPanel5.Location = new System.Drawing.Point(3, 319); + this.flowPanel5.Location = new System.Drawing.Point(3, 225); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 37; @@ -208,7 +331,7 @@ // flowPanel2 // this.flowPanel2.Controls.Add(this.segmented2); - this.flowPanel2.Location = new System.Drawing.Point(3, 275); + this.flowPanel2.Location = new System.Drawing.Point(3, 181); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 36; @@ -244,7 +367,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 245); + this.label4.Location = new System.Drawing.Point(3, 151); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 35; @@ -253,7 +376,7 @@ // flowPanel6 // this.flowPanel6.Controls.Add(this.segmented6); - this.flowPanel6.Location = new System.Drawing.Point(3, 201); + this.flowPanel6.Location = new System.Drawing.Point(3, 107); this.flowPanel6.Name = "flowPanel6"; this.flowPanel6.Size = new System.Drawing.Size(744, 38); this.flowPanel6.TabIndex = 34; @@ -284,7 +407,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 171); + this.label6.Location = new System.Drawing.Point(3, 77); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 33; @@ -293,7 +416,7 @@ // flowPanel1 // this.flowPanel1.Controls.Add(this.segmented1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 22; @@ -323,179 +446,41 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 21; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 20; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 19; - this.label2.Text = "用于展示多个选项并允许用户选择其中单个选项。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 18; - this.label1.Text = "Segmented 分段控制器"; - // - // flowPanel7 - // - this.flowPanel7.Controls.Add(this.segmented7); - this.flowPanel7.Location = new System.Drawing.Point(3, 445); - this.flowPanel7.Name = "flowPanel7"; - this.flowPanel7.Size = new System.Drawing.Size(744, 76); - this.flowPanel7.TabIndex = 42; - this.flowPanel7.Text = "flowPanel7"; - // - // segmented7 - // - this.segmented7.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.segmented7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.segmented7.Full = true; - segmentedItem11.IconActiveSvg = resources.GetString("segmentedItem11.IconActiveSvg"); - segmentedItem11.IconSvg = resources.GetString("segmentedItem11.IconSvg"); - segmentedItem11.Text = "主页"; - segmentedItem12.IconActiveSvg = resources.GetString("segmentedItem12.IconActiveSvg"); - segmentedItem12.IconSvg = resources.GetString("segmentedItem12.IconSvg"); - segmentedItem12.Text = "消息"; - segmentedItem13.IconActiveSvg = resources.GetString("segmentedItem13.IconActiveSvg"); - segmentedItem13.IconSvg = resources.GetString("segmentedItem13.IconSvg"); - segmentedItem13.Text = "相册"; - segmentedItem14.IconActiveSvg = resources.GetString("segmentedItem14.IconActiveSvg"); - segmentedItem14.IconSvg = resources.GetString("segmentedItem14.IconSvg"); - segmentedItem14.Text = "设置"; - segmentedItem15.IconActiveSvg = resources.GetString("segmentedItem15.IconActiveSvg"); - segmentedItem15.IconSvg = resources.GetString("segmentedItem15.IconSvg"); - segmentedItem15.Text = "收藏"; - this.segmented7.Items.Add(segmentedItem11); - this.segmented7.Items.Add(segmentedItem12); - this.segmented7.Items.Add(segmentedItem13); - this.segmented7.Items.Add(segmentedItem14); - this.segmented7.Items.Add(segmentedItem15); - this.segmented7.Location = new System.Drawing.Point(3, 3); - this.segmented7.Name = "segmented7"; - this.segmented7.SelectIndex = 0; - this.segmented7.Size = new System.Drawing.Size(500, 70); - this.segmented7.TabIndex = 0; - this.segmented7.Text = "segmented7"; - // - // flowPanel4 - // - this.flowPanel4.Controls.Add(this.segmented4); - this.flowPanel4.Location = new System.Drawing.Point(3, 557); - this.flowPanel4.Name = "flowPanel4"; - this.flowPanel4.Size = new System.Drawing.Size(744, 38); - this.flowPanel4.TabIndex = 44; - this.flowPanel4.Text = "flowPanel4"; - // - // segmented4 - // - this.segmented4.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.segmented4.BarPadding = 8; - this.segmented4.BarRadius = 4; - this.segmented4.BarSize = 4F; - this.segmented4.BarStyle = true; - this.segmented4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.segmented4.Full = true; - segmentedItem6.Text = "Daily"; - segmentedItem7.Text = "Weekly"; - segmentedItem8.Text = "Monthly"; - segmentedItem9.Text = "Quarterly"; - segmentedItem10.Text = "Yearly"; - this.segmented4.Items.Add(segmentedItem6); - this.segmented4.Items.Add(segmentedItem7); - this.segmented4.Items.Add(segmentedItem8); - this.segmented4.Items.Add(segmentedItem9); - this.segmented4.Items.Add(segmentedItem10); - this.segmented4.Location = new System.Drawing.Point(3, 3); - this.segmented4.Name = "segmented4"; - this.segmented4.SelectIndex = 0; - this.segmented4.Size = new System.Drawing.Size(500, 32); - this.segmented4.TabIndex = 0; - this.segmented4.Text = "segmented4"; - // - // label5 - // - this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 527); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(744, 24); - this.label5.TabIndex = 43; - this.label5.Text = "线条样式"; - // - // flowPanel8 - // - this.flowPanel8.Controls.Add(this.segmented8); - this.flowPanel8.Location = new System.Drawing.Point(3, 601); - this.flowPanel8.Name = "flowPanel8"; - this.flowPanel8.Size = new System.Drawing.Size(744, 76); - this.flowPanel8.TabIndex = 45; - this.flowPanel8.Text = "flowPanel8"; - // - // segmented8 - // - this.segmented8.BackActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.segmented8.BarStyle = true; - this.segmented8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.segmented8.Full = true; - segmentedItem1.IconActiveSvg = resources.GetString("segmentedItem1.IconActiveSvg"); - segmentedItem1.IconSvg = resources.GetString("segmentedItem1.IconSvg"); - segmentedItem1.Text = "主页"; - segmentedItem2.IconActiveSvg = resources.GetString("segmentedItem2.IconActiveSvg"); - segmentedItem2.IconSvg = resources.GetString("segmentedItem2.IconSvg"); - segmentedItem2.Text = "消息"; - segmentedItem3.IconActiveSvg = resources.GetString("segmentedItem3.IconActiveSvg"); - segmentedItem3.IconSvg = resources.GetString("segmentedItem3.IconSvg"); - segmentedItem3.Text = "相册"; - segmentedItem4.IconActiveSvg = resources.GetString("segmentedItem4.IconActiveSvg"); - segmentedItem4.IconSvg = resources.GetString("segmentedItem4.IconSvg"); - segmentedItem4.Text = "设置"; - segmentedItem5.IconActiveSvg = resources.GetString("segmentedItem5.IconActiveSvg"); - segmentedItem5.IconSvg = resources.GetString("segmentedItem5.IconSvg"); - segmentedItem5.Text = "收藏"; - this.segmented8.Items.Add(segmentedItem1); - this.segmented8.Items.Add(segmentedItem2); - this.segmented8.Items.Add(segmentedItem3); - this.segmented8.Items.Add(segmentedItem4); - this.segmented8.Items.Add(segmentedItem5); - this.segmented8.Location = new System.Drawing.Point(3, 3); - this.segmented8.Name = "segmented8"; - this.segmented8.SelectIndex = 0; - this.segmented8.Size = new System.Drawing.Size(500, 70); - this.segmented8.TabIndex = 0; - this.segmented8.Text = "segmented8"; + this.header1.Description = "用于展示多个选项并允许用户选择其中单个选项。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Segmented 分段控制器"; + this.header1.UseTitleFont = true; // // SegmentedDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SegmentedDemo"; this.Size = new System.Drawing.Size(750, 697); this.stackPanel1.ResumeLayout(false); + this.flowPanel8.ResumeLayout(false); + this.flowPanel4.ResumeLayout(false); + this.flowPanel7.ResumeLayout(false); this.flowPanel3.ResumeLayout(false); this.flowPanel5.ResumeLayout(false); this.flowPanel2.ResumeLayout(false); this.flowPanel6.ResumeLayout(false); this.flowPanel1.ResumeLayout(false); - this.flowPanel7.ResumeLayout(false); - this.flowPanel4.ResumeLayout(false); - this.flowPanel8.ResumeLayout(false); this.ResumeLayout(false); } @@ -503,9 +488,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Label label3; private AntdUI.Segmented segmented1; @@ -526,5 +508,6 @@ private AntdUI.Label label5; private AntdUI.FlowPanel flowPanel8; private AntdUI.Segmented segmented8; + private AntdUI.PageHeader header1; } } diff --git a/Views/SelectDemo.Designer.cs b/Views/SelectDemo.Designer.cs index 6c10115..02440f2 100644 --- a/Views/SelectDemo.Designer.cs +++ b/Views/SelectDemo.Designer.cs @@ -58,9 +58,7 @@ this.select1 = new AntdUI.Select(); this.select4 = new AntdUI.Select(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel6.SuspendLayout(); this.flowPanel5.SuspendLayout(); @@ -81,13 +79,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 553); + this.stackPanel1.Size = new System.Drawing.Size(750, 479); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -96,7 +91,7 @@ // this.flowPanel6.Controls.Add(this.select_custom); this.flowPanel6.Gap = 6; - this.flowPanel6.Location = new System.Drawing.Point(3, 423); + this.flowPanel6.Location = new System.Drawing.Point(3, 329); this.flowPanel6.Name = "flowPanel6"; this.flowPanel6.Size = new System.Drawing.Size(744, 38); this.flowPanel6.TabIndex = 28; @@ -118,7 +113,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 393); + this.label8.Location = new System.Drawing.Point(3, 299); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(744, 24); this.label8.TabIndex = 27; @@ -129,7 +124,7 @@ this.flowPanel5.Controls.Add(this.select15); this.flowPanel5.Controls.Add(this.select16); this.flowPanel5.Gap = 6; - this.flowPanel5.Location = new System.Drawing.Point(3, 349); + this.flowPanel5.Location = new System.Drawing.Point(3, 255); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 26; @@ -174,7 +169,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 319); + this.label7.Location = new System.Drawing.Point(3, 225); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 25; @@ -186,7 +181,7 @@ this.flowPanel4.Controls.Add(this.select11); this.flowPanel4.Controls.Add(this.select13); this.flowPanel4.Gap = 6; - this.flowPanel4.Location = new System.Drawing.Point(3, 275); + this.flowPanel4.Location = new System.Drawing.Point(3, 181); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 24; @@ -245,7 +240,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 245); + this.label6.Location = new System.Drawing.Point(3, 151); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 23; @@ -260,7 +255,7 @@ this.flowPanel2.Controls.Add(this.select6); this.flowPanel2.Controls.Add(this.select5); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 15; @@ -376,7 +371,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 14; @@ -391,7 +386,7 @@ this.flowPanel1.Controls.Add(this.select1); this.flowPanel1.Controls.Add(this.select4); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 13; @@ -501,41 +496,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 12; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 7; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 6; - this.label2.Text = "下拉选择器。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 5; - this.label1.Text = "Select 选择器"; + this.header1.Description = "下拉选择器。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Select 选择器"; + this.header1.UseTitleFont = true; // // SelectDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SelectDemo"; this.Size = new System.Drawing.Size(750, 553); this.stackPanel1.ResumeLayout(false); @@ -551,9 +535,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Select select4; @@ -582,5 +563,6 @@ private AntdUI.FlowPanel flowPanel6; private AntdUI.Select select_custom; private AntdUI.Select select18; + private AntdUI.PageHeader header1; } } diff --git a/Views/SelectMultipleDemo.Designer.cs b/Views/SelectMultipleDemo.Designer.cs index 4ada69d..d8f4200 100644 --- a/Views/SelectMultipleDemo.Designer.cs +++ b/Views/SelectMultipleDemo.Designer.cs @@ -64,9 +64,7 @@ this.selectMultiple2 = new AntdUI.SelectMultiple(); this.selectMultiple1 = new AntdUI.SelectMultiple(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel7.SuspendLayout(); this.flowPanel6.SuspendLayout(); @@ -79,6 +77,7 @@ // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.flowPanel7); this.stackPanel1.Controls.Add(this.label8); this.stackPanel1.Controls.Add(this.flowPanel6); @@ -92,13 +91,10 @@ this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 580); + this.stackPanel1.Size = new System.Drawing.Size(750, 506); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -107,7 +103,7 @@ // this.flowPanel7.Controls.Add(this.selectMultiple19); this.flowPanel7.Gap = 6; - this.flowPanel7.Location = new System.Drawing.Point(3, 541); + this.flowPanel7.Location = new System.Drawing.Point(3, 447); this.flowPanel7.Name = "flowPanel7"; this.flowPanel7.Size = new System.Drawing.Size(744, 38); this.flowPanel7.TabIndex = 31; @@ -135,7 +131,7 @@ // label8 // this.label8.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(3, 511); + this.label8.Location = new System.Drawing.Point(3, 417); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(744, 24); this.label8.TabIndex = 30; @@ -146,7 +142,7 @@ this.flowPanel6.Controls.Add(this.selectMultiple18); this.flowPanel6.Controls.Add(this.selectMultiple20); this.flowPanel6.Gap = 6; - this.flowPanel6.Location = new System.Drawing.Point(3, 467); + this.flowPanel6.Location = new System.Drawing.Point(3, 373); this.flowPanel6.Name = "flowPanel6"; this.flowPanel6.Size = new System.Drawing.Size(744, 38); this.flowPanel6.TabIndex = 29; @@ -193,7 +189,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 437); + this.label7.Location = new System.Drawing.Point(3, 343); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 28; @@ -205,7 +201,7 @@ this.flowPanel5.Controls.Add(this.selectMultiple15); this.flowPanel5.Controls.Add(this.selectMultiple17); this.flowPanel5.Gap = 6; - this.flowPanel5.Location = new System.Drawing.Point(3, 393); + this.flowPanel5.Location = new System.Drawing.Point(3, 299); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 27; @@ -271,7 +267,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 363); + this.label5.Location = new System.Drawing.Point(3, 269); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 26; @@ -283,7 +279,7 @@ this.flowPanel4.Controls.Add(this.selectMultiple13); this.flowPanel4.Controls.Add(this.selectMultiple12); this.flowPanel4.Gap = 6; - this.flowPanel4.Location = new System.Drawing.Point(3, 319); + this.flowPanel4.Location = new System.Drawing.Point(3, 225); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 25; @@ -345,7 +341,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 289); + this.label6.Location = new System.Drawing.Point(3, 195); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 24; @@ -360,7 +356,7 @@ this.flowPanel3.Controls.Add(this.selectMultiple5); this.flowPanel3.Controls.Add(this.selectMultiple7); this.flowPanel3.Gap = 6; - this.flowPanel3.Location = new System.Drawing.Point(3, 245); + this.flowPanel3.Location = new System.Drawing.Point(3, 151); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 18; @@ -482,7 +478,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 215); + this.label4.Location = new System.Drawing.Point(3, 121); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 17; @@ -494,7 +490,7 @@ this.flowPanel2.Controls.Add(this.selectMultiple4); this.flowPanel2.Controls.Add(this.selectMultiple_del); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 171); + this.flowPanel2.Location = new System.Drawing.Point(3, 77); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 16; @@ -560,7 +556,7 @@ this.flowPanel1.Controls.Add(this.selectMultiple2); this.flowPanel1.Controls.Add(this.selectMultiple1); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 15; @@ -622,41 +618,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 14; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 13; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 12; - this.label2.Text = "多选下拉选择器。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 11; - this.label1.Text = "SelectMultiple 多选选择器"; + this.header1.Description = "多选下拉选择器。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "SelectMultiple 多选选择器"; + this.header1.UseTitleFont = true; // // SelectMultipleDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SelectMultipleDemo"; this.Size = new System.Drawing.Size(750, 580); this.stackPanel1.ResumeLayout(false); @@ -674,9 +659,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.SelectMultiple selectMultiple1; @@ -711,5 +693,6 @@ private AntdUI.FlowPanel flowPanel7; private AntdUI.SelectMultiple selectMultiple19; private AntdUI.Label label8; + private AntdUI.PageHeader header1; } } diff --git a/Views/SignalDemo.Designer.cs b/Views/SignalDemo.Designer.cs index 1ded0b1..bf94c37 100644 --- a/Views/SignalDemo.Designer.cs +++ b/Views/SignalDemo.Designer.cs @@ -62,9 +62,7 @@ this.signal2 = new AntdUI.Signal(); this.signal1 = new AntdUI.Signal(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel5.SuspendLayout(); this.flowPanel2.SuspendLayout(); @@ -84,13 +82,10 @@ this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.flowPanel); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 497); + this.stackPanel1.Size = new System.Drawing.Size(750, 423); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -101,7 +96,7 @@ this.flowPanel5.Controls.Add(this.signal22); this.flowPanel5.Controls.Add(this.signal25); this.flowPanel5.Controls.Add(this.signal30); - this.flowPanel5.Location = new System.Drawing.Point(3, 393); + this.flowPanel5.Location = new System.Drawing.Point(3, 299); this.flowPanel5.Name = "flowPanel5"; this.flowPanel5.Size = new System.Drawing.Size(744, 38); this.flowPanel5.TabIndex = 65; @@ -154,7 +149,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 363); + this.label6.Location = new System.Drawing.Point(3, 269); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 64; @@ -167,7 +162,7 @@ this.flowPanel2.Controls.Add(this.signal13); this.flowPanel2.Controls.Add(this.signal14); this.flowPanel2.Controls.Add(this.signal15); - this.flowPanel2.Location = new System.Drawing.Point(3, 319); + this.flowPanel2.Location = new System.Drawing.Point(3, 225); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 63; @@ -235,7 +230,7 @@ this.flowPanel3.Controls.Add(this.signal18); this.flowPanel3.Controls.Add(this.signal19); this.flowPanel3.Controls.Add(this.signal20); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 62; @@ -294,7 +289,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 60; @@ -307,7 +302,7 @@ this.flowPanel1.Controls.Add(this.signal8); this.flowPanel1.Controls.Add(this.signal9); this.flowPanel1.Controls.Add(this.signal10); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 59; @@ -366,7 +361,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 171); + this.label3.Location = new System.Drawing.Point(3, 77); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 58; @@ -379,7 +374,7 @@ this.flowPanel.Controls.Add(this.signal3); this.flowPanel.Controls.Add(this.signal2); this.flowPanel.Controls.Add(this.signal1); - this.flowPanel.Location = new System.Drawing.Point(3, 127); + this.flowPanel.Location = new System.Drawing.Point(3, 33); this.flowPanel.Name = "flowPanel"; this.flowPanel.Size = new System.Drawing.Size(744, 38); this.flowPanel.TabIndex = 57; @@ -433,41 +428,30 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 56; this.label4.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 55; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 54; - this.label2.Text = "信号显示"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 53; - this.label1.Text = "Signal 信号"; + this.header1.Description = "信号显示"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Signal 信号"; + this.header1.UseTitleFont = true; // // SignalDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SignalDemo"; this.Size = new System.Drawing.Size(750, 497); this.stackPanel1.ResumeLayout(false); @@ -485,9 +469,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.FlowPanel flowPanel; private AntdUI.Label label4; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Signal signal4; private AntdUI.Signal signal3; private AntdUI.Signal signal2; @@ -519,5 +500,6 @@ private AntdUI.Signal signal25; private AntdUI.Signal signal21; private AntdUI.Signal signal22; + private AntdUI.PageHeader header1; } } diff --git a/Views/SliderDemo.Designer.cs b/Views/SliderDemo.Designer.cs index a954b4e..2584648 100644 --- a/Views/SliderDemo.Designer.cs +++ b/Views/SliderDemo.Designer.cs @@ -54,9 +54,7 @@ this.slider2 = new AntdUI.Slider(); this.slider1 = new AntdUI.Slider(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -74,13 +72,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 519); + this.stackPanel1.Size = new System.Drawing.Size(750, 445); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -90,7 +85,7 @@ this.flowPanel4.Controls.Add(this.slider7); this.flowPanel4.Controls.Add(this.slider6); this.flowPanel4.Gap = 6; - this.flowPanel4.Location = new System.Drawing.Point(3, 372); + this.flowPanel4.Location = new System.Drawing.Point(3, 278); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 167); this.flowPanel4.TabIndex = 24; @@ -121,7 +116,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 342); + this.label6.Location = new System.Drawing.Point(3, 248); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 23; @@ -131,7 +126,7 @@ // this.flowPanel3.Controls.Add(this.slider_formmat); this.flowPanel3.Gap = 6; - this.flowPanel3.Location = new System.Drawing.Point(3, 298); + this.flowPanel3.Location = new System.Drawing.Point(3, 204); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 22; @@ -150,7 +145,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 268); + this.label5.Location = new System.Drawing.Point(3, 174); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 21; @@ -162,7 +157,7 @@ this.flowPanel2.Controls.Add(this.slider5); this.flowPanel2.Controls.Add(this.slider4); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 61); this.flowPanel2.TabIndex = 20; @@ -230,7 +225,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 19; @@ -242,7 +237,7 @@ this.flowPanel1.Controls.Add(this.slider2); this.flowPanel1.Controls.Add(this.slider1); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 18; @@ -284,41 +279,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 17; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 16; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 15; - this.label2.Text = "滑动型输入器，展示当前值和可选范围。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 14; - this.label1.Text = "Slider 滑动输入条"; + this.header1.Description = "滑动型输入器，展示当前值和可选范围。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Slider 滑动输入条"; + this.header1.UseTitleFont = true; // // SliderDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SliderDemo"; this.Size = new System.Drawing.Size(750, 519); this.stackPanel1.ResumeLayout(false); @@ -333,9 +317,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Slider slider1; @@ -353,5 +334,6 @@ private AntdUI.Slider slider6; private AntdUI.Slider slider7; private AntdUI.Slider slider8; + private AntdUI.PageHeader header1; } } diff --git a/Views/SliderRangeDemo.Designer.cs b/Views/SliderRangeDemo.Designer.cs index e55aa44..c5e1c34 100644 --- a/Views/SliderRangeDemo.Designer.cs +++ b/Views/SliderRangeDemo.Designer.cs @@ -28,31 +28,29 @@ /// private void InitializeComponent() { - AntdUI.SliderMarkItem sliderMarkItem6 = new AntdUI.SliderMarkItem(); - AntdUI.SliderMarkItem sliderMarkItem7 = new AntdUI.SliderMarkItem(); - AntdUI.SliderMarkItem sliderMarkItem8 = new AntdUI.SliderMarkItem(); + AntdUI.SliderMarkItem sliderMarkItem1 = new AntdUI.SliderMarkItem(); + AntdUI.SliderMarkItem sliderMarkItem2 = new AntdUI.SliderMarkItem(); AntdUI.SliderMarkItem sliderMarkItem3 = new AntdUI.SliderMarkItem(); AntdUI.SliderMarkItem sliderMarkItem4 = new AntdUI.SliderMarkItem(); AntdUI.SliderMarkItem sliderMarkItem5 = new AntdUI.SliderMarkItem(); - AntdUI.SliderMarkItem sliderMarkItem1 = new AntdUI.SliderMarkItem(); - AntdUI.SliderMarkItem sliderMarkItem2 = new AntdUI.SliderMarkItem(); + AntdUI.SliderMarkItem sliderMarkItem6 = new AntdUI.SliderMarkItem(); + AntdUI.SliderMarkItem sliderMarkItem7 = new AntdUI.SliderMarkItem(); + AntdUI.SliderMarkItem sliderMarkItem8 = new AntdUI.SliderMarkItem(); this.stackPanel1 = new AntdUI.StackPanel(); - this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.flowPanel1 = new AntdUI.FlowPanel(); - this.sliderRange1 = new AntdUI.SliderRange(); - this.sliderRange2 = new AntdUI.SliderRange(); - this.sliderRange3 = new AntdUI.SliderRange(); - this.label4 = new AntdUI.Label(); this.flowPanel2 = new AntdUI.FlowPanel(); - this.sliderRange4 = new AntdUI.SliderRange(); - this.sliderRange5 = new AntdUI.SliderRange(); this.sliderRange6 = new AntdUI.SliderRange(); + this.sliderRange5 = new AntdUI.SliderRange(); + this.sliderRange4 = new AntdUI.SliderRange(); + this.label4 = new AntdUI.Label(); + this.flowPanel1 = new AntdUI.FlowPanel(); + this.sliderRange3 = new AntdUI.SliderRange(); + this.sliderRange2 = new AntdUI.SliderRange(); + this.sliderRange1 = new AntdUI.SliderRange(); + this.label3 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); - this.flowPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); + this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -61,134 +59,44 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 478); + this.stackPanel1.Size = new System.Drawing.Size(750, 404); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(744, 24); - this.label3.TabIndex = 21; - this.label3.Text = "基本用法"; - this.label3.TooltipConfig = null; - // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 20; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 19; - this.label2.Text = "滑动型范围输入器，展示可选范围。"; - this.label2.TooltipConfig = null; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 18; - this.label1.Text = "SliderRange 滑动范围输入条"; - this.label1.TooltipConfig = null; - // - // flowPanel1 - // - this.flowPanel1.Controls.Add(this.sliderRange3); - this.flowPanel1.Controls.Add(this.sliderRange2); - this.flowPanel1.Controls.Add(this.sliderRange1); - this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); - this.flowPanel1.Name = "flowPanel1"; - this.flowPanel1.Size = new System.Drawing.Size(744, 38); - this.flowPanel1.TabIndex = 22; - this.flowPanel1.Text = "flowPanel1"; - // - // sliderRange1 - // - this.sliderRange1.Location = new System.Drawing.Point(3, 3); - this.sliderRange1.Name = "sliderRange1"; - this.sliderRange1.Size = new System.Drawing.Size(195, 23); - this.sliderRange1.TabIndex = 0; - this.sliderRange1.Text = "sliderRange1"; - // - // sliderRange2 - // - this.sliderRange2.Fill = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.sliderRange2.FillActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); - this.sliderRange2.FillHover = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(133)))), ((int)(((byte)(34))))); - this.sliderRange2.Location = new System.Drawing.Point(210, 3); - this.sliderRange2.Name = "sliderRange2"; - this.sliderRange2.ShowValue = true; - this.sliderRange2.Size = new System.Drawing.Size(195, 23); - this.sliderRange2.TabIndex = 1; - this.sliderRange2.Text = "sliderRange2"; - this.sliderRange2.Value = 50; - // - // sliderRange3 - // - this.sliderRange3.Location = new System.Drawing.Point(417, 3); - this.sliderRange3.MaxValue = 10; - this.sliderRange3.Name = "sliderRange3"; - this.sliderRange3.ShowValue = true; - this.sliderRange3.Size = new System.Drawing.Size(195, 23); - this.sliderRange3.TabIndex = 2; - this.sliderRange3.Text = "sliderRange3"; - this.sliderRange3.Value = 5; - this.sliderRange3.Value2 = 1; - // - // label4 - // - this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(744, 24); - this.label4.TabIndex = 23; - this.label4.Text = "固定点"; - this.label4.TooltipConfig = null; - // // flowPanel2 // this.flowPanel2.Controls.Add(this.sliderRange6); this.flowPanel2.Controls.Add(this.sliderRange5); this.flowPanel2.Controls.Add(this.sliderRange4); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 61); this.flowPanel2.TabIndex = 24; this.flowPanel2.Text = "flowPanel2"; // - // sliderRange4 + // sliderRange6 // - this.sliderRange4.Location = new System.Drawing.Point(3, 3); - sliderMarkItem6.Value = 20; - sliderMarkItem7.Value = 50; - sliderMarkItem8.Value = 75; - this.sliderRange4.Marks.Add(sliderMarkItem6); - this.sliderRange4.Marks.Add(sliderMarkItem7); - this.sliderRange4.Marks.Add(sliderMarkItem8); - this.sliderRange4.Name = "sliderRange4"; - this.sliderRange4.Size = new System.Drawing.Size(195, 55); - this.sliderRange4.TabIndex = 1; - this.sliderRange4.Text = "sliderRange4"; + this.sliderRange6.Location = new System.Drawing.Point(417, 3); + sliderMarkItem1.Fore = System.Drawing.Color.Orange; + sliderMarkItem1.Text = "上海"; + sliderMarkItem1.Value = 2; + sliderMarkItem2.Text = "北京"; + sliderMarkItem2.Value = 8; + this.sliderRange6.Marks.Add(sliderMarkItem1); + this.sliderRange6.Marks.Add(sliderMarkItem2); + this.sliderRange6.MaxValue = 10; + this.sliderRange6.Name = "sliderRange6"; + this.sliderRange6.ShowValue = true; + this.sliderRange6.Size = new System.Drawing.Size(195, 55); + this.sliderRange6.TabIndex = 3; + this.sliderRange6.Text = "sliderRange6"; + this.sliderRange6.Value = 2; + this.sliderRange6.Value2 = 8; // // sliderRange5 // @@ -210,34 +118,106 @@ this.sliderRange5.Text = "sliderRange5"; this.sliderRange5.Value2 = 6; // - // sliderRange6 + // sliderRange4 // - this.sliderRange6.Location = new System.Drawing.Point(417, 3); - sliderMarkItem1.Fore = System.Drawing.Color.Orange; - sliderMarkItem1.Text = "上海"; - sliderMarkItem1.Value = 2; - sliderMarkItem2.Text = "北京"; - sliderMarkItem2.Value = 8; - this.sliderRange6.Marks.Add(sliderMarkItem1); - this.sliderRange6.Marks.Add(sliderMarkItem2); - this.sliderRange6.MaxValue = 10; - this.sliderRange6.Name = "sliderRange6"; - this.sliderRange6.ShowValue = true; - this.sliderRange6.Size = new System.Drawing.Size(195, 55); - this.sliderRange6.TabIndex = 3; - this.sliderRange6.Text = "sliderRange6"; - this.sliderRange6.Value = 2; - this.sliderRange6.Value2 = 8; + this.sliderRange4.Location = new System.Drawing.Point(3, 3); + sliderMarkItem6.Value = 20; + sliderMarkItem7.Value = 50; + sliderMarkItem8.Value = 75; + this.sliderRange4.Marks.Add(sliderMarkItem6); + this.sliderRange4.Marks.Add(sliderMarkItem7); + this.sliderRange4.Marks.Add(sliderMarkItem8); + this.sliderRange4.Name = "sliderRange4"; + this.sliderRange4.Size = new System.Drawing.Size(195, 55); + this.sliderRange4.TabIndex = 1; + this.sliderRange4.Text = "sliderRange4"; + // + // label4 + // + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(3, 77); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(744, 24); + this.label4.TabIndex = 23; + this.label4.Text = "固定点"; + // + // flowPanel1 + // + this.flowPanel1.Controls.Add(this.sliderRange3); + this.flowPanel1.Controls.Add(this.sliderRange2); + this.flowPanel1.Controls.Add(this.sliderRange1); + this.flowPanel1.Gap = 6; + this.flowPanel1.Location = new System.Drawing.Point(3, 33); + this.flowPanel1.Name = "flowPanel1"; + this.flowPanel1.Size = new System.Drawing.Size(744, 38); + this.flowPanel1.TabIndex = 22; + this.flowPanel1.Text = "flowPanel1"; + // + // sliderRange3 + // + this.sliderRange3.Location = new System.Drawing.Point(417, 3); + this.sliderRange3.MaxValue = 10; + this.sliderRange3.Name = "sliderRange3"; + this.sliderRange3.ShowValue = true; + this.sliderRange3.Size = new System.Drawing.Size(195, 23); + this.sliderRange3.TabIndex = 2; + this.sliderRange3.Text = "sliderRange3"; + this.sliderRange3.Value = 5; + this.sliderRange3.Value2 = 1; + // + // sliderRange2 + // + this.sliderRange2.Fill = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.sliderRange2.FillActive = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(87)))), ((int)(((byte)(34))))); + this.sliderRange2.FillHover = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(133)))), ((int)(((byte)(34))))); + this.sliderRange2.Location = new System.Drawing.Point(210, 3); + this.sliderRange2.Name = "sliderRange2"; + this.sliderRange2.ShowValue = true; + this.sliderRange2.Size = new System.Drawing.Size(195, 23); + this.sliderRange2.TabIndex = 1; + this.sliderRange2.Text = "sliderRange2"; + this.sliderRange2.Value = 50; + // + // sliderRange1 + // + this.sliderRange1.Location = new System.Drawing.Point(3, 3); + this.sliderRange1.Name = "sliderRange1"; + this.sliderRange1.Size = new System.Drawing.Size(195, 23); + this.sliderRange1.TabIndex = 0; + this.sliderRange1.Text = "sliderRange1"; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 3); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(744, 24); + this.label3.TabIndex = 21; + this.label3.Text = "基本用法"; + // + // header1 + // + this.header1.Description = "滑动型范围输入器，展示可选范围。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "SliderRange 滑动范围输入条"; + this.header1.UseTitleFont = true; // // SliderRangeDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SliderRangeDemo"; this.Size = new System.Drawing.Size(750, 478); this.stackPanel1.ResumeLayout(false); - this.flowPanel1.ResumeLayout(false); this.flowPanel2.ResumeLayout(false); + this.flowPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -246,9 +226,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.SliderRange sliderRange3; private AntdUI.SliderRange sliderRange2; @@ -258,5 +235,6 @@ private AntdUI.SliderRange sliderRange4; private AntdUI.SliderRange sliderRange5; private AntdUI.SliderRange sliderRange6; + private AntdUI.PageHeader header1; } } diff --git a/Views/SpinDemo.Designer.cs b/Views/SpinDemo.Designer.cs index 7b48b3a..d2758ab 100644 --- a/Views/SpinDemo.Designer.cs +++ b/Views/SpinDemo.Designer.cs @@ -41,9 +41,7 @@ this.spin2 = new AntdUI.Spin(); this.spin1 = new AntdUI.Spin(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.flowPanel.SuspendLayout(); @@ -57,13 +55,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 469); + this.stackPanel1.Size = new System.Drawing.Size(750, 395); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -71,7 +66,7 @@ // flowPanel1 // this.flowPanel1.Controls.Add(this.label_spin); - this.flowPanel1.Location = new System.Drawing.Point(3, 245); + this.flowPanel1.Location = new System.Drawing.Point(3, 151); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 61; @@ -93,7 +88,7 @@ this.flowPanel.Controls.Add(this.button_custom); this.flowPanel.Controls.Add(this.button_base); this.flowPanel.Controls.Add(this.button_control); - this.flowPanel.Location = new System.Drawing.Point(3, 201); + this.flowPanel.Location = new System.Drawing.Point(3, 107); this.flowPanel.Name = "flowPanel"; this.flowPanel.Size = new System.Drawing.Size(744, 38); this.flowPanel.TabIndex = 60; @@ -146,7 +141,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 59; @@ -156,7 +151,7 @@ // this.flowPanel2.Controls.Add(this.spin2); this.flowPanel2.Controls.Add(this.spin1); - this.flowPanel2.Location = new System.Drawing.Point(3, 127); + this.flowPanel2.Location = new System.Drawing.Point(3, 33); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 58; @@ -180,41 +175,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 53; this.label3.Text = "直接使用"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 48; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 47; - this.label2.Text = "用于页面和区块的加载中状态。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 46; - this.label1.Text = "Spin 加载中"; + this.header1.Description = "用于页面和区块的加载中状态。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Spin 加载中"; + this.header1.UseTitleFont = true; // // SpinDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SpinDemo"; this.Size = new System.Drawing.Size(750, 469); this.stackPanel1.ResumeLayout(false); @@ -228,9 +212,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Label label_spin; @@ -243,5 +224,6 @@ private AntdUI.FlowPanel flowPanel2; private AntdUI.Spin spin2; private AntdUI.Spin spin1; + private AntdUI.PageHeader header1; } } diff --git a/Views/SpinDemo.cs b/Views/SpinDemo.cs index e241eae..cbf37d0 100644 --- a/Views/SpinDemo.cs +++ b/Views/SpinDemo.cs @@ -43,7 +43,7 @@ namespace AntdUIDemo.Views { AntdUI.Spin.open(window, new AntdUI.Spin.Config() { - Back = Color.FromArgb(220,147, 181, 207), + Back = Color.FromArgb(220, 147, 181, 207), Color = Color.White, Radius = 6, }, () => diff --git a/Views/StackPanelDemo.Designer.cs b/Views/StackPanelDemo.Designer.cs index cd49ce8..5721798 100644 --- a/Views/StackPanelDemo.Designer.cs +++ b/Views/StackPanelDemo.Designer.cs @@ -47,9 +47,7 @@ this.stackPanel5 = new AntdUI.StackPanel(); this.input_gap = new AntdUI.InputNumber(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel3.SuspendLayout(); @@ -62,13 +60,10 @@ // stackPanel1 // this.stackPanel1.Controls.Add(this.stackPanel2); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 531); + this.stackPanel1.Size = new System.Drawing.Size(750, 457); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -77,7 +72,7 @@ // this.stackPanel2.Controls.Add(this.stackPanel); this.stackPanel2.Controls.Add(this.stackPanel3); - this.stackPanel2.Location = new System.Drawing.Point(3, 97); + this.stackPanel2.Location = new System.Drawing.Point(3, 3); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(744, 406); this.stackPanel2.TabIndex = 11; @@ -261,35 +256,24 @@ this.label3.TabIndex = 4; this.label3.Text = "Gap"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 10; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 9; - this.label2.Text = "将子元素排列成水平或垂直的一行。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 8; - this.label1.Text = "StackPanel 堆叠布局"; + this.header1.Description = "将子元素排列成水平或垂直的一行。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "StackPanel 堆叠布局"; + this.header1.UseTitleFont = true; // // StackPanelDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "StackPanelDemo"; this.Size = new System.Drawing.Size(750, 531); this.Load += new System.EventHandler(this.StackPanelDemo_Load); @@ -307,9 +291,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Label label2; - private AntdUI.Label label1; - private AntdUI.Divider divider1; private AntdUI.StackPanel stackPanel2; private AntdUI.StackPanel stackPanel; private AntdUI.StackPanel stackPanel3; @@ -328,5 +309,6 @@ private AntdUI.StackPanel stackPanel6; private AntdUI.Switch switch_autoscroll; private AntdUI.Label label4; + private AntdUI.PageHeader header1; } } diff --git a/Views/StepsDemo.Designer.cs b/Views/StepsDemo.Designer.cs index 80fd4a5..397e26f 100644 --- a/Views/StepsDemo.Designer.cs +++ b/Views/StepsDemo.Designer.cs @@ -43,9 +43,7 @@ this.input_current = new AntdUI.InputNumber(); this.label8 = new AntdUI.Label(); this.label12 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.SuspendLayout(); @@ -56,13 +54,10 @@ this.stackPanel1.Controls.Add(this.steph); this.stackPanel1.Controls.Add(this.stackPanel2); this.stackPanel1.Controls.Add(this.label12); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 508); + this.stackPanel1.Size = new System.Drawing.Size(750, 434); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -81,7 +76,7 @@ this.stepsv.Items.Add(stepsItem1); this.stepsv.Items.Add(stepsItem2); this.stepsv.Items.Add(stepsItem3); - this.stepsv.Location = new System.Drawing.Point(36, 243); + this.stepsv.Location = new System.Drawing.Point(36, 149); this.stepsv.Margin = new System.Windows.Forms.Padding(36, 3, 36, 3); this.stepsv.Name = "stepsv"; this.stepsv.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -104,7 +99,7 @@ this.steph.Items.Add(stepsItem4); this.steph.Items.Add(stepsItem5); this.steph.Items.Add(stepsItem6); - this.steph.Location = new System.Drawing.Point(3, 165); + this.steph.Location = new System.Drawing.Point(3, 71); this.steph.Name = "steph"; this.steph.RightToLeft = System.Windows.Forms.RightToLeft.No; this.steph.Size = new System.Drawing.Size(744, 72); @@ -117,7 +112,7 @@ this.stackPanel2.Controls.Add(this.label3); this.stackPanel2.Controls.Add(this.input_current); this.stackPanel2.Controls.Add(this.label8); - this.stackPanel2.Location = new System.Drawing.Point(3, 127); + this.stackPanel2.Location = new System.Drawing.Point(3, 33); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(744, 32); this.stackPanel2.TabIndex = 44; @@ -179,41 +174,30 @@ // label12 // this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label12.Location = new System.Drawing.Point(3, 97); + this.label12.Location = new System.Drawing.Point(3, 3); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(744, 24); this.label12.TabIndex = 42; this.label12.Text = "控件配置"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 7; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 6; - this.label2.Text = "引导用户按照流程完成任务的导航条。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 5; - this.label1.Text = "Steps 步骤条"; + this.header1.Description = "引导用户按照流程完成任务的导航条。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Steps 步骤条"; + this.header1.UseTitleFont = true; // // StepsDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "StepsDemo"; this.Size = new System.Drawing.Size(750, 508); this.stackPanel1.ResumeLayout(false); @@ -225,9 +209,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label12; private AntdUI.StackPanel stackPanel2; private AntdUI.Select select_Status; @@ -236,5 +217,6 @@ private AntdUI.Label label8; private AntdUI.Steps stepsv; private AntdUI.Steps steph; + private AntdUI.PageHeader header1; } } diff --git a/Views/SubView/Demo.Designer.cs b/Views/SubView/Demo.Designer.cs index 13a377b..3e16330 100644 --- a/Views/SubView/Demo.Designer.cs +++ b/Views/SubView/Demo.Designer.cs @@ -71,7 +71,7 @@ // // Demo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.panel1); this.Name = "Demo"; this.Size = new System.Drawing.Size(500, 420); diff --git a/Views/SubView/SystemSet.Designer.cs b/Views/SubView/SystemSet.Designer.cs index 8cb3c50..c646699 100644 --- a/Views/SubView/SystemSet.Designer.cs +++ b/Views/SubView/SystemSet.Designer.cs @@ -327,7 +327,7 @@ // // SystemSet // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.tabs); this.Margin = new System.Windows.Forms.Padding(4); this.Name = "SystemSet"; diff --git a/Views/SubView/UserEdit.Designer.cs b/Views/SubView/UserEdit.Designer.cs index 49dcc17..e508233 100644 --- a/Views/SubView/UserEdit.Designer.cs +++ b/Views/SubView/UserEdit.Designer.cs @@ -176,7 +176,7 @@ // // UserEdit // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; + this.Controls.Add(this.panel1); this.Name = "UserEdit"; this.Size = new System.Drawing.Size(500, 386); diff --git a/Views/SubView/Wellcome.Designer.cs b/Views/SubView/Wellcome.Designer.cs index 43d378d..4f00bfc 100644 --- a/Views/SubView/Wellcome.Designer.cs +++ b/Views/SubView/Wellcome.Designer.cs @@ -45,8 +45,6 @@ // // Wellcome // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.label1); this.Name = "Wellcome"; this.Size = new System.Drawing.Size(750, 150); diff --git a/Views/SwitchDemo.Designer.cs b/Views/SwitchDemo.Designer.cs index df21307..7dca785 100644 --- a/Views/SwitchDemo.Designer.cs +++ b/Views/SwitchDemo.Designer.cs @@ -45,9 +45,7 @@ this.switch2 = new AntdUI.Switch(); this.switch1 = new AntdUI.Switch(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel3.SuspendLayout(); this.flowPanel2.SuspendLayout(); @@ -62,13 +60,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 458); + this.stackPanel1.Size = new System.Drawing.Size(750, 384); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -78,7 +73,7 @@ this.flowPanel3.Controls.Add(this.switch13); this.flowPanel3.Controls.Add(this.switch14); this.flowPanel3.Gap = 6; - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 25; @@ -108,7 +103,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 24; @@ -121,7 +116,7 @@ this.flowPanel2.Controls.Add(this.switch7); this.flowPanel2.Controls.Add(this.switch8); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 23; @@ -187,7 +182,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 22; @@ -200,7 +195,7 @@ this.flowPanel1.Controls.Add(this.switch2); this.flowPanel1.Controls.Add(this.switch1); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 21; @@ -261,41 +256,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 20; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 19; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 18; - this.label2.Text = "使用开关切换两种状态之间。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 17; - this.label1.Text = "Switch 开关"; + this.header1.Description = "使用开关切换两种状态之间。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Switch 开关"; + this.header1.UseTitleFont = true; // // SwitchDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "SwitchDemo"; this.Size = new System.Drawing.Size(750, 458); this.stackPanel1.ResumeLayout(false); @@ -309,9 +293,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.Switch switch1; @@ -328,5 +309,6 @@ private AntdUI.Switch switch13; private AntdUI.Switch switch14; private AntdUI.Label label5; + private AntdUI.PageHeader header1; } } diff --git a/Views/TableDemo.Designer.cs b/Views/TableDemo.Designer.cs index e0d7f1e..d841557 100644 --- a/Views/TableDemo.Designer.cs +++ b/Views/TableDemo.Designer.cs @@ -28,7 +28,8 @@ /// private void InitializeComponent() { - this.stackPanel1 = new AntdUI.StackPanel(); + this.header1 = new AntdUI.PageHeader(); + this.stackPanel1 = new AntdUI.Panel(); this.table_base = new AntdUI.Table(); this.flowPanel1 = new AntdUI.FlowPanel(); this.checkbox_sort = new AntdUI.Checkbox(); @@ -41,40 +42,50 @@ this.buttonDEL = new AntdUI.Button(); this.buttonADD = new AntdUI.Button(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.flowPanel3.SuspendLayout(); this.SuspendLayout(); // + // header1 + // + this.header1.Description = "展示行列数据。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Table 表格"; + this.header1.UseTitleFont = true; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.table_base); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.flowPanel3); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 560); + this.stackPanel1.Padding = new System.Windows.Forms.Padding(3); + this.stackPanel1.Radius = 0; + this.stackPanel1.Size = new System.Drawing.Size(750, 486); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; - this.stackPanel1.Vertical = true; // // table_base // + this.table_base.Dock = System.Windows.Forms.DockStyle.Fill; this.table_base.EmptyHeader = true; this.table_base.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.table_base.Gap = 8; - this.table_base.Location = new System.Drawing.Point(3, 215); + this.table_base.Location = new System.Drawing.Point(3, 103); this.table_base.Name = "table_base"; this.table_base.ShowTip = false; - this.table_base.Size = new System.Drawing.Size(744, 342); + this.table_base.Size = new System.Drawing.Size(744, 380); this.table_base.TabIndex = 30; this.table_base.Text = "table1"; // @@ -86,7 +97,8 @@ this.flowPanel1.Controls.Add(this.checkbox_columndragsort); this.flowPanel1.Controls.Add(this.checkbox_visibleheader); this.flowPanel1.Controls.Add(this.checkbox_fixheader); - this.flowPanel1.Location = new System.Drawing.Point(3, 171); + this.flowPanel1.Dock = System.Windows.Forms.DockStyle.Top; + this.flowPanel1.Location = new System.Drawing.Point(3, 65); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 29; @@ -97,7 +109,7 @@ this.checkbox_sort.AutoCheck = true; this.checkbox_sort.AutoSizeMode = AntdUI.TAutoSize.Auto; this.checkbox_sort.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.checkbox_sort.Location = new System.Drawing.Point(466, 0); + this.checkbox_sort.Location = new System.Drawing.Point(467, 0); this.checkbox_sort.Margin = new System.Windows.Forms.Padding(0); this.checkbox_sort.Name = "checkbox_sort"; this.checkbox_sort.Size = new System.Drawing.Size(66, 37); @@ -112,7 +124,7 @@ this.checkbox_rowstyle.Location = new System.Drawing.Point(388, 0); this.checkbox_rowstyle.Margin = new System.Windows.Forms.Padding(0); this.checkbox_rowstyle.Name = "checkbox_rowstyle"; - this.checkbox_rowstyle.Size = new System.Drawing.Size(78, 37); + this.checkbox_rowstyle.Size = new System.Drawing.Size(79, 37); this.checkbox_rowstyle.TabIndex = 20; this.checkbox_rowstyle.Text = "奇偶列"; // @@ -170,7 +182,8 @@ // this.flowPanel3.Controls.Add(this.buttonDEL); this.flowPanel3.Controls.Add(this.buttonADD); - this.flowPanel3.Location = new System.Drawing.Point(3, 127); + this.flowPanel3.Dock = System.Windows.Forms.DockStyle.Top; + this.flowPanel3.Location = new System.Drawing.Point(3, 27); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 27; @@ -200,42 +213,18 @@ // // label3 // + this.label3.Dock = System.Windows.Forms.DockStyle.Top; this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 24; this.label3.Text = "基本用法"; // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 23; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 22; - this.label2.Text = "展示行列数据。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 21; - this.label1.Text = "Table 表格"; - // // TableDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "TableDemo"; this.Size = new System.Drawing.Size(750, 560); this.stackPanel1.ResumeLayout(false); @@ -248,10 +237,8 @@ #endregion - private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; + private AntdUI.PageHeader header1; + private AntdUI.Panel stackPanel1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel3; private AntdUI.Button buttonADD; diff --git a/Views/TableDemo.cs b/Views/TableDemo.cs index 6d00654..1cec4b2 100644 --- a/Views/TableDemo.cs +++ b/Views/TableDemo.cs @@ -150,11 +150,11 @@ namespace AntdUIDemo.Views AntdUI.ContextMenuStrip.open(new AntdUI.ContextMenuStrip.Config(table_base, (item) => { - if(item.Text == "开启") + if (item.Text == "开启") { user.Enabled = true; } - else if(item.Text == "关闭") + else if (item.Text == "关闭") { user.Enabled = false; } diff --git a/Views/TabsDemo.Designer.cs b/Views/TabsDemo.Designer.cs index 914b4f3..429cfff 100644 --- a/Views/TabsDemo.Designer.cs +++ b/Views/TabsDemo.Designer.cs @@ -28,11 +28,11 @@ /// private void InitializeComponent() { - AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine(); + AntdUI.Tabs.StyleLine styleLine4 = new AntdUI.Tabs.StyleLine(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TabsDemo)); - AntdUI.Tabs.StyleLine styleLine2 = new AntdUI.Tabs.StyleLine(); - AntdUI.Tabs.StyleCard styleCard1 = new AntdUI.Tabs.StyleCard(); - AntdUI.Tabs.StyleLine styleLine3 = new AntdUI.Tabs.StyleLine(); + AntdUI.Tabs.StyleLine styleLine5 = new AntdUI.Tabs.StyleLine(); + AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard(); + AntdUI.Tabs.StyleLine styleLine6 = new AntdUI.Tabs.StyleLine(); this.stackPanel1 = new AntdUI.StackPanel(); this.tabs_typeexceed = new AntdUI.Tabs(); this.tabPage10 = new AntdUI.TabPage(); @@ -77,9 +77,7 @@ this.tabPage7 = new AntdUI.TabPage(); this.label6 = new AntdUI.Label(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.tabs_typeexceed.SuspendLayout(); this.tabPage10.SuspendLayout(); @@ -100,6 +98,7 @@ // // stackPanel1 // + this.stackPanel1.AutoScroll = true; this.stackPanel1.Controls.Add(this.tabs_typeexceed); this.stackPanel1.Controls.Add(this.flowPanel3); this.stackPanel1.Controls.Add(this.label15); @@ -109,13 +108,10 @@ this.stackPanel1.Controls.Add(this.label7); this.stackPanel1.Controls.Add(this.tabs1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 744); + this.stackPanel1.Size = new System.Drawing.Size(750, 670); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -125,7 +121,7 @@ this.tabs_typeexceed.Cursor = System.Windows.Forms.Cursors.Default; this.tabs_typeexceed.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); this.tabs_typeexceed.Gap = 12; - this.tabs_typeexceed.Location = new System.Drawing.Point(3, 639); + this.tabs_typeexceed.Location = new System.Drawing.Point(3, 545); this.tabs_typeexceed.Name = "tabs_typeexceed"; this.tabs_typeexceed.Pages.Add(this.tabPage10); this.tabs_typeexceed.Pages.Add(this.tabPage11); @@ -141,7 +137,7 @@ this.tabs_typeexceed.Pages.Add(this.tabPage21); this.tabs_typeexceed.Pages.Add(this.tabPage22); this.tabs_typeexceed.Size = new System.Drawing.Size(744, 88); - this.tabs_typeexceed.Style = styleLine1; + this.tabs_typeexceed.Style = styleLine4; this.tabs_typeexceed.TabIndex = 35; this.tabs_typeexceed.Text = "tabs2"; this.tabs_typeexceed.TypExceed = AntdUI.TabTypExceed.None; @@ -279,7 +275,7 @@ // this.flowPanel3.Controls.Add(this.select_typeexceed); this.flowPanel3.Controls.Add(this.label17); - this.flowPanel3.Location = new System.Drawing.Point(3, 595); + this.flowPanel3.Location = new System.Drawing.Point(3, 501); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 33; @@ -307,7 +303,7 @@ // label15 // this.label15.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(3, 565); + this.label15.Location = new System.Drawing.Point(3, 471); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(744, 24); this.label15.TabIndex = 30; @@ -319,13 +315,13 @@ this.tabs3.Cursor = System.Windows.Forms.Cursors.Hand; this.tabs3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); this.tabs3.Gap = 12; - this.tabs3.Location = new System.Drawing.Point(3, 439); + this.tabs3.Location = new System.Drawing.Point(3, 345); this.tabs3.Name = "tabs3"; this.tabs3.Pages.Add(this.tabPage5); this.tabs3.Pages.Add(this.tabPage8); this.tabs3.Pages.Add(this.tabPage9); this.tabs3.Size = new System.Drawing.Size(744, 120); - this.tabs3.Style = styleLine2; + this.tabs3.Style = styleLine5; this.tabs3.TabIndex = 29; this.tabs3.Text = "tabs3"; // @@ -396,7 +392,7 @@ // label9 // this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(3, 409); + this.label9.Location = new System.Drawing.Point(3, 315); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(744, 24); this.label9.TabIndex = 27; @@ -407,15 +403,15 @@ this.tabs_close.Cursor = System.Windows.Forms.Cursors.Hand; this.tabs_close.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); this.tabs_close.Gap = 12; - this.tabs_close.Location = new System.Drawing.Point(3, 283); + this.tabs_close.Location = new System.Drawing.Point(3, 189); this.tabs_close.Name = "tabs_close"; this.tabs_close.Pages.Add(this.tabPage2); this.tabs_close.Pages.Add(this.tabPage3); this.tabs_close.Pages.Add(this.tabPage4); this.tabs_close.Size = new System.Drawing.Size(744, 120); - styleCard1.Closable = true; - styleCard1.Gap = 6; - this.tabs_close.Style = styleCard1; + styleCard2.Closable = true; + styleCard2.Gap = 6; + this.tabs_close.Style = styleCard2; this.tabs_close.TabIndex = 26; this.tabs_close.Text = "tabs2"; this.tabs_close.Type = AntdUI.TabType.Card; @@ -486,7 +482,7 @@ // label7 // this.label7.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(3, 253); + this.label7.Location = new System.Drawing.Point(3, 159); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(744, 24); this.label7.TabIndex = 24; @@ -494,16 +490,16 @@ // // tabs1 // - this.tabs1.Cursor = System.Windows.Forms.Cursors.Hand; + this.tabs1.Cursor = System.Windows.Forms.Cursors.Default; this.tabs1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); this.tabs1.Gap = 12; - this.tabs1.Location = new System.Drawing.Point(3, 127); + this.tabs1.Location = new System.Drawing.Point(3, 33); this.tabs1.Name = "tabs1"; this.tabs1.Pages.Add(this.tabPage1); this.tabs1.Pages.Add(this.tabPage6); this.tabs1.Pages.Add(this.tabPage7); this.tabs1.Size = new System.Drawing.Size(744, 120); - this.tabs1.Style = styleLine3; + this.tabs1.Style = styleLine6; this.tabs1.TabIndex = 23; this.tabs1.Text = "tabs1"; // @@ -554,7 +550,7 @@ this.tabPage7.Dock = System.Windows.Forms.DockStyle.Fill; this.tabPage7.Location = new System.Drawing.Point(3, 38); this.tabPage7.Name = "tabPage7"; - this.tabPage7.Size = new System.Drawing.Size(688, 89); + this.tabPage7.Size = new System.Drawing.Size(738, 79); this.tabPage7.TabIndex = 0; this.tabPage7.Text = "Tab3"; // @@ -564,48 +560,37 @@ this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.label6.Location = new System.Drawing.Point(0, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(688, 23); + this.label6.Size = new System.Drawing.Size(738, 23); this.label6.TabIndex = 2; this.label6.Text = "Content of Tab Pane 3"; // // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 22; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 7; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 6; - this.label2.Text = "选项卡切换组件。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 5; - this.label1.Text = "Tabs 标签页"; + this.header1.Description = "选项卡切换组件。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Tabs 标签页"; + this.header1.UseTitleFont = true; // // TabsDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "TabsDemo"; this.Size = new System.Drawing.Size(750, 744); this.stackPanel1.ResumeLayout(false); @@ -631,9 +616,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.Tabs tabs1; private AntdUI.TabPage tabPage1; @@ -677,5 +659,6 @@ private AntdUI.FlowPanel flowPanel3; private AntdUI.Label label17; private AntdUI.Select select_typeexceed; + private AntdUI.PageHeader header1; } } diff --git a/Views/TagDemo.Designer.cs b/Views/TagDemo.Designer.cs index a719dd1..029b6ba 100644 --- a/Views/TagDemo.Designer.cs +++ b/Views/TagDemo.Designer.cs @@ -50,9 +50,7 @@ this.tag2 = new AntdUI.Tag(); this.tag1 = new AntdUI.Tag(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); @@ -67,13 +65,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel3); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 414); + this.stackPanel1.Size = new System.Drawing.Size(750, 340); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -82,7 +77,7 @@ // this.flowPanel2.Controls.Add(this.tag13); this.flowPanel2.Controls.Add(this.tag18); - this.flowPanel2.Location = new System.Drawing.Point(3, 275); + this.flowPanel2.Location = new System.Drawing.Point(3, 181); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 33; @@ -111,7 +106,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 32; @@ -125,7 +120,7 @@ this.flowPanel1.Controls.Add(this.tag10); this.flowPanel1.Controls.Add(this.tag11); this.flowPanel1.Controls.Add(this.tag12); - this.flowPanel1.Location = new System.Drawing.Point(3, 201); + this.flowPanel1.Location = new System.Drawing.Point(3, 107); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 31; @@ -199,7 +194,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 30; @@ -213,7 +208,7 @@ this.flowPanel3.Controls.Add(this.tag3); this.flowPanel3.Controls.Add(this.tag2); this.flowPanel3.Controls.Add(this.tag1); - this.flowPanel3.Location = new System.Drawing.Point(3, 127); + this.flowPanel3.Location = new System.Drawing.Point(3, 33); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 29; @@ -281,41 +276,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 28; this.label3.Text = "基本类型"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 27; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 26; - this.label2.Text = "进行标记和分类的小标签。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 25; - this.label1.Text = "Tag 标签"; + this.header1.Description = "进行标记和分类的小标签。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Tag 标签"; + this.header1.UseTitleFont = true; // // TagDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "TagDemo"; this.Size = new System.Drawing.Size(750, 414); this.stackPanel1.ResumeLayout(false); @@ -330,9 +314,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel3; private AntdUI.Tag tag1; private AntdUI.Tag tag3; @@ -352,5 +333,6 @@ private AntdUI.FlowPanel flowPanel2; private AntdUI.Tag tag18; private AntdUI.Tag tag13; + private AntdUI.PageHeader header1; } } diff --git a/Views/TimePickerDemo.Designer.cs b/Views/TimePickerDemo.Designer.cs index b3e7b54..8d2e3bd 100644 --- a/Views/TimePickerDemo.Designer.cs +++ b/Views/TimePickerDemo.Designer.cs @@ -51,9 +51,7 @@ this.timePicker7 = new AntdUI.TimePicker(); this.timePicker1 = new AntdUI.TimePicker(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel4.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -71,13 +69,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 466); + this.stackPanel1.Size = new System.Drawing.Size(750, 392); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -91,7 +86,7 @@ this.flowPanel4.Controls.Add(this.timePicker8); this.flowPanel4.Controls.Add(this.timePicker9); this.flowPanel4.Gap = 6; - this.flowPanel4.Location = new System.Drawing.Point(3, 349); + this.flowPanel4.Location = new System.Drawing.Point(3, 255); this.flowPanel4.Name = "flowPanel4"; this.flowPanel4.Size = new System.Drawing.Size(744, 38); this.flowPanel4.TabIndex = 30; @@ -177,7 +172,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 319); + this.label6.Location = new System.Drawing.Point(3, 225); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 29; @@ -188,7 +183,7 @@ this.flowPanel3.Controls.Add(this.timePicker6); this.flowPanel3.Controls.Add(this.timePicker5); this.flowPanel3.Gap = 6; - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 181); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 28; @@ -223,7 +218,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 151); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 27; @@ -235,7 +230,7 @@ this.flowPanel2.Controls.Add(this.timePicker3); this.flowPanel2.Controls.Add(this.timePicker2); this.flowPanel2.Gap = 6; - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 107); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 26; @@ -286,7 +281,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 77); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 25; @@ -297,7 +292,7 @@ this.flowPanel1.Controls.Add(this.timePicker7); this.flowPanel1.Controls.Add(this.timePicker1); this.flowPanel1.Gap = 6; - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 38); this.flowPanel1.TabIndex = 24; @@ -332,41 +327,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 23; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 22; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 21; - this.label2.Text = "输入或选择时间的控件。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 20; - this.label1.Text = "TimePicker 时间选择框"; + this.header1.Description = "输入或选择时间的控件。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "TimePicker 时间选择框"; + this.header1.UseTitleFont = true; // // TimePickerDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "TimePickerDemo"; this.Size = new System.Drawing.Size(750, 466); this.stackPanel1.ResumeLayout(false); @@ -381,9 +365,6 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.TimePicker timePicker1; @@ -405,5 +386,6 @@ private AntdUI.TimePicker timePicker8; private AntdUI.TimePicker timePicker9; private AntdUI.Label label6; + private AntdUI.PageHeader header1; } } diff --git a/Views/TimelineDemo.Designer.cs b/Views/TimelineDemo.Designer.cs index c592c24..cc6378d 100644 --- a/Views/TimelineDemo.Designer.cs +++ b/Views/TimelineDemo.Designer.cs @@ -38,9 +38,7 @@ this.stackPanel1 = new AntdUI.StackPanel(); this.timeline1 = new AntdUI.Timeline(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -48,13 +46,10 @@ // this.stackPanel1.Controls.Add(this.timeline1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 509); + this.stackPanel1.Size = new System.Drawing.Size(750, 435); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -86,7 +81,7 @@ this.timeline1.Items.Add(timelineItem4); this.timeline1.Items.Add(timelineItem5); this.timeline1.Items.Add(timelineItem6); - this.timeline1.Location = new System.Drawing.Point(3, 127); + this.timeline1.Location = new System.Drawing.Point(3, 33); this.timeline1.Name = "timeline1"; this.timeline1.Size = new System.Drawing.Size(744, 379); this.timeline1.TabIndex = 32; @@ -95,41 +90,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 31; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 30; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 29; - this.label2.Text = "垂直展示的时间流信息。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 28; - this.label1.Text = "Timeline 时间轴"; + this.header1.Description = "垂直展示的时间流信息。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Timeline 时间轴"; + this.header1.UseTitleFont = true; // // TimelineDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "TimelineDemo"; this.Size = new System.Drawing.Size(750, 509); this.stackPanel1.ResumeLayout(false); @@ -140,10 +124,8 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.Label label3; private AntdUI.Timeline timeline1; + private AntdUI.PageHeader header1; } } diff --git a/Views/TimelineDemo.cs b/Views/TimelineDemo.cs index 6c91752..a3a79f2 100644 --- a/Views/TimelineDemo.cs +++ b/Views/TimelineDemo.cs @@ -2,7 +2,7 @@ namespace AntdUIDemo.Views { - public partial class TimelineDemo: UserControl + public partial class TimelineDemo : UserControl { public TimelineDemo() { diff --git a/Views/TooltipDemo.Designer.cs b/Views/TooltipDemo.Designer.cs index 784a76a..0f7a187 100644 --- a/Views/TooltipDemo.Designer.cs +++ b/Views/TooltipDemo.Designer.cs @@ -49,9 +49,7 @@ this.label_showclick = new AntdUI.Label(); this.label_show = new AntdUI.Label(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.flowPanel3.SuspendLayout(); this.flowPanel2.SuspendLayout(); @@ -65,13 +63,10 @@ this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 506); + this.stackPanel1.Size = new System.Drawing.Size(750, 432); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -84,7 +79,7 @@ this.flowPanel3.Controls.Add(this.buttonTL); this.flowPanel3.Controls.Add(this.buttonTop); this.flowPanel3.Controls.Add(this.buttonTR); - this.flowPanel3.Location = new System.Drawing.Point(3, 257); + this.flowPanel3.Location = new System.Drawing.Point(3, 163); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(744, 38); this.flowPanel3.TabIndex = 39; @@ -164,7 +159,7 @@ this.flowPanel2.Controls.Add(this.buttonBL); this.flowPanel2.Controls.Add(this.buttonBottom); this.flowPanel2.Controls.Add(this.buttonBR); - this.flowPanel2.Location = new System.Drawing.Point(3, 213); + this.flowPanel2.Location = new System.Drawing.Point(3, 119); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(744, 38); this.flowPanel2.TabIndex = 38; @@ -239,7 +234,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 183); + this.label4.Location = new System.Drawing.Point(3, 89); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 14; @@ -250,7 +245,7 @@ this.flowPanel1.Controls.Add(this.tooltip1); this.flowPanel1.Controls.Add(this.label_showclick); this.flowPanel1.Controls.Add(this.label_show); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 33); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(744, 50); this.flowPanel1.TabIndex = 13; @@ -288,41 +283,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 12; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 11; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 10; - this.label2.Text = "简单的文字提示气泡框。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 9; - this.label1.Text = "Tooltip 文字提示"; + this.header1.Description = "简单的文字提示气泡框。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Tooltip 文字提示"; + this.header1.UseTitleFont = true; // // TooltipDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "TooltipDemo"; this.Size = new System.Drawing.Size(750, 506); this.stackPanel1.ResumeLayout(false); @@ -337,9 +321,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; private AntdUI.Label label_show; private AntdUI.Label label4; @@ -359,5 +340,6 @@ private AntdUI.Button buttonBR; private AntdUI.Label label_showclick; private AntdUI.Tooltip tooltip1; + private AntdUI.PageHeader header1; } } diff --git a/Views/TreeDemo.Designer.cs b/Views/TreeDemo.Designer.cs index 7668423..d73a5d1 100644 --- a/Views/TreeDemo.Designer.cs +++ b/Views/TreeDemo.Designer.cs @@ -45,9 +45,7 @@ this.tree2 = new AntdUI.Tree(); this.tree1 = new AntdUI.Tree(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.SuspendLayout(); @@ -56,13 +54,10 @@ // this.stackPanel1.Controls.Add(this.stackPanel2); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 477); + this.stackPanel1.Size = new System.Drawing.Size(750, 403); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -71,7 +66,7 @@ // this.stackPanel2.Controls.Add(this.tree2); this.stackPanel2.Controls.Add(this.tree1); - this.stackPanel2.Location = new System.Drawing.Point(3, 127); + this.stackPanel2.Location = new System.Drawing.Point(3, 33); this.stackPanel2.Name = "stackPanel2"; this.stackPanel2.Size = new System.Drawing.Size(744, 347); this.stackPanel2.TabIndex = 17; @@ -158,41 +153,30 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 16; this.label3.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 14; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 13; - this.label2.Text = "多层次的结构列表。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 12; - this.label1.Text = "Tree 树形控件"; + this.header1.Description = "多层次的结构列表。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "Tree 树形控件"; + this.header1.UseTitleFont = true; // // TreeDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "TreeDemo"; this.Size = new System.Drawing.Size(750, 477); this.stackPanel1.ResumeLayout(false); @@ -204,12 +188,10 @@ #endregion private AntdUI.StackPanel stackPanel1; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.StackPanel stackPanel2; private AntdUI.Tree tree2; private AntdUI.Tree tree1; private AntdUI.Label label3; + private AntdUI.PageHeader header1; } } diff --git a/Views/UploadDraggerDemo.Designer.cs b/Views/UploadDraggerDemo.Designer.cs index 291746c..fe61ae8 100644 --- a/Views/UploadDraggerDemo.Designer.cs +++ b/Views/UploadDraggerDemo.Designer.cs @@ -29,11 +29,9 @@ private void InitializeComponent() { this.stackPanel1 = new AntdUI.StackPanel(); - this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); this.uploadDragger = new AntdUI.UploadDragger(); + this.label3 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -41,66 +39,52 @@ // this.stackPanel1.Controls.Add(this.uploadDragger); this.stackPanel1.Controls.Add(this.label3); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 542); + this.stackPanel1.Size = new System.Drawing.Size(750, 468); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(744, 24); - this.label3.TabIndex = 35; - this.label3.Text = "基本用法"; - // - // divider1 - // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 34; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 33; - this.label2.Text = "文件选择上传和拖拽上传控件。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 32; - this.label1.Text = "UploadDragger 上传"; - // // uploadDragger // this.uploadDragger.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.uploadDragger.Location = new System.Drawing.Point(3, 127); + this.uploadDragger.Location = new System.Drawing.Point(3, 33); this.uploadDragger.Name = "uploadDragger"; this.uploadDragger.Size = new System.Drawing.Size(744, 155); this.uploadDragger.TabIndex = 36; this.uploadDragger.Text = "Click or drag file to this area to upload"; this.uploadDragger.TextDesc = "Support for a single or bulk upload. Strictly prohibited from uploading company d" + "ata or other banned files."; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(3, 3); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(744, 24); + this.label3.TabIndex = 35; + this.label3.Text = "基本用法"; + // + // header1 + // + this.header1.Description = "文件选择上传和拖拽上传控件。"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "UploadDragger 上传"; + this.header1.UseTitleFont = true; // // UploadDraggerDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "UploadDraggerDemo"; this.Size = new System.Drawing.Size(750, 542); this.stackPanel1.ResumeLayout(false); @@ -112,9 +96,7 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label3; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.UploadDragger uploadDragger; + private AntdUI.PageHeader header1; } } diff --git a/Views/UploadDraggerDemo.cs b/Views/UploadDraggerDemo.cs index 9422f13..3dbfb6a 100644 --- a/Views/UploadDraggerDemo.cs +++ b/Views/UploadDraggerDemo.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AntdUIDemo.Views @@ -53,7 +46,7 @@ namespace AntdUIDemo.Views string[] filePaths = e.Value; foreach (string path in filePaths) { - AntdUI.Message.info(window, path,autoClose:3); + AntdUI.Message.info(window, path, autoClose: 3); } } } diff --git a/Views/WindowBarDemo.Designer.cs b/Views/WindowBarDemo.Designer.cs index db5849d..2b3e030 100644 --- a/Views/WindowBarDemo.Designer.cs +++ b/Views/WindowBarDemo.Designer.cs @@ -37,9 +37,7 @@ this.label3 = new AntdUI.Label(); this.windowBar1 = new AntdUI.WindowBar(); this.label4 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); + this.header1 = new AntdUI.PageHeader(); this.stackPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -53,13 +51,10 @@ this.stackPanel1.Controls.Add(this.label3); this.stackPanel1.Controls.Add(this.windowBar1); this.stackPanel1.Controls.Add(this.label4); - this.stackPanel1.Controls.Add(this.divider1); - this.stackPanel1.Controls.Add(this.label2); - this.stackPanel1.Controls.Add(this.label1); this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.stackPanel1.Location = new System.Drawing.Point(0, 0); + this.stackPanel1.Location = new System.Drawing.Point(0, 74); this.stackPanel1.Name = "stackPanel1"; - this.stackPanel1.Size = new System.Drawing.Size(750, 527); + this.stackPanel1.Size = new System.Drawing.Size(750, 453); this.stackPanel1.TabIndex = 0; this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; @@ -72,7 +67,7 @@ this.windowBar4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.windowBar4.Icon = global::AntdUIDemo.Properties.Resources.logo; this.windowBar4.IsMax = false; - this.windowBar4.Location = new System.Drawing.Point(3, 331); + this.windowBar4.Location = new System.Drawing.Point(3, 237); this.windowBar4.Name = "windowBar4"; this.windowBar4.Size = new System.Drawing.Size(744, 32); this.windowBar4.TabIndex = 73; @@ -81,7 +76,7 @@ // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 301); + this.label6.Location = new System.Drawing.Point(3, 207); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(744, 24); this.label6.TabIndex = 72; @@ -92,7 +87,7 @@ this.windowBar3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.windowBar3.Icon = global::AntdUIDemo.Properties.Resources.logo; this.windowBar3.IsMax = false; - this.windowBar3.Location = new System.Drawing.Point(3, 263); + this.windowBar3.Location = new System.Drawing.Point(3, 169); this.windowBar3.MaximizeBox = false; this.windowBar3.MinimizeBox = false; this.windowBar3.Name = "windowBar3"; @@ -103,7 +98,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 233); + this.label5.Location = new System.Drawing.Point(3, 139); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(744, 24); this.label5.TabIndex = 70; @@ -115,7 +110,7 @@ this.windowBar2.Icon = global::AntdUIDemo.Properties.Resources.logo; this.windowBar2.IsMax = false; this.windowBar2.Loading = true; - this.windowBar2.Location = new System.Drawing.Point(3, 195); + this.windowBar2.Location = new System.Drawing.Point(3, 101); this.windowBar2.Name = "windowBar2"; this.windowBar2.Size = new System.Drawing.Size(744, 32); this.windowBar2.TabIndex = 69; @@ -124,7 +119,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 165); + this.label3.Location = new System.Drawing.Point(3, 71); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(744, 24); this.label3.TabIndex = 68; @@ -135,7 +130,7 @@ this.windowBar1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.windowBar1.Icon = global::AntdUIDemo.Properties.Resources.logo; this.windowBar1.IsMax = false; - this.windowBar1.Location = new System.Drawing.Point(3, 127); + this.windowBar1.Location = new System.Drawing.Point(3, 33); this.windowBar1.Name = "windowBar1"; this.windowBar1.Size = new System.Drawing.Size(744, 32); this.windowBar1.SubText = "Demo"; @@ -145,41 +140,30 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 97); + this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(744, 24); this.label4.TabIndex = 65; this.label4.Text = "基本用法"; // - // divider1 + // header1 // - this.divider1.Location = new System.Drawing.Point(3, 79); - this.divider1.Name = "divider1"; - this.divider1.Size = new System.Drawing.Size(744, 12); - this.divider1.TabIndex = 64; - // - // label2 - // - this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(3, 49); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(744, 24); - this.label2.TabIndex = 63; - this.label2.Text = "可自定义的窗口栏"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(744, 40); - this.label1.TabIndex = 62; - this.label1.Text = "WindowBar 窗口栏"; + this.header1.Description = "可自定义的窗口栏"; + this.header1.DividerShow = true; + this.header1.Dock = System.Windows.Forms.DockStyle.Top; + this.header1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.header1.Location = new System.Drawing.Point(0, 0); + this.header1.Name = "header1"; + this.header1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 10); + this.header1.Size = new System.Drawing.Size(750, 74); + this.header1.TabIndex = 27; + this.header1.Text = "WindowBar 窗口栏"; + this.header1.UseTitleFont = true; // // WindowBarDemo // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.header1); this.Name = "WindowBarDemo"; this.Size = new System.Drawing.Size(750, 527); this.stackPanel1.ResumeLayout(false); @@ -191,9 +175,6 @@ private AntdUI.StackPanel stackPanel1; private AntdUI.Label label4; - private AntdUI.Divider divider1; - private AntdUI.Label label2; - private AntdUI.Label label1; private AntdUI.WindowBar windowBar1; private AntdUI.Label label6; private AntdUI.WindowBar windowBar3; @@ -201,5 +182,6 @@ private AntdUI.WindowBar windowBar2; private AntdUI.Label label3; private AntdUI.WindowBar windowBar4; + private AntdUI.PageHeader header1; } }