This commit is contained in:
Sunny 2024-08-17 23:07:45 +08:00
parent cc4e37d1c1
commit f6a6d75d5f
10 changed files with 195 additions and 208 deletions

View File

@ -30,54 +30,54 @@ namespace Sunny.UI.Demo
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("节点0"); System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("节点0");
System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("节点1"); System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("节点1");
System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode35 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode36 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode37 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] {
treeNode1, treeNode33,
treeNode2, treeNode34,
treeNode3, treeNode35,
treeNode4}); treeNode36});
System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("节点4"); System.Windows.Forms.TreeNode treeNode38 = new System.Windows.Forms.TreeNode("节点4");
System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("节点5"); System.Windows.Forms.TreeNode treeNode39 = new System.Windows.Forms.TreeNode("节点5");
System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("节点6"); System.Windows.Forms.TreeNode treeNode40 = new System.Windows.Forms.TreeNode("节点6");
System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("节点7"); System.Windows.Forms.TreeNode treeNode41 = new System.Windows.Forms.TreeNode("节点7");
System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode42 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] {
treeNode6, treeNode38,
treeNode7, treeNode39,
treeNode8, treeNode40,
treeNode9}); treeNode41});
System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode43 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode44 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("节点00"); System.Windows.Forms.TreeNode treeNode45 = new System.Windows.Forms.TreeNode("节点00");
System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("节点01"); System.Windows.Forms.TreeNode treeNode46 = new System.Windows.Forms.TreeNode("节点01");
System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("节点02"); System.Windows.Forms.TreeNode treeNode47 = new System.Windows.Forms.TreeNode("节点02");
System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("节点03"); System.Windows.Forms.TreeNode treeNode48 = new System.Windows.Forms.TreeNode("节点03");
System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode49 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] {
treeNode13, treeNode45,
treeNode14, treeNode46,
treeNode15, treeNode47,
treeNode16}); treeNode48});
System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("节点11"); System.Windows.Forms.TreeNode treeNode50 = new System.Windows.Forms.TreeNode("节点11");
System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("节点12"); System.Windows.Forms.TreeNode treeNode51 = new System.Windows.Forms.TreeNode("节点12");
System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("节点13"); System.Windows.Forms.TreeNode treeNode52 = new System.Windows.Forms.TreeNode("节点13");
System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("节点14"); System.Windows.Forms.TreeNode treeNode53 = new System.Windows.Forms.TreeNode("节点14");
System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { System.Windows.Forms.TreeNode treeNode54 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] {
treeNode18, treeNode50,
treeNode19, treeNode51,
treeNode20, treeNode52,
treeNode21}); treeNode53});
System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode55 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode56 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("节点0"); System.Windows.Forms.TreeNode treeNode57 = new System.Windows.Forms.TreeNode("节点0");
System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("节点1"); System.Windows.Forms.TreeNode treeNode58 = new System.Windows.Forms.TreeNode("节点1");
System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode59 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode60 = new System.Windows.Forms.TreeNode("节点3");
System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("节点0"); System.Windows.Forms.TreeNode treeNode61 = new System.Windows.Forms.TreeNode("节点0");
System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("节点1"); System.Windows.Forms.TreeNode treeNode62 = new System.Windows.Forms.TreeNode("节点1");
System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("节点2"); System.Windows.Forms.TreeNode treeNode63 = new System.Windows.Forms.TreeNode("节点2");
System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("节点3"); System.Windows.Forms.TreeNode treeNode64 = new System.Windows.Forms.TreeNode("节点3");
this.uiComboTreeView3 = new Sunny.UI.UIComboTreeView(); this.uiComboTreeView3 = new Sunny.UI.UIComboTreeView();
this.uiComboTreeView4 = new Sunny.UI.UIComboTreeView(); this.uiComboTreeView4 = new Sunny.UI.UIComboTreeView();
this.uiComboTreeView2 = new Sunny.UI.UIComboTreeView(); this.uiComboTreeView2 = new Sunny.UI.UIComboTreeView();
@ -114,6 +114,7 @@ namespace Sunny.UI.Demo
this.uiDatetimePicker2 = new Sunny.UI.UIDatetimePicker(); this.uiDatetimePicker2 = new Sunny.UI.UIDatetimePicker();
this.uiTimePicker2 = new Sunny.UI.UITimePicker(); this.uiTimePicker2 = new Sunny.UI.UITimePicker();
this.uiNumPadTextBox5 = new Sunny.UI.UINumPadTextBox(); this.uiNumPadTextBox5 = new Sunny.UI.UINumPadTextBox();
this.uiDatePicker5 = new Sunny.UI.UIDatePicker();
this.SuspendLayout(); this.SuspendLayout();
// //
// uiComboTreeView3 // uiComboTreeView3
@ -126,35 +127,35 @@ namespace Sunny.UI.Demo
this.uiComboTreeView3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView3.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView3.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView3.Name = "uiComboTreeView3"; this.uiComboTreeView3.Name = "uiComboTreeView3";
treeNode1.Name = "节点0"; treeNode33.Name = "节点0";
treeNode1.Text = "节点0"; treeNode33.Text = "节点0";
treeNode2.Name = "节点1"; treeNode34.Name = "节点1";
treeNode2.Text = "节点1"; treeNode34.Text = "节点1";
treeNode3.Name = "节点2"; treeNode35.Name = "节点2";
treeNode3.Text = "节点2"; treeNode35.Text = "节点2";
treeNode4.Name = "节点3"; treeNode36.Name = "节点3";
treeNode4.Text = "节点3"; treeNode36.Text = "节点3";
treeNode5.Name = "节点0"; treeNode37.Name = "节点0";
treeNode5.Text = "节点0"; treeNode37.Text = "节点0";
treeNode6.Name = "节点4"; treeNode38.Name = "节点4";
treeNode6.Text = "节点4"; treeNode38.Text = "节点4";
treeNode7.Name = "节点5"; treeNode39.Name = "节点5";
treeNode7.Text = "节点5"; treeNode39.Text = "节点5";
treeNode8.Name = "节点6"; treeNode40.Name = "节点6";
treeNode8.Text = "节点6"; treeNode40.Text = "节点6";
treeNode9.Name = "节点7"; treeNode41.Name = "节点7";
treeNode9.Text = "节点7"; treeNode41.Text = "节点7";
treeNode10.Name = "节点1"; treeNode42.Name = "节点1";
treeNode10.Text = "节点1"; treeNode42.Text = "节点1";
treeNode11.Name = "节点2"; treeNode43.Name = "节点2";
treeNode11.Text = "节点2"; treeNode43.Text = "节点2";
treeNode12.Name = "节点3"; treeNode44.Name = "节点3";
treeNode12.Text = "节点3"; treeNode44.Text = "节点3";
this.uiComboTreeView3.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView3.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode5, treeNode37,
treeNode10, treeNode42,
treeNode11, treeNode43,
treeNode12}); treeNode44});
this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView3.ShowLines = true; this.uiComboTreeView3.ShowLines = true;
this.uiComboTreeView3.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView3.Size = new System.Drawing.Size(150, 29);
@ -172,35 +173,35 @@ namespace Sunny.UI.Demo
this.uiComboTreeView4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView4.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView4.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView4.Name = "uiComboTreeView4"; this.uiComboTreeView4.Name = "uiComboTreeView4";
treeNode13.Name = "节点0"; treeNode45.Name = "节点0";
treeNode13.Text = "节点00"; treeNode45.Text = "节点00";
treeNode14.Name = "节点1"; treeNode46.Name = "节点1";
treeNode14.Text = "节点01"; treeNode46.Text = "节点01";
treeNode15.Name = "节点2"; treeNode47.Name = "节点2";
treeNode15.Text = "节点02"; treeNode47.Text = "节点02";
treeNode16.Name = "节点3"; treeNode48.Name = "节点3";
treeNode16.Text = "节点03"; treeNode48.Text = "节点03";
treeNode17.Name = "节点0"; treeNode49.Name = "节点0";
treeNode17.Text = "节点0"; treeNode49.Text = "节点0";
treeNode18.Name = "节点4"; treeNode50.Name = "节点4";
treeNode18.Text = "节点11"; treeNode50.Text = "节点11";
treeNode19.Name = "节点5"; treeNode51.Name = "节点5";
treeNode19.Text = "节点12"; treeNode51.Text = "节点12";
treeNode20.Name = "节点6"; treeNode52.Name = "节点6";
treeNode20.Text = "节点13"; treeNode52.Text = "节点13";
treeNode21.Name = "节点7"; treeNode53.Name = "节点7";
treeNode21.Text = "节点14"; treeNode53.Text = "节点14";
treeNode22.Name = "节点1"; treeNode54.Name = "节点1";
treeNode22.Text = "节点1"; treeNode54.Text = "节点1";
treeNode23.Name = "节点2"; treeNode55.Name = "节点2";
treeNode23.Text = "节点2"; treeNode55.Text = "节点2";
treeNode24.Name = "节点3"; treeNode56.Name = "节点3";
treeNode24.Text = "节点3"; treeNode56.Text = "节点3";
this.uiComboTreeView4.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView4.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode17, treeNode49,
treeNode22, treeNode54,
treeNode23, treeNode55,
treeNode24}); treeNode56});
this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView4.ShowLines = true; this.uiComboTreeView4.ShowLines = true;
this.uiComboTreeView4.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView4.Size = new System.Drawing.Size(150, 29);
@ -219,19 +220,19 @@ namespace Sunny.UI.Demo
this.uiComboTreeView2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView2.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView2.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView2.Name = "uiComboTreeView2"; this.uiComboTreeView2.Name = "uiComboTreeView2";
treeNode25.Name = "节点0"; treeNode57.Name = "节点0";
treeNode25.Text = "节点0"; treeNode57.Text = "节点0";
treeNode26.Name = "节点1"; treeNode58.Name = "节点1";
treeNode26.Text = "节点1"; treeNode58.Text = "节点1";
treeNode27.Name = "节点2"; treeNode59.Name = "节点2";
treeNode27.Text = "节点2"; treeNode59.Text = "节点2";
treeNode28.Name = "节点3"; treeNode60.Name = "节点3";
treeNode28.Text = "节点3"; treeNode60.Text = "节点3";
this.uiComboTreeView2.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView2.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode25, treeNode57,
treeNode26, treeNode58,
treeNode27, treeNode59,
treeNode28}); treeNode60});
this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29);
this.uiComboTreeView2.SymbolSize = 24; this.uiComboTreeView2.SymbolSize = 24;
@ -262,19 +263,19 @@ namespace Sunny.UI.Demo
this.uiComboTreeView1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiComboTreeView1.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView1.MinimumSize = new System.Drawing.Size(63, 0);
this.uiComboTreeView1.Name = "uiComboTreeView1"; this.uiComboTreeView1.Name = "uiComboTreeView1";
treeNode29.Name = "节点0"; treeNode61.Name = "节点0";
treeNode29.Text = "节点0"; treeNode61.Text = "节点0";
treeNode30.Name = "节点1"; treeNode62.Name = "节点1";
treeNode30.Text = "节点1"; treeNode62.Text = "节点1";
treeNode31.Name = "节点2"; treeNode63.Name = "节点2";
treeNode31.Text = "节点2"; treeNode63.Text = "节点2";
treeNode32.Name = "节点3"; treeNode64.Name = "节点3";
treeNode32.Text = "节点3"; treeNode64.Text = "节点3";
this.uiComboTreeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.uiComboTreeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode29, treeNode61,
treeNode30, treeNode62,
treeNode31, treeNode63,
treeNode32}); treeNode64});
this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29);
this.uiComboTreeView1.SymbolSize = 24; this.uiComboTreeView1.SymbolSize = 24;
@ -855,11 +856,34 @@ namespace Sunny.UI.Demo
this.uiNumPadTextBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; this.uiNumPadTextBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiNumPadTextBox5.Watermark = ""; this.uiNumPadTextBox5.Watermark = "";
// //
// uiDatePicker5
//
this.uiDatePicker5.CanEmpty = true;
this.uiDatePicker5.FillColor = System.Drawing.Color.White;
this.uiDatePicker5.Font = new System.Drawing.Font("宋体", 12F);
this.uiDatePicker5.Location = new System.Drawing.Point(188, 293);
this.uiDatePicker5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiDatePicker5.MaxLength = 10;
this.uiDatePicker5.MinimumSize = new System.Drawing.Size(63, 0);
this.uiDatePicker5.Name = "uiDatePicker5";
this.uiDatePicker5.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
this.uiDatePicker5.ShowToday = true;
this.uiDatePicker5.Size = new System.Drawing.Size(150, 29);
this.uiDatePicker5.SymbolDropDown = 61555;
this.uiDatePicker5.SymbolNormal = 61555;
this.uiDatePicker5.SymbolSize = 24;
this.uiDatePicker5.TabIndex = 90;
this.uiDatePicker5.Text = "2020-04-16";
this.uiDatePicker5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.uiDatePicker5.Value = new System.DateTime(2020, 4, 16, 0, 0, 0, 0);
this.uiDatePicker5.Watermark = "";
//
// FCombobox // FCombobox
// //
this.AllowShowTitle = true; this.AllowShowTitle = true;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(765, 665); this.ClientSize = new System.Drawing.Size(765, 665);
this.Controls.Add(this.uiDatePicker5);
this.Controls.Add(this.uiNumPadTextBox5); this.Controls.Add(this.uiNumPadTextBox5);
this.Controls.Add(this.uiTimePicker2); this.Controls.Add(this.uiTimePicker2);
this.Controls.Add(this.uiDatetimePicker2); this.Controls.Add(this.uiDatetimePicker2);
@ -900,6 +924,7 @@ namespace Sunny.UI.Demo
this.ShowTitle = true; this.ShowTitle = true;
this.Symbol = 61776; this.Symbol = 61776;
this.Text = "Combobox"; this.Text = "Combobox";
this.Shown += new System.EventHandler(this.FCombobox_Shown);
this.ResumeLayout(false); this.ResumeLayout(false);
} }
@ -941,5 +966,6 @@ namespace Sunny.UI.Demo
private UIDatetimePicker uiDatetimePicker2; private UIDatetimePicker uiDatetimePicker2;
private UITimePicker uiTimePicker2; private UITimePicker uiTimePicker2;
private UINumPadTextBox uiNumPadTextBox5; private UINumPadTextBox uiNumPadTextBox5;
private UIDatePicker uiDatePicker5;
} }
} }

