diff --git a/MainWindow.Designer.cs b/MainWindow.Designer.cs index 7bb0e16..63302b9 100644 --- a/MainWindow.Designer.cs +++ b/MainWindow.Designer.cs @@ -36,9 +36,7 @@ this.divider = new AntdUI.Divider(); this.menu = new AntdUI.Menu(); this.panel_content = new AntdUI.StackPanel(); - this.label1 = new AntdUI.Label(); this.titlebar.SuspendLayout(); - this.panel_content.SuspendLayout(); this.SuspendLayout(); // // titlebar @@ -116,7 +114,6 @@ // panel_content // this.panel_content.AutoScroll = true; - this.panel_content.Controls.Add(this.label1); this.panel_content.Dock = System.Windows.Forms.DockStyle.Fill; this.panel_content.Location = new System.Drawing.Point(283, 52); this.panel_content.Name = "panel_content"; @@ -125,18 +122,6 @@ this.panel_content.Text = "stackPanel1"; this.panel_content.Vertical = true; // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Fill; - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 20F, 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(735, 505); - this.label1.TabIndex = 14; - this.label1.Text = "欢迎使用 AntdUI Demo"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.label1.TooltipConfig = null; - // // MainWindow // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -154,7 +139,6 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "AntdUI Demo"; this.titlebar.ResumeLayout(false); - this.panel_content.ResumeLayout(false); this.ResumeLayout(false); } @@ -168,6 +152,5 @@ private AntdUI.Button button_color; private AntdUI.Input input_search; private AntdUI.StackPanel panel_content; - private AntdUI.Label label1; } } \ No newline at end of file diff --git a/MainWindow.cs b/MainWindow.cs index cc9a010..bef128c 100644 --- a/MainWindow.cs +++ b/MainWindow.cs @@ -1,15 +1,12 @@ using AntdUI; -using Newtonsoft.Json.Linq; using AntdUIDemo.Controls; using AntdUIDemo.Models; using AntdUIDemo.Utils; using AntdUIDemo.Views; +using AntdUIDemo.Views.SubView; using Microsoft.Win32; using System; -using System.Configuration; -using System.Drawing; using System.Windows.Forms; -using System.IO; namespace AntdUIDemo { @@ -23,10 +20,19 @@ namespace AntdUIDemo LoadAppConfig(); //加载菜单 LoadMenu(); + //加载欢迎页 + InitData(); //绑定事件 BindEventHandler(); } + private void InitData() + { + var control = new Wellcome(); + AutoDpi(control); + panel_content.Controls.Add(control); + } + private void BindEventHandler() { buttonSZ.Click += ButtonSZ_Click; diff --git a/Program.cs b/Program.cs index fc2e322..bdfd949 100644 --- a/Program.cs +++ b/Program.cs @@ -1,8 +1,5 @@ using AntdUIDemo.Utils; using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; namespace AntdUIDemo diff --git a/Utils/AppSetting.cs b/Utils/AppSetting.cs index 5eac4fe..ef89561 100644 --- a/Utils/AppSetting.cs +++ b/Utils/AppSetting.cs @@ -1,11 +1,5 @@ using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Configuration; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AntdUIDemo.Utils { diff --git a/Utils/LoggerHelper.cs b/Utils/LoggerHelper.cs index 980b136..e5de7f0 100644 --- a/Utils/LoggerHelper.cs +++ b/Utils/LoggerHelper.cs @@ -1,9 +1,4 @@ using NLog; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace AntdUIDemo.Utils { diff --git a/Utils/ThemeHelper.cs b/Utils/ThemeHelper.cs index 4d3afd8..f9f6f52 100644 --- a/Utils/ThemeHelper.cs +++ b/Utils/ThemeHelper.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; +using Microsoft.Win32; using System.Drawing; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; -using Microsoft.Win32; namespace AntdUIDemo.Utils { diff --git a/Views/AlertDemo.cs b/Views/AlertDemo.cs index 541f1c8..b054c6f 100644 --- a/Views/AlertDemo.cs +++ b/Views/AlertDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/AvatarDemo.cs b/Views/AvatarDemo.cs index c156047..387978b 100644 --- a/Views/AvatarDemo.cs +++ b/Views/AvatarDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/BadgeDemo.cs b/Views/BadgeDemo.cs index a3e58b3..742050e 100644 --- a/Views/BadgeDemo.cs +++ b/Views/BadgeDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/BatteryDemo.cs b/Views/BatteryDemo.cs index 116efa4..76117ab 100644 --- a/Views/BatteryDemo.cs +++ b/Views/BatteryDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/BreadcrumbDemo.cs b/Views/BreadcrumbDemo.cs index 80e0250..087d933 100644 --- a/Views/BreadcrumbDemo.cs +++ b/Views/BreadcrumbDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/CalendarDemo.Designer.cs b/Views/CalendarDemo.Designer.cs index 3a44255..129c195 100644 --- a/Views/CalendarDemo.Designer.cs +++ b/Views/CalendarDemo.Designer.cs @@ -29,16 +29,16 @@ private void InitializeComponent() { this.stackPanel1 = new AntdUI.StackPanel(); + this.calendar = new AntdUI.Calendar(); + this.flowPanel1 = new AntdUI.FlowPanel(); + this.switch_showchinese = new AntdUI.Switch(); + this.label4 = new AntdUI.Label(); + 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.flowPanel1 = new AntdUI.FlowPanel(); - this.calendar = new AntdUI.Calendar(); - this.switch_showtoday = new AntdUI.Switch(); - this.label6 = new AntdUI.Label(); - this.switch_showchinese = new AntdUI.Switch(); - this.label4 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,70 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // + // calendar + // + 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.Name = "calendar"; + this.calendar.ShowChinese = true; + this.calendar.Size = new System.Drawing.Size(694, 376); + this.calendar.TabIndex = 26; + this.calendar.Text = "calendar1"; + this.calendar.Value = new System.DateTime(2024, 8, 30, 8, 41, 9, 706); + // + // flowPanel1 + // + this.flowPanel1.Controls.Add(this.switch_showchinese); + 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.Name = "flowPanel1"; + this.flowPanel1.Size = new System.Drawing.Size(694, 32); + this.flowPanel1.TabIndex = 25; + this.flowPanel1.Text = "flowPanel1"; + // + // switch_showchinese + // + this.switch_showchinese.AutoCheck = true; + this.switch_showchinese.Checked = true; + this.switch_showchinese.Location = new System.Drawing.Point(381, 3); + this.switch_showchinese.Name = "switch_showchinese"; + this.switch_showchinese.Size = new System.Drawing.Size(50, 26); + this.switch_showchinese.TabIndex = 13; + this.switch_showchinese.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(220, 3); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(155, 26); + this.label4.TabIndex = 12; + this.label4.Text = "ShowChinese"; + this.label4.TooltipConfig = null; + // + // switch_showtoday + // + this.switch_showtoday.AutoCheck = true; + this.switch_showtoday.Checked = true; + this.switch_showtoday.Location = new System.Drawing.Point(164, 3); + this.switch_showtoday.Name = "switch_showtoday"; + this.switch_showtoday.Size = new System.Drawing.Size(50, 26); + this.switch_showtoday.TabIndex = 11; + this.switch_showtoday.Text = "switch1"; + // + // 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(155, 26); + this.label6.TabIndex = 10; + this.label6.Text = "ShowButtonToday"; + this.label6.TooltipConfig = null; + // // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -67,6 +131,7 @@ this.label3.Size = new System.Drawing.Size(694, 24); this.label3.TabIndex = 23; this.label3.Text = "基本用法"; + this.label3.TooltipConfig = null; // // divider1 // @@ -83,6 +148,7 @@ this.label2.Size = new System.Drawing.Size(694, 24); this.label2.TabIndex = 21; this.label2.Text = "按照日历形式展示数据的容器。"; + this.label2.TooltipConfig = null; // // label1 // @@ -92,68 +158,7 @@ this.label1.Size = new System.Drawing.Size(694, 40); this.label1.TabIndex = 20; this.label1.Text = "Calendar 日历"; - // - // flowPanel1 - // - this.flowPanel1.Controls.Add(this.switch_showchinese); - 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.Name = "flowPanel1"; - this.flowPanel1.Size = new System.Drawing.Size(694, 38); - this.flowPanel1.TabIndex = 25; - this.flowPanel1.Text = "flowPanel1"; - // - // calendar - // - this.calendar.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.calendar.Full = true; - this.calendar.Location = new System.Drawing.Point(3, 171); - this.calendar.Name = "calendar"; - this.calendar.ShowChinese = true; - this.calendar.Size = new System.Drawing.Size(694, 376); - this.calendar.TabIndex = 26; - this.calendar.Text = "calendar1"; - this.calendar.Value = new System.DateTime(2024, 8, 30, 8, 41, 9, 706); - // - // switch_showtoday - // - this.switch_showtoday.AutoCheck = true; - this.switch_showtoday.Checked = true; - this.switch_showtoday.Location = new System.Drawing.Point(164, 3); - this.switch_showtoday.Name = "switch_showtoday"; - this.switch_showtoday.Size = new System.Drawing.Size(60, 32); - this.switch_showtoday.TabIndex = 11; - this.switch_showtoday.Text = "switch1"; - // - // 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(155, 32); - this.label6.TabIndex = 10; - this.label6.Text = "ShowButtonToday"; - // - // switch_showchinese - // - this.switch_showchinese.AutoCheck = true; - this.switch_showchinese.Checked = true; - this.switch_showchinese.Location = new System.Drawing.Point(391, 3); - this.switch_showchinese.Name = "switch_showchinese"; - this.switch_showchinese.Size = new System.Drawing.Size(60, 32); - this.switch_showchinese.TabIndex = 13; - this.switch_showchinese.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(230, 3); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(155, 32); - this.label4.TabIndex = 12; - this.label4.Text = "ShowChinese"; + this.label1.TooltipConfig = null; // // CalendarDemo // diff --git a/Views/CalendarDemo.cs b/Views/CalendarDemo.cs index 99ba7fb..6eb9186 100644 --- a/Views/CalendarDemo.cs +++ b/Views/CalendarDemo.cs @@ -1,5 +1,4 @@ using AntdUI; -using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; diff --git a/Views/CarouselDemo.cs b/Views/CarouselDemo.cs index 10d7cb3..218d947 100644 --- a/Views/CarouselDemo.cs +++ b/Views/CarouselDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/ChatListDemo.cs b/Views/ChatListDemo.cs index 1e8c6bc..6661815 100644 --- a/Views/ChatListDemo.cs +++ b/Views/ChatListDemo.cs @@ -1,10 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; diff --git a/Views/CheckBoxDemo.cs b/Views/CheckBoxDemo.cs index 693bf3b..d937150 100644 --- a/Views/CheckBoxDemo.cs +++ b/Views/CheckBoxDemo.cs @@ -1,13 +1,4 @@ -using AntdUI; -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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/CollapseDemo.cs b/Views/CollapseDemo.cs index f16d206..9a13d2b 100644 --- a/Views/CollapseDemo.cs +++ b/Views/CollapseDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/ColorPickerDemo.cs b/Views/ColorPickerDemo.cs index 5f0fcda..3b6a77b 100644 --- a/Views/ColorPickerDemo.cs +++ b/Views/ColorPickerDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/ContextMenuStripDemo.cs b/Views/ContextMenuStripDemo.cs index adfafc5..2cb68b3 100644 --- a/Views/ContextMenuStripDemo.cs +++ b/Views/ContextMenuStripDemo.cs @@ -1,12 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Diagnostics; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AntdUIDemo.Views diff --git a/Views/DatePickerDemo.cs b/Views/DatePickerDemo.cs index 298e44e..9d4ad17 100644 --- a/Views/DatePickerDemo.cs +++ b/Views/DatePickerDemo.cs @@ -1,11 +1,6 @@ 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 diff --git a/Views/DatePickerRangeDemo.cs b/Views/DatePickerRangeDemo.cs index b2a4ab7..0cc4588 100644 --- a/Views/DatePickerRangeDemo.cs +++ b/Views/DatePickerRangeDemo.cs @@ -1,12 +1,5 @@ using AntdUI; 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 diff --git a/Views/DividerDemo.cs b/Views/DividerDemo.cs index 0e92c75..2b2dda2 100644 --- a/Views/DividerDemo.cs +++ b/Views/DividerDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/DrawerDemo.Designer.cs b/Views/DrawerDemo.Designer.cs index 6858749..af1c2df 100644 --- a/Views/DrawerDemo.Designer.cs +++ b/Views/DrawerDemo.Designer.cs @@ -29,23 +29,23 @@ private void InitializeComponent() { this.stackPanel1 = new AntdUI.StackPanel(); + this.stackPanel3 = new AntdUI.StackPanel(); + this.select_align = new AntdUI.Select(); + this.label10 = new AntdUI.Label(); + this.label4 = new AntdUI.Label(); + this.flowPanel1 = new AntdUI.FlowPanel(); 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.button = new AntdUI.Button(); - this.label4 = new AntdUI.Label(); - this.stackPanel3 = new AntdUI.StackPanel(); - this.select_align = new AntdUI.Select(); - this.label10 = new AntdUI.Label(); this.switch_mask = new AntdUI.Switch(); this.label5 = new AntdUI.Label(); this.switch_mc = new AntdUI.Switch(); this.label6 = new AntdUI.Label(); + this.button = new AntdUI.Button(); this.stackPanel1.SuspendLayout(); - this.flowPanel1.SuspendLayout(); this.stackPanel3.SuspendLayout(); + this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -65,6 +65,60 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // + // stackPanel3 + // + this.stackPanel3.Controls.Add(this.switch_mc); + this.stackPanel3.Controls.Add(this.label6); + this.stackPanel3.Controls.Add(this.switch_mask); + this.stackPanel3.Controls.Add(this.label5); + 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.Name = "stackPanel3"; + this.stackPanel3.Size = new System.Drawing.Size(694, 32); + this.stackPanel3.TabIndex = 32; + this.stackPanel3.Text = "stackPanel3"; + // + // select_align + // + this.select_align.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.select_align.List = true; + this.select_align.Location = new System.Drawing.Point(88, 3); + this.select_align.Name = "select_align"; + this.select_align.Size = new System.Drawing.Size(90, 26); + this.select_align.TabIndex = 5; + this.select_align.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(75, 26); + this.label10.TabIndex = 4; + this.label10.Text = "Align"; + this.label10.TooltipConfig = null; + // + // label4 + // + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(694, 24); + this.label4.TabIndex = 31; + this.label4.Text = "控件配置"; + this.label4.TooltipConfig = null; + // + // flowPanel1 + // + this.flowPanel1.Controls.Add(this.button); + this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Name = "flowPanel1"; + this.flowPanel1.Size = new System.Drawing.Size(694, 38); + this.flowPanel1.TabIndex = 29; + this.flowPanel1.Text = "flowPanel1"; + // // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -73,6 +127,7 @@ this.label3.Size = new System.Drawing.Size(694, 24); this.label3.TabIndex = 28; this.label3.Text = "基本用法"; + this.label3.TooltipConfig = null; // // divider1 // @@ -89,6 +144,7 @@ this.label2.Size = new System.Drawing.Size(694, 24); this.label2.TabIndex = 26; this.label2.Text = "屏幕边缘滑出的浮层面板。"; + this.label2.TooltipConfig = null; // // label1 // @@ -98,15 +154,45 @@ this.label1.Size = new System.Drawing.Size(694, 40); this.label1.TabIndex = 25; this.label1.Text = "Drawer 抽屉"; + this.label1.TooltipConfig = null; // - // flowPanel1 + // switch_mask // - this.flowPanel1.Controls.Add(this.button); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); - this.flowPanel1.Name = "flowPanel1"; - this.flowPanel1.Size = new System.Drawing.Size(694, 38); - this.flowPanel1.TabIndex = 29; - this.flowPanel1.Text = "flowPanel1"; + this.switch_mask.AutoCheck = true; + this.switch_mask.Location = new System.Drawing.Point(273, 3); + this.switch_mask.Name = "switch_mask"; + this.switch_mask.Size = new System.Drawing.Size(50, 26); + this.switch_mask.TabIndex = 11; + this.switch_mask.Text = "switch1"; + // + // 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(188, 3); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(75, 26); + this.label5.TabIndex = 10; + this.label5.Text = "Mask"; + this.label5.TooltipConfig = null; + // + // switch_mc + // + this.switch_mc.AutoCheck = true; + this.switch_mc.Location = new System.Drawing.Point(463, 3); + this.switch_mc.Name = "switch_mc"; + this.switch_mc.Size = new System.Drawing.Size(50, 26); + this.switch_mc.TabIndex = 13; + this.switch_mc.Text = "switch1"; + // + // 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(333, 3); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(120, 26); + this.label6.TabIndex = 12; + this.label6.Text = "MaskClosable"; + this.label6.TooltipConfig = null; // // button // @@ -119,85 +205,6 @@ this.button.Type = AntdUI.TTypeMini.Primary; this.button.WaveSize = 0; // - // label4 - // - this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label4.Location = new System.Drawing.Point(3, 171); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(694, 24); - this.label4.TabIndex = 31; - this.label4.Text = "控件配置"; - // - // stackPanel3 - // - this.stackPanel3.Controls.Add(this.switch_mc); - this.stackPanel3.Controls.Add(this.label6); - this.stackPanel3.Controls.Add(this.switch_mask); - this.stackPanel3.Controls.Add(this.label5); - this.stackPanel3.Controls.Add(this.select_align); - this.stackPanel3.Controls.Add(this.label10); - this.stackPanel3.Gap = 6; - this.stackPanel3.Location = new System.Drawing.Point(3, 201); - this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(694, 38); - this.stackPanel3.TabIndex = 32; - this.stackPanel3.Text = "stackPanel3"; - // - // select_align - // - this.select_align.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.select_align.List = true; - this.select_align.Location = new System.Drawing.Point(135, 3); - this.select_align.Name = "select_align"; - this.select_align.Size = new System.Drawing.Size(75, 32); - this.select_align.TabIndex = 5; - this.select_align.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(120, 32); - this.label10.TabIndex = 4; - this.label10.Text = "Align"; - // - // switch_mask - // - this.switch_mask.AutoCheck = true; - this.switch_mask.Location = new System.Drawing.Point(354, 3); - this.switch_mask.Name = "switch_mask"; - this.switch_mask.Size = new System.Drawing.Size(60, 32); - this.switch_mask.TabIndex = 7; - this.switch_mask.Text = "switch1"; - // - // 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(222, 3); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(120, 32); - this.label5.TabIndex = 6; - this.label5.Text = "Mask"; - // - // switch_mc - // - this.switch_mc.AutoCheck = true; - this.switch_mc.Location = new System.Drawing.Point(558, 3); - this.switch_mc.Name = "switch_mc"; - this.switch_mc.Size = new System.Drawing.Size(60, 32); - this.switch_mc.TabIndex = 9; - this.switch_mc.Text = "switch1"; - // - // 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(426, 3); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(120, 32); - this.label6.TabIndex = 8; - this.label6.Text = "MaskClosable"; - // // DrawerDemo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -205,8 +212,8 @@ this.Name = "DrawerDemo"; this.Size = new System.Drawing.Size(700, 327); this.stackPanel1.ResumeLayout(false); - this.flowPanel1.ResumeLayout(false); this.stackPanel3.ResumeLayout(false); + this.flowPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -219,14 +226,14 @@ private AntdUI.Label label2; private AntdUI.Label label1; private AntdUI.FlowPanel flowPanel1; - private AntdUI.Button button; private AntdUI.Label label4; private AntdUI.StackPanel stackPanel3; private AntdUI.Select select_align; private AntdUI.Label label10; - private AntdUI.Switch switch_mask; - private AntdUI.Label label5; private AntdUI.Switch switch_mc; private AntdUI.Label label6; + private AntdUI.Switch switch_mask; + private AntdUI.Label label5; + private AntdUI.Button button; } } diff --git a/Views/DrawerDemo.cs b/Views/DrawerDemo.cs index d66f2ea..a696c55 100644 --- a/Views/DrawerDemo.cs +++ b/Views/DrawerDemo.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; +using AntdUI; +using System; using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using AntdUI; namespace AntdUIDemo.Views { diff --git a/Views/DropDownDemo.cs b/Views/DropDownDemo.cs index 7a02f5d..13257d3 100644 --- a/Views/DropDownDemo.cs +++ b/Views/DropDownDemo.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; +using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace AntdUIDemo.Views diff --git a/Views/FloatButtonDemo.Designer.cs b/Views/FloatButtonDemo.Designer.cs index 719c5bc..0a6e6f2 100644 --- a/Views/FloatButtonDemo.Designer.cs +++ b/Views/FloatButtonDemo.Designer.cs @@ -29,28 +29,6 @@ private void InitializeComponent() { this.stackPanel1 = new AntdUI.StackPanel(); - this.stackPanel4 = new AntdUI.StackPanel(); - this.input_my = new AntdUI.InputNumber(); - this.label8 = new AntdUI.Label(); - this.input_mx = new AntdUI.InputNumber(); - this.label7 = new AntdUI.Label(); - this.input_size = new AntdUI.InputNumber(); - this.label9 = new AntdUI.Label(); - this.stackPanel3 = new AntdUI.StackPanel(); - this.select_vertical = new AntdUI.Select(); - this.label5 = new AntdUI.Label(); - this.select_topmost = new AntdUI.Select(); - this.label6 = new AntdUI.Label(); - 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.stackPanel7 = new AntdUI.StackPanel(); - this.input_gap = new AntdUI.InputNumber(); - this.label20 = new AntdUI.Label(); this.stackPanel2 = new AntdUI.StackPanel(); this.buttonCZ = new AntdUI.Button(); this.buttonClose = new AntdUI.Button(); @@ -62,20 +40,42 @@ this.input_badge = new AntdUI.Input(); this.label17 = new AntdUI.Label(); this.stackPanel5 = new AntdUI.StackPanel(); + this.label11 = new AntdUI.Label(); + this.stackPanel7 = new AntdUI.StackPanel(); + this.input_gap = new AntdUI.InputNumber(); + this.label20 = new AntdUI.Label(); + this.stackPanel4 = new AntdUI.StackPanel(); + this.input_my = new AntdUI.InputNumber(); + this.label8 = new AntdUI.Label(); + this.input_size = new AntdUI.InputNumber(); + this.label9 = new AntdUI.Label(); + this.stackPanel3 = new AntdUI.StackPanel(); + 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.input_radius = new AntdUI.InputNumber(); this.label12 = new AntdUI.Label(); + this.switch_topmost = new AntdUI.Switch(); + this.label6 = new AntdUI.Label(); + this.input_mx = new AntdUI.InputNumber(); + this.label7 = new AntdUI.Label(); + this.switch_vertical = new AntdUI.Switch(); + this.label5 = new AntdUI.Label(); this.select_type = new AntdUI.Select(); this.label13 = new AntdUI.Label(); - this.select_round = new AntdUI.Select(); + this.switch_round = new AntdUI.Switch(); this.label14 = new AntdUI.Label(); - this.label11 = new AntdUI.Label(); this.stackPanel1.SuspendLayout(); - this.stackPanel4.SuspendLayout(); - this.stackPanel3.SuspendLayout(); - this.stackPanel7.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel6.SuspendLayout(); this.stackPanel5.SuspendLayout(); + this.stackPanel7.SuspendLayout(); + this.stackPanel4.SuspendLayout(); + this.stackPanel3.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -100,271 +100,6 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // - // stackPanel4 - // - this.stackPanel4.Controls.Add(this.input_my); - this.stackPanel4.Controls.Add(this.label8); - this.stackPanel4.Controls.Add(this.input_mx); - this.stackPanel4.Controls.Add(this.label7); - this.stackPanel4.Controls.Add(this.input_size); - this.stackPanel4.Controls.Add(this.label9); - this.stackPanel4.Location = new System.Drawing.Point(3, 195); - this.stackPanel4.Name = "stackPanel4"; - this.stackPanel4.Size = new System.Drawing.Size(694, 32); - this.stackPanel4.TabIndex = 17; - this.stackPanel4.Text = "stackPanel4"; - // - // input_my - // - this.input_my.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_my.Location = new System.Drawing.Point(459, 3); - this.input_my.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_my.Name = "input_my"; - this.input_my.Size = new System.Drawing.Size(100, 26); - this.input_my.TabIndex = 9; - this.input_my.Text = "24"; - this.input_my.Value = new decimal(new int[] { - 24, - 0, - 0, - 0}); - this.input_my.WaveSize = 0; - // - // 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(361, 3); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(92, 26); - this.label8.TabIndex = 8; - this.label8.Text = "MarginY"; - // - // input_mx - // - this.input_mx.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_mx.Location = new System.Drawing.Point(280, 3); - this.input_mx.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_mx.Name = "input_mx"; - this.input_mx.Size = new System.Drawing.Size(75, 26); - this.input_mx.TabIndex = 7; - this.input_mx.Text = "24"; - this.input_mx.Value = new decimal(new int[] { - 24, - 0, - 0, - 0}); - this.input_mx.WaveSize = 0; - // - // 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(182, 3); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(92, 26); - this.label7.TabIndex = 6; - this.label7.Text = "MarginX"; - // - // input_size - // - this.input_size.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_size.Location = new System.Drawing.Point(101, 3); - this.input_size.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_size.Name = "input_size"; - this.input_size.Size = new System.Drawing.Size(75, 26); - this.input_size.TabIndex = 5; - this.input_size.Text = "40"; - this.input_size.Value = new decimal(new int[] { - 40, - 0, - 0, - 0}); - this.input_size.WaveSize = 0; - // - // 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(92, 26); - this.label9.TabIndex = 4; - this.label9.Text = "Size"; - // - // stackPanel3 - // - this.stackPanel3.Controls.Add(this.select_vertical); - this.stackPanel3.Controls.Add(this.label5); - this.stackPanel3.Controls.Add(this.select_topmost); - this.stackPanel3.Controls.Add(this.label6); - this.stackPanel3.Controls.Add(this.select_align); - this.stackPanel3.Controls.Add(this.label10); - this.stackPanel3.Location = new System.Drawing.Point(3, 157); - this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(694, 32); - this.stackPanel3.TabIndex = 16; - this.stackPanel3.Text = "stackPanel3"; - // - // select_vertical - // - this.select_vertical.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_vertical.Items.AddRange(new object[] { - "True", - "False"}); - this.select_vertical.List = true; - this.select_vertical.Location = new System.Drawing.Point(459, 3); - this.select_vertical.Name = "select_vertical"; - this.select_vertical.SelectedIndex = 0; - this.select_vertical.SelectedValue = "True"; - this.select_vertical.Size = new System.Drawing.Size(100, 26); - this.select_vertical.TabIndex = 11; - this.select_vertical.Text = "True"; - this.select_vertical.WaveSize = 0; - // - // 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(361, 3); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(92, 26); - this.label5.TabIndex = 10; - this.label5.Text = "Vertical"; - // - // select_topmost - // - this.select_topmost.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_topmost.Items.AddRange(new object[] { - "True", - "False"}); - this.select_topmost.List = true; - this.select_topmost.Location = new System.Drawing.Point(280, 3); - this.select_topmost.Name = "select_topmost"; - this.select_topmost.SelectedValue = "是"; - this.select_topmost.Size = new System.Drawing.Size(75, 26); - this.select_topmost.TabIndex = 9; - this.select_topmost.Text = "True"; - this.select_topmost.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(182, 3); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(92, 26); - this.label6.TabIndex = 8; - this.label6.Text = "TopMost"; - // - // select_align - // - this.select_align.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.select_align.List = true; - this.select_align.Location = new System.Drawing.Point(101, 3); - this.select_align.Name = "select_align"; - this.select_align.Size = new System.Drawing.Size(75, 26); - this.select_align.TabIndex = 5; - this.select_align.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(92, 26); - this.label10.TabIndex = 4; - this.label10.Text = "Align"; - // - // label4 - // - this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label4.Location = new System.Drawing.Point(3, 127); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(694, 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(694, 12); - this.divider1.TabIndex = 13; - // - // label3 - // - this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.label3.Location = new System.Drawing.Point(3, 79); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(694, 24); - 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(694, 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(694, 40); - this.label1.TabIndex = 2; - this.label1.Text = "FloatButton 悬浮按钮"; - // - // stackPanel7 - // - this.stackPanel7.Controls.Add(this.input_gap); - this.stackPanel7.Controls.Add(this.label20); - this.stackPanel7.Location = new System.Drawing.Point(3, 233); - this.stackPanel7.Name = "stackPanel7"; - this.stackPanel7.Size = new System.Drawing.Size(694, 32); - this.stackPanel7.TabIndex = 22; - this.stackPanel7.Text = "stackPanel7"; - // - // input_gap - // - this.input_gap.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_gap.Location = new System.Drawing.Point(101, 3); - this.input_gap.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_gap.Name = "input_gap"; - this.input_gap.Size = new System.Drawing.Size(75, 26); - this.input_gap.TabIndex = 5; - this.input_gap.Text = "40"; - this.input_gap.Value = new decimal(new int[] { - 40, - 0, - 0, - 0}); - this.input_gap.WaveSize = 0; - // - // label20 - // - this.label20.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(3, 3); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(92, 26); - this.label20.TabIndex = 4; - this.label20.Text = "Gap"; - // // stackPanel2 // this.stackPanel2.Controls.Add(this.buttonCZ); @@ -405,6 +140,7 @@ this.stackPanel6.Controls.Add(this.label15); 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.Name = "stackPanel6"; this.stackPanel6.Size = new System.Drawing.Size(694, 32); @@ -414,7 +150,7 @@ // colorPicker // this.colorPicker.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.colorPicker.Location = new System.Drawing.Point(459, 3); + this.colorPicker.Location = new System.Drawing.Point(492, 3); this.colorPicker.Name = "colorPicker"; this.colorPicker.ShowText = true; this.colorPicker.Size = new System.Drawing.Size(100, 26); @@ -426,24 +162,25 @@ // 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(361, 3); + this.label16.Location = new System.Drawing.Point(390, 3); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(92, 26); this.label16.TabIndex = 14; this.label16.Text = "BadgeBack"; + this.label16.TooltipConfig = null; // // input_badgesize // this.input_badgesize.DecimalPlaces = 2; this.input_badgesize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_badgesize.Location = new System.Drawing.Point(280, 3); + this.input_badgesize.Location = new System.Drawing.Point(292, 3); this.input_badgesize.Minimum = new decimal(new int[] { 0, 0, 0, 0}); this.input_badgesize.Name = "input_badgesize"; - this.input_badgesize.Size = new System.Drawing.Size(75, 26); + this.input_badgesize.Size = new System.Drawing.Size(88, 26); this.input_badgesize.TabIndex = 13; this.input_badgesize.Text = "6.00"; this.input_badgesize.Value = new decimal(new int[] { @@ -456,16 +193,17 @@ // 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(182, 3); + this.label15.Location = new System.Drawing.Point(190, 3); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(92, 26); this.label15.TabIndex = 12; this.label15.Text = "BadgeSize"; + this.label15.TooltipConfig = null; // // input_badge // this.input_badge.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_badge.Location = new System.Drawing.Point(101, 3); + this.input_badge.Location = new System.Drawing.Point(105, 3); this.input_badge.Name = "input_badge"; this.input_badge.Size = new System.Drawing.Size(75, 26); this.input_badge.TabIndex = 5; @@ -479,33 +217,243 @@ this.label17.Size = new System.Drawing.Size(92, 26); this.label17.TabIndex = 4; this.label17.Text = "Badge"; + this.label17.TooltipConfig = null; // // stackPanel5 // - this.stackPanel5.Controls.Add(this.input_radius); - this.stackPanel5.Controls.Add(this.label12); + this.stackPanel5.Controls.Add(this.switch_round); + this.stackPanel5.Controls.Add(this.label14); this.stackPanel5.Controls.Add(this.select_type); this.stackPanel5.Controls.Add(this.label13); - this.stackPanel5.Controls.Add(this.select_round); - this.stackPanel5.Controls.Add(this.label14); + 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.Name = "stackPanel5"; this.stackPanel5.Size = new System.Drawing.Size(694, 32); this.stackPanel5.TabIndex = 24; this.stackPanel5.Text = "stackPanel5"; // + // label11 + // + this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.label11.Location = new System.Drawing.Point(3, 271); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(694, 24); + this.label11.TabIndex = 23; + this.label11.Text = "按钮配置"; + this.label11.TooltipConfig = null; + // + // stackPanel7 + // + 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.Name = "stackPanel7"; + this.stackPanel7.Size = new System.Drawing.Size(694, 32); + this.stackPanel7.TabIndex = 22; + this.stackPanel7.Text = "stackPanel7"; + // + // input_gap + // + this.input_gap.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_gap.Location = new System.Drawing.Point(105, 3); + this.input_gap.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_gap.Name = "input_gap"; + this.input_gap.Size = new System.Drawing.Size(75, 26); + this.input_gap.TabIndex = 5; + this.input_gap.Text = "40"; + this.input_gap.Value = new decimal(new int[] { + 40, + 0, + 0, + 0}); + this.input_gap.WaveSize = 0; + // + // label20 + // + this.label20.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label20.Location = new System.Drawing.Point(3, 3); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(92, 26); + this.label20.TabIndex = 4; + this.label20.Text = "Gap"; + this.label20.TooltipConfig = null; + // + // stackPanel4 + // + this.stackPanel4.Controls.Add(this.switch_topmost); + this.stackPanel4.Controls.Add(this.label6); + this.stackPanel4.Controls.Add(this.input_my); + this.stackPanel4.Controls.Add(this.label8); + 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.Name = "stackPanel4"; + this.stackPanel4.Size = new System.Drawing.Size(694, 32); + this.stackPanel4.TabIndex = 17; + this.stackPanel4.Text = "stackPanel4"; + // + // input_my + // + this.input_my.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_my.Location = new System.Drawing.Point(292, 3); + this.input_my.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_my.Name = "input_my"; + this.input_my.Size = new System.Drawing.Size(88, 26); + this.input_my.TabIndex = 9; + this.input_my.Text = "24"; + this.input_my.Value = new decimal(new int[] { + 24, + 0, + 0, + 0}); + this.input_my.WaveSize = 0; + // + // 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(190, 3); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(92, 26); + this.label8.TabIndex = 8; + this.label8.Text = "MarginY"; + this.label8.TooltipConfig = null; + // + // input_size + // + this.input_size.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_size.Location = new System.Drawing.Point(105, 3); + this.input_size.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_size.Name = "input_size"; + this.input_size.Size = new System.Drawing.Size(75, 26); + this.input_size.TabIndex = 5; + this.input_size.Text = "40"; + this.input_size.Value = new decimal(new int[] { + 40, + 0, + 0, + 0}); + this.input_size.WaveSize = 0; + // + // 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(92, 26); + this.label9.TabIndex = 4; + this.label9.Text = "Size"; + this.label9.TooltipConfig = null; + // + // stackPanel3 + // + this.stackPanel3.Controls.Add(this.switch_vertical); + this.stackPanel3.Controls.Add(this.label5); + this.stackPanel3.Controls.Add(this.input_mx); + this.stackPanel3.Controls.Add(this.label7); + 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.Name = "stackPanel3"; + this.stackPanel3.Size = new System.Drawing.Size(694, 32); + this.stackPanel3.TabIndex = 16; + this.stackPanel3.Text = "stackPanel3"; + // + // select_align + // + this.select_align.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.select_align.List = true; + this.select_align.Location = new System.Drawing.Point(105, 3); + this.select_align.Name = "select_align"; + this.select_align.Size = new System.Drawing.Size(75, 26); + this.select_align.TabIndex = 5; + this.select_align.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(92, 26); + this.label10.TabIndex = 4; + this.label10.Text = "Align"; + this.label10.TooltipConfig = null; + // + // label4 + // + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.label4.Location = new System.Drawing.Point(3, 127); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(694, 24); + this.label4.TabIndex = 15; + this.label4.Text = "控件配置"; + this.label4.TooltipConfig = null; + // + // divider1 + // + this.divider1.Location = new System.Drawing.Point(3, 109); + this.divider1.Name = "divider1"; + this.divider1.Size = new System.Drawing.Size(694, 12); + this.divider1.TabIndex = 13; + // + // label3 + // + this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.label3.Location = new System.Drawing.Point(3, 79); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(694, 24); + this.label3.TabIndex = 4; + this.label3.Text = "FloatButton没有工具箱控件，使用代码方式调用。"; + this.label3.TooltipConfig = null; + // + // 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 = 3; + 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(694, 40); + this.label1.TabIndex = 2; + this.label1.Text = "FloatButton 悬浮按钮"; + this.label1.TooltipConfig = null; + // // input_radius // this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_radius.Location = new System.Drawing.Point(459, 3); + this.input_radius.Location = new System.Drawing.Point(105, 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 = 11; + this.input_radius.Size = new System.Drawing.Size(75, 26); + this.input_radius.TabIndex = 18; this.input_radius.Text = "6"; this.input_radius.Value = new decimal(new int[] { 6, @@ -517,64 +465,121 @@ // 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(361, 3); + this.label12.Location = new System.Drawing.Point(3, 3); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(92, 26); - this.label12.TabIndex = 10; + this.label12.TabIndex = 17; this.label12.Text = "Radius"; + this.label12.TooltipConfig = null; + // + // switch_topmost + // + this.switch_topmost.AutoCheck = true; + this.switch_topmost.Checked = true; + this.switch_topmost.Location = new System.Drawing.Point(492, 3); + this.switch_topmost.Name = "switch_topmost"; + this.switch_topmost.Size = new System.Drawing.Size(50, 26); + this.switch_topmost.TabIndex = 15; + this.switch_topmost.Text = "switch1"; + // + // 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(390, 3); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(92, 26); + this.label6.TabIndex = 14; + this.label6.Text = "TopMost"; + this.label6.TooltipConfig = null; + // + // input_mx + // + this.input_mx.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_mx.Location = new System.Drawing.Point(292, 3); + this.input_mx.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_mx.Name = "input_mx"; + this.input_mx.Size = new System.Drawing.Size(88, 26); + this.input_mx.TabIndex = 17; + this.input_mx.Text = "24"; + this.input_mx.Value = new decimal(new int[] { + 24, + 0, + 0, + 0}); + this.input_mx.WaveSize = 0; + // + // 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(190, 3); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(92, 26); + this.label7.TabIndex = 16; + this.label7.Text = "MarginX"; + this.label7.TooltipConfig = null; + // + // switch_vertical + // + this.switch_vertical.AutoCheck = true; + this.switch_vertical.Checked = true; + this.switch_vertical.Location = new System.Drawing.Point(492, 3); + this.switch_vertical.Name = "switch_vertical"; + this.switch_vertical.Size = new System.Drawing.Size(50, 26); + this.switch_vertical.TabIndex = 19; + this.switch_vertical.Text = "switch1"; + // + // 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(390, 3); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(92, 26); + this.label5.TabIndex = 18; + this.label5.Text = "Vertical"; + this.label5.TooltipConfig = null; // // select_type // this.select_type.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.select_type.List = true; - this.select_type.Location = new System.Drawing.Point(280, 3); + this.select_type.Location = new System.Drawing.Point(292, 3); this.select_type.Name = "select_type"; - this.select_type.Size = new System.Drawing.Size(75, 26); - this.select_type.TabIndex = 9; + this.select_type.Size = new System.Drawing.Size(88, 26); + this.select_type.TabIndex = 22; this.select_type.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(182, 3); + this.label13.Location = new System.Drawing.Point(190, 3); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(92, 26); - this.label13.TabIndex = 8; + this.label13.TabIndex = 21; this.label13.Text = "Type"; + this.label13.TooltipConfig = null; // - // select_round + // switch_round // - this.select_round.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.select_round.Items.AddRange(new object[] { - "True", - "False"}); - this.select_round.List = true; - this.select_round.Location = new System.Drawing.Point(101, 3); - this.select_round.Name = "select_round"; - this.select_round.SelectedIndex = 1; - this.select_round.SelectedValue = "False"; - this.select_round.Size = new System.Drawing.Size(75, 26); - this.select_round.TabIndex = 5; - this.select_round.Text = "False"; - this.select_round.WaveSize = 0; + this.switch_round.AutoCheck = true; + this.switch_round.Location = new System.Drawing.Point(492, 3); + this.switch_round.Name = "switch_round"; + this.switch_round.Size = new System.Drawing.Size(50, 26); + this.switch_round.TabIndex = 24; + this.switch_round.Text = "switch1"; // // 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.Location = new System.Drawing.Point(390, 3); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(92, 26); - this.label14.TabIndex = 4; + this.label14.TabIndex = 23; this.label14.Text = "Round"; - // - // label11 - // - this.label11.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label11.Location = new System.Drawing.Point(3, 271); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(694, 24); - this.label11.TabIndex = 23; - this.label11.Text = "按钮配置"; + this.label14.TooltipConfig = null; // // FloatButtonDemo // @@ -584,12 +589,12 @@ this.Size = new System.Drawing.Size(700, 434); this.Load += new System.EventHandler(this.FloatButtonDemo_Load); this.stackPanel1.ResumeLayout(false); - this.stackPanel4.ResumeLayout(false); - this.stackPanel3.ResumeLayout(false); - this.stackPanel7.ResumeLayout(false); this.stackPanel2.ResumeLayout(false); this.stackPanel6.ResumeLayout(false); this.stackPanel5.ResumeLayout(false); + this.stackPanel7.ResumeLayout(false); + this.stackPanel4.ResumeLayout(false); + this.stackPanel3.ResumeLayout(false); this.ResumeLayout(false); } @@ -603,15 +608,9 @@ private AntdUI.StackPanel stackPanel4; private AntdUI.InputNumber input_my; private AntdUI.Label label8; - private AntdUI.InputNumber input_mx; - private AntdUI.Label label7; private AntdUI.InputNumber input_size; private AntdUI.Label label9; private AntdUI.StackPanel stackPanel3; - private AntdUI.Select select_vertical; - private AntdUI.Label label5; - private AntdUI.Select select_topmost; - private AntdUI.Label label6; private AntdUI.Select select_align; private AntdUI.Label label10; private AntdUI.Label label4; @@ -627,15 +626,21 @@ private AntdUI.Input input_badge; private AntdUI.Label label17; private AntdUI.StackPanel stackPanel5; - private AntdUI.InputNumber input_radius; - private AntdUI.Label label12; - private AntdUI.Select select_type; - private AntdUI.Label label13; - private AntdUI.Select select_round; - private AntdUI.Label label14; private AntdUI.Label label11; private AntdUI.StackPanel stackPanel7; private AntdUI.InputNumber input_gap; private AntdUI.Label label20; + private AntdUI.InputNumber input_radius; + private AntdUI.Label label12; + private AntdUI.Switch switch_topmost; + private AntdUI.Label label6; + private AntdUI.Switch switch_vertical; + private AntdUI.Label label5; + private AntdUI.InputNumber input_mx; + private AntdUI.Label label7; + private AntdUI.Switch switch_round; + private AntdUI.Label label14; + private AntdUI.Select select_type; + private AntdUI.Label label13; } } diff --git a/Views/FloatButtonDemo.cs b/Views/FloatButtonDemo.cs index 3934e2e..18afa15 100644 --- a/Views/FloatButtonDemo.cs +++ b/Views/FloatButtonDemo.cs @@ -33,11 +33,12 @@ namespace AntdUIDemo.Views buttonCZ.Click += buttonCZ_Click; select_align.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; - select_round.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; - select_topmost.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; - select_vertical.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; select_type.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; + switch_round.CheckedChanged += Switch_CheckedChanged; + switch_vertical.CheckedChanged += Switch_CheckedChanged; + switch_topmost.CheckedChanged += Switch_CheckedChanged; + input_size.ValueChanged += input_decimalvalue_ValeChanged; input_mx.ValueChanged += input_decimalvalue_ValeChanged; input_my.ValueChanged += input_decimalvalue_ValeChanged; @@ -71,10 +72,11 @@ namespace AntdUIDemo.Views private void InitData() { select_align.SelectedIndex = 7; - select_round.SelectedIndex = 1; select_type.SelectedIndex = 0; - select_topmost.SelectedIndex = 1; - select_vertical.SelectedIndex = 0; + + switch_round.Checked = false; + switch_vertical.Checked = true; + switch_topmost.Checked = false; input_size.Value = 40; input_mx.Value = 24; @@ -101,7 +103,7 @@ namespace AntdUIDemo.Views Text = "SVG图片", IconSvg = "", Tooltip = "SVG图片按钮", - Round = select_round.SelectedIndex == 0, + Round = switch_round.Checked, Type = (TTypeMini)select_type.SelectedValue, Radius = (int)input_radius.Value, Badge = input_badge.Text, @@ -113,7 +115,7 @@ namespace AntdUIDemo.Views { Text = "资源图片", Tooltip = "资源图片按钮", - Round = select_round.SelectedIndex == 0, + Round = switch_round.Checked, Type = (TTypeMini)select_type.SelectedValue, Radius = (int)input_radius.Value, Badge = input_badge.Text, @@ -124,7 +126,7 @@ namespace AntdUIDemo.Views new FloatButton.ConfigBtn("button3", "文本") { Tooltip = "文本按钮", - Round = select_round.SelectedIndex == 0, + Round = switch_round.Checked, Type = (TTypeMini)select_type.SelectedValue, Radius = (int)input_radius.Value, Badge = input_badge.Text, @@ -146,9 +148,9 @@ namespace AntdUIDemo.Views //位置 Align = (TAlign)select_align.SelectedIndex, //是否垂直方向 - Vertical = select_vertical.SelectedIndex == 0, + Vertical = switch_vertical.Checked, //是否置顶 - TopMost = select_topmost.SelectedIndex == 0, + TopMost = switch_topmost.Checked, //尺寸大小 Size = (int)input_size.Value, //相对于Align位置X轴偏移 @@ -187,6 +189,12 @@ namespace AntdUIDemo.Views LoadFloatButton(); } + private void Switch_CheckedChanged(object sender, BoolEventArgs e) + { + CloseFloatButtonForm(); + LoadFloatButton(); + } + private void colorPicker_ValueChanged(object sender, ColorEventArgs e) { CloseFloatButtonForm(); diff --git a/Views/IconDemo.cs b/Views/IconDemo.cs index b65d68b..e00caa0 100644 --- a/Views/IconDemo.cs +++ b/Views/IconDemo.cs @@ -1,11 +1,6 @@ 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 diff --git a/Views/Image3DDemo.cs b/Views/Image3DDemo.cs index 9dd9eaf..54968a4 100644 --- a/Views/Image3DDemo.cs +++ b/Views/Image3DDemo.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 diff --git a/Views/InputDemo.Designer.cs b/Views/InputDemo.Designer.cs index 04263b9..1f6db89 100644 --- a/Views/InputDemo.Designer.cs +++ b/Views/InputDemo.Designer.cs @@ -30,6 +30,10 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InputDemo)); this.stackPanel1 = new AntdUI.StackPanel(); + this.flowPanel9 = new AntdUI.FlowPanel(); + this.input18 = new AntdUI.Input(); + this.input20 = new AntdUI.Input(); + this.label11 = new AntdUI.Label(); this.flowPanel8 = new AntdUI.FlowPanel(); this.input_status = new AntdUI.Input(); this.input15 = new AntdUI.Input(); @@ -72,11 +76,8 @@ this.label2 = new AntdUI.Label(); this.label1 = new AntdUI.Label(); this.tooltipComponent1 = new AntdUI.TooltipComponent(); - this.label11 = new AntdUI.Label(); - this.flowPanel9 = new AntdUI.FlowPanel(); - this.input20 = new AntdUI.Input(); - this.input18 = new AntdUI.Input(); this.stackPanel1.SuspendLayout(); + this.flowPanel9.SuspendLayout(); this.flowPanel8.SuspendLayout(); this.flowPanel7.SuspendLayout(); this.flowPanel3.SuspendLayout(); @@ -87,7 +88,6 @@ this.flowPanel4.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); - this.flowPanel9.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -121,6 +121,49 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // + // flowPanel9 + // + this.flowPanel9.Controls.Add(this.input18); + this.flowPanel9.Controls.Add(this.input20); + this.flowPanel9.Location = new System.Drawing.Point(3, 757); + this.flowPanel9.Name = "flowPanel9"; + this.flowPanel9.Size = new System.Drawing.Size(694, 38); + this.flowPanel9.TabIndex = 28; + this.flowPanel9.Text = "flowPanel9"; + // + // 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))); + this.input18.Location = new System.Drawing.Point(209, 3); + this.input18.Name = "input18"; + this.input18.Size = new System.Drawing.Size(200, 32); + this.input18.TabIndex = 1; + this.input18.WaveSize = 0; + // + // 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); + this.input20.Name = "input20"; + this.input20.Size = new System.Drawing.Size(200, 32); + this.input20.TabIndex = 0; + this.input20.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, 727); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(694, 24); + this.label11.TabIndex = 27; + this.label11.Text = "光标颜色速度"; + this.label11.TooltipConfig = null; + // // flowPanel8 // this.flowPanel8.Controls.Add(this.input_status); @@ -175,6 +218,7 @@ this.label10.Size = new System.Drawing.Size(694, 24); this.label10.TabIndex = 25; this.label10.Text = "状态"; + this.label10.TooltipConfig = null; // // flowPanel7 // @@ -205,6 +249,7 @@ this.label9.Size = new System.Drawing.Size(694, 24); this.label9.TabIndex = 23; this.label9.Text = "提示组合"; + this.label9.TooltipConfig = null; // // flowPanel3 // @@ -298,6 +343,7 @@ this.label7.Size = new System.Drawing.Size(694, 24); this.label7.TabIndex = 21; this.label7.Text = "按钮组合"; + this.label7.TooltipConfig = null; // // flowPanel6 // @@ -341,6 +387,7 @@ this.label8.Size = new System.Drawing.Size(694, 24); this.label8.TabIndex = 19; this.label8.Text = "边框显示"; + this.label8.TooltipConfig = null; // // flowPanel5 // @@ -361,6 +408,7 @@ this.input17.Name = "input17"; this.input17.PasswordChar = '*'; this.input17.PasswordCopy = true; + this.input17.PasswordPaste = false; this.input17.PlaceholderText = "密码不可粘贴"; this.input17.Size = new System.Drawing.Size(200, 32); this.input17.TabIndex = 2; @@ -401,6 +449,7 @@ this.label6.Size = new System.Drawing.Size(694, 24); this.label6.TabIndex = 15; this.label6.Text = "密码框"; + this.label6.TooltipConfig = null; // // flowPanel4 // @@ -444,6 +493,7 @@ this.label5.Size = new System.Drawing.Size(694, 24); this.label5.TabIndex = 13; this.label5.Text = "多行文本"; + this.label5.TooltipConfig = null; // // flowPanel2 // @@ -490,6 +540,7 @@ this.label4.Size = new System.Drawing.Size(694, 24); this.label4.TabIndex = 10; this.label4.Text = "前/后标签"; + this.label4.TooltipConfig = null; // // flowPanel1 // @@ -544,6 +595,7 @@ this.label3.Size = new System.Drawing.Size(694, 24); this.label3.TabIndex = 8; this.label3.Text = "基本类型"; + this.label3.TooltipConfig = null; // // divider1 // @@ -560,6 +612,7 @@ this.label2.Size = new System.Drawing.Size(694, 24); this.label2.TabIndex = 6; this.label2.Text = "通过鼠标或键盘输入内容，是最基础的表单域的包装。"; + this.label2.TooltipConfig = null; // // label1 // @@ -569,54 +622,13 @@ this.label1.Size = new System.Drawing.Size(694, 40); this.label1.TabIndex = 5; this.label1.Text = "Input 输入框"; + this.label1.TooltipConfig = null; // // tooltipComponent1 // this.tooltipComponent1.ArrowAlign = AntdUI.TAlign.TL; this.tooltipComponent1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); // - // 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.Name = "label11"; - this.label11.Size = new System.Drawing.Size(694, 24); - this.label11.TabIndex = 27; - this.label11.Text = "光标颜色速度"; - // - // flowPanel9 - // - this.flowPanel9.Controls.Add(this.input18); - this.flowPanel9.Controls.Add(this.input20); - this.flowPanel9.Location = new System.Drawing.Point(3, 757); - this.flowPanel9.Name = "flowPanel9"; - this.flowPanel9.Size = new System.Drawing.Size(694, 38); - this.flowPanel9.TabIndex = 28; - this.flowPanel9.Text = "flowPanel9"; - // - // 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); - this.input20.Name = "input20"; - this.input20.Size = new System.Drawing.Size(200, 32); - this.input20.TabIndex = 0; - this.input20.WaveSize = 0; - // - // 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))); - this.input18.Location = new System.Drawing.Point(209, 3); - this.input18.Name = "input18"; - this.input18.Size = new System.Drawing.Size(200, 32); - this.input18.TabIndex = 1; - this.input18.WaveSize = 0; - // // InputDemo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -624,6 +636,7 @@ this.Name = "InputDemo"; this.Size = new System.Drawing.Size(700, 821); this.stackPanel1.ResumeLayout(false); + this.flowPanel9.ResumeLayout(false); this.flowPanel8.ResumeLayout(false); this.flowPanel7.ResumeLayout(false); this.flowPanel3.ResumeLayout(false); @@ -634,7 +647,6 @@ this.flowPanel4.ResumeLayout(false); this.flowPanel2.ResumeLayout(false); this.flowPanel1.ResumeLayout(false); - this.flowPanel9.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/Views/InputDemo.cs b/Views/InputDemo.cs index 5c53e41..3d115c0 100644 --- a/Views/InputDemo.cs +++ b/Views/InputDemo.cs @@ -1,11 +1,5 @@ using AntdUI; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Windows.Forms; diff --git a/Views/InputDemo.resx b/Views/InputDemo.resx index a4377fe..eb36694 100644 --- a/Views/InputDemo.resx +++ b/Views/InputDemo.resx @@ -132,7 +132,4 @@ <svg viewBox="64 64 896 896" focusable="false" data-icon="poweroff" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M705.6 124.9a8 8 0 00-11.6 7.2v64.2c0 5.5 2.9 10.6 7.5 13.6a352.2 352.2 0 0162.2 49.8c32.7 32.8 58.4 70.9 76.3 113.3a355 355 0 0127.9 138.7c0 48.1-9.4 94.8-27.9 138.7a355.92 355.92 0 01-76.3 113.3 353.06 353.06 0 01-113.2 76.4c-43.8 18.6-90.5 28-138.5 28s-94.7-9.4-138.5-28a353.06 353.06 0 01-113.2-76.4A355.92 355.92 0 01184 650.4a355 355 0 01-27.9-138.7c0-48.1 9.4-94.8 27.9-138.7 17.9-42.4 43.6-80.5 76.3-113.3 19-19 39.8-35.6 62.2-49.8 4.7-2.9 7.5-8.1 7.5-13.6V132c0-6-6.3-9.8-11.6-7.2C178.5 195.2 82 339.3 80 506.3 77.2 745.1 272.5 943.5 511.2 944c239 .5 432.8-193.3 432.8-432.4 0-169.2-97-315.7-238.4-386.7zM480 560h64c4.4 0 8-3.6 8-8V88c0-4.4-3.6-8-8-8h-64c-4.4 0-8 3.6-8 8v464c0 4.4 3.6 8 8 8z"></path></svg> - - 17, 17 - \ No newline at end of file diff --git a/Views/InputNumberDemo.cs b/Views/InputNumberDemo.cs index 5e3fa56..9007dde 100644 --- a/Views/InputNumberDemo.cs +++ b/Views/InputNumberDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/LabelDemo.cs b/Views/LabelDemo.cs index 88f2c1a..d1d685a 100644 --- a/Views/LabelDemo.cs +++ b/Views/LabelDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/MenuDemo.cs b/Views/MenuDemo.cs index 2ffbce3..297a126 100644 --- a/Views/MenuDemo.cs +++ b/Views/MenuDemo.cs @@ -1,13 +1,6 @@ using AntdUI; -using AntdUIDemo.Utils; 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 diff --git a/Views/MessageDemo.cs b/Views/MessageDemo.cs index fb864b3..25b110c 100644 --- a/Views/MessageDemo.cs +++ b/Views/MessageDemo.cs @@ -1,13 +1,7 @@ using AntdUI; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Windows.Forms; namespace AntdUIDemo.Views diff --git a/Views/ModalDemo.cs b/Views/ModalDemo.cs index 051602f..b03e087 100644 --- a/Views/ModalDemo.cs +++ b/Views/ModalDemo.cs @@ -1,14 +1,8 @@ using AntdUI; using AntdUIDemo.Controls; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Windows.Forms; namespace AntdUIDemo.Views diff --git a/Views/MsgListDemo.cs b/Views/MsgListDemo.cs index 135343f..496ca05 100644 --- a/Views/MsgListDemo.cs +++ b/Views/MsgListDemo.cs @@ -1,10 +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; using System.Threading.Tasks; using System.Windows.Forms; diff --git a/Views/NotificationDemo.cs b/Views/NotificationDemo.cs index 0b845ea..4cba171 100644 --- a/Views/NotificationDemo.cs +++ b/Views/NotificationDemo.cs @@ -1,12 +1,6 @@ using AntdUI; 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 diff --git a/Views/PageHeaderDemo.cs b/Views/PageHeaderDemo.cs index f2a45de..332bb19 100644 --- a/Views/PageHeaderDemo.cs +++ b/Views/PageHeaderDemo.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 diff --git a/Views/PaginationDemo.Designer.cs b/Views/PaginationDemo.Designer.cs index 30e7025..6f934bd 100644 --- a/Views/PaginationDemo.Designer.cs +++ b/Views/PaginationDemo.Designer.cs @@ -82,6 +82,7 @@ this.label1.Size = new System.Drawing.Size(694, 40); this.label1.TabIndex = 3; this.label1.Text = "Pagination 分页"; + this.label1.TooltipConfig = null; // // label2 // @@ -91,6 +92,7 @@ this.label2.Size = new System.Drawing.Size(694, 24); this.label2.TabIndex = 4; this.label2.Text = "采用分页的形式分隔长列表，每次只加载一个页面。"; + this.label2.TooltipConfig = null; // // divider1 // @@ -107,6 +109,7 @@ this.label12.Size = new System.Drawing.Size(694, 24); this.label12.TabIndex = 41; this.label12.Text = "控件配置"; + this.label12.TooltipConfig = null; // // stackPanel1 // @@ -181,7 +184,6 @@ this.switch_right.TabIndex = 15; this.switch_right.Text = "switch1"; this.switch_right.UnCheckedText = "No"; - this.switch_right.WaveSize = 0; // // label15 // @@ -191,6 +193,7 @@ this.label15.Size = new System.Drawing.Size(120, 26); this.label15.TabIndex = 14; this.label15.Text = "RightToLeft"; + this.label15.TooltipConfig = null; // // stackPanel5 // @@ -232,6 +235,7 @@ this.label13.Size = new System.Drawing.Size(155, 26); this.label13.TabIndex = 17; this.label13.Text = "SizeChangerWidth"; + this.label13.TooltipConfig = null; // // selectMultiple // @@ -258,6 +262,7 @@ this.label14.Size = new System.Drawing.Size(150, 26); this.label14.TabIndex = 8; this.label14.Text = "PageSizeOptions"; + this.label14.TooltipConfig = null; // // stackPanel4 // @@ -281,11 +286,10 @@ this.switch_show.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.switch_show.Location = new System.Drawing.Point(588, 3); this.switch_show.Name = "switch_show"; - this.switch_show.Size = new System.Drawing.Size(60, 26); + this.switch_show.Size = new System.Drawing.Size(50, 26); this.switch_show.TabIndex = 13; this.switch_show.Text = "switch1"; this.switch_show.UnCheckedText = ""; - this.switch_show.WaveSize = 0; // // label9 // @@ -295,6 +299,7 @@ this.label9.Size = new System.Drawing.Size(155, 26); this.label9.TabIndex = 12; this.label9.Text = "ShowSizeChanger"; + this.label9.TooltipConfig = null; // // input_textdesc // @@ -313,6 +318,7 @@ this.label10.Size = new System.Drawing.Size(120, 26); this.label10.TabIndex = 10; this.label10.Text = "TextDesc"; + this.label10.TooltipConfig = null; // // input_radius // @@ -342,6 +348,7 @@ this.label11.Size = new System.Drawing.Size(120, 26); this.label11.TabIndex = 8; this.label11.Text = "Radius"; + this.label11.TooltipConfig = null; // // stackPanel3 // @@ -385,6 +392,7 @@ this.label5.Size = new System.Drawing.Size(155, 26); this.label5.TabIndex = 15; this.label5.Text = "Gap"; + this.label5.TooltipConfig = null; // // colorPicker // @@ -395,6 +403,7 @@ this.colorPicker.Size = new System.Drawing.Size(100, 26); this.colorPicker.TabIndex = 14; this.colorPicker.Text = "colorPicker1"; + this.colorPicker.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); this.colorPicker.WaveSize = 0; // // label6 @@ -405,6 +414,7 @@ this.label6.Size = new System.Drawing.Size(120, 26); this.label6.TabIndex = 10; this.label6.Text = "Fill"; + this.label6.TooltipConfig = null; // // input_max // @@ -429,6 +439,7 @@ this.label8.Size = new System.Drawing.Size(120, 26); this.label8.TabIndex = 8; this.label8.Text = "MaxPageTotal"; + this.label8.TooltipConfig = null; // // stackPanel2 // @@ -472,6 +483,7 @@ this.label4.Size = new System.Drawing.Size(155, 26); this.label4.TabIndex = 12; this.label4.Text = "Total"; + this.label4.TooltipConfig = null; // // input_pagesize // @@ -501,6 +513,7 @@ this.label3.Size = new System.Drawing.Size(120, 26); this.label3.TabIndex = 10; this.label3.Text = "PageSize"; + this.label3.TooltipConfig = null; // // input_current // @@ -530,6 +543,7 @@ this.label7.Size = new System.Drawing.Size(120, 26); this.label7.TabIndex = 8; this.label7.Text = "Current"; + this.label7.TooltipConfig = null; // // PaginationDemo // diff --git a/Views/PaginationDemo.cs b/Views/PaginationDemo.cs index 41e01a9..948efdb 100644 --- a/Views/PaginationDemo.cs +++ b/Views/PaginationDemo.cs @@ -1,12 +1,5 @@ using AntdUI; 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 diff --git a/Views/PanelDemo.Designer.cs b/Views/PanelDemo.Designer.cs index 273eb13..ef4c21c 100644 --- a/Views/PanelDemo.Designer.cs +++ b/Views/PanelDemo.Designer.cs @@ -36,7 +36,6 @@ this.input_shadowOH = new AntdUI.InputNumber(); this.label12 = new AntdUI.Label(); this.stackPanel14 = new AntdUI.StackPanel(); - this.select_shadowOA = new AntdUI.Select(); this.label13 = new AntdUI.Label(); this.stackPanel3 = new AntdUI.StackPanel(); this.buttonCZ = new AntdUI.Button(); @@ -76,6 +75,7 @@ this.divider1 = new AntdUI.Divider(); this.label2 = new AntdUI.Label(); this.label1 = new AntdUI.Label(); + this.switch_shadowOA = new AntdUI.Switch(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel15.SuspendLayout(); @@ -191,10 +191,11 @@ this.label12.Size = new System.Drawing.Size(220, 26); this.label12.TabIndex = 4; this.label12.Text = "ShadowOpacityHover"; + this.label12.TooltipConfig = null; // // stackPanel14 // - this.stackPanel14.Controls.Add(this.select_shadowOA); + this.stackPanel14.Controls.Add(this.switch_shadowOA); this.stackPanel14.Controls.Add(this.label13); this.stackPanel14.Location = new System.Drawing.Point(3, 3); this.stackPanel14.Name = "stackPanel14"; @@ -202,22 +203,6 @@ this.stackPanel14.TabIndex = 29; this.stackPanel14.Text = "stackPanel14"; // - // select_shadowOA - // - this.select_shadowOA.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_shadowOA.Items.AddRange(new object[] { - "True", - "False"}); - this.select_shadowOA.List = true; - this.select_shadowOA.Location = new System.Drawing.Point(229, 3); - this.select_shadowOA.Name = "select_shadowOA"; - this.select_shadowOA.SelectedIndex = 0; - this.select_shadowOA.SelectedValue = "True"; - this.select_shadowOA.Size = new System.Drawing.Size(75, 26); - this.select_shadowOA.TabIndex = 11; - this.select_shadowOA.Text = "True"; - this.select_shadowOA.WaveSize = 0; - // // label13 // this.label13.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -226,6 +211,7 @@ this.label13.Size = new System.Drawing.Size(220, 26); this.label13.TabIndex = 4; this.label13.Text = "ShadowOpacityAnimation"; + this.label13.TooltipConfig = null; // // stackPanel3 // @@ -308,6 +294,7 @@ this.label11.Size = new System.Drawing.Size(130, 26); this.label11.TabIndex = 4; this.label11.Text = "ShadowOpacity"; + this.label11.TooltipConfig = null; // // stackPanel11 // @@ -342,6 +329,7 @@ this.label9.Size = new System.Drawing.Size(130, 26); this.label9.TabIndex = 4; this.label9.Text = "ShadowOffsetY"; + this.label9.TooltipConfig = null; // // stackPanel10 // @@ -376,6 +364,7 @@ this.label8.Size = new System.Drawing.Size(130, 26); this.label8.TabIndex = 4; this.label8.Text = "ShadowOffsetX"; + this.label8.TooltipConfig = null; // // stackPanel9 // @@ -407,6 +396,7 @@ this.label7.Size = new System.Drawing.Size(130, 26); this.label7.TabIndex = 4; this.label7.Text = "ShadowColor"; + this.label7.TooltipConfig = null; // // stackPanel8 // @@ -436,6 +426,7 @@ this.label6.Size = new System.Drawing.Size(130, 26); this.label6.TabIndex = 4; this.label6.Text = "ShadowAlign"; + this.label6.TooltipConfig = null; // // stackPanel7 // @@ -475,6 +466,7 @@ this.label5.Size = new System.Drawing.Size(130, 26); this.label5.TabIndex = 4; this.label5.Text = "Shadow"; + this.label5.TooltipConfig = null; // // stackPanel17 // @@ -510,6 +502,7 @@ this.label15.Size = new System.Drawing.Size(130, 26); this.label15.TabIndex = 4; this.label15.Text = "BorderWidth"; + this.label15.TooltipConfig = null; // // stackPanel16 // @@ -541,6 +534,7 @@ this.label14.Size = new System.Drawing.Size(130, 26); this.label14.TabIndex = 4; this.label14.Text = "BorderColor"; + this.label14.TooltipConfig = null; // // stackPanel6 // @@ -580,6 +574,7 @@ this.label4.Size = new System.Drawing.Size(130, 26); this.label4.TabIndex = 4; this.label4.Text = "Radius"; + this.label4.TooltipConfig = null; // // stackPanel5 // @@ -619,6 +614,7 @@ this.label3.Size = new System.Drawing.Size(130, 26); this.label3.TabIndex = 4; this.label3.Text = "ArrowSize"; + this.label3.TooltipConfig = null; // // stackPanel4 // @@ -648,6 +644,7 @@ this.label10.Size = new System.Drawing.Size(130, 26); this.label10.TabIndex = 4; this.label10.Text = "ArrowAlign"; + this.label10.TooltipConfig = null; // // divider1 // @@ -664,6 +661,7 @@ this.label2.Size = new System.Drawing.Size(694, 24); this.label2.TabIndex = 7; this.label2.Text = "普通布局面板"; + this.label2.TooltipConfig = null; // // label1 // @@ -673,6 +671,17 @@ this.label1.Size = new System.Drawing.Size(694, 40); this.label1.TabIndex = 6; this.label1.Text = "Panel 面板"; + this.label1.TooltipConfig = null; + // + // switch_shadowOA + // + this.switch_shadowOA.AutoCheck = true; + this.switch_shadowOA.Checked = true; + this.switch_shadowOA.Location = new System.Drawing.Point(229, 3); + this.switch_shadowOA.Name = "switch_shadowOA"; + this.switch_shadowOA.Size = new System.Drawing.Size(50, 26); + this.switch_shadowOA.TabIndex = 12; + this.switch_shadowOA.Text = "switch1"; // // PanelDemo // @@ -714,7 +723,6 @@ private AntdUI.InputNumber input_shadowOH; private AntdUI.Label label12; private AntdUI.StackPanel stackPanel14; - private AntdUI.Select select_shadowOA; private AntdUI.Label label13; private AntdUI.StackPanel stackPanel3; private AntdUI.StackPanel stackPanel17; @@ -751,5 +759,6 @@ private AntdUI.InputNumber input_shadow; private AntdUI.Label label5; private AntdUI.Button buttonCZ; + private AntdUI.Switch switch_shadowOA; } } diff --git a/Views/PanelDemo.cs b/Views/PanelDemo.cs index 12f3893..fd4dbd4 100644 --- a/Views/PanelDemo.cs +++ b/Views/PanelDemo.cs @@ -1,6 +1,5 @@ using AntdUI; using System; -using System.Drawing; using System.Windows.Forms; namespace AntdUIDemo.Views @@ -24,7 +23,8 @@ namespace AntdUIDemo.Views select_arrowalign.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; select_shadowalign.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; - select_shadowOA.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; + + switch_shadowOA.CheckedChanged += switch_CheckedChanged; input_arrowsize.ValueChanged += input_decimalvalue_ValueChanged; input_radius.ValueChanged += input_decimalvalue_ValueChanged; @@ -61,7 +61,8 @@ namespace AntdUIDemo.Views { select_arrowalign.SelectedIndex = 0; select_shadowalign.SelectedIndex = 0; - select_shadowOA.SelectedIndex = 0; + + switch_shadowOA.Checked = true; input_arrowsize.Value = 8; input_radius.Value = 6; @@ -94,7 +95,7 @@ namespace AntdUIDemo.Views panel.ShadowOffsetX = (int)input_shadowX.Value; panel.ShadowOffsetY = (int)input_shadowY.Value; panel.ShadowOpacity = (float)input_shadowO.Value; - panel.ShadowOpacityAnimation = select_shadowOA.SelectedIndex == 0; + panel.ShadowOpacityAnimation = switch_shadowOA.Checked; panel.ShadowOpacityHover = (float)input_shadowOH.Value; } @@ -105,6 +106,11 @@ namespace AntdUIDemo.Views LoadPanel(); } + private void switch_CheckedChanged(object sender, BoolEventArgs e) + { + LoadPanel(); + } + private void input_decimalvalue_ValueChanged(object sender, DecimalEventArgs e) { LoadPanel(); diff --git a/Views/PopoverDemo.cs b/Views/PopoverDemo.cs index ea53f3c..0471afe 100644 --- a/Views/PopoverDemo.cs +++ b/Views/PopoverDemo.cs @@ -1,12 +1,6 @@ using AntdUI; 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 diff --git a/Views/PreviewDemo.cs b/Views/PreviewDemo.cs index 2cfe882..26b0572 100644 --- a/Views/PreviewDemo.cs +++ b/Views/PreviewDemo.cs @@ -1,12 +1,7 @@ using AntdUI; 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 diff --git a/Views/ProgressDemo.cs b/Views/ProgressDemo.cs index d511522..93455e5 100644 --- a/Views/ProgressDemo.cs +++ b/Views/ProgressDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/RadioDemo.cs b/Views/RadioDemo.cs index 6be9ce6..2fb1d57 100644 --- a/Views/RadioDemo.cs +++ b/Views/RadioDemo.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/RateDemo.cs b/Views/RateDemo.cs index 44b4d85..62ffd07 100644 --- a/Views/RateDemo.cs +++ b/Views/RateDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/SegmentedDemo.cs b/Views/SegmentedDemo.cs index f112120..f2fc666 100644 --- a/Views/SegmentedDemo.cs +++ b/Views/SegmentedDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/SelectDemo.cs b/Views/SelectDemo.cs index 9a9090b..ccd0ca8 100644 --- a/Views/SelectDemo.cs +++ b/Views/SelectDemo.cs @@ -1,12 +1,5 @@ using AntdUI; -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 diff --git a/Views/SelectMultipleDemo.cs b/Views/SelectMultipleDemo.cs index d16eb42..d448381 100644 --- a/Views/SelectMultipleDemo.cs +++ b/Views/SelectMultipleDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/SignalDemo.cs b/Views/SignalDemo.cs index 5f05c20..cf05ca9 100644 --- a/Views/SignalDemo.cs +++ b/Views/SignalDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/SliderDemo.cs b/Views/SliderDemo.cs index 15c0905..8c63181 100644 --- a/Views/SliderDemo.cs +++ b/Views/SliderDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/SliderRangeDemo.cs b/Views/SliderRangeDemo.cs index bc0052a..f4b8d4c 100644 --- a/Views/SliderRangeDemo.cs +++ b/Views/SliderRangeDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/SpinDemo.cs b/Views/SpinDemo.cs index 001d9b7..e241eae 100644 --- a/Views/SpinDemo.cs +++ b/Views/SpinDemo.cs @@ -1,13 +1,6 @@ -using AntdUI; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; +using System; using System.Drawing; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Windows.Forms; namespace AntdUIDemo.Views diff --git a/Views/StackPanelDemo.Designer.cs b/Views/StackPanelDemo.Designer.cs index 44c5ca7..a9f9d7c 100644 --- a/Views/StackPanelDemo.Designer.cs +++ b/Views/StackPanelDemo.Designer.cs @@ -32,15 +32,6 @@ this.stackPanel2 = new AntdUI.StackPanel(); this.stackPanel = new AntdUI.StackPanel(); this.stackPanel3 = new AntdUI.StackPanel(); - this.stackPanel7 = new AntdUI.StackPanel(); - this.input_itemsize = new AntdUI.Input(); - this.label5 = new AntdUI.Label(); - 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.buttonCZ = new AntdUI.Button(); this.buttonDEL = new AntdUI.Button(); this.buttonADD = new AntdUI.Button(); @@ -50,13 +41,22 @@ this.stackPanel6 = new AntdUI.StackPanel(); this.switch_autoscroll = new AntdUI.Switch(); this.label4 = new AntdUI.Label(); + this.stackPanel7 = new AntdUI.StackPanel(); + this.input_itemsize = new AntdUI.Input(); + this.label5 = new AntdUI.Label(); + 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.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel3.SuspendLayout(); - this.stackPanel7.SuspendLayout(); - this.stackPanel5.SuspendLayout(); this.stackPanel8.SuspendLayout(); this.stackPanel6.SuspendLayout(); + this.stackPanel7.SuspendLayout(); + this.stackPanel5.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -108,94 +108,6 @@ this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; // - // stackPanel7 - // - this.stackPanel7.Controls.Add(this.input_itemsize); - this.stackPanel7.Controls.Add(this.label5); - this.stackPanel7.Location = new System.Drawing.Point(3, 41); - this.stackPanel7.Name = "stackPanel7"; - this.stackPanel7.Size = new System.Drawing.Size(214, 32); - this.stackPanel7.TabIndex = 20; - this.stackPanel7.Text = "stackPanel7"; - // - // input_itemsize - // - this.input_itemsize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.input_itemsize.Location = new System.Drawing.Point(97, 3); - this.input_itemsize.Name = "input_itemsize"; - this.input_itemsize.PlaceholderText = "数值或百分比"; - this.input_itemsize.Size = new System.Drawing.Size(115, 26); - this.input_itemsize.TabIndex = 5; - this.input_itemsize.WaveSize = 0; - // - // 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, 3); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(88, 26); - this.label5.TabIndex = 4; - this.label5.Text = "ItemSize"; - // - // stackPanel5 - // - this.stackPanel5.Controls.Add(this.input_gap); - 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(214, 32); - this.stackPanel5.TabIndex = 19; - this.stackPanel5.Text = "stackPanel5"; - // - // input_gap - // - this.input_gap.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.input_gap.Location = new System.Drawing.Point(97, 3); - this.input_gap.Minimum = new decimal(new int[] { - 0, - 0, - 0, - 0}); - this.input_gap.Name = "input_gap"; - this.input_gap.Size = new System.Drawing.Size(115, 26); - this.input_gap.TabIndex = 5; - this.input_gap.Text = "0"; - this.input_gap.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(88, 26); - this.label3.TabIndex = 4; - this.label3.Text = "Gap"; - // - // 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 = 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(694, 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(694, 40); - this.label1.TabIndex = 8; - this.label1.Text = "StackPanel 堆叠布局"; - // // buttonCZ // this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -245,10 +157,9 @@ this.switch_vertical.Checked = true; this.switch_vertical.Location = new System.Drawing.Point(97, 3); this.switch_vertical.Name = "switch_vertical"; - this.switch_vertical.Size = new System.Drawing.Size(60, 26); + this.switch_vertical.Size = new System.Drawing.Size(50, 26); this.switch_vertical.TabIndex = 6; this.switch_vertical.Text = "switch1"; - this.switch_vertical.WaveSize = 0; // // label6 // @@ -258,6 +169,7 @@ this.label6.Size = new System.Drawing.Size(88, 26); this.label6.TabIndex = 4; this.label6.Text = "Vertical"; + this.label6.TooltipConfig = null; // // stackPanel6 // @@ -274,10 +186,9 @@ this.switch_autoscroll.AutoCheck = true; this.switch_autoscroll.Location = new System.Drawing.Point(97, 3); this.switch_autoscroll.Name = "switch_autoscroll"; - this.switch_autoscroll.Size = new System.Drawing.Size(60, 26); + this.switch_autoscroll.Size = new System.Drawing.Size(50, 26); this.switch_autoscroll.TabIndex = 5; this.switch_autoscroll.Text = "switch1"; - this.switch_autoscroll.WaveSize = 0; // // label4 // @@ -287,6 +198,99 @@ this.label4.Size = new System.Drawing.Size(88, 26); this.label4.TabIndex = 4; this.label4.Text = "AutoScroll"; + this.label4.TooltipConfig = null; + // + // stackPanel7 + // + this.stackPanel7.Controls.Add(this.input_itemsize); + this.stackPanel7.Controls.Add(this.label5); + this.stackPanel7.Location = new System.Drawing.Point(3, 41); + this.stackPanel7.Name = "stackPanel7"; + this.stackPanel7.Size = new System.Drawing.Size(214, 32); + this.stackPanel7.TabIndex = 20; + this.stackPanel7.Text = "stackPanel7"; + // + // input_itemsize + // + this.input_itemsize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.input_itemsize.Location = new System.Drawing.Point(97, 3); + this.input_itemsize.Name = "input_itemsize"; + this.input_itemsize.PlaceholderText = "数值或百分比"; + this.input_itemsize.Size = new System.Drawing.Size(115, 26); + this.input_itemsize.TabIndex = 5; + this.input_itemsize.WaveSize = 0; + // + // 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, 3); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(88, 26); + this.label5.TabIndex = 4; + this.label5.Text = "ItemSize"; + this.label5.TooltipConfig = null; + // + // stackPanel5 + // + this.stackPanel5.Controls.Add(this.input_gap); + 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(214, 32); + this.stackPanel5.TabIndex = 19; + this.stackPanel5.Text = "stackPanel5"; + // + // input_gap + // + this.input_gap.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_gap.Location = new System.Drawing.Point(97, 3); + this.input_gap.Minimum = new decimal(new int[] { + 0, + 0, + 0, + 0}); + this.input_gap.Name = "input_gap"; + this.input_gap.Size = new System.Drawing.Size(115, 26); + this.input_gap.TabIndex = 5; + this.input_gap.Text = "0"; + this.input_gap.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(88, 26); + this.label3.TabIndex = 4; + this.label3.Text = "Gap"; + 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(694, 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(694, 24); + this.label2.TabIndex = 9; + 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(694, 40); + this.label1.TabIndex = 8; + this.label1.Text = "StackPanel 堆叠布局"; + this.label1.TooltipConfig = null; // // StackPanelDemo // @@ -298,10 +302,10 @@ this.stackPanel1.ResumeLayout(false); this.stackPanel2.ResumeLayout(false); this.stackPanel3.ResumeLayout(false); - this.stackPanel7.ResumeLayout(false); - this.stackPanel5.ResumeLayout(false); this.stackPanel8.ResumeLayout(false); this.stackPanel6.ResumeLayout(false); + this.stackPanel7.ResumeLayout(false); + this.stackPanel5.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/Views/StackPanelDemo.cs b/Views/StackPanelDemo.cs index 2de0354..bd9f558 100644 --- a/Views/StackPanelDemo.cs +++ b/Views/StackPanelDemo.cs @@ -1,12 +1,6 @@ using AntdUI; 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 diff --git a/Views/StepsDemo.Designer.cs b/Views/StepsDemo.Designer.cs index 07b3cef..044ba21 100644 --- a/Views/StepsDemo.Designer.cs +++ b/Views/StepsDemo.Designer.cs @@ -129,7 +129,7 @@ this.select_Status.List = true; this.select_Status.Location = new System.Drawing.Point(280, 3); this.select_Status.Name = "select_Status"; - this.select_Status.Size = new System.Drawing.Size(75, 26); + this.select_Status.Size = new System.Drawing.Size(90, 26); this.select_Status.TabIndex = 13; this.select_Status.WaveSize = 0; // @@ -141,6 +141,7 @@ this.label3.Size = new System.Drawing.Size(92, 26); this.label3.TabIndex = 12; this.label3.Text = "Status"; + this.label3.TooltipConfig = null; // // input_current // @@ -175,6 +176,7 @@ this.label8.Size = new System.Drawing.Size(92, 26); this.label8.TabIndex = 10; this.label8.Text = "Current"; + this.label8.TooltipConfig = null; // // label12 // @@ -184,6 +186,7 @@ this.label12.Size = new System.Drawing.Size(694, 24); this.label12.TabIndex = 42; this.label12.Text = "控件配置"; + this.label12.TooltipConfig = null; // // divider1 // @@ -200,6 +203,7 @@ this.label2.Size = new System.Drawing.Size(694, 24); this.label2.TabIndex = 6; this.label2.Text = "引导用户按照流程完成任务的导航条。"; + this.label2.TooltipConfig = null; // // label1 // @@ -209,6 +213,7 @@ this.label1.Size = new System.Drawing.Size(694, 40); this.label1.TabIndex = 5; this.label1.Text = "Steps 步骤条"; + this.label1.TooltipConfig = null; // // StepsDemo // diff --git a/Views/StepsDemo.cs b/Views/StepsDemo.cs index bac63ac..3ce1c74 100644 --- a/Views/StepsDemo.cs +++ b/Views/StepsDemo.cs @@ -1,12 +1,5 @@ using AntdUI; 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 diff --git a/Views/Demo.Designer.cs b/Views/SubView/Demo.Designer.cs similarity index 100% rename from Views/Demo.Designer.cs rename to Views/SubView/Demo.Designer.cs diff --git a/Views/Demo.cs b/Views/SubView/Demo.cs similarity index 69% rename from Views/Demo.cs rename to Views/SubView/Demo.cs index da1bbb4..493564c 100644 --- a/Views/Demo.cs +++ b/Views/SubView/Demo.cs @@ -1,12 +1,4 @@ -using AntdUI; -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; using System.Windows.Forms; namespace AntdUIDemo.Views diff --git a/Views/Demo.resx b/Views/SubView/Demo.resx similarity index 100% rename from Views/Demo.resx rename to Views/SubView/Demo.resx diff --git a/Controls/SystemSet.Designer.cs b/Views/SubView/SystemSet.Designer.cs similarity index 100% rename from Controls/SystemSet.Designer.cs rename to Views/SubView/SystemSet.Designer.cs diff --git a/Controls/SystemSet.cs b/Views/SubView/SystemSet.cs similarity index 96% rename from Controls/SystemSet.cs rename to Views/SubView/SystemSet.cs index 87363d9..eccf54f 100644 --- a/Controls/SystemSet.cs +++ b/Views/SubView/SystemSet.cs @@ -1,17 +1,9 @@ using AntdUI; -using Newtonsoft.Json.Linq; using AntdUIDemo.Utils; -using System; +using Newtonsoft.Json.Linq; using System.Collections.Generic; -using System.ComponentModel; -using System.Configuration; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using System.IO; +using System.Windows.Forms; namespace AntdUIDemo.Controls { diff --git a/Controls/SystemSet.resx b/Views/SubView/SystemSet.resx similarity index 100% rename from Controls/SystemSet.resx rename to Views/SubView/SystemSet.resx diff --git a/Views/Table/UserEdit.Designer.cs b/Views/SubView/UserEdit.Designer.cs similarity index 100% rename from Views/Table/UserEdit.Designer.cs rename to Views/SubView/UserEdit.Designer.cs diff --git a/Views/Table/UserEdit.cs b/Views/SubView/UserEdit.cs similarity index 90% rename from Views/Table/UserEdit.cs rename to Views/SubView/UserEdit.cs index 5eaa442..303af68 100644 --- a/Views/Table/UserEdit.cs +++ b/Views/SubView/UserEdit.cs @@ -1,12 +1,5 @@ using AntdUIDemo.Models; 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.Table diff --git a/Views/Table/UserEdit.resx b/Views/SubView/UserEdit.resx similarity index 100% rename from Views/Table/UserEdit.resx rename to Views/SubView/UserEdit.resx diff --git a/Views/SubView/Wellcome.Designer.cs b/Views/SubView/Wellcome.Designer.cs new file mode 100644 index 0000000..43d378d --- /dev/null +++ b/Views/SubView/Wellcome.Designer.cs @@ -0,0 +1,61 @@ +namespace AntdUIDemo.Views.SubView +{ + partial class Wellcome + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.label1 = new AntdUI.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.Dock = System.Windows.Forms.DockStyle.Fill; + this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 20F); + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(750, 150); + this.label1.TabIndex = 0; + this.label1.Text = "欢迎使用 AntdUI Demo"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label1.TooltipConfig = null; + // + // 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); + this.ResumeLayout(false); + + } + + #endregion + + private AntdUI.Label label1; + } +} diff --git a/Views/SubView/Wellcome.cs b/Views/SubView/Wellcome.cs new file mode 100644 index 0000000..2d85946 --- /dev/null +++ b/Views/SubView/Wellcome.cs @@ -0,0 +1,12 @@ +using System.Windows.Forms; + +namespace AntdUIDemo.Views.SubView +{ + public partial class Wellcome : UserControl + { + public Wellcome() + { + InitializeComponent(); + } + } +} diff --git a/Views/SubView/Wellcome.resx b/Views/SubView/Wellcome.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Views/SubView/Wellcome.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Views/SwitchDemo.cs b/Views/SwitchDemo.cs index 7de7dec..51ab80b 100644 --- a/Views/SwitchDemo.cs +++ b/Views/SwitchDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/TableDemo.cs b/Views/TableDemo.cs index 93491aa..56d594f 100644 --- a/Views/TableDemo.cs +++ b/Views/TableDemo.cs @@ -51,8 +51,11 @@ namespace AntdUIDemo.Views }, new Column("CellProgress", "进度条",ColumnAlign.Center), new Column("CellDivider", "分割线",ColumnAlign.Center), - new Column("CellLinks", "链接",ColumnAlign.Center), - }; + new Column("CellLinks", "链接", ColumnAlign.Center) + { + Fixed = true,//冻结列 + }, + }; } private void BindEventHandler() diff --git a/Views/TabsDemo.cs b/Views/TabsDemo.cs index 12fcfc1..d5d5fc7 100644 --- a/Views/TabsDemo.cs +++ b/Views/TabsDemo.cs @@ -1,12 +1,5 @@ using AntdUI; 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 diff --git a/Views/TagDemo.cs b/Views/TagDemo.cs index 713fb96..b7d024b 100644 --- a/Views/TagDemo.cs +++ b/Views/TagDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/TimePickerDemo.cs b/Views/TimePickerDemo.cs index cb36201..518fce9 100644 --- a/Views/TimePickerDemo.cs +++ b/Views/TimePickerDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/TimelineDemo.cs b/Views/TimelineDemo.cs index 87cc717..6c91752 100644 --- a/Views/TimelineDemo.cs +++ b/Views/TimelineDemo.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/TooltipDemo.cs b/Views/TooltipDemo.cs index 0a03fab..6cf2632 100644 --- a/Views/TooltipDemo.cs +++ b/Views/TooltipDemo.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.Drawing; using System.Windows.Forms; namespace AntdUIDemo.Views diff --git a/Views/TreeDemo.cs b/Views/TreeDemo.cs index 7c06b52..dc87bb1 100644 --- a/Views/TreeDemo.cs +++ b/Views/TreeDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views { diff --git a/Views/WindowBarDemo.cs b/Views/WindowBarDemo.cs index 9595896..11eed25 100644 --- a/Views/WindowBarDemo.cs +++ b/Views/WindowBarDemo.cs @@ -1,12 +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; +using System.Windows.Forms; namespace AntdUIDemo.Views {