diff --git a/AntdUIDemo.csproj b/AntdUIDemo.csproj index a6f2cae..2801a6d 100644 --- a/AntdUIDemo.csproj +++ b/AntdUIDemo.csproj @@ -13,7 +13,7 @@ Copyright © 2024 czz_y $(Version) $(Version) - 1.5.6.0 + 1.5.7-beta czz_y 基于 Winform UI框架 AntdUI 设计的Demo https://gitee.com/mubaiyanghua/antd-uidemo diff --git a/Controls/SystemSet.Designer.cs b/Controls/SystemSet.Designer.cs index b176e25..2eb1433 100644 --- a/Controls/SystemSet.Designer.cs +++ b/Controls/SystemSet.Designer.cs @@ -68,7 +68,7 @@ // tabs // this.tabs.Alignment = System.Windows.Forms.TabAlignment.Left; - this.tabs.Cursor = System.Windows.Forms.Cursors.Hand; + this.tabs.Cursor = System.Windows.Forms.Cursors.Default; this.tabs.Dock = System.Windows.Forms.DockStyle.Fill; this.tabs.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); this.tabs.Gap = 12; @@ -120,14 +120,14 @@ // switch_scrollbar // this.switch_scrollbar.AutoCheck = true; - this.switch_scrollbar.CheckedText = "是"; + this.switch_scrollbar.CheckedText = ""; this.switch_scrollbar.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.switch_scrollbar.Location = new System.Drawing.Point(129, 3); this.switch_scrollbar.Name = "switch_scrollbar"; - this.switch_scrollbar.Size = new System.Drawing.Size(75, 26); + this.switch_scrollbar.Size = new System.Drawing.Size(60, 26); this.switch_scrollbar.TabIndex = 1; this.switch_scrollbar.Text = "switch4"; - this.switch_scrollbar.UnCheckedText = "否"; + this.switch_scrollbar.UnCheckedText = ""; this.switch_scrollbar.WaveSize = 0; // // label4 @@ -153,14 +153,14 @@ // this.switch_shadow.AutoCheck = true; this.switch_shadow.Checked = true; - this.switch_shadow.CheckedText = "是"; + this.switch_shadow.CheckedText = ""; this.switch_shadow.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.switch_shadow.Location = new System.Drawing.Point(129, 3); this.switch_shadow.Name = "switch_shadow"; - this.switch_shadow.Size = new System.Drawing.Size(75, 26); + this.switch_shadow.Size = new System.Drawing.Size(60, 26); this.switch_shadow.TabIndex = 1; this.switch_shadow.Text = "switch3"; - this.switch_shadow.UnCheckedText = "否"; + this.switch_shadow.UnCheckedText = ""; this.switch_shadow.WaveSize = 0; // // label3 @@ -186,14 +186,14 @@ // this.switch_animation.AutoCheck = true; this.switch_animation.Checked = true; - this.switch_animation.CheckedText = "是"; + this.switch_animation.CheckedText = ""; this.switch_animation.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.switch_animation.Location = new System.Drawing.Point(129, 3); this.switch_animation.Name = "switch_animation"; - this.switch_animation.Size = new System.Drawing.Size(75, 26); + this.switch_animation.Size = new System.Drawing.Size(60, 26); this.switch_animation.TabIndex = 1; this.switch_animation.Text = "switch2"; - this.switch_animation.UnCheckedText = "否"; + this.switch_animation.UnCheckedText = ""; this.switch_animation.WaveSize = 0; // // label2 @@ -217,6 +217,7 @@ // // select_colormode // + this.select_colormode.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.select_colormode.Items.AddRange(new object[] { "Auto", "Light", @@ -226,9 +227,10 @@ this.select_colormode.Name = "select_colormode"; this.select_colormode.SelectedIndex = 0; this.select_colormode.SelectedValue = "Auto"; - this.select_colormode.Size = new System.Drawing.Size(90, 26); + this.select_colormode.Size = new System.Drawing.Size(60, 26); this.select_colormode.TabIndex = 2; this.select_colormode.Text = "Auto"; + this.select_colormode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.select_colormode.WaveSize = 0; // // label1 @@ -245,9 +247,9 @@ this.tabPage2.Controls.Add(this.stackPanel6); this.tabPage2.Dock = System.Windows.Forms.DockStyle.Fill; this.tabPage2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tabPage2.Location = new System.Drawing.Point(87, 3); + this.tabPage2.Location = new System.Drawing.Point(90, 6); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Size = new System.Drawing.Size(530, 414); + this.tabPage2.Size = new System.Drawing.Size(502, 384); this.tabPage2.TabIndex = 0; this.tabPage2.Text = "消息配置"; // @@ -258,7 +260,7 @@ this.stackPanel6.Dock = System.Windows.Forms.DockStyle.Fill; this.stackPanel6.Location = new System.Drawing.Point(0, 0); this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(530, 414); + this.stackPanel6.Size = new System.Drawing.Size(502, 384); this.stackPanel6.TabIndex = 0; this.stackPanel6.Text = "stackPanel6"; this.stackPanel6.Vertical = true; @@ -269,7 +271,7 @@ this.stackPanel8.Controls.Add(this.label6); this.stackPanel8.Location = new System.Drawing.Point(3, 41); this.stackPanel8.Name = "stackPanel8"; - this.stackPanel8.Size = new System.Drawing.Size(524, 32); + this.stackPanel8.Size = new System.Drawing.Size(496, 32); this.stackPanel8.TabIndex = 5; this.stackPanel8.Text = "stackPanel8"; // @@ -277,7 +279,7 @@ // this.input_offset.Location = new System.Drawing.Point(129, 3); this.input_offset.Name = "input_offset"; - this.input_offset.Size = new System.Drawing.Size(75, 26); + this.input_offset.Size = new System.Drawing.Size(60, 26); this.input_offset.TabIndex = 1; this.input_offset.Text = "0"; this.input_offset.WaveSize = 0; @@ -297,21 +299,21 @@ this.stackPanel7.Controls.Add(this.label5); this.stackPanel7.Location = new System.Drawing.Point(3, 3); this.stackPanel7.Name = "stackPanel7"; - this.stackPanel7.Size = new System.Drawing.Size(524, 32); + this.stackPanel7.Size = new System.Drawing.Size(496, 32); this.stackPanel7.TabIndex = 4; this.stackPanel7.Text = "stackPanel7"; // // switch_showinwindow // this.switch_showinwindow.AutoCheck = true; - this.switch_showinwindow.CheckedText = "是"; + this.switch_showinwindow.CheckedText = ""; this.switch_showinwindow.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.switch_showinwindow.Location = new System.Drawing.Point(129, 3); this.switch_showinwindow.Name = "switch_showinwindow"; - this.switch_showinwindow.Size = new System.Drawing.Size(75, 26); + this.switch_showinwindow.Size = new System.Drawing.Size(60, 26); this.switch_showinwindow.TabIndex = 1; this.switch_showinwindow.Text = "switch5"; - this.switch_showinwindow.UnCheckedText = "否"; + this.switch_showinwindow.UnCheckedText = ""; this.switch_showinwindow.WaveSize = 0; // // label5 diff --git a/MainWindow.Designer.cs b/MainWindow.Designer.cs index df9f8c7..66bae9d 100644 --- a/MainWindow.Designer.cs +++ b/MainWindow.Designer.cs @@ -64,13 +64,12 @@ this.button_color.IconHover = null; this.button_color.IconHoverSvg = null; this.button_color.IconSize = new System.Drawing.Size(0, 0); - this.button_color.IconSvg = resources.GetString("button_color.ImageSvg"); + this.button_color.IconSvg = resources.GetString("button_color.IconSvg"); this.button_color.Location = new System.Drawing.Point(806, 0); this.button_color.Name = "button_color"; this.button_color.Radius = 0; this.button_color.Size = new System.Drawing.Size(50, 40); this.button_color.TabIndex = 1; - this.button_color.ToggleType = null; this.button_color.WaveSize = 0; // // buttonSZ @@ -82,13 +81,12 @@ this.buttonSZ.IconHover = null; this.buttonSZ.IconHoverSvg = null; this.buttonSZ.IconSize = new System.Drawing.Size(0, 0); - this.buttonSZ.IconSvg = resources.GetString("buttonSZ.ImageSvg"); + this.buttonSZ.IconSvg = resources.GetString("buttonSZ.IconSvg"); this.buttonSZ.Location = new System.Drawing.Point(856, 0); this.buttonSZ.Name = "buttonSZ"; this.buttonSZ.Radius = 0; this.buttonSZ.Size = new System.Drawing.Size(50, 40); this.buttonSZ.TabIndex = 0; - this.buttonSZ.ToggleType = null; this.buttonSZ.WaveSize = 0; // // divider @@ -129,7 +127,7 @@ this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(719, 563); this.label1.TabIndex = 0; - this.label1.Text = "欢迎使用AntdUI Demo"; + this.label1.Text = "欢迎使用 AntdUI Demo\r\n\r\n当前版本 AntdUI 1.5.7-beta"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // MainWindow diff --git a/MainWindow.cs b/MainWindow.cs index 0ac2661..eb1b105 100644 --- a/MainWindow.cs +++ b/MainWindow.cs @@ -186,7 +186,7 @@ namespace AntdUIDemo { AutoDpi(control); //测试日志归档 - LoggerHelper.Logger.Error(new Exception("测试点击了Menu"), "点击了" + name); + LoggerHelper.Logger.Error(new Exception($"{name} Clicked."),"Menu"); panel_content.Controls.Add(control); } } diff --git a/NLog.config b/NLog.config index 36a7f25..bae1761 100644 --- a/NLog.config +++ b/NLog.config @@ -8,8 +8,8 @@ archiveEvery="Day" archiveNumbering="Date" maxArchiveFiles="7" - archiveFileName="logs/archived/log.{##}.log" - layout="${longdate} ${level} ${message} ${newline} ${exception}" /> + archiveFileName="logs/archived/{##}.log" + layout="${longdate} ${message} ${newline} ${exception}" /> diff --git a/Views/CheckBoxDemo.Designer.cs b/Views/CheckBoxDemo.Designer.cs index 0492eca..b0ead3b 100644 --- a/Views/CheckBoxDemo.Designer.cs +++ b/Views/CheckBoxDemo.Designer.cs @@ -29,20 +29,22 @@ private void InitializeComponent() { this.stackPanel1 = new AntdUI.StackPanel(); + this.flowPanel2 = new AntdUI.FlowPanel(); + this.checkbox3 = new AntdUI.Checkbox(); + this.checkbox4 = new AntdUI.Checkbox(); + this.label4 = new AntdUI.Label(); this.flowPanel1 = new AntdUI.FlowPanel(); + this.checkbox2 = new AntdUI.Checkbox(); this.checkbox1 = new AntdUI.Checkbox(); this.label3 = new AntdUI.Label(); this.divider1 = new AntdUI.Divider(); this.label2 = new AntdUI.Label(); this.label1 = new AntdUI.Label(); - this.checkbox2 = new AntdUI.Checkbox(); - this.flowPanel2 = new AntdUI.FlowPanel(); - this.checkbox3 = new AntdUI.Checkbox(); - this.checkbox4 = new AntdUI.Checkbox(); - this.label4 = new AntdUI.Label(); + this.checkbox5 = new AntdUI.Checkbox(); + this.checkbox6 = new AntdUI.Checkbox(); this.stackPanel1.SuspendLayout(); - this.flowPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); + this.flowPanel1.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 @@ -62,8 +64,52 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // + // flowPanel2 + // + this.flowPanel2.Controls.Add(this.checkbox3); + this.flowPanel2.Controls.Add(this.checkbox4); + this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Name = "flowPanel2"; + this.flowPanel2.Size = new System.Drawing.Size(694, 38); + this.flowPanel2.TabIndex = 11; + this.flowPanel2.Text = "flowPanel2"; + // + // checkbox3 + // + this.checkbox3.AutoCheck = true; + this.checkbox3.Checked = true; + this.checkbox3.Enabled = false; + this.checkbox3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.checkbox3.Location = new System.Drawing.Point(99, 3); + this.checkbox3.Name = "checkbox3"; + this.checkbox3.Size = new System.Drawing.Size(90, 32); + this.checkbox3.TabIndex = 1; + this.checkbox3.Text = "Checkbox"; + // + // checkbox4 + // + this.checkbox4.AutoCheck = true; + this.checkbox4.Enabled = false; + this.checkbox4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.checkbox4.Location = new System.Drawing.Point(3, 3); + this.checkbox4.Name = "checkbox4"; + this.checkbox4.Size = new System.Drawing.Size(90, 32); + this.checkbox4.TabIndex = 0; + this.checkbox4.Text = "Checkbox"; + // + // label4 + // + this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(694, 24); + this.label4.TabIndex = 10; + this.label4.Text = "禁用状态"; + // // flowPanel1 // + this.flowPanel1.Controls.Add(this.checkbox5); + this.flowPanel1.Controls.Add(this.checkbox6); this.flowPanel1.Controls.Add(this.checkbox2); this.flowPanel1.Controls.Add(this.checkbox1); this.flowPanel1.Location = new System.Drawing.Point(3, 127); @@ -72,6 +118,17 @@ this.flowPanel1.TabIndex = 9; this.flowPanel1.Text = "flowPanel1"; // + // checkbox2 + // + this.checkbox2.AutoCheck = true; + this.checkbox2.Checked = true; + this.checkbox2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.checkbox2.Location = new System.Drawing.Point(99, 3); + this.checkbox2.Name = "checkbox2"; + this.checkbox2.Size = new System.Drawing.Size(90, 32); + this.checkbox2.TabIndex = 1; + this.checkbox2.Text = "Checkbox"; + // // checkbox1 // this.checkbox1.AutoCheck = true; @@ -116,58 +173,28 @@ this.label1.TabIndex = 5; this.label1.Text = "Checkbox 多选框"; // - // checkbox2 + // checkbox5 // - this.checkbox2.AutoCheck = true; - this.checkbox2.Checked = true; - this.checkbox2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.checkbox2.Location = new System.Drawing.Point(99, 3); - this.checkbox2.Name = "checkbox2"; - this.checkbox2.Size = new System.Drawing.Size(90, 32); - this.checkbox2.TabIndex = 1; - this.checkbox2.Text = "Checkbox"; + this.checkbox5.AutoCheck = true; + this.checkbox5.Checked = true; + this.checkbox5.Fill = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.checkbox5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.checkbox5.Location = new System.Drawing.Point(291, 3); + this.checkbox5.Name = "checkbox5"; + this.checkbox5.Size = new System.Drawing.Size(90, 32); + this.checkbox5.TabIndex = 3; + this.checkbox5.Text = "Checkbox"; // - // flowPanel2 + // checkbox6 // - this.flowPanel2.Controls.Add(this.checkbox3); - this.flowPanel2.Controls.Add(this.checkbox4); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); - this.flowPanel2.Name = "flowPanel2"; - this.flowPanel2.Size = new System.Drawing.Size(694, 38); - this.flowPanel2.TabIndex = 11; - this.flowPanel2.Text = "flowPanel2"; - // - // checkbox3 - // - this.checkbox3.AutoCheck = true; - this.checkbox3.Checked = true; - this.checkbox3.Enabled = false; - this.checkbox3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.checkbox3.Location = new System.Drawing.Point(99, 3); - this.checkbox3.Name = "checkbox3"; - this.checkbox3.Size = new System.Drawing.Size(90, 32); - this.checkbox3.TabIndex = 1; - this.checkbox3.Text = "Checkbox"; - // - // checkbox4 - // - this.checkbox4.AutoCheck = true; - this.checkbox4.Enabled = false; - this.checkbox4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - this.checkbox4.Location = new System.Drawing.Point(3, 3); - this.checkbox4.Name = "checkbox4"; - this.checkbox4.Size = new System.Drawing.Size(90, 32); - this.checkbox4.TabIndex = 0; - this.checkbox4.Text = "Checkbox"; - // - // label4 - // - this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(694, 24); - this.label4.TabIndex = 10; - this.label4.Text = "禁用状态"; + this.checkbox6.AutoCheck = true; + this.checkbox6.Fill = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.checkbox6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.checkbox6.Location = new System.Drawing.Point(195, 3); + this.checkbox6.Name = "checkbox6"; + this.checkbox6.Size = new System.Drawing.Size(90, 32); + this.checkbox6.TabIndex = 2; + this.checkbox6.Text = "Checkbox"; // // CheckBoxDemo // @@ -176,8 +203,8 @@ this.Name = "CheckBoxDemo"; this.Size = new System.Drawing.Size(700, 451); this.stackPanel1.ResumeLayout(false); - this.flowPanel1.ResumeLayout(false); this.flowPanel2.ResumeLayout(false); + this.flowPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -196,5 +223,7 @@ private AntdUI.Checkbox checkbox3; private AntdUI.Checkbox checkbox4; private AntdUI.Label label4; + private AntdUI.Checkbox checkbox5; + private AntdUI.Checkbox checkbox6; } } diff --git a/Views/DatePickerDemo.Designer.cs b/Views/DatePickerDemo.Designer.cs index 0220b60..22ce07b 100644 --- a/Views/DatePickerDemo.Designer.cs +++ b/Views/DatePickerDemo.Designer.cs @@ -34,6 +34,13 @@ this.datePicker7 = new AntdUI.DatePicker(); this.datePicker11 = new AntdUI.DatePicker(); this.label5 = new AntdUI.Label(); + this.divider1 = new AntdUI.Divider(); + this.label2 = new AntdUI.Label(); + this.label1 = new AntdUI.Label(); + this.datePicker10 = new AntdUI.DatePicker(); + this.flowPanel4 = new AntdUI.FlowPanel(); + this.datePicker_badge = new AntdUI.DatePicker(); + this.label6 = new AntdUI.Label(); this.flowPanel2 = new AntdUI.FlowPanel(); this.datePicker8 = new AntdUI.DatePicker(); this.datePicker9 = new AntdUI.DatePicker(); @@ -47,29 +54,23 @@ this.datePicker2 = new AntdUI.DatePicker(); this.datePicker1 = new AntdUI.DatePicker(); this.label3 = new AntdUI.Label(); - this.divider1 = new AntdUI.Divider(); - this.label2 = new AntdUI.Label(); - this.label1 = new AntdUI.Label(); - this.label6 = new AntdUI.Label(); - this.flowPanel4 = new AntdUI.FlowPanel(); - this.datePicker_badge = new AntdUI.DatePicker(); this.stackPanel1.SuspendLayout(); this.flowPanel3.SuspendLayout(); + this.flowPanel4.SuspendLayout(); this.flowPanel2.SuspendLayout(); this.flowPanel1.SuspendLayout(); - this.flowPanel4.SuspendLayout(); this.SuspendLayout(); // // stackPanel1 // - this.stackPanel1.Controls.Add(this.flowPanel4); - this.stackPanel1.Controls.Add(this.label6); - this.stackPanel1.Controls.Add(this.flowPanel3); - this.stackPanel1.Controls.Add(this.label5); this.stackPanel1.Controls.Add(this.flowPanel2); this.stackPanel1.Controls.Add(this.label4); this.stackPanel1.Controls.Add(this.flowPanel1); this.stackPanel1.Controls.Add(this.label3); + this.stackPanel1.Controls.Add(this.flowPanel4); + this.stackPanel1.Controls.Add(this.label6); + this.stackPanel1.Controls.Add(this.flowPanel3); + this.stackPanel1.Controls.Add(this.label5); this.stackPanel1.Controls.Add(this.divider1); this.stackPanel1.Controls.Add(this.label2); this.stackPanel1.Controls.Add(this.label1); @@ -83,9 +84,10 @@ // // flowPanel3 // + this.flowPanel3.Controls.Add(this.datePicker10); this.flowPanel3.Controls.Add(this.datePicker7); this.flowPanel3.Controls.Add(this.datePicker11); - this.flowPanel3.Location = new System.Drawing.Point(3, 275); + this.flowPanel3.Location = new System.Drawing.Point(3, 127); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(694, 38); this.flowPanel3.TabIndex = 16; @@ -115,21 +117,85 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(3, 245); + this.label5.Location = new System.Drawing.Point(3, 97); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(694, 24); this.label5.TabIndex = 15; this.label5.Text = "日期格式化"; // + // divider1 + // + this.divider1.Location = new System.Drawing.Point(3, 79); + this.divider1.Name = "divider1"; + this.divider1.Size = new System.Drawing.Size(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 = "DatePicker 日期选择器"; + // + // datePicker10 + // + this.datePicker10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.datePicker10.Format = "yyyy-MM-dd HH:mm:ss"; + this.datePicker10.Location = new System.Drawing.Point(229, 3); + this.datePicker10.Name = "datePicker10"; + this.datePicker10.PlaceholderText = "yyyy-MM-dd HH:mm:ss"; + this.datePicker10.Size = new System.Drawing.Size(220, 32); + this.datePicker10.TabIndex = 2; + this.datePicker10.WaveSize = 0; + // + // flowPanel4 + // + this.flowPanel4.Controls.Add(this.datePicker_badge); + this.flowPanel4.Location = new System.Drawing.Point(3, 201); + this.flowPanel4.Name = "flowPanel4"; + this.flowPanel4.Size = new System.Drawing.Size(694, 38); + this.flowPanel4.TabIndex = 30; + this.flowPanel4.Text = "flowPanel4"; + // + // datePicker_badge + // + this.datePicker_badge.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.datePicker_badge.Location = new System.Drawing.Point(3, 3); + this.datePicker_badge.Name = "datePicker_badge"; + this.datePicker_badge.PlaceholderText = ""; + this.datePicker_badge.Size = new System.Drawing.Size(107, 32); + this.datePicker_badge.TabIndex = 0; + this.datePicker_badge.WaveSize = 0; + // + // label6 + // + this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label6.Location = new System.Drawing.Point(3, 171); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(694, 24); + this.label6.TabIndex = 29; + this.label6.Text = "日期徽标"; + // // flowPanel2 // this.flowPanel2.Controls.Add(this.datePicker8); this.flowPanel2.Controls.Add(this.datePicker9); this.flowPanel2.Controls.Add(this.datePicker12); - this.flowPanel2.Location = new System.Drawing.Point(3, 201); + this.flowPanel2.Location = new System.Drawing.Point(3, 349); this.flowPanel2.Name = "flowPanel2"; this.flowPanel2.Size = new System.Drawing.Size(694, 38); - this.flowPanel2.TabIndex = 14; + this.flowPanel2.TabIndex = 36; this.flowPanel2.Text = "flowPanel2"; // // datePicker8 @@ -169,10 +235,10 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(3, 171); + this.label4.Location = new System.Drawing.Point(3, 319); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(694, 24); - this.label4.TabIndex = 13; + this.label4.TabIndex = 35; this.label4.Text = "图标显示"; // // flowPanel1 @@ -183,10 +249,10 @@ this.flowPanel1.Controls.Add(this.datePicker3); this.flowPanel1.Controls.Add(this.datePicker2); this.flowPanel1.Controls.Add(this.datePicker1); - this.flowPanel1.Location = new System.Drawing.Point(3, 127); + this.flowPanel1.Location = new System.Drawing.Point(3, 275); this.flowPanel1.Name = "flowPanel1"; this.flowPanel1.Size = new System.Drawing.Size(694, 38); - this.flowPanel1.TabIndex = 12; + this.flowPanel1.TabIndex = 34; this.flowPanel1.Text = "flowPanel1"; // // datePicker6 @@ -257,65 +323,12 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(3, 97); + this.label3.Location = new System.Drawing.Point(3, 245); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(694, 24); - this.label3.TabIndex = 11; + this.label3.TabIndex = 33; this.label3.Text = "显示位置"; // - // 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 = "DatePicker 日期选择器"; - // - // label6 - // - this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(3, 319); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(694, 24); - this.label6.TabIndex = 17; - this.label6.Text = "日期徽标"; - // - // flowPanel4 - // - this.flowPanel4.Controls.Add(this.datePicker_badge); - this.flowPanel4.Location = new System.Drawing.Point(3, 349); - this.flowPanel4.Name = "flowPanel4"; - this.flowPanel4.Size = new System.Drawing.Size(694, 38); - this.flowPanel4.TabIndex = 18; - this.flowPanel4.Text = "flowPanel4"; - // - // datePicker_badge - // - this.datePicker_badge.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.datePicker_badge.Location = new System.Drawing.Point(3, 3); - this.datePicker_badge.Name = "datePicker_badge"; - this.datePicker_badge.PlaceholderText = ""; - this.datePicker_badge.Size = new System.Drawing.Size(107, 32); - this.datePicker_badge.TabIndex = 0; - this.datePicker_badge.WaveSize = 0; - // // DatePickerDemo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -324,9 +337,9 @@ this.Size = new System.Drawing.Size(700, 471); this.stackPanel1.ResumeLayout(false); this.flowPanel3.ResumeLayout(false); + this.flowPanel4.ResumeLayout(false); this.flowPanel2.ResumeLayout(false); this.flowPanel1.ResumeLayout(false); - this.flowPanel4.ResumeLayout(false); this.ResumeLayout(false); } @@ -337,25 +350,26 @@ private AntdUI.Divider divider1; private AntdUI.Label label2; private AntdUI.Label label1; + private AntdUI.FlowPanel flowPanel3; + private AntdUI.DatePicker datePicker7; + private AntdUI.DatePicker datePicker11; + private AntdUI.Label label5; + private AntdUI.DatePicker datePicker10; + private AntdUI.FlowPanel flowPanel4; + private AntdUI.DatePicker datePicker_badge; + private AntdUI.Label label6; + private AntdUI.FlowPanel flowPanel2; + private AntdUI.DatePicker datePicker8; + private AntdUI.DatePicker datePicker9; + private AntdUI.DatePicker datePicker12; + private AntdUI.Label label4; private AntdUI.FlowPanel flowPanel1; - private AntdUI.Label label3; - private AntdUI.DatePicker datePicker1; private AntdUI.DatePicker datePicker6; private AntdUI.DatePicker datePicker5; private AntdUI.DatePicker datePicker4; private AntdUI.DatePicker datePicker3; private AntdUI.DatePicker datePicker2; - private AntdUI.FlowPanel flowPanel2; - private AntdUI.DatePicker datePicker12; - private AntdUI.Label label4; - private AntdUI.DatePicker datePicker9; - private AntdUI.DatePicker datePicker8; - private AntdUI.FlowPanel flowPanel3; - private AntdUI.DatePicker datePicker7; - private AntdUI.DatePicker datePicker11; - private AntdUI.Label label5; - private AntdUI.FlowPanel flowPanel4; - private AntdUI.DatePicker datePicker_badge; - private AntdUI.Label label6; + private AntdUI.DatePicker datePicker1; + private AntdUI.Label label3; } } diff --git a/Views/DatePickerRangeDemo.cs b/Views/DatePickerRangeDemo.cs index 328af96..dc0e0c2 100644 --- a/Views/DatePickerRangeDemo.cs +++ b/Views/DatePickerRangeDemo.cs @@ -1,4 +1,5 @@ -using System; +using AntdUI; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -24,47 +25,49 @@ namespace AntdUIDemo.Views datePickerRange.PresetsClickChanged += DatePickerRange_PresetsClickChanged; } - private void DatePickerRange_PresetsClickChanged(object sender, object value) + private void DatePickerRange_PresetsClickChanged(object sender, ObjectNEventArgs e) { DateTime today = DateTime.Today; - string str = value.ToString(); + string str = e.Value.ToString(); + DateTime start; + DateTime end; switch (str) { case "本周": int daysToMonday = (int)today.DayOfWeek - (int)DayOfWeek.Monday; if (daysToMonday < 0) daysToMonday += 7; - DateTime startOfWeek = today.AddDays(-daysToMonday); - DateTime endOfWeek = startOfWeek.AddDays(6); - datePickerRange.Value = new DateTime[] { startOfWeek, endOfWeek }; + start = today.AddDays(-daysToMonday); + end = start.AddDays(6); + datePickerRange.Value = [start, end]; break; case "上周": daysToMonday = (int)today.DayOfWeek - (int)DayOfWeek.Monday; if (daysToMonday < 0) daysToMonday += 7; - startOfWeek = today.AddDays(-daysToMonday - 7); - endOfWeek = startOfWeek.AddDays(6); - datePickerRange.Value = new DateTime[] { startOfWeek, endOfWeek }; + start = today.AddDays(-daysToMonday - 7); + end = start.AddDays(6); + datePickerRange.Value = [start, end]; break; case "本月": - startOfWeek = new DateTime(today.Year, today.Month, 1); - endOfWeek = startOfWeek.AddMonths(1).AddDays(-1); - datePickerRange.Value = new DateTime[] { startOfWeek, endOfWeek }; + start = new DateTime(today.Year, today.Month, 1); + end = start.AddMonths(1).AddDays(-1); + datePickerRange.Value = [start, end]; break; case "上月": - startOfWeek = new DateTime(today.Year, today.Month, 1); - endOfWeek = startOfWeek.AddMonths(1).AddDays(-1); - datePickerRange.Value = new DateTime[] { startOfWeek, endOfWeek }; + start = new DateTime(today.Year, today.Month, 1).AddMonths(-1); + end = start.AddMonths(1).AddDays(-1); + datePickerRange.Value = [start, end]; break; case "本年": - startOfWeek = new DateTime(today.Year, 1, 1); - endOfWeek = startOfWeek.AddYears(1).AddDays(-1); - datePickerRange.Value = new DateTime[] { startOfWeek, endOfWeek }; + start = new DateTime(today.Year, 1, 1); + end = start.AddYears(1).AddDays(-1); + datePickerRange.Value = [start, end]; break; case "去年": - startOfWeek = new DateTime(today.Year - 1, 1, 1); - endOfWeek = startOfWeek.AddYears(1).AddDays(-1); - datePickerRange.Value = new DateTime[] { startOfWeek, endOfWeek }; + start = new DateTime(today.Year - 1, 1, 1); + end = start.AddYears(1).AddDays(-1); + datePickerRange.Value = [start, end]; break; } } diff --git a/Views/FloatButtonDemo.Designer.cs b/Views/FloatButtonDemo.Designer.cs index 97d2049..ebcfefc 100644 --- a/Views/FloatButtonDemo.Designer.cs +++ b/Views/FloatButtonDemo.Designer.cs @@ -108,6 +108,11 @@ // buttonCZ // this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Image = null; + this.buttonCZ.ImageHover = null; + this.buttonCZ.ImageHoverSvg = null; + this.buttonCZ.ImageSize = new System.Drawing.Size(0, 0); + this.buttonCZ.ImageSvg = null; this.buttonCZ.Location = new System.Drawing.Point(84, 3); this.buttonCZ.Name = "buttonCZ"; this.buttonCZ.Size = new System.Drawing.Size(75, 32); @@ -119,6 +124,11 @@ // buttonClose // this.buttonClose.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonClose.Image = null; + this.buttonClose.ImageHover = null; + this.buttonClose.ImageHoverSvg = null; + this.buttonClose.ImageSize = new System.Drawing.Size(0, 0); + this.buttonClose.ImageSvg = null; this.buttonClose.Location = new System.Drawing.Point(3, 3); this.buttonClose.Name = "buttonClose"; this.buttonClose.Size = new System.Drawing.Size(75, 32); @@ -143,9 +153,11 @@ // // colorPicker // + this.colorPicker.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.colorPicker.Location = new System.Drawing.Point(459, 3); this.colorPicker.Name = "colorPicker"; - this.colorPicker.Size = new System.Drawing.Size(75, 26); + this.colorPicker.ShowText = true; + this.colorPicker.Size = new System.Drawing.Size(100, 26); this.colorPicker.TabIndex = 15; this.colorPicker.Text = "colorPicker1"; this.colorPicker.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); @@ -163,6 +175,7 @@ // 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.Minimum = new decimal(new int[] { 0, @@ -191,6 +204,7 @@ // // 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.Name = "input_badge"; this.input_badge.Size = new System.Drawing.Size(75, 26); @@ -222,6 +236,7 @@ // // 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.Minimum = new decimal(new int[] { 0, @@ -229,7 +244,7 @@ 0, 0}); this.input_radius.Name = "input_radius"; - this.input_radius.Size = new System.Drawing.Size(75, 26); + this.input_radius.Size = new System.Drawing.Size(100, 26); this.input_radius.TabIndex = 11; this.input_radius.Text = "6"; this.input_radius.Value = new decimal(new int[] { @@ -317,6 +332,7 @@ // // 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, @@ -324,7 +340,7 @@ 0, 0}); this.input_my.Name = "input_my"; - this.input_my.Size = new System.Drawing.Size(75, 26); + 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[] { @@ -345,6 +361,7 @@ // // 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, @@ -373,6 +390,7 @@ // // 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, @@ -424,7 +442,7 @@ this.select_vertical.Name = "select_vertical"; this.select_vertical.SelectedIndex = 0; this.select_vertical.SelectedValue = "True"; - this.select_vertical.Size = new System.Drawing.Size(75, 26); + 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; diff --git a/Views/FlowPanelDemo.Designer.cs b/Views/FlowPanelDemo.Designer.cs index a948185..66467e4 100644 --- a/Views/FlowPanelDemo.Designer.cs +++ b/Views/FlowPanelDemo.Designer.cs @@ -36,7 +36,7 @@ this.buttonDEL = new AntdUI.Button(); this.buttonADD = new AntdUI.Button(); this.stackPanel6 = new AntdUI.StackPanel(); - this.select_autoscroll = new AntdUI.Select(); + this.switch_autoscroll = new AntdUI.Switch(); this.label4 = new AntdUI.Label(); this.stackPanel5 = new AntdUI.StackPanel(); this.input_gap = new AntdUI.InputNumber(); @@ -82,9 +82,9 @@ // flowPanel // this.flowPanel.Badge = ""; - this.flowPanel.Location = new System.Drawing.Point(289, 3); + this.flowPanel.Location = new System.Drawing.Point(259, 3); this.flowPanel.Name = "flowPanel"; - this.flowPanel.Size = new System.Drawing.Size(400, 273); + this.flowPanel.Size = new System.Drawing.Size(462, 273); this.flowPanel.TabIndex = 1; // // stackPanel3 @@ -97,7 +97,7 @@ this.stackPanel3.Controls.Add(this.stackPanel4); this.stackPanel3.Location = new System.Drawing.Point(3, 3); this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(280, 273); + this.stackPanel3.Size = new System.Drawing.Size(250, 273); this.stackPanel3.TabIndex = 0; this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; @@ -105,9 +105,14 @@ // buttonCZ // this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Image = null; + this.buttonCZ.ImageHover = null; + this.buttonCZ.ImageHoverSvg = null; + this.buttonCZ.ImageSize = new System.Drawing.Size(0, 0); + this.buttonCZ.ImageSvg = null; this.buttonCZ.Location = new System.Drawing.Point(3, 193); this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(274, 32); + this.buttonCZ.Size = new System.Drawing.Size(244, 32); this.buttonCZ.TabIndex = 37; this.buttonCZ.Text = "重 置"; this.buttonCZ.Type = AntdUI.TTypeMini.Warn; @@ -116,9 +121,14 @@ // buttonDEL // this.buttonDEL.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonDEL.Image = null; + this.buttonDEL.ImageHover = null; + this.buttonDEL.ImageHoverSvg = null; + this.buttonDEL.ImageSize = new System.Drawing.Size(0, 0); + this.buttonDEL.ImageSvg = null; this.buttonDEL.Location = new System.Drawing.Point(3, 155); this.buttonDEL.Name = "buttonDEL"; - this.buttonDEL.Size = new System.Drawing.Size(274, 32); + this.buttonDEL.Size = new System.Drawing.Size(244, 32); this.buttonDEL.TabIndex = 36; this.buttonDEL.Text = "删除 Button"; this.buttonDEL.Type = AntdUI.TTypeMini.Error; @@ -127,9 +137,14 @@ // buttonADD // this.buttonADD.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonADD.Image = null; + this.buttonADD.ImageHover = null; + this.buttonADD.ImageHoverSvg = null; + this.buttonADD.ImageSize = new System.Drawing.Size(0, 0); + this.buttonADD.ImageSvg = null; this.buttonADD.Location = new System.Drawing.Point(3, 117); this.buttonADD.Name = "buttonADD"; - this.buttonADD.Size = new System.Drawing.Size(274, 32); + this.buttonADD.Size = new System.Drawing.Size(244, 32); this.buttonADD.TabIndex = 35; this.buttonADD.Text = "添加 Button"; this.buttonADD.Type = AntdUI.TTypeMini.Info; @@ -137,29 +152,23 @@ // // stackPanel6 // - this.stackPanel6.Controls.Add(this.select_autoscroll); + this.stackPanel6.Controls.Add(this.switch_autoscroll); this.stackPanel6.Controls.Add(this.label4); this.stackPanel6.Location = new System.Drawing.Point(3, 79); this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(274, 32); + this.stackPanel6.Size = new System.Drawing.Size(244, 32); this.stackPanel6.TabIndex = 11; this.stackPanel6.Text = "stackPanel6"; // - // select_autoscroll + // switch_autoscroll // - this.select_autoscroll.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_autoscroll.Items.AddRange(new object[] { - "True", - "False"}); - this.select_autoscroll.List = true; - this.select_autoscroll.Location = new System.Drawing.Point(97, 3); - this.select_autoscroll.Name = "select_autoscroll"; - this.select_autoscroll.SelectedIndex = 1; - this.select_autoscroll.SelectedValue = "False"; - this.select_autoscroll.Size = new System.Drawing.Size(175, 26); - this.select_autoscroll.TabIndex = 11; - this.select_autoscroll.Text = "False"; - this.select_autoscroll.WaveSize = 0; + 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.TabIndex = 5; + this.switch_autoscroll.Text = "switch1"; + this.switch_autoscroll.WaveSize = 0; // // label4 // @@ -176,7 +185,7 @@ this.stackPanel5.Controls.Add(this.label3); this.stackPanel5.Location = new System.Drawing.Point(3, 41); this.stackPanel5.Name = "stackPanel5"; - this.stackPanel5.Size = new System.Drawing.Size(274, 32); + this.stackPanel5.Size = new System.Drawing.Size(244, 32); this.stackPanel5.TabIndex = 10; this.stackPanel5.Text = "stackPanel5"; // @@ -190,7 +199,7 @@ 0, 0}); this.input_gap.Name = "input_gap"; - this.input_gap.Size = new System.Drawing.Size(175, 26); + this.input_gap.Size = new System.Drawing.Size(145, 26); this.input_gap.TabIndex = 5; this.input_gap.Text = "0"; this.input_gap.WaveSize = 0; @@ -210,7 +219,7 @@ this.stackPanel4.Controls.Add(this.label10); this.stackPanel4.Location = new System.Drawing.Point(3, 3); this.stackPanel4.Name = "stackPanel4"; - this.stackPanel4.Size = new System.Drawing.Size(274, 32); + this.stackPanel4.Size = new System.Drawing.Size(244, 32); this.stackPanel4.TabIndex = 9; this.stackPanel4.Text = "stackPanel4"; // @@ -220,7 +229,7 @@ this.select_align.List = true; this.select_align.Location = new System.Drawing.Point(97, 3); this.select_align.Name = "select_align"; - this.select_align.Size = new System.Drawing.Size(175, 26); + this.select_align.Size = new System.Drawing.Size(145, 26); this.select_align.TabIndex = 11; this.select_align.WaveSize = 0; // @@ -291,10 +300,10 @@ private AntdUI.InputNumber input_gap; private AntdUI.Label label3; private AntdUI.StackPanel stackPanel6; - private AntdUI.Select select_autoscroll; private AntdUI.Label label4; private AntdUI.Button buttonDEL; private AntdUI.Button buttonADD; private AntdUI.Button buttonCZ; + private AntdUI.Switch switch_autoscroll; } } diff --git a/Views/FlowPanelDemo.cs b/Views/FlowPanelDemo.cs index eb5614d..97a1ff2 100644 --- a/Views/FlowPanelDemo.cs +++ b/Views/FlowPanelDemo.cs @@ -31,7 +31,7 @@ namespace AntdUIDemo.Views { flowPanel.Align = (TAlignFlow)select_align.SelectedValue; flowPanel.Gap = (int)input_gap.Value; - flowPanel.AutoScroll = select_autoscroll.SelectedIndex == 0; + flowPanel.AutoScroll = switch_autoscroll.Checked; flowPanel.Controls.Clear(); for (int i = 0; i < 14; i++) @@ -55,8 +55,8 @@ namespace AntdUIDemo.Views private void InitData() { select_align.SelectedIndex = 0; + switch_autoscroll.Checked = false; input_gap.Value = 0; - select_autoscroll.SelectedIndex = 1; } // 绑定按钮事件 @@ -67,11 +67,17 @@ namespace AntdUIDemo.Views buttonDEL.Click += buttonDEL_Click; select_align.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; - select_autoscroll.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; + + switch_autoscroll.CheckedChanged += switch_autoscroll_CheckedChanged; input_gap.ValueChanged += input_gap_ValueChanged; } + private void switch_autoscroll_CheckedChanged(object sender, BoolEventArgs e) + { + flowPanel.AutoScroll = switch_autoscroll.Checked; + } + // 初始化下拉框 private void InitSelectItems() { @@ -86,7 +92,6 @@ namespace AntdUIDemo.Views private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) { flowPanel.Align = (TAlignFlow)select_align.SelectedValue; - flowPanel.AutoScroll = select_autoscroll.SelectedIndex == 0; } private void input_gap_ValueChanged(object sender, DecimalEventArgs e) diff --git a/Views/GridPanelDemo.Designer.cs b/Views/GridPanelDemo.Designer.cs index aeda6ac..fd880a1 100644 --- a/Views/GridPanelDemo.Designer.cs +++ b/Views/GridPanelDemo.Designer.cs @@ -75,9 +75,9 @@ // // gridPanel // - this.gridPanel.Location = new System.Drawing.Point(289, 3); + this.gridPanel.Location = new System.Drawing.Point(259, 3); this.gridPanel.Name = "gridPanel"; - this.gridPanel.Size = new System.Drawing.Size(400, 293); + this.gridPanel.Size = new System.Drawing.Size(462, 293); this.gridPanel.TabIndex = 1; this.gridPanel.Text = "gridPanel1"; // @@ -88,7 +88,7 @@ this.stackPanel3.Controls.Add(this.stackPanel5); this.stackPanel3.Location = new System.Drawing.Point(3, 3); this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(280, 293); + this.stackPanel3.Size = new System.Drawing.Size(250, 293); this.stackPanel3.TabIndex = 0; this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; @@ -96,9 +96,14 @@ // buttonCZ // this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Image = null; + this.buttonCZ.ImageHover = null; + this.buttonCZ.ImageHoverSvg = null; + this.buttonCZ.ImageSize = new System.Drawing.Size(0, 0); + this.buttonCZ.ImageSvg = null; this.buttonCZ.Location = new System.Drawing.Point(3, 98); this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(274, 32); + this.buttonCZ.Size = new System.Drawing.Size(244, 32); this.buttonCZ.TabIndex = 20; this.buttonCZ.Text = "重 置"; this.buttonCZ.Type = AntdUI.TTypeMini.Warn; @@ -110,21 +115,21 @@ this.stackPanel4.Controls.Add(this.label4); this.stackPanel4.Location = new System.Drawing.Point(3, 60); this.stackPanel4.Name = "stackPanel4"; - this.stackPanel4.Size = new System.Drawing.Size(274, 32); + this.stackPanel4.Size = new System.Drawing.Size(244, 32); this.stackPanel4.TabIndex = 18; this.stackPanel4.Text = "stackPanel4"; // // 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.Location = new System.Drawing.Point(79, 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(175, 26); + this.input_gap.Size = new System.Drawing.Size(165, 26); this.input_gap.TabIndex = 5; this.input_gap.Text = "0"; this.input_gap.WaveSize = 0; @@ -134,7 +139,7 @@ this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Location = new System.Drawing.Point(3, 3); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(88, 26); + this.label4.Size = new System.Drawing.Size(70, 26); this.label4.TabIndex = 4; this.label4.Text = "Gap"; // @@ -144,18 +149,18 @@ 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(274, 51); + this.stackPanel5.Size = new System.Drawing.Size(244, 51); this.stackPanel5.TabIndex = 15; this.stackPanel5.Text = "stackPanel5"; // // input_span // this.input_span.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.input_span.Location = new System.Drawing.Point(97, 3); + this.input_span.Location = new System.Drawing.Point(79, 3); this.input_span.Multiline = true; this.input_span.Name = "input_span"; this.input_span.PlaceholderText = "分号隔开为行,空格隔开为列(可设置固定值或百分号)"; - this.input_span.Size = new System.Drawing.Size(175, 45); + this.input_span.Size = new System.Drawing.Size(165, 45); this.input_span.TabIndex = 5; this.input_span.Text = "50% 50%;50% 50%"; this.input_span.WaveSize = 0; @@ -165,7 +170,7 @@ 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, 45); + this.label3.Size = new System.Drawing.Size(70, 45); this.label3.TabIndex = 4; this.label3.Text = "Span"; // diff --git a/Views/MenuDemo.Designer.cs b/Views/MenuDemo.Designer.cs index 7addb24..cc3bf39 100644 --- a/Views/MenuDemo.Designer.cs +++ b/Views/MenuDemo.Designer.cs @@ -28,44 +28,44 @@ /// private void InitializeComponent() { - AntdUI.Tabs.StyleLine styleLine1 = new AntdUI.Tabs.StyleLine(); - AntdUI.MenuItem menuItem1 = new AntdUI.MenuItem(); + AntdUI.Tabs.StyleLine styleLine2 = new AntdUI.Tabs.StyleLine(); + AntdUI.MenuItem menuItem37 = new AntdUI.MenuItem(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MenuDemo)); - AntdUI.MenuItem menuItem2 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem3 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem4 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem5 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem6 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem7 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem8 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem9 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem10 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem11 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem12 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem13 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem14 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem15 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem16 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem17 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem18 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem19 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem20 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem21 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem22 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem23 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem24 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem25 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem26 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem27 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem28 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem29 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem30 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem31 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem32 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem33 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem34 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem35 = new AntdUI.MenuItem(); - AntdUI.MenuItem menuItem36 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem38 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem39 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem40 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem41 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem42 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem43 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem44 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem45 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem46 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem47 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem48 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem49 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem50 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem51 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem52 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem53 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem54 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem55 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem56 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem57 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem58 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem59 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem60 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem61 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem62 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem63 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem64 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem65 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem66 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem67 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem68 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem69 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem70 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem71 = new AntdUI.MenuItem(); + AntdUI.MenuItem menuItem72 = new AntdUI.MenuItem(); this.stackPanel1 = new AntdUI.StackPanel(); this.stackPanel2 = new AntdUI.StackPanel(); this.tabs1 = new AntdUI.Tabs(); @@ -161,13 +161,13 @@ this.tabs1.Cursor = System.Windows.Forms.Cursors.Default; this.tabs1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tabs1.Gap = 12; - this.tabs1.Location = new System.Drawing.Point(301, 3); + this.tabs1.Location = new System.Drawing.Point(289, 3); this.tabs1.Name = "tabs1"; this.tabs1.Pages.Add(this.tabPage1); this.tabs1.Pages.Add(this.tabPage2); this.tabs1.Pages.Add(this.tabPage3); - this.tabs1.Size = new System.Drawing.Size(382, 445); - this.tabs1.Style = styleLine1; + this.tabs1.Size = new System.Drawing.Size(402, 445); + this.tabs1.Style = styleLine2; this.tabs1.TabIndex = 3; this.tabs1.Text = "tabs1"; // @@ -179,7 +179,7 @@ this.tabPage1.Location = new System.Drawing.Point(3, 38); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(9); - this.tabPage1.Size = new System.Drawing.Size(376, 404); + this.tabPage1.Size = new System.Drawing.Size(396, 404); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Inline"; // @@ -189,69 +189,69 @@ this.menu_inline.Dock = System.Windows.Forms.DockStyle.Left; this.menu_inline.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.menu_inline.Indent = true; - menuItem1.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem1.IconSvg = resources.GetString("menuItem1.IconSvg"); - menuItem1.PARENTITEM = null; - menuItem1.Select = false; - menuItem2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - menuItem2.PARENTITEM = menuItem1; - menuItem2.Select = false; - menuItem2.Text = "SVG可以变色"; - menuItem3.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem3.PARENTITEM = menuItem1; - menuItem3.Select = false; - menuItem3.Text = "如果变不了"; - menuItem4.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem4.PARENTITEM = menuItem1; - menuItem4.Select = false; - menuItem4.Text = "调整svg内容"; - menuItem1.Sub.Add(menuItem2); - menuItem1.Sub.Add(menuItem3); - menuItem1.Sub.Add(menuItem4); - menuItem1.Text = "SVG图标菜单"; - menuItem5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem5.Icon = global::AntdUIDemo.Properties.Resources.关闭; - menuItem5.PARENTITEM = null; - menuItem5.Select = false; - menuItem6.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem6.PARENTITEM = menuItem5; - menuItem6.Select = false; - menuItem6.Text = "不能变色"; - menuItem7.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem7.PARENTITEM = menuItem5; - menuItem7.Select = false; - menuItem7.Text = "不适合使用黑白"; - menuItem8.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem8.PARENTITEM = menuItem5; - menuItem8.Select = false; - menuItem8.Text = "子菜单"; - menuItem5.Sub.Add(menuItem6); - menuItem5.Sub.Add(menuItem7); - menuItem5.Sub.Add(menuItem8); - menuItem5.Text = "图片资源菜单"; - menuItem9.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem9.IconSvg = resources.GetString("menuItem9.IconSvg"); - menuItem9.PARENTITEM = null; - menuItem9.Select = false; - menuItem10.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - menuItem10.PARENTITEM = menuItem9; - menuItem10.Select = false; - menuItem10.Text = "二级菜单"; - menuItem11.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem11.PARENTITEM = menuItem9; - menuItem11.Select = false; - menuItem11.Text = "二级菜单"; - menuItem12.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem12.PARENTITEM = menuItem9; - menuItem12.Select = false; - menuItem12.Text = "二级菜单"; - menuItem9.Sub.Add(menuItem10); - menuItem9.Sub.Add(menuItem11); - menuItem9.Sub.Add(menuItem12); - menuItem9.Text = "一级菜单"; - this.menu_inline.Items.Add(menuItem1); - this.menu_inline.Items.Add(menuItem5); - this.menu_inline.Items.Add(menuItem9); + menuItem37.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem37.IconSvg = resources.GetString("menuItem37.IconSvg"); + menuItem37.PARENTITEM = null; + menuItem37.Select = false; + menuItem38.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + menuItem38.PARENTITEM = menuItem37; + menuItem38.Select = false; + menuItem38.Text = "SVG可以变色"; + menuItem39.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem39.PARENTITEM = menuItem37; + menuItem39.Select = false; + menuItem39.Text = "如果变不了"; + menuItem40.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem40.PARENTITEM = menuItem37; + menuItem40.Select = false; + menuItem40.Text = "调整svg内容"; + menuItem37.Sub.Add(menuItem38); + menuItem37.Sub.Add(menuItem39); + menuItem37.Sub.Add(menuItem40); + menuItem37.Text = "SVG图标菜单"; + menuItem41.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem41.Icon = global::AntdUIDemo.Properties.Resources.关闭; + menuItem41.PARENTITEM = null; + menuItem41.Select = false; + menuItem42.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem42.PARENTITEM = menuItem41; + menuItem42.Select = false; + menuItem42.Text = "不能变色"; + menuItem43.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem43.PARENTITEM = menuItem41; + menuItem43.Select = false; + menuItem43.Text = "不适合使用黑白"; + menuItem44.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem44.PARENTITEM = menuItem41; + menuItem44.Select = false; + menuItem44.Text = "子菜单"; + menuItem41.Sub.Add(menuItem42); + menuItem41.Sub.Add(menuItem43); + menuItem41.Sub.Add(menuItem44); + menuItem41.Text = "图片资源菜单"; + menuItem45.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem45.IconSvg = resources.GetString("menuItem45.IconSvg"); + menuItem45.PARENTITEM = null; + menuItem45.Select = false; + menuItem46.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + menuItem46.PARENTITEM = menuItem45; + menuItem46.Select = false; + menuItem46.Text = "二级菜单"; + menuItem47.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem47.PARENTITEM = menuItem45; + menuItem47.Select = false; + menuItem47.Text = "二级菜单"; + menuItem48.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem48.PARENTITEM = menuItem45; + menuItem48.Select = false; + menuItem48.Text = "二级菜单"; + menuItem45.Sub.Add(menuItem46); + menuItem45.Sub.Add(menuItem47); + menuItem45.Sub.Add(menuItem48); + menuItem45.Text = "一级菜单"; + this.menu_inline.Items.Add(menuItem37); + this.menu_inline.Items.Add(menuItem41); + this.menu_inline.Items.Add(menuItem45); this.menu_inline.Location = new System.Drawing.Point(9, 9); this.menu_inline.Name = "menu_inline"; this.menu_inline.Size = new System.Drawing.Size(185, 386); @@ -276,69 +276,69 @@ this.menu_vertical.Dock = System.Windows.Forms.DockStyle.Left; this.menu_vertical.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.menu_vertical.Indent = true; - menuItem13.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem13.IconSvg = resources.GetString("menuItem13.IconSvg"); - menuItem13.PARENTITEM = null; - menuItem13.Select = false; - menuItem14.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - menuItem14.PARENTITEM = menuItem13; - menuItem14.Select = false; - menuItem14.Text = "SVG可以变色"; - menuItem15.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem15.PARENTITEM = menuItem13; - menuItem15.Select = false; - menuItem15.Text = "如果变不了"; - menuItem16.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem16.PARENTITEM = menuItem13; - menuItem16.Select = false; - menuItem16.Text = "调整svg内容"; - menuItem13.Sub.Add(menuItem14); - menuItem13.Sub.Add(menuItem15); - menuItem13.Sub.Add(menuItem16); - menuItem13.Text = "SVG图标菜单"; - menuItem17.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem17.Icon = global::AntdUIDemo.Properties.Resources.关闭; - menuItem17.PARENTITEM = null; - menuItem17.Select = false; - menuItem18.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem18.PARENTITEM = menuItem17; - menuItem18.Select = false; - menuItem18.Text = "不能变色"; - menuItem19.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem19.PARENTITEM = menuItem17; - menuItem19.Select = false; - menuItem19.Text = "不适合使用黑白"; - menuItem20.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem20.PARENTITEM = menuItem17; - menuItem20.Select = false; - menuItem20.Text = "子菜单"; - menuItem17.Sub.Add(menuItem18); - menuItem17.Sub.Add(menuItem19); - menuItem17.Sub.Add(menuItem20); - menuItem17.Text = "图片资源菜单"; - menuItem21.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem21.IconSvg = resources.GetString("menuItem21.IconSvg"); - menuItem21.PARENTITEM = null; - menuItem21.Select = false; - menuItem22.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - menuItem22.PARENTITEM = menuItem21; - menuItem22.Select = false; - menuItem22.Text = "二级菜单"; - menuItem23.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem23.PARENTITEM = menuItem21; - menuItem23.Select = false; - menuItem23.Text = "二级菜单"; - menuItem24.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - menuItem24.PARENTITEM = menuItem21; - menuItem24.Select = false; - menuItem24.Text = "二级菜单"; - menuItem21.Sub.Add(menuItem22); - menuItem21.Sub.Add(menuItem23); - menuItem21.Sub.Add(menuItem24); - menuItem21.Text = "一级菜单"; - this.menu_vertical.Items.Add(menuItem13); - this.menu_vertical.Items.Add(menuItem17); - this.menu_vertical.Items.Add(menuItem21); + menuItem49.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem49.IconSvg = resources.GetString("menuItem49.IconSvg"); + menuItem49.PARENTITEM = null; + menuItem49.Select = false; + menuItem50.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + menuItem50.PARENTITEM = menuItem49; + menuItem50.Select = false; + menuItem50.Text = "SVG可以变色"; + menuItem51.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem51.PARENTITEM = menuItem49; + menuItem51.Select = false; + menuItem51.Text = "如果变不了"; + menuItem52.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem52.PARENTITEM = menuItem49; + menuItem52.Select = false; + menuItem52.Text = "调整svg内容"; + menuItem49.Sub.Add(menuItem50); + menuItem49.Sub.Add(menuItem51); + menuItem49.Sub.Add(menuItem52); + menuItem49.Text = "SVG图标菜单"; + menuItem53.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem53.Icon = global::AntdUIDemo.Properties.Resources.关闭; + menuItem53.PARENTITEM = null; + menuItem53.Select = false; + menuItem54.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem54.PARENTITEM = menuItem53; + menuItem54.Select = false; + menuItem54.Text = "不能变色"; + menuItem55.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem55.PARENTITEM = menuItem53; + menuItem55.Select = false; + menuItem55.Text = "不适合使用黑白"; + menuItem56.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem56.PARENTITEM = menuItem53; + menuItem56.Select = false; + menuItem56.Text = "子菜单"; + menuItem53.Sub.Add(menuItem54); + menuItem53.Sub.Add(menuItem55); + menuItem53.Sub.Add(menuItem56); + menuItem53.Text = "图片资源菜单"; + menuItem57.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem57.IconSvg = resources.GetString("menuItem57.IconSvg"); + menuItem57.PARENTITEM = null; + menuItem57.Select = false; + menuItem58.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + menuItem58.PARENTITEM = menuItem57; + menuItem58.Select = false; + menuItem58.Text = "二级菜单"; + menuItem59.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem59.PARENTITEM = menuItem57; + menuItem59.Select = false; + menuItem59.Text = "二级菜单"; + menuItem60.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + menuItem60.PARENTITEM = menuItem57; + menuItem60.Select = false; + menuItem60.Text = "二级菜单"; + menuItem57.Sub.Add(menuItem58); + menuItem57.Sub.Add(menuItem59); + menuItem57.Sub.Add(menuItem60); + menuItem57.Text = "一级菜单"; + this.menu_vertical.Items.Add(menuItem49); + this.menu_vertical.Items.Add(menuItem53); + this.menu_vertical.Items.Add(menuItem57); this.menu_vertical.Location = new System.Drawing.Point(9, 9); this.menu_vertical.Mode = AntdUI.TMenuMode.Vertical; this.menu_vertical.Name = "menu_vertical"; @@ -364,57 +364,57 @@ this.menu_horizontal.Dock = System.Windows.Forms.DockStyle.Top; this.menu_horizontal.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.menu_horizontal.Indent = true; - menuItem25.IconSvg = resources.GetString("menuItem25.IconSvg"); - menuItem25.PARENTITEM = null; - menuItem25.Select = false; - menuItem26.PARENTITEM = null; - menuItem26.Select = false; - menuItem26.Text = "SVG可以变色"; - menuItem27.PARENTITEM = null; - menuItem27.Select = false; - menuItem27.Text = "如果变不了"; - menuItem28.PARENTITEM = null; - menuItem28.Select = false; - menuItem28.Text = "调整svg内容"; - menuItem25.Sub.Add(menuItem26); - menuItem25.Sub.Add(menuItem27); - menuItem25.Sub.Add(menuItem28); - menuItem25.Text = "SVG图标菜单"; - menuItem29.Icon = global::AntdUIDemo.Properties.Resources.关闭; - menuItem29.PARENTITEM = null; - menuItem29.Select = false; - menuItem30.PARENTITEM = null; - menuItem30.Select = false; - menuItem30.Text = "不能变色"; - menuItem31.PARENTITEM = null; - menuItem31.Select = false; - menuItem31.Text = "不适合使用黑白"; - menuItem32.PARENTITEM = null; - menuItem32.Select = false; - menuItem32.Text = "二级菜单"; - menuItem29.Sub.Add(menuItem30); - menuItem29.Sub.Add(menuItem31); - menuItem29.Sub.Add(menuItem32); - menuItem29.Text = "图片资源菜单"; - menuItem33.IconSvg = resources.GetString("menuItem33.IconSvg"); - menuItem33.PARENTITEM = null; - menuItem33.Select = false; - menuItem34.PARENTITEM = null; - menuItem34.Select = false; - menuItem34.Text = "二级菜单"; - menuItem35.PARENTITEM = null; - menuItem35.Select = false; - menuItem35.Text = "二级菜单"; - menuItem36.PARENTITEM = null; - menuItem36.Select = false; - menuItem36.Text = "二级菜单"; - menuItem33.Sub.Add(menuItem34); - menuItem33.Sub.Add(menuItem35); - menuItem33.Sub.Add(menuItem36); - menuItem33.Text = "一级菜单"; - this.menu_horizontal.Items.Add(menuItem25); - this.menu_horizontal.Items.Add(menuItem29); - this.menu_horizontal.Items.Add(menuItem33); + menuItem61.IconSvg = resources.GetString("menuItem61.IconSvg"); + menuItem61.PARENTITEM = null; + menuItem61.Select = false; + menuItem62.PARENTITEM = null; + menuItem62.Select = false; + menuItem62.Text = "SVG可以变色"; + menuItem63.PARENTITEM = null; + menuItem63.Select = false; + menuItem63.Text = "如果变不了"; + menuItem64.PARENTITEM = null; + menuItem64.Select = false; + menuItem64.Text = "调整svg内容"; + menuItem61.Sub.Add(menuItem62); + menuItem61.Sub.Add(menuItem63); + menuItem61.Sub.Add(menuItem64); + menuItem61.Text = "SVG图标菜单"; + menuItem65.Icon = global::AntdUIDemo.Properties.Resources.关闭; + menuItem65.PARENTITEM = null; + menuItem65.Select = false; + menuItem66.PARENTITEM = null; + menuItem66.Select = false; + menuItem66.Text = "不能变色"; + menuItem67.PARENTITEM = null; + menuItem67.Select = false; + menuItem67.Text = "不适合使用黑白"; + menuItem68.PARENTITEM = null; + menuItem68.Select = false; + menuItem68.Text = "二级菜单"; + menuItem65.Sub.Add(menuItem66); + menuItem65.Sub.Add(menuItem67); + menuItem65.Sub.Add(menuItem68); + menuItem65.Text = "图片资源菜单"; + menuItem69.IconSvg = resources.GetString("menuItem69.IconSvg"); + menuItem69.PARENTITEM = null; + menuItem69.Select = false; + menuItem70.PARENTITEM = null; + menuItem70.Select = false; + menuItem70.Text = "二级菜单"; + menuItem71.PARENTITEM = null; + menuItem71.Select = false; + menuItem71.Text = "二级菜单"; + menuItem72.PARENTITEM = null; + menuItem72.Select = false; + menuItem72.Text = "二级菜单"; + menuItem69.Sub.Add(menuItem70); + menuItem69.Sub.Add(menuItem71); + menuItem69.Sub.Add(menuItem72); + menuItem69.Text = "一级菜单"; + this.menu_horizontal.Items.Add(menuItem61); + this.menu_horizontal.Items.Add(menuItem65); + this.menu_horizontal.Items.Add(menuItem69); this.menu_horizontal.Location = new System.Drawing.Point(9, 9); this.menu_horizontal.Mode = AntdUI.TMenuMode.Horizontal; this.menu_horizontal.Name = "menu_horizontal"; @@ -424,7 +424,7 @@ // // divider2 // - this.divider2.Location = new System.Drawing.Point(271, 3); + this.divider2.Location = new System.Drawing.Point(259, 3); this.divider2.Name = "divider2"; this.divider2.Size = new System.Drawing.Size(24, 445); this.divider2.TabIndex = 2; @@ -445,7 +445,7 @@ this.stackPanel3.Controls.Add(this.stackPanel5); this.stackPanel3.Location = new System.Drawing.Point(3, 3); this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(262, 445); + this.stackPanel3.Size = new System.Drawing.Size(250, 445); this.stackPanel3.TabIndex = 0; this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; @@ -453,9 +453,14 @@ // buttonCZ // this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Image = null; + this.buttonCZ.ImageHover = null; + this.buttonCZ.ImageHoverSvg = null; + this.buttonCZ.ImageSize = new System.Drawing.Size(0, 0); + this.buttonCZ.ImageSvg = null; this.buttonCZ.Location = new System.Drawing.Point(3, 383); this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(256, 32); + this.buttonCZ.Size = new System.Drawing.Size(244, 32); this.buttonCZ.TabIndex = 45; this.buttonCZ.Text = "重 置"; this.buttonCZ.Type = AntdUI.TTypeMini.Warn; @@ -467,18 +472,19 @@ this.stackPanel14.Controls.Add(this.label13); this.stackPanel14.Location = new System.Drawing.Point(3, 345); this.stackPanel14.Name = "stackPanel14"; - this.stackPanel14.Size = new System.Drawing.Size(256, 32); + this.stackPanel14.Size = new System.Drawing.Size(244, 32); this.stackPanel14.TabIndex = 44; this.stackPanel14.Text = "stackPanel14"; // // colorPicker_backactive // + this.colorPicker_backactive.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.colorPicker_backactive.Location = new System.Drawing.Point(129, 3); this.colorPicker_backactive.Name = "colorPicker_backactive"; - this.colorPicker_backactive.Size = new System.Drawing.Size(120, 26); + this.colorPicker_backactive.ShowText = true; + this.colorPicker_backactive.Size = new System.Drawing.Size(115, 26); this.colorPicker_backactive.TabIndex = 5; this.colorPicker_backactive.Text = "colorPicker3"; - this.colorPicker_backactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); this.colorPicker_backactive.WaveSize = 0; // // label13 @@ -496,18 +502,19 @@ this.stackPanel13.Controls.Add(this.label12); this.stackPanel13.Location = new System.Drawing.Point(3, 307); this.stackPanel13.Name = "stackPanel13"; - this.stackPanel13.Size = new System.Drawing.Size(256, 32); + this.stackPanel13.Size = new System.Drawing.Size(244, 32); this.stackPanel13.TabIndex = 43; this.stackPanel13.Text = "stackPanel13"; // // colorPicker_backhover // + this.colorPicker_backhover.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.colorPicker_backhover.Location = new System.Drawing.Point(129, 3); this.colorPicker_backhover.Name = "colorPicker_backhover"; - this.colorPicker_backhover.Size = new System.Drawing.Size(120, 26); + this.colorPicker_backhover.ShowText = true; + this.colorPicker_backhover.Size = new System.Drawing.Size(115, 26); this.colorPicker_backhover.TabIndex = 5; this.colorPicker_backhover.Text = "colorPicker2"; - this.colorPicker_backhover.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); this.colorPicker_backhover.WaveSize = 0; // // label12 @@ -525,18 +532,19 @@ this.stackPanel16.Controls.Add(this.label14); this.stackPanel16.Location = new System.Drawing.Point(3, 269); this.stackPanel16.Name = "stackPanel16"; - this.stackPanel16.Size = new System.Drawing.Size(256, 32); + this.stackPanel16.Size = new System.Drawing.Size(244, 32); this.stackPanel16.TabIndex = 42; this.stackPanel16.Text = "stackPanel16"; // // colorPicker_foreactive // + this.colorPicker_foreactive.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.colorPicker_foreactive.Location = new System.Drawing.Point(129, 3); this.colorPicker_foreactive.Name = "colorPicker_foreactive"; - this.colorPicker_foreactive.Size = new System.Drawing.Size(120, 26); + this.colorPicker_foreactive.ShowText = true; + this.colorPicker_foreactive.Size = new System.Drawing.Size(115, 26); this.colorPicker_foreactive.TabIndex = 5; this.colorPicker_foreactive.Text = "colorPicker1"; - this.colorPicker_foreactive.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); this.colorPicker_foreactive.WaveSize = 0; // // label14 @@ -554,18 +562,19 @@ this.stackPanel12.Controls.Add(this.label11); this.stackPanel12.Location = new System.Drawing.Point(3, 231); this.stackPanel12.Name = "stackPanel12"; - this.stackPanel12.Size = new System.Drawing.Size(256, 32); + this.stackPanel12.Size = new System.Drawing.Size(244, 32); this.stackPanel12.TabIndex = 41; this.stackPanel12.Text = "stackPanel12"; // // colorPicker_forecolor // + this.colorPicker_forecolor.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.colorPicker_forecolor.Location = new System.Drawing.Point(129, 3); this.colorPicker_forecolor.Name = "colorPicker_forecolor"; - this.colorPicker_forecolor.Size = new System.Drawing.Size(120, 26); + this.colorPicker_forecolor.ShowText = true; + this.colorPicker_forecolor.Size = new System.Drawing.Size(115, 26); this.colorPicker_forecolor.TabIndex = 5; this.colorPicker_forecolor.Text = "colorPicker1"; - this.colorPicker_forecolor.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); this.colorPicker_forecolor.WaveSize = 0; // // label11 @@ -583,7 +592,7 @@ this.stackPanel11.Controls.Add(this.label9); this.stackPanel11.Location = new System.Drawing.Point(3, 193); this.stackPanel11.Name = "stackPanel11"; - this.stackPanel11.Size = new System.Drawing.Size(256, 32); + this.stackPanel11.Size = new System.Drawing.Size(244, 32); this.stackPanel11.TabIndex = 17; this.stackPanel11.Text = "stackPanel11"; // @@ -598,7 +607,7 @@ this.select_unique.Name = "select_unique"; this.select_unique.SelectedIndex = 1; this.select_unique.SelectedValue = "False"; - this.select_unique.Size = new System.Drawing.Size(120, 26); + this.select_unique.Size = new System.Drawing.Size(115, 26); this.select_unique.TabIndex = 11; this.select_unique.Text = "False"; this.select_unique.WaveSize = 0; @@ -618,7 +627,7 @@ this.stackPanel10.Controls.Add(this.label8); this.stackPanel10.Location = new System.Drawing.Point(3, 155); this.stackPanel10.Name = "stackPanel10"; - this.stackPanel10.Size = new System.Drawing.Size(256, 32); + this.stackPanel10.Size = new System.Drawing.Size(244, 32); this.stackPanel10.TabIndex = 16; this.stackPanel10.Text = "stackPanel10"; // @@ -633,7 +642,7 @@ this.select_showsubback.Name = "select_showsubback"; this.select_showsubback.SelectedIndex = 1; this.select_showsubback.SelectedValue = "False"; - this.select_showsubback.Size = new System.Drawing.Size(120, 26); + this.select_showsubback.Size = new System.Drawing.Size(115, 26); this.select_showsubback.TabIndex = 11; this.select_showsubback.Text = "False"; this.select_showsubback.WaveSize = 0; @@ -653,7 +662,7 @@ this.stackPanel9.Controls.Add(this.label7); this.stackPanel9.Location = new System.Drawing.Point(3, 117); this.stackPanel9.Name = "stackPanel9"; - this.stackPanel9.Size = new System.Drawing.Size(256, 32); + this.stackPanel9.Size = new System.Drawing.Size(244, 32); this.stackPanel9.TabIndex = 15; this.stackPanel9.Text = "stackPanel9"; // @@ -668,7 +677,7 @@ this.select_round.Name = "select_round"; this.select_round.SelectedIndex = 1; this.select_round.SelectedValue = "False"; - this.select_round.Size = new System.Drawing.Size(120, 26); + this.select_round.Size = new System.Drawing.Size(115, 26); this.select_round.TabIndex = 11; this.select_round.Text = "False"; this.select_round.WaveSize = 0; @@ -688,7 +697,7 @@ this.stackPanel8.Controls.Add(this.label6); this.stackPanel8.Location = new System.Drawing.Point(3, 79); this.stackPanel8.Name = "stackPanel8"; - this.stackPanel8.Size = new System.Drawing.Size(256, 32); + this.stackPanel8.Size = new System.Drawing.Size(244, 32); this.stackPanel8.TabIndex = 14; this.stackPanel8.Text = "stackPanel8"; // @@ -702,7 +711,7 @@ 0, 0}); this.input_radius.Name = "input_radius"; - this.input_radius.Size = new System.Drawing.Size(120, 26); + this.input_radius.Size = new System.Drawing.Size(115, 26); this.input_radius.TabIndex = 5; this.input_radius.Text = "6"; this.input_radius.Value = new decimal(new int[] { @@ -727,7 +736,7 @@ this.stackPanel6.Controls.Add(this.label4); this.stackPanel6.Location = new System.Drawing.Point(3, 41); this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(256, 32); + this.stackPanel6.Size = new System.Drawing.Size(244, 32); this.stackPanel6.TabIndex = 12; this.stackPanel6.Text = "stackPanel6"; // @@ -742,7 +751,7 @@ this.select_indent.Name = "select_indent"; this.select_indent.SelectedIndex = 0; this.select_indent.SelectedValue = "True"; - this.select_indent.Size = new System.Drawing.Size(120, 26); + this.select_indent.Size = new System.Drawing.Size(115, 26); this.select_indent.TabIndex = 11; this.select_indent.Text = "True"; this.select_indent.WaveSize = 0; @@ -762,7 +771,7 @@ 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(256, 32); + this.stackPanel5.Size = new System.Drawing.Size(244, 32); this.stackPanel5.TabIndex = 11; this.stackPanel5.Text = "stackPanel5"; // @@ -777,7 +786,7 @@ this.select_collapsed.Name = "select_collapsed"; this.select_collapsed.SelectedIndex = 1; this.select_collapsed.SelectedValue = "False"; - this.select_collapsed.Size = new System.Drawing.Size(120, 26); + this.select_collapsed.Size = new System.Drawing.Size(115, 26); this.select_collapsed.TabIndex = 11; this.select_collapsed.Text = "False"; this.select_collapsed.WaveSize = 0; diff --git a/Views/MenuDemo.resx b/Views/MenuDemo.resx index 4868381..2bebb9e 100644 --- a/Views/MenuDemo.resx +++ b/Views/MenuDemo.resx @@ -117,22 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + <svg t="1724229402123" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7948" width="200" height="200"><path d="M911.945421 306.603008l-62.497894 36.07767c-17.62304 10.177843-40.14592 4.144435-50.315981-13.476966-10.177229-17.622323-4.143514-40.145306 13.469286-50.324173l62.422221-36.033638c-30.075187-43.229594-67.660698-80.808448-110.886912-110.890598l-36.04951 62.414541c-10.171085 17.621299-32.692941 23.654707-50.315981 13.486182-17.625088-10.177843-23.656755-32.700723-13.479526-50.322125L700.379443 95.037542c-46.631936-22.00105-97.723597-36.02135-151.551693-40.466637l0 72.03564c0 20.337152-16.480973 36.835942-36.837478 36.835942-20.336947 0-36.836454-16.49879-36.836454-36.835942L475.153818 54.56985c-53.817856 4.44631-104.912589 18.465587-151.533261 40.461517l36.089344 62.502502c10.170061 17.622323 4.134298 40.144282-13.488742 50.322125-17.611776 10.168627-40.14592 4.135219-50.325197-13.486182l-36.032102-62.414541c-43.23543 30.08215-80.811725 67.666125-110.89408 110.890598l62.410957 36.033638c17.624064 10.178867 23.656755 32.702771 13.488742 50.324173-10.170061 17.621299-32.703181 23.655731-50.327245 13.476966l-62.497894-36.071526c-26.967245 57.152717-42.104627 120.981402-42.104627 188.367155 0 244.134298 197.907354 442.041651 442.05056 442.041651 244.153446 0 442.066944-197.905408 442.066944-442.041651C954.05824 427.586458 938.919834 363.755725 911.945421 306.603008zM767.225549 642.319053c-81.385882 140.943053-261.623091 189.244109-402.584166 107.86775-140.962099-81.382502-189.253939-261.618483-107.864986-402.564608 81.37769-140.946125 261.624115-189.245133 402.584166-107.869798C800.302285 321.13705 848.603238 501.372928 767.225549 642.319053zM667.258778 305.542861 562.319565 482.312909c-10.170061 17.611059-32.694989 23.654707-50.325197 13.487206-17.6128-10.178867-23.655731-32.710963-13.478502-50.324173L603.857306 268.040704c-28.383539-11.459994-59.370598-17.823949-91.862938-17.823949-135.626342 0-245.582029 109.951181-245.582029 245.583258 0 135.619789 109.955686 245.571994 245.582029 245.571994 135.644774 0 245.593293-109.950157 245.593293-245.571994C757.587661 419.071488 722.381414 350.581658 667.258778 305.542861z" p-id="7949"></path></svg> - + <svg t="1724229420898" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8098" width="200" height="200"><path d="M892.928 128q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0zM892.928 448.512q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0zM892.928 769.024q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0z" p-id="8099"></path></svg> - + <svg t="1724229402123" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7948" width="200" height="200"><path d="M911.945421 306.603008l-62.497894 36.07767c-17.62304 10.177843-40.14592 4.144435-50.315981-13.476966-10.177229-17.622323-4.143514-40.145306 13.469286-50.324173l62.422221-36.033638c-30.075187-43.229594-67.660698-80.808448-110.886912-110.890598l-36.04951 62.414541c-10.171085 17.621299-32.692941 23.654707-50.315981 13.486182-17.625088-10.177843-23.656755-32.700723-13.479526-50.322125L700.379443 95.037542c-46.631936-22.00105-97.723597-36.02135-151.551693-40.466637l0 72.03564c0 20.337152-16.480973 36.835942-36.837478 36.835942-20.336947 0-36.836454-16.49879-36.836454-36.835942L475.153818 54.56985c-53.817856 4.44631-104.912589 18.465587-151.533261 40.461517l36.089344 62.502502c10.170061 17.622323 4.134298 40.144282-13.488742 50.322125-17.611776 10.168627-40.14592 4.135219-50.325197-13.486182l-36.032102-62.414541c-43.23543 30.08215-80.811725 67.666125-110.89408 110.890598l62.410957 36.033638c17.624064 10.178867 23.656755 32.702771 13.488742 50.324173-10.170061 17.621299-32.703181 23.655731-50.327245 13.476966l-62.497894-36.071526c-26.967245 57.152717-42.104627 120.981402-42.104627 188.367155 0 244.134298 197.907354 442.041651 442.05056 442.041651 244.153446 0 442.066944-197.905408 442.066944-442.041651C954.05824 427.586458 938.919834 363.755725 911.945421 306.603008zM767.225549 642.319053c-81.385882 140.943053-261.623091 189.244109-402.584166 107.86775-140.962099-81.382502-189.253939-261.618483-107.864986-402.564608 81.37769-140.946125 261.624115-189.245133 402.584166-107.869798C800.302285 321.13705 848.603238 501.372928 767.225549 642.319053zM667.258778 305.542861 562.319565 482.312909c-10.170061 17.611059-32.694989 23.654707-50.325197 13.487206-17.6128-10.178867-23.655731-32.710963-13.478502-50.324173L603.857306 268.040704c-28.383539-11.459994-59.370598-17.823949-91.862938-17.823949-135.626342 0-245.582029 109.951181-245.582029 245.583258 0 135.619789 109.955686 245.571994 245.582029 245.571994 135.644774 0 245.593293-109.950157 245.593293-245.571994C757.587661 419.071488 722.381414 350.581658 667.258778 305.542861z" p-id="7949"></path></svg> - + <svg t="1724229420898" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8098" width="200" height="200"><path d="M892.928 128q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0zM892.928 448.512q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0zM892.928 769.024q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0z" p-id="8099"></path></svg> - + <svg t="1724229402123" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7948" width="200" height="200"><path d="M911.945421 306.603008l-62.497894 36.07767c-17.62304 10.177843-40.14592 4.144435-50.315981-13.476966-10.177229-17.622323-4.143514-40.145306 13.469286-50.324173l62.422221-36.033638c-30.075187-43.229594-67.660698-80.808448-110.886912-110.890598l-36.04951 62.414541c-10.171085 17.621299-32.692941 23.654707-50.315981 13.486182-17.625088-10.177843-23.656755-32.700723-13.479526-50.322125L700.379443 95.037542c-46.631936-22.00105-97.723597-36.02135-151.551693-40.466637l0 72.03564c0 20.337152-16.480973 36.835942-36.837478 36.835942-20.336947 0-36.836454-16.49879-36.836454-36.835942L475.153818 54.56985c-53.817856 4.44631-104.912589 18.465587-151.533261 40.461517l36.089344 62.502502c10.170061 17.622323 4.134298 40.144282-13.488742 50.322125-17.611776 10.168627-40.14592 4.135219-50.325197-13.486182l-36.032102-62.414541c-43.23543 30.08215-80.811725 67.666125-110.89408 110.890598l62.410957 36.033638c17.624064 10.178867 23.656755 32.702771 13.488742 50.324173-10.170061 17.621299-32.703181 23.655731-50.327245 13.476966l-62.497894-36.071526c-26.967245 57.152717-42.104627 120.981402-42.104627 188.367155 0 244.134298 197.907354 442.041651 442.05056 442.041651 244.153446 0 442.066944-197.905408 442.066944-442.041651C954.05824 427.586458 938.919834 363.755725 911.945421 306.603008zM767.225549 642.319053c-81.385882 140.943053-261.623091 189.244109-402.584166 107.86775-140.962099-81.382502-189.253939-261.618483-107.864986-402.564608 81.37769-140.946125 261.624115-189.245133 402.584166-107.869798C800.302285 321.13705 848.603238 501.372928 767.225549 642.319053zM667.258778 305.542861 562.319565 482.312909c-10.170061 17.611059-32.694989 23.654707-50.325197 13.487206-17.6128-10.178867-23.655731-32.710963-13.478502-50.324173L603.857306 268.040704c-28.383539-11.459994-59.370598-17.823949-91.862938-17.823949-135.626342 0-245.582029 109.951181-245.582029 245.583258 0 135.619789 109.955686 245.571994 245.582029 245.571994 135.644774 0 245.593293-109.950157 245.593293-245.571994C757.587661 419.071488 722.381414 350.581658 667.258778 305.542861z" p-id="7949"></path></svg> - + <svg t="1724229420898" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8098" width="200" height="200"><path d="M892.928 128q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0zM892.928 448.512q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0zM892.928 769.024q28.672 0 48.64 19.968t19.968 48.64l0 52.224q0 28.672-19.968 48.64t-48.64 19.968l-759.808 0q-28.672 0-48.64-19.968t-19.968-48.64l0-52.224q0-28.672 19.968-48.64t48.64-19.968l759.808 0z" p-id="8099"></path></svg> \ No newline at end of file diff --git a/Views/PaginationDemo.Designer.cs b/Views/PaginationDemo.Designer.cs index af64bac..ae5d8ec 100644 --- a/Views/PaginationDemo.Designer.cs +++ b/Views/PaginationDemo.Designer.cs @@ -33,7 +33,15 @@ this.divider1 = new AntdUI.Divider(); this.label12 = new AntdUI.Label(); this.stackPanel1 = new AntdUI.StackPanel(); + this.pagination = new AntdUI.Pagination(); + this.stackPanel7 = new AntdUI.StackPanel(); + this.buttonCZ = new AntdUI.Button(); + this.stackPanel6 = new AntdUI.StackPanel(); + this.switch_right = new AntdUI.Switch(); + this.label15 = new AntdUI.Label(); this.stackPanel5 = new AntdUI.StackPanel(); + this.input_size = new AntdUI.InputNumber(); + this.label13 = new AntdUI.Label(); this.selectMultiple = new AntdUI.SelectMultiple(); this.label14 = new AntdUI.Label(); this.stackPanel4 = new AntdUI.StackPanel(); @@ -57,21 +65,13 @@ this.label3 = new AntdUI.Label(); this.input_current = new AntdUI.InputNumber(); this.label7 = new AntdUI.Label(); - this.input_size = new AntdUI.InputNumber(); - this.label13 = new AntdUI.Label(); - this.stackPanel6 = new AntdUI.StackPanel(); - this.switch_right = new AntdUI.Switch(); - this.label15 = new AntdUI.Label(); - this.stackPanel7 = new AntdUI.StackPanel(); - this.buttonCZ = new AntdUI.Button(); - this.pagination = new AntdUI.Pagination(); this.stackPanel1.SuspendLayout(); + this.stackPanel7.SuspendLayout(); + this.stackPanel6.SuspendLayout(); this.stackPanel5.SuspendLayout(); this.stackPanel4.SuspendLayout(); this.stackPanel3.SuspendLayout(); this.stackPanel2.SuspendLayout(); - this.stackPanel6.SuspendLayout(); - this.stackPanel7.SuspendLayout(); this.SuspendLayout(); // // label1 @@ -129,6 +129,74 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // + // pagination + // + this.pagination.Location = new System.Drawing.Point(3, 361); + this.pagination.Name = "pagination"; + this.pagination.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.pagination.Size = new System.Drawing.Size(694, 38); + this.pagination.SizeChangerWidth = 60; + this.pagination.TabIndex = 50; + this.pagination.Text = "pagination1"; + // + // stackPanel7 + // + this.stackPanel7.Controls.Add(this.buttonCZ); + this.stackPanel7.Location = new System.Drawing.Point(3, 317); + this.stackPanel7.Name = "stackPanel7"; + this.stackPanel7.Size = new System.Drawing.Size(694, 38); + this.stackPanel7.TabIndex = 49; + this.stackPanel7.Text = "stackPanel7"; + // + // buttonCZ + // + this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Image = null; + this.buttonCZ.ImageHover = null; + this.buttonCZ.ImageHoverSvg = null; + this.buttonCZ.ImageSize = new System.Drawing.Size(0, 0); + this.buttonCZ.ImageSvg = null; + this.buttonCZ.Location = new System.Drawing.Point(3, 3); + this.buttonCZ.Name = "buttonCZ"; + this.buttonCZ.Size = new System.Drawing.Size(75, 32); + this.buttonCZ.TabIndex = 16; + this.buttonCZ.Text = "重 置"; + this.buttonCZ.Type = AntdUI.TTypeMini.Warn; + this.buttonCZ.WaveSize = 0; + // + // stackPanel6 + // + this.stackPanel6.Controls.Add(this.switch_right); + this.stackPanel6.Controls.Add(this.label15); + this.stackPanel6.Location = new System.Drawing.Point(3, 279); + this.stackPanel6.Name = "stackPanel6"; + this.stackPanel6.Size = new System.Drawing.Size(694, 32); + this.stackPanel6.TabIndex = 47; + this.stackPanel6.Text = "stackPanel6"; + // + // switch_right + // + this.switch_right.AutoCheck = true; + this.switch_right.Checked = true; + this.switch_right.CheckedText = "Yes"; + this.switch_right.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.switch_right.Location = new System.Drawing.Point(129, 3); + this.switch_right.Name = "switch_right"; + this.switch_right.Size = new System.Drawing.Size(60, 26); + this.switch_right.TabIndex = 15; + this.switch_right.Text = "switch1"; + this.switch_right.UnCheckedText = "No"; + this.switch_right.WaveSize = 0; + // + // label15 + // + this.label15.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(3, 3); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(120, 26); + this.label15.TabIndex = 14; + this.label15.Text = "RightToLeft"; + // // stackPanel5 // this.stackPanel5.Controls.Add(this.input_size); @@ -141,6 +209,35 @@ this.stackPanel5.TabIndex = 45; this.stackPanel5.Text = "stackPanel5"; // + // input_size + // + this.input_size.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_size.Location = new System.Drawing.Point(588, 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(60, 26); + this.input_size.TabIndex = 18; + this.input_size.Text = "85"; + this.input_size.Value = new decimal(new int[] { + 85, + 0, + 0, + 0}); + this.input_size.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(427, 3); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(155, 26); + this.label13.TabIndex = 17; + this.label13.Text = "SizeChangerWidth"; + // // selectMultiple // this.selectMultiple.Items.AddRange(new object[] { @@ -154,7 +251,7 @@ this.selectMultiple.Location = new System.Drawing.Point(159, 3); this.selectMultiple.Name = "selectMultiple"; this.selectMultiple.SelectedValue = new object[0]; - this.selectMultiple.Size = new System.Drawing.Size(252, 26); + this.selectMultiple.Size = new System.Drawing.Size(262, 26); this.selectMultiple.TabIndex = 9; this.selectMultiple.WaveSize = 0; // @@ -185,20 +282,20 @@ // this.switch_show.AutoCheck = true; this.switch_show.Checked = true; - this.switch_show.CheckedText = "True"; + this.switch_show.CheckedText = ""; 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(578, 3); + this.switch_show.Location = new System.Drawing.Point(588, 3); this.switch_show.Name = "switch_show"; - this.switch_show.Size = new System.Drawing.Size(75, 26); + this.switch_show.Size = new System.Drawing.Size(60, 26); this.switch_show.TabIndex = 13; this.switch_show.Text = "switch1"; - this.switch_show.UnCheckedText = "False"; + this.switch_show.UnCheckedText = ""; this.switch_show.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(417, 3); + this.label9.Location = new System.Drawing.Point(427, 3); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(155, 26); this.label9.TabIndex = 12; @@ -206,16 +303,17 @@ // // input_textdesc // - this.input_textdesc.Location = new System.Drawing.Point(336, 3); + this.input_textdesc.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_textdesc.Location = new System.Drawing.Point(321, 3); this.input_textdesc.Name = "input_textdesc"; - this.input_textdesc.Size = new System.Drawing.Size(75, 26); + this.input_textdesc.Size = new System.Drawing.Size(100, 26); this.input_textdesc.TabIndex = 11; this.input_textdesc.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(210, 3); + this.label10.Location = new System.Drawing.Point(195, 3); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(120, 26); this.label10.TabIndex = 10; @@ -223,6 +321,7 @@ // // input_radius // + this.input_radius.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.input_radius.Location = new System.Drawing.Point(129, 3); this.input_radius.Minimum = new decimal(new int[] { 0, @@ -230,7 +329,7 @@ 0, 0}); this.input_radius.Name = "input_radius"; - this.input_radius.Size = new System.Drawing.Size(75, 26); + this.input_radius.Size = new System.Drawing.Size(60, 26); this.input_radius.TabIndex = 9; this.input_radius.Text = "6"; this.input_radius.Value = new decimal(new int[] { @@ -265,14 +364,15 @@ // // input_gap // - this.input_gap.Location = new System.Drawing.Point(578, 3); + this.input_gap.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_gap.Location = new System.Drawing.Point(588, 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.Size = new System.Drawing.Size(60, 26); this.input_gap.TabIndex = 16; this.input_gap.Text = "8"; this.input_gap.Value = new decimal(new int[] { @@ -285,7 +385,7 @@ // label5 // this.label5.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(417, 3); + this.label5.Location = new System.Drawing.Point(427, 3); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(155, 26); this.label5.TabIndex = 15; @@ -293,17 +393,20 @@ // // colorPicker // - this.colorPicker.Location = new System.Drawing.Point(336, 3); + this.colorPicker.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.colorPicker.Location = new System.Drawing.Point(321, 3); this.colorPicker.Name = "colorPicker"; - this.colorPicker.Size = new System.Drawing.Size(75, 26); + this.colorPicker.ShowText = true; + 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 // 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(210, 3); + this.label6.Location = new System.Drawing.Point(195, 3); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(120, 26); this.label6.TabIndex = 10; @@ -311,6 +414,7 @@ // // input_max // + this.input_max.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.input_max.Location = new System.Drawing.Point(129, 3); this.input_max.Minimum = new decimal(new int[] { 0, @@ -318,7 +422,7 @@ 0, 0}); this.input_max.Name = "input_max"; - this.input_max.Size = new System.Drawing.Size(75, 26); + this.input_max.Size = new System.Drawing.Size(60, 26); this.input_max.TabIndex = 9; this.input_max.Text = "0"; this.input_max.WaveSize = 0; @@ -348,14 +452,15 @@ // // input_total // - this.input_total.Location = new System.Drawing.Point(578, 3); + this.input_total.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_total.Location = new System.Drawing.Point(588, 3); this.input_total.Minimum = new decimal(new int[] { 0, 0, 0, 0}); this.input_total.Name = "input_total"; - this.input_total.Size = new System.Drawing.Size(75, 26); + this.input_total.Size = new System.Drawing.Size(60, 26); this.input_total.TabIndex = 13; this.input_total.Text = "50"; this.input_total.Value = new decimal(new int[] { @@ -368,7 +473,7 @@ // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label4.Location = new System.Drawing.Point(417, 3); + this.label4.Location = new System.Drawing.Point(427, 3); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(155, 26); this.label4.TabIndex = 12; @@ -376,14 +481,15 @@ // // input_pagesize // - this.input_pagesize.Location = new System.Drawing.Point(336, 3); + this.input_pagesize.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + this.input_pagesize.Location = new System.Drawing.Point(321, 3); this.input_pagesize.Minimum = new decimal(new int[] { 0, 0, 0, 0}); this.input_pagesize.Name = "input_pagesize"; - this.input_pagesize.Size = new System.Drawing.Size(75, 26); + this.input_pagesize.Size = new System.Drawing.Size(100, 26); this.input_pagesize.TabIndex = 11; this.input_pagesize.Text = "10"; this.input_pagesize.Value = new decimal(new int[] { @@ -396,7 +502,7 @@ // label3 // this.label3.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(210, 3); + this.label3.Location = new System.Drawing.Point(195, 3); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(120, 26); this.label3.TabIndex = 10; @@ -404,6 +510,7 @@ // // input_current // + this.input_current.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.input_current.Location = new System.Drawing.Point(129, 3); this.input_current.Minimum = new decimal(new int[] { 0, @@ -411,7 +518,7 @@ 0, 0}); this.input_current.Name = "input_current"; - this.input_current.Size = new System.Drawing.Size(75, 26); + this.input_current.Size = new System.Drawing.Size(60, 26); this.input_current.TabIndex = 9; this.input_current.Text = "1"; this.input_current.Value = new decimal(new int[] { @@ -430,96 +537,6 @@ this.label7.TabIndex = 8; this.label7.Text = "Current"; // - // input_size - // - this.input_size.Location = new System.Drawing.Point(578, 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 = 18; - this.input_size.Text = "60"; - this.input_size.Value = new decimal(new int[] { - 60, - 0, - 0, - 0}); - this.input_size.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(417, 3); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(155, 26); - this.label13.TabIndex = 17; - this.label13.Text = "SizeChangerWidth"; - // - // stackPanel6 - // - this.stackPanel6.Controls.Add(this.switch_right); - this.stackPanel6.Controls.Add(this.label15); - this.stackPanel6.Location = new System.Drawing.Point(3, 279); - this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(694, 38); - this.stackPanel6.TabIndex = 47; - this.stackPanel6.Text = "stackPanel6"; - // - // switch_right - // - this.switch_right.AutoCheck = true; - this.switch_right.Checked = true; - this.switch_right.CheckedText = "Yes"; - this.switch_right.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.switch_right.Location = new System.Drawing.Point(129, 3); - this.switch_right.Name = "switch_right"; - this.switch_right.Size = new System.Drawing.Size(75, 32); - this.switch_right.TabIndex = 15; - this.switch_right.Text = "switch1"; - this.switch_right.UnCheckedText = "No"; - this.switch_right.WaveSize = 0; - // - // label15 - // - this.label15.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(3, 3); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(120, 32); - this.label15.TabIndex = 14; - this.label15.Text = "RightToLeft"; - // - // stackPanel7 - // - this.stackPanel7.Controls.Add(this.buttonCZ); - this.stackPanel7.Location = new System.Drawing.Point(3, 323); - this.stackPanel7.Name = "stackPanel7"; - this.stackPanel7.Size = new System.Drawing.Size(694, 38); - this.stackPanel7.TabIndex = 49; - this.stackPanel7.Text = "stackPanel7"; - // - // buttonCZ - // - this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.buttonCZ.Location = new System.Drawing.Point(3, 3); - this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(75, 32); - this.buttonCZ.TabIndex = 16; - this.buttonCZ.Text = "重 置"; - this.buttonCZ.Type = AntdUI.TTypeMini.Warn; - this.buttonCZ.WaveSize = 0; - // - // pagination - // - this.pagination.Location = new System.Drawing.Point(3, 367); - this.pagination.Name = "pagination"; - this.pagination.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.pagination.Size = new System.Drawing.Size(694, 32); - this.pagination.TabIndex = 50; - this.pagination.Text = "pagination1"; - // // PaginationDemo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -527,12 +544,12 @@ this.Name = "PaginationDemo"; this.Size = new System.Drawing.Size(700, 535); this.stackPanel1.ResumeLayout(false); + this.stackPanel7.ResumeLayout(false); + this.stackPanel6.ResumeLayout(false); this.stackPanel5.ResumeLayout(false); this.stackPanel4.ResumeLayout(false); this.stackPanel3.ResumeLayout(false); this.stackPanel2.ResumeLayout(false); - this.stackPanel6.ResumeLayout(false); - this.stackPanel7.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/Views/PaginationDemo.cs b/Views/PaginationDemo.cs index ec0b014..c5e16e3 100644 --- a/Views/PaginationDemo.cs +++ b/Views/PaginationDemo.cs @@ -13,8 +13,6 @@ namespace AntdUIDemo.Views { public partial class PaginationDemo : UserControl { - private int selectMultiple_SelectedIndexChanged; - public PaginationDemo() { InitializeComponent(); @@ -123,7 +121,7 @@ namespace AntdUIDemo.Views input_max.Value = 0; input_gap.Value = 8; input_radius.Value = 6; - input_size.Value = 60; + input_size.Value = 85; input_textdesc.Text = null; diff --git a/Views/PanelDemo.Designer.cs b/Views/PanelDemo.Designer.cs index d62633e..27337c7 100644 --- a/Views/PanelDemo.Designer.cs +++ b/Views/PanelDemo.Designer.cs @@ -32,7 +32,6 @@ this.stackPanel2 = new AntdUI.StackPanel(); this.stackPanel15 = new AntdUI.StackPanel(); this.panel = new AntdUI.Panel(); - this.buttonCZ = new AntdUI.Button(); this.stackPanel13 = new AntdUI.StackPanel(); this.input_shadowOH = new AntdUI.InputNumber(); this.label12 = new AntdUI.Label(); @@ -40,6 +39,7 @@ this.select_shadowOA = new AntdUI.Select(); this.label13 = new AntdUI.Label(); this.stackPanel3 = new AntdUI.StackPanel(); + this.buttonCZ = new AntdUI.Button(); this.stackPanel12 = new AntdUI.StackPanel(); this.input_shadowO = new AntdUI.InputNumber(); this.label11 = new AntdUI.Label(); @@ -115,19 +115,18 @@ this.stackPanel2.Controls.Add(this.stackPanel3); this.stackPanel2.Location = new System.Drawing.Point(3, 97); this.stackPanel2.Name = "stackPanel2"; - this.stackPanel2.Size = new System.Drawing.Size(694, 437); + this.stackPanel2.Size = new System.Drawing.Size(694, 469); this.stackPanel2.TabIndex = 9; this.stackPanel2.Text = "stackPanel2"; // // stackPanel15 // this.stackPanel15.Controls.Add(this.panel); - this.stackPanel15.Controls.Add(this.buttonCZ); this.stackPanel15.Controls.Add(this.stackPanel13); this.stackPanel15.Controls.Add(this.stackPanel14); - this.stackPanel15.Location = new System.Drawing.Point(289, 3); + this.stackPanel15.Location = new System.Drawing.Point(259, 3); this.stackPanel15.Name = "stackPanel15"; - this.stackPanel15.Size = new System.Drawing.Size(373, 431); + this.stackPanel15.Size = new System.Drawing.Size(462, 463); this.stackPanel15.TabIndex = 1; this.stackPanel15.Text = "stackPanel15"; this.stackPanel15.Vertical = true; @@ -135,32 +134,21 @@ // panel // this.panel.BackColor = System.Drawing.Color.Transparent; - this.panel.Location = new System.Drawing.Point(3, 117); + this.panel.Location = new System.Drawing.Point(3, 79); this.panel.Name = "panel"; this.panel.Shadow = 12; this.panel.ShadowOpacityAnimation = true; - this.panel.Size = new System.Drawing.Size(367, 298); + this.panel.Size = new System.Drawing.Size(456, 298); this.panel.TabIndex = 35; this.panel.Text = "panel1"; // - // buttonCZ - // - this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.buttonCZ.Location = new System.Drawing.Point(3, 79); - this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(367, 32); - this.buttonCZ.TabIndex = 33; - this.buttonCZ.Text = "重 置"; - this.buttonCZ.Type = AntdUI.TTypeMini.Warn; - this.buttonCZ.WaveSize = 0; - // // stackPanel13 // this.stackPanel13.Controls.Add(this.input_shadowOH); this.stackPanel13.Controls.Add(this.label12); this.stackPanel13.Location = new System.Drawing.Point(3, 41); this.stackPanel13.Name = "stackPanel13"; - this.stackPanel13.Size = new System.Drawing.Size(367, 32); + this.stackPanel13.Size = new System.Drawing.Size(456, 32); this.stackPanel13.TabIndex = 30; this.stackPanel13.Text = "stackPanel13"; // @@ -185,7 +173,7 @@ 0, 0}); this.input_shadowOH.Name = "input_shadowOH"; - this.input_shadowOH.Size = new System.Drawing.Size(132, 26); + this.input_shadowOH.Size = new System.Drawing.Size(75, 26); this.input_shadowOH.TabIndex = 5; this.input_shadowOH.Text = "0.30"; this.input_shadowOH.Value = new decimal(new int[] { @@ -210,7 +198,7 @@ this.stackPanel14.Controls.Add(this.label13); this.stackPanel14.Location = new System.Drawing.Point(3, 3); this.stackPanel14.Name = "stackPanel14"; - this.stackPanel14.Size = new System.Drawing.Size(367, 32); + this.stackPanel14.Size = new System.Drawing.Size(456, 32); this.stackPanel14.TabIndex = 29; this.stackPanel14.Text = "stackPanel14"; // @@ -225,7 +213,7 @@ this.select_shadowOA.Name = "select_shadowOA"; this.select_shadowOA.SelectedIndex = 0; this.select_shadowOA.SelectedValue = "True"; - this.select_shadowOA.Size = new System.Drawing.Size(132, 26); + 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; @@ -241,6 +229,7 @@ // // stackPanel3 // + this.stackPanel3.Controls.Add(this.buttonCZ); this.stackPanel3.Controls.Add(this.stackPanel12); this.stackPanel3.Controls.Add(this.stackPanel11); this.stackPanel3.Controls.Add(this.stackPanel10); @@ -254,18 +243,34 @@ this.stackPanel3.Controls.Add(this.stackPanel4); this.stackPanel3.Location = new System.Drawing.Point(3, 3); this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(280, 431); + this.stackPanel3.Size = new System.Drawing.Size(250, 463); this.stackPanel3.TabIndex = 0; this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; // + // buttonCZ + // + this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Image = null; + this.buttonCZ.ImageHover = null; + this.buttonCZ.ImageHoverSvg = null; + this.buttonCZ.ImageSize = new System.Drawing.Size(0, 0); + this.buttonCZ.ImageSvg = null; + this.buttonCZ.Location = new System.Drawing.Point(3, 421); + this.buttonCZ.Name = "buttonCZ"; + this.buttonCZ.Size = new System.Drawing.Size(244, 32); + this.buttonCZ.TabIndex = 35; + this.buttonCZ.Text = "重 置"; + this.buttonCZ.Type = AntdUI.TTypeMini.Warn; + this.buttonCZ.WaveSize = 0; + // // stackPanel12 // this.stackPanel12.Controls.Add(this.input_shadowO); this.stackPanel12.Controls.Add(this.label11); this.stackPanel12.Location = new System.Drawing.Point(3, 383); this.stackPanel12.Name = "stackPanel12"; - this.stackPanel12.Size = new System.Drawing.Size(274, 32); + this.stackPanel12.Size = new System.Drawing.Size(244, 32); this.stackPanel12.TabIndex = 34; this.stackPanel12.Text = "stackPanel12"; // @@ -290,7 +295,7 @@ 0, 0}); this.input_shadowO.Name = "input_shadowO"; - this.input_shadowO.Size = new System.Drawing.Size(120, 26); + this.input_shadowO.Size = new System.Drawing.Size(100, 26); this.input_shadowO.TabIndex = 5; this.input_shadowO.Text = "0.20"; this.input_shadowO.Value = new decimal(new int[] { @@ -315,7 +320,7 @@ this.stackPanel11.Controls.Add(this.label9); this.stackPanel11.Location = new System.Drawing.Point(3, 345); this.stackPanel11.Name = "stackPanel11"; - this.stackPanel11.Size = new System.Drawing.Size(274, 32); + this.stackPanel11.Size = new System.Drawing.Size(244, 32); this.stackPanel11.TabIndex = 33; this.stackPanel11.Text = "stackPanel11"; // @@ -329,7 +334,7 @@ 0, 0}); this.input_shadowY.Name = "input_shadowY"; - this.input_shadowY.Size = new System.Drawing.Size(120, 26); + this.input_shadowY.Size = new System.Drawing.Size(100, 26); this.input_shadowY.TabIndex = 5; this.input_shadowY.Text = "0"; this.input_shadowY.WaveSize = 0; @@ -349,7 +354,7 @@ this.stackPanel10.Controls.Add(this.label8); this.stackPanel10.Location = new System.Drawing.Point(3, 307); this.stackPanel10.Name = "stackPanel10"; - this.stackPanel10.Size = new System.Drawing.Size(274, 32); + this.stackPanel10.Size = new System.Drawing.Size(244, 32); this.stackPanel10.TabIndex = 32; this.stackPanel10.Text = "stackPanel10"; // @@ -363,7 +368,7 @@ 0, 0}); this.input_shadowX.Name = "input_shadowX"; - this.input_shadowX.Size = new System.Drawing.Size(120, 26); + this.input_shadowX.Size = new System.Drawing.Size(100, 26); this.input_shadowX.TabIndex = 5; this.input_shadowX.Text = "0"; this.input_shadowX.WaveSize = 0; @@ -383,15 +388,17 @@ this.stackPanel9.Controls.Add(this.label7); this.stackPanel9.Location = new System.Drawing.Point(3, 269); this.stackPanel9.Name = "stackPanel9"; - this.stackPanel9.Size = new System.Drawing.Size(274, 32); + this.stackPanel9.Size = new System.Drawing.Size(244, 32); this.stackPanel9.TabIndex = 31; this.stackPanel9.Text = "stackPanel9"; // // colorPicker_shadow // + this.colorPicker_shadow.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.colorPicker_shadow.Location = new System.Drawing.Point(139, 3); this.colorPicker_shadow.Name = "colorPicker_shadow"; - this.colorPicker_shadow.Size = new System.Drawing.Size(120, 26); + this.colorPicker_shadow.ShowText = true; + this.colorPicker_shadow.Size = new System.Drawing.Size(100, 26); this.colorPicker_shadow.TabIndex = 5; this.colorPicker_shadow.Text = "colorPicker1"; this.colorPicker_shadow.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); @@ -412,7 +419,7 @@ this.stackPanel8.Controls.Add(this.label6); this.stackPanel8.Location = new System.Drawing.Point(3, 231); this.stackPanel8.Name = "stackPanel8"; - this.stackPanel8.Size = new System.Drawing.Size(274, 32); + this.stackPanel8.Size = new System.Drawing.Size(244, 32); this.stackPanel8.TabIndex = 30; this.stackPanel8.Text = "stackPanel8"; // @@ -422,7 +429,7 @@ this.select_shadowalign.List = true; this.select_shadowalign.Location = new System.Drawing.Point(139, 3); this.select_shadowalign.Name = "select_shadowalign"; - this.select_shadowalign.Size = new System.Drawing.Size(120, 26); + this.select_shadowalign.Size = new System.Drawing.Size(100, 26); this.select_shadowalign.TabIndex = 11; this.select_shadowalign.WaveSize = 0; // @@ -441,7 +448,7 @@ this.stackPanel7.Controls.Add(this.label5); this.stackPanel7.Location = new System.Drawing.Point(3, 193); this.stackPanel7.Name = "stackPanel7"; - this.stackPanel7.Size = new System.Drawing.Size(274, 32); + this.stackPanel7.Size = new System.Drawing.Size(244, 32); this.stackPanel7.TabIndex = 29; this.stackPanel7.Text = "stackPanel7"; // @@ -455,7 +462,7 @@ 0, 0}); this.input_shadow.Name = "input_shadow"; - this.input_shadow.Size = new System.Drawing.Size(120, 26); + this.input_shadow.Size = new System.Drawing.Size(100, 26); this.input_shadow.TabIndex = 5; this.input_shadow.Text = "12"; this.input_shadow.Value = new decimal(new int[] { @@ -480,7 +487,7 @@ this.stackPanel17.Controls.Add(this.label15); this.stackPanel17.Location = new System.Drawing.Point(3, 155); this.stackPanel17.Name = "stackPanel17"; - this.stackPanel17.Size = new System.Drawing.Size(274, 32); + this.stackPanel17.Size = new System.Drawing.Size(244, 32); this.stackPanel17.TabIndex = 28; this.stackPanel17.Text = "stackPanel17"; // @@ -495,7 +502,7 @@ 0, 0}); this.input_borderwidth.Name = "input_borderwidth"; - this.input_borderwidth.Size = new System.Drawing.Size(120, 26); + this.input_borderwidth.Size = new System.Drawing.Size(100, 26); this.input_borderwidth.TabIndex = 5; this.input_borderwidth.Text = "0.00"; this.input_borderwidth.WaveSize = 0; @@ -515,15 +522,17 @@ this.stackPanel16.Controls.Add(this.label14); this.stackPanel16.Location = new System.Drawing.Point(3, 117); this.stackPanel16.Name = "stackPanel16"; - this.stackPanel16.Size = new System.Drawing.Size(274, 32); + this.stackPanel16.Size = new System.Drawing.Size(244, 32); this.stackPanel16.TabIndex = 27; this.stackPanel16.Text = "stackPanel16"; // // colorPicker_border // + this.colorPicker_border.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.colorPicker_border.Location = new System.Drawing.Point(139, 3); this.colorPicker_border.Name = "colorPicker_border"; - this.colorPicker_border.Size = new System.Drawing.Size(120, 26); + this.colorPicker_border.ShowText = true; + this.colorPicker_border.Size = new System.Drawing.Size(100, 26); this.colorPicker_border.TabIndex = 5; this.colorPicker_border.Text = "colorPicker1"; this.colorPicker_border.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); @@ -544,7 +553,7 @@ this.stackPanel6.Controls.Add(this.label4); this.stackPanel6.Location = new System.Drawing.Point(3, 79); this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(274, 32); + this.stackPanel6.Size = new System.Drawing.Size(244, 32); this.stackPanel6.TabIndex = 12; this.stackPanel6.Text = "stackPanel6"; // @@ -558,7 +567,7 @@ 0, 0}); this.input_radius.Name = "input_radius"; - this.input_radius.Size = new System.Drawing.Size(120, 26); + this.input_radius.Size = new System.Drawing.Size(100, 26); this.input_radius.TabIndex = 5; this.input_radius.Text = "6"; this.input_radius.Value = new decimal(new int[] { @@ -583,7 +592,7 @@ this.stackPanel5.Controls.Add(this.label3); this.stackPanel5.Location = new System.Drawing.Point(3, 41); this.stackPanel5.Name = "stackPanel5"; - this.stackPanel5.Size = new System.Drawing.Size(274, 32); + this.stackPanel5.Size = new System.Drawing.Size(244, 32); this.stackPanel5.TabIndex = 11; this.stackPanel5.Text = "stackPanel5"; // @@ -597,7 +606,7 @@ 0, 0}); this.input_arrowsize.Name = "input_arrowsize"; - this.input_arrowsize.Size = new System.Drawing.Size(120, 26); + this.input_arrowsize.Size = new System.Drawing.Size(100, 26); this.input_arrowsize.TabIndex = 5; this.input_arrowsize.Text = "8"; this.input_arrowsize.Value = new decimal(new int[] { @@ -622,7 +631,7 @@ this.stackPanel4.Controls.Add(this.label10); this.stackPanel4.Location = new System.Drawing.Point(3, 3); this.stackPanel4.Name = "stackPanel4"; - this.stackPanel4.Size = new System.Drawing.Size(274, 32); + this.stackPanel4.Size = new System.Drawing.Size(244, 32); this.stackPanel4.TabIndex = 10; this.stackPanel4.Text = "stackPanel4"; // @@ -632,7 +641,7 @@ this.select_arrowalign.List = true; this.select_arrowalign.Location = new System.Drawing.Point(139, 3); this.select_arrowalign.Name = "select_arrowalign"; - this.select_arrowalign.Size = new System.Drawing.Size(120, 26); + this.select_arrowalign.Size = new System.Drawing.Size(100, 26); this.select_arrowalign.TabIndex = 11; this.select_arrowalign.WaveSize = 0; // @@ -706,7 +715,6 @@ private AntdUI.StackPanel stackPanel2; private AntdUI.StackPanel stackPanel15; private AntdUI.Panel panel; - private AntdUI.Button buttonCZ; private AntdUI.StackPanel stackPanel13; private AntdUI.InputNumber input_shadowOH; private AntdUI.Label label12; @@ -747,5 +755,6 @@ private AntdUI.StackPanel stackPanel7; private AntdUI.InputNumber input_shadow; private AntdUI.Label label5; + private AntdUI.Button buttonCZ; } } diff --git a/Views/PanelDemo.cs b/Views/PanelDemo.cs index aadc243..2e5a6c8 100644 --- a/Views/PanelDemo.cs +++ b/Views/PanelDemo.cs @@ -122,6 +122,5 @@ namespace AntdUIDemo.Views LoadPanel(); } #endregion - } } diff --git a/Views/StackPanelDemo.Designer.cs b/Views/StackPanelDemo.Designer.cs index 5c7e441..cb7873e 100644 --- a/Views/StackPanelDemo.Designer.cs +++ b/Views/StackPanelDemo.Designer.cs @@ -36,7 +36,6 @@ this.buttonDEL = new AntdUI.Button(); this.buttonADD = new AntdUI.Button(); this.stackPanel8 = new AntdUI.StackPanel(); - this.select_vertical = new AntdUI.Select(); this.label6 = new AntdUI.Label(); this.stackPanel7 = new AntdUI.StackPanel(); this.input_itemsize = new AntdUI.Input(); @@ -45,11 +44,12 @@ this.input_gap = new AntdUI.InputNumber(); this.label3 = new AntdUI.Label(); this.stackPanel6 = new AntdUI.StackPanel(); - this.select_autoscroll = new AntdUI.Select(); this.label4 = new AntdUI.Label(); this.divider1 = new AntdUI.Divider(); this.label2 = new AntdUI.Label(); this.label1 = new AntdUI.Label(); + this.switch_autoscroll = new AntdUI.Switch(); + this.switch_vertical = new AntdUI.Switch(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.stackPanel3.SuspendLayout(); @@ -86,7 +86,7 @@ // stackPanel // this.stackPanel.ItemSize = ""; - this.stackPanel.Location = new System.Drawing.Point(289, 3); + this.stackPanel.Location = new System.Drawing.Point(229, 3); this.stackPanel.Name = "stackPanel"; this.stackPanel.Size = new System.Drawing.Size(400, 400); this.stackPanel.TabIndex = 1; @@ -103,7 +103,7 @@ this.stackPanel3.Controls.Add(this.stackPanel6); this.stackPanel3.Location = new System.Drawing.Point(3, 3); this.stackPanel3.Name = "stackPanel3"; - this.stackPanel3.Size = new System.Drawing.Size(280, 400); + this.stackPanel3.Size = new System.Drawing.Size(220, 400); this.stackPanel3.TabIndex = 0; this.stackPanel3.Text = "stackPanel3"; this.stackPanel3.Vertical = true; @@ -111,9 +111,14 @@ // buttonCZ // this.buttonCZ.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonCZ.Image = null; + this.buttonCZ.ImageHover = null; + this.buttonCZ.ImageHoverSvg = null; + this.buttonCZ.ImageSize = new System.Drawing.Size(0, 0); + this.buttonCZ.ImageSvg = null; this.buttonCZ.Location = new System.Drawing.Point(3, 231); this.buttonCZ.Name = "buttonCZ"; - this.buttonCZ.Size = new System.Drawing.Size(274, 32); + this.buttonCZ.Size = new System.Drawing.Size(214, 32); this.buttonCZ.TabIndex = 39; this.buttonCZ.Text = "重 置"; this.buttonCZ.Type = AntdUI.TTypeMini.Warn; @@ -122,9 +127,14 @@ // buttonDEL // this.buttonDEL.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonDEL.Image = null; + this.buttonDEL.ImageHover = null; + this.buttonDEL.ImageHoverSvg = null; + this.buttonDEL.ImageSize = new System.Drawing.Size(0, 0); + this.buttonDEL.ImageSvg = null; this.buttonDEL.Location = new System.Drawing.Point(3, 193); this.buttonDEL.Name = "buttonDEL"; - this.buttonDEL.Size = new System.Drawing.Size(274, 32); + this.buttonDEL.Size = new System.Drawing.Size(214, 32); this.buttonDEL.TabIndex = 38; this.buttonDEL.Text = "删除 Button"; this.buttonDEL.Type = AntdUI.TTypeMini.Error; @@ -133,9 +143,14 @@ // buttonADD // this.buttonADD.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.buttonADD.Image = null; + this.buttonADD.ImageHover = null; + this.buttonADD.ImageHoverSvg = null; + this.buttonADD.ImageSize = new System.Drawing.Size(0, 0); + this.buttonADD.ImageSvg = null; this.buttonADD.Location = new System.Drawing.Point(3, 155); this.buttonADD.Name = "buttonADD"; - this.buttonADD.Size = new System.Drawing.Size(274, 32); + this.buttonADD.Size = new System.Drawing.Size(214, 32); this.buttonADD.TabIndex = 37; this.buttonADD.Text = "添加 Button"; this.buttonADD.Type = AntdUI.TTypeMini.Info; @@ -143,30 +158,14 @@ // // stackPanel8 // - this.stackPanel8.Controls.Add(this.select_vertical); + this.stackPanel8.Controls.Add(this.switch_vertical); this.stackPanel8.Controls.Add(this.label6); this.stackPanel8.Location = new System.Drawing.Point(3, 117); this.stackPanel8.Name = "stackPanel8"; - this.stackPanel8.Size = new System.Drawing.Size(274, 32); + this.stackPanel8.Size = new System.Drawing.Size(214, 32); this.stackPanel8.TabIndex = 21; this.stackPanel8.Text = "stackPanel8"; // - // 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(97, 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(175, 26); - this.select_vertical.TabIndex = 11; - this.select_vertical.Text = "True"; - this.select_vertical.WaveSize = 0; - // // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -182,7 +181,7 @@ this.stackPanel7.Controls.Add(this.label5); this.stackPanel7.Location = new System.Drawing.Point(3, 79); this.stackPanel7.Name = "stackPanel7"; - this.stackPanel7.Size = new System.Drawing.Size(274, 32); + this.stackPanel7.Size = new System.Drawing.Size(214, 32); this.stackPanel7.TabIndex = 20; this.stackPanel7.Text = "stackPanel7"; // @@ -192,7 +191,7 @@ 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(174, 26); + this.input_itemsize.Size = new System.Drawing.Size(115, 26); this.input_itemsize.TabIndex = 5; this.input_itemsize.WaveSize = 0; // @@ -211,7 +210,7 @@ this.stackPanel5.Controls.Add(this.label3); this.stackPanel5.Location = new System.Drawing.Point(3, 41); this.stackPanel5.Name = "stackPanel5"; - this.stackPanel5.Size = new System.Drawing.Size(274, 32); + this.stackPanel5.Size = new System.Drawing.Size(214, 32); this.stackPanel5.TabIndex = 19; this.stackPanel5.Text = "stackPanel5"; // @@ -225,7 +224,7 @@ 0, 0}); this.input_gap.Name = "input_gap"; - this.input_gap.Size = new System.Drawing.Size(175, 26); + 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; @@ -241,30 +240,14 @@ // // stackPanel6 // - this.stackPanel6.Controls.Add(this.select_autoscroll); + this.stackPanel6.Controls.Add(this.switch_autoscroll); this.stackPanel6.Controls.Add(this.label4); this.stackPanel6.Location = new System.Drawing.Point(3, 3); this.stackPanel6.Name = "stackPanel6"; - this.stackPanel6.Size = new System.Drawing.Size(274, 32); + this.stackPanel6.Size = new System.Drawing.Size(214, 32); this.stackPanel6.TabIndex = 12; this.stackPanel6.Text = "stackPanel6"; // - // select_autoscroll - // - this.select_autoscroll.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.select_autoscroll.Items.AddRange(new object[] { - "True", - "False"}); - this.select_autoscroll.List = true; - this.select_autoscroll.Location = new System.Drawing.Point(97, 3); - this.select_autoscroll.Name = "select_autoscroll"; - this.select_autoscroll.SelectedIndex = 1; - this.select_autoscroll.SelectedValue = "False"; - this.select_autoscroll.Size = new System.Drawing.Size(175, 26); - this.select_autoscroll.TabIndex = 11; - this.select_autoscroll.Text = "False"; - this.select_autoscroll.WaveSize = 0; - // // label4 // this.label4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -299,6 +282,27 @@ this.label1.TabIndex = 8; this.label1.Text = "StackPanel 堆叠布局"; // + // switch_autoscroll + // + 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.TabIndex = 5; + this.switch_autoscroll.Text = "switch1"; + this.switch_autoscroll.WaveSize = 0; + // + // switch_vertical + // + this.switch_vertical.AutoCheck = true; + 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.TabIndex = 6; + this.switch_vertical.Text = "switch1"; + this.switch_vertical.WaveSize = 0; + // // StackPanelDemo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -327,13 +331,11 @@ private AntdUI.StackPanel stackPanel; private AntdUI.StackPanel stackPanel3; private AntdUI.StackPanel stackPanel6; - private AntdUI.Select select_autoscroll; private AntdUI.Label label4; private AntdUI.StackPanel stackPanel5; private AntdUI.InputNumber input_gap; private AntdUI.Label label3; private AntdUI.StackPanel stackPanel8; - private AntdUI.Select select_vertical; private AntdUI.Label label6; private AntdUI.StackPanel stackPanel7; private AntdUI.Label label5; @@ -341,5 +343,7 @@ private AntdUI.Button buttonADD; private AntdUI.Input input_itemsize; private AntdUI.Button buttonCZ; + private AntdUI.Switch switch_vertical; + private AntdUI.Switch switch_autoscroll; } } diff --git a/Views/StackPanelDemo.cs b/Views/StackPanelDemo.cs index b5ae689..b4fb07e 100644 --- a/Views/StackPanelDemo.cs +++ b/Views/StackPanelDemo.cs @@ -29,10 +29,10 @@ namespace AntdUIDemo.Views private void LoadStackPanel() { - stackPanel.AutoScroll = select_autoscroll.SelectedIndex == 0; + stackPanel.AutoScroll = switch_autoscroll.Checked; stackPanel.Gap = (int)input_gap.Value; stackPanel.ItemSize = input_itemsize.Text; - stackPanel.Vertical = select_vertical.SelectedIndex == 0; + stackPanel.Vertical = switch_vertical.Checked; stackPanel.Controls.Clear(); for (int i = 1; i < 4; i++) @@ -56,20 +56,26 @@ namespace AntdUIDemo.Views buttonADD.Click += ButtonADD_Click; buttonDEL.Click += ButtonDEL_Click; - select_autoscroll.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; - select_vertical.SelectedIndexChanged += select_intvalue_SelectedIndexChanged; + switch_autoscroll.CheckedChanged += switch_CheckedChanged; + switch_vertical.CheckedChanged += switch_CheckedChanged; input_gap.ValueChanged += input_gap_ValueChanged; input_itemsize.TextChanged += input_itemsize_TextChanged; } + private void switch_CheckedChanged(object sender, BoolEventArgs e) + { + stackPanel.AutoScroll = switch_autoscroll.Checked; + stackPanel.Vertical = switch_vertical.Checked; + } + private void InitData() { - select_autoscroll.SelectedIndex = 1; input_gap.Value = 0; + switch_autoscroll.Checked = false; + switch_vertical.Checked = true; input_itemsize.Text = "10%"; - select_vertical.SelectedIndex = 0; } #region 事件 @@ -84,12 +90,6 @@ namespace AntdUIDemo.Views stackPanel.Gap = (int)input_gap.Value; } - private void select_intvalue_SelectedIndexChanged(object sender, IntEventArgs e) - { - stackPanel.AutoScroll = select_autoscroll.SelectedIndex == 0; - stackPanel.Vertical = select_vertical.SelectedIndex == 0; - } - private void ButtonDEL_Click(object sender, EventArgs e) { if (stackPanel.Controls.Count > 0) diff --git a/Views/StepsDemo.Designer.cs b/Views/StepsDemo.Designer.cs index 0a2866e..07b3cef 100644 --- a/Views/StepsDemo.Designer.cs +++ b/Views/StepsDemo.Designer.cs @@ -28,24 +28,24 @@ /// private void InitializeComponent() { - AntdUI.StepsItem stepsItem4 = new AntdUI.StepsItem(); - AntdUI.StepsItem stepsItem5 = new AntdUI.StepsItem(); - AntdUI.StepsItem stepsItem6 = new AntdUI.StepsItem(); AntdUI.StepsItem stepsItem1 = new AntdUI.StepsItem(); AntdUI.StepsItem stepsItem2 = new AntdUI.StepsItem(); AntdUI.StepsItem stepsItem3 = new AntdUI.StepsItem(); + AntdUI.StepsItem stepsItem4 = new AntdUI.StepsItem(); + AntdUI.StepsItem stepsItem5 = new AntdUI.StepsItem(); + AntdUI.StepsItem stepsItem6 = new AntdUI.StepsItem(); this.stackPanel1 = new AntdUI.StackPanel(); + this.stepsv = new AntdUI.Steps(); + this.steph = new AntdUI.Steps(); + this.stackPanel2 = new AntdUI.StackPanel(); + this.select_Status = new AntdUI.Select(); + this.label3 = new AntdUI.Label(); + this.input_current = new AntdUI.InputNumber(); + this.label8 = new AntdUI.Label(); + this.label12 = new AntdUI.Label(); this.divider1 = new AntdUI.Divider(); this.label2 = new AntdUI.Label(); this.label1 = new AntdUI.Label(); - this.label12 = new AntdUI.Label(); - this.stackPanel2 = new AntdUI.StackPanel(); - this.input_current = new AntdUI.InputNumber(); - this.label8 = new AntdUI.Label(); - this.label3 = new AntdUI.Label(); - this.select_Status = new AntdUI.Select(); - this.steph = new AntdUI.Steps(); - this.stepsv = new AntdUI.Steps(); this.stackPanel1.SuspendLayout(); this.stackPanel2.SuspendLayout(); this.SuspendLayout(); @@ -67,39 +67,49 @@ this.stackPanel1.Text = "stackPanel1"; this.stackPanel1.Vertical = true; // - // divider1 + // stepsv // - 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 = 7; + this.stepsv.Current = 1; + this.stepsv.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + stepsItem1.Description = "This is a description."; + stepsItem1.Title = "Finished"; + stepsItem2.Description = "This is a description."; + stepsItem2.SubTitle = "Left 00:00:08"; + stepsItem2.Title = "In Progress"; + stepsItem3.Description = "This is a description."; + stepsItem3.Title = "Waiting"; + this.stepsv.Items.Add(stepsItem1); + this.stepsv.Items.Add(stepsItem2); + this.stepsv.Items.Add(stepsItem3); + this.stepsv.Location = new System.Drawing.Point(36, 243); + this.stepsv.Margin = new System.Windows.Forms.Padding(36, 3, 36, 3); + this.stepsv.Name = "stepsv"; + this.stepsv.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.stepsv.Size = new System.Drawing.Size(628, 244); + this.stepsv.TabIndex = 48; + this.stepsv.Text = "steps1"; + this.stepsv.Vertical = true; // - // label2 + // steph // - 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 = 6; - this.label2.Text = "引导用户按照流程完成任务的导航条。"; - // - // label1 - // - this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label1.Location = new System.Drawing.Point(3, 3); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(694, 40); - this.label1.TabIndex = 5; - this.label1.Text = "Steps 步骤条"; - // - // label12 - // - this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); - this.label12.Location = new System.Drawing.Point(3, 97); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(694, 24); - this.label12.TabIndex = 42; - this.label12.Text = "控件配置"; + this.steph.Current = 1; + this.steph.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + stepsItem4.Description = "This is a description."; + stepsItem4.Title = "Finished"; + stepsItem5.Description = "This is a description."; + stepsItem5.SubTitle = "Left 00:00:08"; + stepsItem5.Title = "In Progress"; + stepsItem6.Description = "This is a description."; + stepsItem6.Title = "Waiting"; + this.steph.Items.Add(stepsItem4); + this.steph.Items.Add(stepsItem5); + this.steph.Items.Add(stepsItem6); + this.steph.Location = new System.Drawing.Point(3, 165); + this.steph.Name = "steph"; + this.steph.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.steph.Size = new System.Drawing.Size(694, 72); + this.steph.TabIndex = 47; + this.steph.Text = "steps1"; // // stackPanel2 // @@ -113,8 +123,28 @@ this.stackPanel2.TabIndex = 44; this.stackPanel2.Text = "stackPanel2"; // + // select_Status + // + this.select_Status.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); + 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.TabIndex = 13; + this.select_Status.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(182, 3); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(92, 26); + this.label3.TabIndex = 12; + this.label3.Text = "Status"; + // // input_current // + this.input_current.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); this.input_current.Location = new System.Drawing.Point(101, 3); this.input_current.Maximum = new decimal(new int[] { 2, @@ -146,67 +176,39 @@ this.label8.TabIndex = 10; this.label8.Text = "Current"; // - // label3 + // label12 // - 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(182, 3); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(92, 26); - this.label3.TabIndex = 12; - this.label3.Text = "Status"; + this.label12.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F); + this.label12.Location = new System.Drawing.Point(3, 97); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(694, 24); + this.label12.TabIndex = 42; + this.label12.Text = "控件配置"; // - // select_Status + // divider1 // - 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.TabIndex = 13; - this.select_Status.WaveSize = 0; + 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 = 7; // - // steph + // label2 // - this.steph.Current = 1; - this.steph.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - stepsItem4.Description = "This is a description."; - stepsItem4.Title = "Finished"; - stepsItem5.Description = "This is a description."; - stepsItem5.SubTitle = "Left 00:00:08"; - stepsItem5.Title = "In Progress"; - stepsItem6.Description = "This is a description."; - stepsItem6.Title = "Waiting"; - this.steph.Items.Add(stepsItem4); - this.steph.Items.Add(stepsItem5); - this.steph.Items.Add(stepsItem6); - this.steph.Location = new System.Drawing.Point(3, 165); - this.steph.Name = "steph"; - this.steph.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.steph.Size = new System.Drawing.Size(694, 72); - this.steph.TabIndex = 47; - this.steph.Text = "steps1"; + 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 = 6; + this.label2.Text = "引导用户按照流程完成任务的导航条。"; // - // stepsv + // label1 // - this.stepsv.Current = 1; - this.stepsv.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F); - stepsItem1.Description = "This is a description."; - stepsItem1.Title = "Finished"; - stepsItem2.Description = "This is a description."; - stepsItem2.SubTitle = "Left 00:00:08"; - stepsItem2.Title = "In Progress"; - stepsItem3.Description = "This is a description."; - stepsItem3.Title = "Waiting"; - this.stepsv.Items.Add(stepsItem1); - this.stepsv.Items.Add(stepsItem2); - this.stepsv.Items.Add(stepsItem3); - this.stepsv.Location = new System.Drawing.Point(36, 243); - this.stepsv.Margin = new System.Windows.Forms.Padding(36, 3, 36, 3); - this.stepsv.Name = "stepsv"; - this.stepsv.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.stepsv.Size = new System.Drawing.Size(628, 244); - this.stepsv.TabIndex = 48; - this.stepsv.Text = "steps1"; - this.stepsv.Vertical = true; + 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 = 5; + this.label1.Text = "Steps 步骤条"; // // StepsDemo // diff --git a/packages.config b/packages.config deleted file mode 100644 index b91c526..0000000 --- a/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file