View File

@ -58,10 +58,6 @@ namespace Sunny.UI.Demo
uiComboBox1.SetTipsText(uiToolTip1, "Hello World."); uiComboBox1.SetTipsText(uiToolTip1, "Hello World.");
//日期选择框文本设置为空
uiDatePicker3.CanEmpty = true;
uiDatePicker3.Text = "";
uiDatePicker4.Value = uiDatePicker1.Value = uiDatePicker2.Value = uiDatePicker3.Value = DateTime.Now.Date; uiDatePicker4.Value = uiDatePicker1.Value = uiDatePicker2.Value = uiDatePicker3.Value = DateTime.Now.Date;
uiDatetimePicker2.Value = uiDatetimePicker1.Value = DateTime.Now; uiDatetimePicker2.Value = uiDatetimePicker1.Value = DateTime.Now;
uiTimePicker1.Value = uiTimePicker2.Value = DateTime.Now; uiTimePicker1.Value = uiTimePicker2.Value = DateTime.Now;
@ -169,5 +165,12 @@ namespace Sunny.UI.Demo
{ {
this.ShowInfoTip("Hello world."); this.ShowInfoTip("Hello world.");
} }
private void FCombobox_Shown(object sender, EventArgs e)
{
//日期选择框文本设置为空
uiDatePicker5.CanEmpty = true;
uiDatePicker5.Text = "";
}
} }
} }

