From ec62c7459acd765afc910834831be89b5e3b0a43 Mon Sep 17 00:00:00 2001 From: czz_y Date: Fri, 6 Sep 2024 12:54:34 +0800 Subject: [PATCH] =?UTF-8?q?Timeline=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Views/ColorPickerDemo.Designer.cs | 87 ++++++++++++++++++++----------- Views/TimelineDemo.Designer.cs | 4 +- Views/TimelineDemo.resx | 3 ++ 3 files changed, 64 insertions(+), 30 deletions(-) diff --git a/Views/ColorPickerDemo.Designer.cs b/Views/ColorPickerDemo.Designer.cs index f732ac7..1673a9b 100644 --- a/Views/ColorPickerDemo.Designer.cs +++ b/Views/ColorPickerDemo.Designer.cs @@ -30,7 +30,6 @@ { this.stackPanel1 = new AntdUI.StackPanel(); this.flowPanel1 = new AntdUI.FlowPanel(); - this.colorPicker2 = new AntdUI.ColorPicker(); this.colorPicker1 = new AntdUI.ColorPicker(); this.label3 = new AntdUI.Label(); this.divider1 = new AntdUI.Divider(); @@ -42,7 +41,6 @@ this.colorPicker4 = new AntdUI.ColorPicker(); this.label5 = new AntdUI.Label(); this.flowPanel3 = new AntdUI.FlowPanel(); - this.colorPicker5 = new AntdUI.ColorPicker(); this.label6 = new AntdUI.Label(); this.flowPanel4 = new AntdUI.FlowPanel(); this.colorPicker6 = new AntdUI.ColorPicker(); @@ -51,6 +49,10 @@ this.colorPicker9 = new AntdUI.ColorPicker(); this.colorPicker10 = new AntdUI.ColorPicker(); this.colorPicker11 = new AntdUI.ColorPicker(); + this.colorPicker12 = new AntdUI.ColorPicker(); + this.colorPicker2 = new AntdUI.ColorPicker(); + this.colorPicker13 = new AntdUI.ColorPicker(); + this.colorPicker5 = new AntdUI.ColorPicker(); this.stackPanel1.SuspendLayout(); this.flowPanel1.SuspendLayout(); this.flowPanel2.SuspendLayout(); @@ -82,6 +84,7 @@ // flowPanel1 // this.flowPanel1.Controls.Add(this.colorPicker2); + this.flowPanel1.Controls.Add(this.colorPicker12); this.flowPanel1.Controls.Add(this.colorPicker1); this.flowPanel1.Location = new System.Drawing.Point(3, 127); this.flowPanel1.Name = "flowPanel1"; @@ -89,18 +92,6 @@ this.flowPanel1.TabIndex = 9; this.flowPanel1.Text = "flowPanel1"; // - // colorPicker2 - // - this.colorPicker2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.colorPicker2.Location = new System.Drawing.Point(41, 3); - this.colorPicker2.Name = "colorPicker2"; - this.colorPicker2.ShowText = true; - this.colorPicker2.Size = new System.Drawing.Size(105, 32); - this.colorPicker2.TabIndex = 1; - this.colorPicker2.Text = "colorPicker2"; - this.colorPicker2.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker2.WaveSize = 0; - // // colorPicker1 // this.colorPicker1.Location = new System.Drawing.Point(3, 3); @@ -201,25 +192,13 @@ // flowPanel3 // this.flowPanel3.Controls.Add(this.colorPicker5); + this.flowPanel3.Controls.Add(this.colorPicker13); this.flowPanel3.Location = new System.Drawing.Point(3, 275); this.flowPanel3.Name = "flowPanel3"; this.flowPanel3.Size = new System.Drawing.Size(694, 38); this.flowPanel3.TabIndex = 13; this.flowPanel3.Text = "flowPanel3"; // - // colorPicker5 - // - this.colorPicker5.DisabledAlpha = true; - this.colorPicker5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.colorPicker5.Location = new System.Drawing.Point(3, 3); - this.colorPicker5.Name = "colorPicker5"; - this.colorPicker5.ShowText = true; - this.colorPicker5.Size = new System.Drawing.Size(105, 32); - this.colorPicker5.TabIndex = 2; - this.colorPicker5.Text = "colorPicker5"; - this.colorPicker5.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); - this.colorPicker5.WaveSize = 0; - // // label6 // this.label6.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -326,6 +305,54 @@ this.colorPicker11.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); this.colorPicker11.WaveSize = 0; // + // colorPicker12 + // + this.colorPicker12.Location = new System.Drawing.Point(41, 3); + this.colorPicker12.Mode = AntdUI.TColorMode.Rgb; + this.colorPicker12.Name = "colorPicker12"; + this.colorPicker12.Size = new System.Drawing.Size(32, 32); + this.colorPicker12.TabIndex = 2; + this.colorPicker12.Text = "colorPicker12"; + this.colorPicker12.Value = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.colorPicker12.WaveSize = 0; + // + // colorPicker2 + // + this.colorPicker2.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.colorPicker2.Location = new System.Drawing.Point(79, 3); + this.colorPicker2.Name = "colorPicker2"; + this.colorPicker2.ShowText = true; + this.colorPicker2.Size = new System.Drawing.Size(105, 32); + this.colorPicker2.TabIndex = 3; + this.colorPicker2.Text = "colorPicker2"; + this.colorPicker2.Value = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.colorPicker2.WaveSize = 0; + // + // colorPicker13 + // + this.colorPicker13.DisabledAlpha = true; + this.colorPicker13.Location = new System.Drawing.Point(3, 3); + this.colorPicker13.Mode = AntdUI.TColorMode.Rgb; + this.colorPicker13.Name = "colorPicker13"; + this.colorPicker13.Size = new System.Drawing.Size(32, 32); + this.colorPicker13.TabIndex = 3; + this.colorPicker13.Text = "colorPicker13"; + this.colorPicker13.Value = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.colorPicker13.WaveSize = 0; + // + // colorPicker5 + // + this.colorPicker5.DisabledAlpha = true; + this.colorPicker5.Font = new System.Drawing.Font("Microsoft YaHei UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.colorPicker5.Location = new System.Drawing.Point(41, 3); + this.colorPicker5.Name = "colorPicker5"; + this.colorPicker5.ShowText = true; + this.colorPicker5.Size = new System.Drawing.Size(105, 32); + this.colorPicker5.TabIndex = 4; + this.colorPicker5.Text = "colorPicker5"; + this.colorPicker5.Value = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(119)))), ((int)(((byte)(255))))); + this.colorPicker5.WaveSize = 0; + // // ColorPickerDemo // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -350,13 +377,11 @@ private AntdUI.Label label3; private AntdUI.FlowPanel flowPanel1; private AntdUI.ColorPicker colorPicker1; - private AntdUI.ColorPicker colorPicker2; private AntdUI.FlowPanel flowPanel2; private AntdUI.ColorPicker colorPicker4; private AntdUI.ColorPicker colorPicker3; private AntdUI.Label label4; private AntdUI.FlowPanel flowPanel3; - private AntdUI.ColorPicker colorPicker5; private AntdUI.Label label5; private AntdUI.FlowPanel flowPanel4; private AntdUI.ColorPicker colorPicker11; @@ -366,5 +391,9 @@ private AntdUI.ColorPicker colorPicker7; private AntdUI.ColorPicker colorPicker6; private AntdUI.Label label6; + private AntdUI.ColorPicker colorPicker2; + private AntdUI.ColorPicker colorPicker12; + private AntdUI.ColorPicker colorPicker5; + private AntdUI.ColorPicker colorPicker13; } } diff --git a/Views/TimelineDemo.Designer.cs b/Views/TimelineDemo.Designer.cs index 71be1b1..12213fb 100644 --- a/Views/TimelineDemo.Designer.cs +++ b/Views/TimelineDemo.Designer.cs @@ -34,6 +34,7 @@ AntdUI.TimelineItem timelineItem4 = new AntdUI.TimelineItem(); AntdUI.TimelineItem timelineItem5 = new AntdUI.TimelineItem(); AntdUI.TimelineItem timelineItem6 = new AntdUI.TimelineItem(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TimelineDemo)); this.stackPanel1 = new AntdUI.StackPanel(); this.timeline1 = new AntdUI.Timeline(); this.label3 = new AntdUI.Label(); @@ -76,7 +77,8 @@ timelineItem5.Description = ""; timelineItem5.Text = "Solve initial network problems 1"; timelineItem5.Type = AntdUI.TTypeMini.Default; - timelineItem6.Text = "Solve initial network problems 1\r\nSolve initial network problems 2"; + timelineItem6.IconSvg = resources.GetString("timelineItem6.IconSvg"); + timelineItem6.Text = "自定义图标\r\n自定义图标"; timelineItem6.Type = AntdUI.TTypeMini.Info; this.timeline1.Items.Add(timelineItem1); this.timeline1.Items.Add(timelineItem2); diff --git a/Views/TimelineDemo.resx b/Views/TimelineDemo.resx index 1af7de1..9365614 100644 --- a/Views/TimelineDemo.resx +++ b/Views/TimelineDemo.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <svg t="1725182478452" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5848" width="200" height="200"><path d="M836.608 675.84q41.984 59.392 96.256 76.8-23.552 72.704-74.752 151.552-78.848 118.784-155.648 118.784-28.672 0-84.992-19.456-52.224-19.456-91.136-19.456t-86.016 20.48q-49.152 19.456-80.896 19.456-92.16 0-181.248-156.672-89.088-154.624-89.088-304.128 0-138.24 67.584-226.304 69.632-88.064 172.032-88.064 22.528 0 50.176 5.632t57.344 20.992q31.744 17.408 52.224 24.064t31.744 6.656q13.312 0 40.96-6.144t55.296-22.528q29.696-16.384 51.2-24.576t44.032-8.192q71.68 0 129.024 38.912 30.72 20.48 62.464 60.416-47.104 40.96-68.608 71.68-39.936 57.344-39.936 124.928 0 74.752 41.984 135.168z m-205.824-478.208q-35.84 33.792-65.536 44.032-10.24 3.072-26.112 5.632t-36.352 4.608q1.024-90.112 47.104-155.648T701.44 6.144q2.048 10.24 3.072 14.336v11.264q0 36.864-17.408 82.944-18.432 45.056-56.32 82.944z" fill="#272636" p-id="5849"></path></svg> + \ No newline at end of file