View File

@ -67,7 +67,9 @@ namespace Sunny.UI.Demo
// //
// uiLine1 // uiLine1
// //
this.uiLine1.BackColor = System.Drawing.Color.Transparent;
this.uiLine1.Font = new System.Drawing.Font("宋体", 12F); this.uiLine1.Font = new System.Drawing.Font("宋体", 12F);
this.uiLine1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.uiLine1.Location = new System.Drawing.Point(30, 55); this.uiLine1.Location = new System.Drawing.Point(30, 55);
this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16); this.uiLine1.MinimumSize = new System.Drawing.Size(16, 16);
this.uiLine1.Name = "uiLine1"; this.uiLine1.Name = "uiLine1";
@ -75,7 +77,6 @@ namespace Sunny.UI.Demo
this.uiLine1.TabIndex = 21; this.uiLine1.TabIndex = 21;
this.uiLine1.Text = "UITreeView"; this.uiLine1.Text = "UITreeView";
this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uiLine1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
// uiTreeView1 // uiTreeView1
// //
@ -138,13 +139,12 @@ namespace Sunny.UI.Demo
treeNode15, treeNode15,
treeNode16, treeNode16,
treeNode20}); treeNode20});
this.uiTreeView1.ShowLines = true; this.uiTreeView1.ScrollBarStyleInherited = false;
this.uiTreeView1.ShowText = false; this.uiTreeView1.ShowText = false;
this.uiTreeView1.Size = new System.Drawing.Size(266, 313); this.uiTreeView1.Size = new System.Drawing.Size(266, 313);
this.uiTreeView1.TabIndex = 20; this.uiTreeView1.TabIndex = 20;
this.uiTreeView1.Text = null; this.uiTreeView1.Text = null;
this.uiTreeView1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; this.uiTreeView1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiTreeView1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
// //
// FTreeView // FTreeView
// //

View File

@ -5,6 +5,10 @@ using System.Windows.Forms;
namespace Sunny.UI.Demo namespace Sunny.UI.Demo
{ {
/// <summary>
/// Windows10、Windows11 建议用UIForm2更接近原生窗体使用体验用UIForm也可以
/// WindowsXP、Windows7 建议使用UIForm
/// </summary>
public partial class FMain : UIForm2 public partial class FMain : UIForm2
{ {
public FMain() public FMain()

View File

@ -19,13 +19,13 @@ namespace Sunny.UI.Demo
private void btnInfo_Click(object sender, EventArgs e) private void btnInfo_Click(object sender, EventArgs e)
{ {
this.ShowInfoDialog("默认信息提示框");
this.ShowInfoDialog2("默认信息提示框"); this.ShowInfoDialog2("默认信息提示框");
this.ShowInfoDialog("默认信息提示框");
} }
private void btnAsk_Click(object sender, EventArgs e) private void btnAsk_Click(object sender, EventArgs e)
{ {
if (this.ShowAskDialog("确认信息提示框")) if (this.ShowAskDialog2("确认信息提示框", true))
{ {
this.ShowSuccessTip("您点击了确定按钮"); this.ShowSuccessTip("您点击了确定按钮");
} }
@ -34,7 +34,7 @@ namespace Sunny.UI.Demo
this.ShowErrorTip("您点击了取消按钮"); this.ShowErrorTip("您点击了取消按钮");
} }
if (this.ShowAskDialog2("确认信息提示框")) if (this.ShowAskDialog("确认信息提示框"))
{ {
this.ShowSuccessTip("您点击了确定按钮"); this.ShowSuccessTip("您点击了确定按钮");
} }
@ -46,20 +46,20 @@ namespace Sunny.UI.Demo
private void btnSuccess_Click(object sender, EventArgs e) private void btnSuccess_Click(object sender, EventArgs e)
{ {
this.ShowSuccessDialog("正确信息提示框", false, 3000);
this.ShowSuccessDialog2("正确信息提示框", false, 3000); this.ShowSuccessDialog2("正确信息提示框", false, 3000);
this.ShowSuccessDialog("正确信息提示框", false, 3000);
} }
private void btnWarn_Click(object sender, EventArgs e) private void btnWarn_Click(object sender, EventArgs e)
{ {
this.ShowWarningDialog("警告信息提示框");
this.ShowWarningDialog2("警告信息提示框"); this.ShowWarningDialog2("警告信息提示框");
this.ShowWarningDialog("警告信息提示框");
} }
private void btnError_Click(object sender, EventArgs e) private void btnError_Click(object sender, EventArgs e)
{ {
this.ShowErrorDialog("错误信息提示框");
this.ShowErrorDialog2("错误信息提示框"); this.ShowErrorDialog2("错误信息提示框");
this.ShowErrorDialog("错误信息提示框");
} }
private void btnStatus2_Click(object sender, EventArgs e) private void btnStatus2_Click(object sender, EventArgs e)

View File

@ -41,20 +41,20 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="SunnyUI, Version=3.6.8.1, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL"> <Reference Include="SunnyUI, Version=3.6.9.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.3.6.8.1\lib\net472\SunnyUI.dll</HintPath> <HintPath>..\packages\SunnyUI.3.6.9\lib\net472\SunnyUI.dll</HintPath>
</Reference> </Reference>
<Reference Include="SunnyUI.COM, Version=6.2.3.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SunnyUI.COM, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.COM.6.2.3\lib\net472\SunnyUI.COM.dll</HintPath> <HintPath>..\packages\SunnyUI.COM.6.3.0\lib\net472\SunnyUI.COM.dll</HintPath>
</Reference> </Reference>
<Reference Include="SunnyUI.Common, Version=3.6.8.1, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL"> <Reference Include="SunnyUI.Common, Version=3.6.9.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.Common.3.6.8.1\lib\net472\SunnyUI.Common.dll</HintPath> <HintPath>..\packages\SunnyUI.Common.3.6.9\lib\net472\SunnyUI.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="SunnyUI.FrameDecoder, Version=7.0.7.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SunnyUI.FrameDecoder, Version=7.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.FrameDecoder.7.0.7\lib\net472\SunnyUI.FrameDecoder.dll</HintPath> <HintPath>..\packages\SunnyUI.FrameDecoder.7.1.1\lib\net472\SunnyUI.FrameDecoder.dll</HintPath>
</Reference> </Reference>
<Reference Include="SunnyUI.Serialization, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SunnyUI.Serialization, Version=6.3.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.Serialization.6.3.0\lib\net472\SunnyUI.Serialization.dll</HintPath> <HintPath>..\packages\SunnyUI.Serialization.6.3.5\lib\net472\SunnyUI.Serialization.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="SunnyUI" version="3.6.8.1" targetFramework="net472" /> <package id="SunnyUI" version="3.6.9" targetFramework="net472" />
<package id="SunnyUI.COM" version="6.2.3" targetFramework="net472" /> <package id="SunnyUI.COM" version="6.3.0" targetFramework="net472" />
<package id="SunnyUI.Common" version="3.6.8.1" targetFramework="net472" /> <package id="SunnyUI.Common" version="3.6.9" targetFramework="net472" />
<package id="SunnyUI.FrameDecoder" version="7.0.7" targetFramework="net472" /> <package id="SunnyUI.FrameDecoder" version="7.1.1" targetFramework="net472" />
<package id="SunnyUI.Serialization" version="6.3.0" targetFramework="net472" /> <package id="SunnyUI.Serialization" version="6.3.5" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" /> <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" /> <package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" /> <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />

View File

@ -299,34 +299,6 @@ namespace Sunny.UI
/// </summary> /// </summary>
public class IniFile : IniBase public class IniFile : IniBase
{ {
/// <summary>
/// 写结构
/// </summary>
/// <param name="section">section</param>
/// <param name="key">key</param>
/// <param name="value">value</param>
/// <typeparam name="T">T</typeparam>
public void WriteStruct<T>(string section, string key, T value) where T : struct
{
Write(section, key, value.ToBytes());
}
/// <summary>
/// 读结构
/// </summary>
/// <typeparam name="T">T</typeparam>
/// <param name="section">section</param>
/// <param name="key">key</param>
/// <param name="Default">Normal</param>
/// <returns>结果</returns>
public T ReadStruct<T>(string section, string key, T Default) where T : struct
{
//得到结构体的大小
int size = Default.Size();
byte[] bytes = Read(section, key, "").ToHexBytes();
return size > bytes.Length ? Default : bytes.ToStruct<T>();
}
/// <summary> /// <summary>
/// 写Byte数组 /// 写Byte数组
/// </summary> /// </summary>

View File

@ -194,29 +194,11 @@ namespace Sunny.UI
public string Value { get; set; } public string Value { get; set; }
} }
/// <summary> protected override void FinalStop()
/// 析构函数
/// </summary>
public void Dispose()
{ {
Stop(); var mmf = MemoryMappedFile.OpenExisting(MapName);
try mmf.Dispose();
{ base.FinalStop();
var mmf = MemoryMappedFile.OpenExisting(MapName);
mmf.Dispose();
}
catch (Exception e)
{
Console.WriteLine(e);
}
}
/// <summary>
/// 析构函数
/// </summary>
~MMFile()
{
Dispose();
} }
} }

View File

@ -9,7 +9,7 @@
<Description>SunnyUI.Net 是基于.Net Framework4.0+、.Net6、.Net8 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description> <Description>SunnyUI.Net 是基于.Net Framework4.0+、.Net6、.Net8 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
<Copyright>CopyRight © SunnyUI.Net 2012-2024</Copyright> <Copyright>CopyRight © SunnyUI.Net 2012-2024</Copyright>
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression> <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
<Version>3.6.8.1</Version> <Version>3.6.9.0</Version>
<Authors>ShenYonghua</Authors> <Authors>ShenYonghua</Authors>
<Company>SunnyUI.Net</Company> <Company>SunnyUI.Net</Company>
<PackageId>SunnyUI</PackageId> <PackageId>SunnyUI</PackageId>
@ -72,7 +72,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SunnyUI.Common" Version="3.6.8.1" /> <PackageReference Include="SunnyUI.Common" Version="3.6.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>