From f6a6d75d5feae8c00afa0ad67abe2ff6238c49eb Mon Sep 17 00:00:00 2001 From: Sunny Date: Sat, 17 Aug 2024 23:07:45 +0800 Subject: [PATCH] 3.6.9 --- SunnyUI.Demo/Controls/FCombobox.Designer.cs | 282 +++++++++++--------- SunnyUI.Demo/Controls/FCombobox.cs | 11 +- SunnyUI.Demo/Controls/FTreeView.Designer.cs | 6 +- SunnyUI.Demo/FMain.cs | 4 + SunnyUI.Demo/Forms/FDialogs.cs | 12 +- SunnyUI.Demo/SunnyUI.Demo.csproj | 20 +- SunnyUI.Demo/packages.config | 10 +- SunnyUI/Common/UIniFile.cs | 28 -- SunnyUI/Common/UMMFile.cs | 26 +- SunnyUI/SunnyUI.csproj | 4 +- 10 files changed, 195 insertions(+), 208 deletions(-) diff --git a/SunnyUI.Demo/Controls/FCombobox.Designer.cs b/SunnyUI.Demo/Controls/FCombobox.Designer.cs index 2ea90bf9..b763a692 100644 --- a/SunnyUI.Demo/Controls/FCombobox.Designer.cs +++ b/SunnyUI.Demo/Controls/FCombobox.Designer.cs @@ -30,54 +30,54 @@ namespace Sunny.UI.Demo private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { - treeNode1, - treeNode2, - treeNode3, - treeNode4}); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("节点4"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("节点5"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("节点6"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("节点7"); - System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { - treeNode6, - treeNode7, - treeNode8, - treeNode9}); - System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("节点00"); - System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("节点01"); - System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("节点02"); - System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("节点03"); - System.Windows.Forms.TreeNode treeNode17 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { - treeNode13, - treeNode14, - treeNode15, - treeNode16}); - System.Windows.Forms.TreeNode treeNode18 = new System.Windows.Forms.TreeNode("节点11"); - System.Windows.Forms.TreeNode treeNode19 = new System.Windows.Forms.TreeNode("节点12"); - System.Windows.Forms.TreeNode treeNode20 = new System.Windows.Forms.TreeNode("节点13"); - System.Windows.Forms.TreeNode treeNode21 = new System.Windows.Forms.TreeNode("节点14"); - System.Windows.Forms.TreeNode treeNode22 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { - treeNode18, - treeNode19, - treeNode20, - treeNode21}); - System.Windows.Forms.TreeNode treeNode23 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode24 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode25 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode26 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode27 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode28 = new System.Windows.Forms.TreeNode("节点3"); - System.Windows.Forms.TreeNode treeNode29 = new System.Windows.Forms.TreeNode("节点0"); - System.Windows.Forms.TreeNode treeNode30 = new System.Windows.Forms.TreeNode("节点1"); - System.Windows.Forms.TreeNode treeNode31 = new System.Windows.Forms.TreeNode("节点2"); - System.Windows.Forms.TreeNode treeNode32 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode33 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode34 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode35 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode36 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode37 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { + treeNode33, + treeNode34, + treeNode35, + treeNode36}); + System.Windows.Forms.TreeNode treeNode38 = new System.Windows.Forms.TreeNode("节点4"); + System.Windows.Forms.TreeNode treeNode39 = new System.Windows.Forms.TreeNode("节点5"); + System.Windows.Forms.TreeNode treeNode40 = new System.Windows.Forms.TreeNode("节点6"); + System.Windows.Forms.TreeNode treeNode41 = new System.Windows.Forms.TreeNode("节点7"); + System.Windows.Forms.TreeNode treeNode42 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { + treeNode38, + treeNode39, + treeNode40, + treeNode41}); + System.Windows.Forms.TreeNode treeNode43 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode44 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode45 = new System.Windows.Forms.TreeNode("节点00"); + System.Windows.Forms.TreeNode treeNode46 = new System.Windows.Forms.TreeNode("节点01"); + System.Windows.Forms.TreeNode treeNode47 = new System.Windows.Forms.TreeNode("节点02"); + System.Windows.Forms.TreeNode treeNode48 = new System.Windows.Forms.TreeNode("节点03"); + System.Windows.Forms.TreeNode treeNode49 = new System.Windows.Forms.TreeNode("节点0", new System.Windows.Forms.TreeNode[] { + treeNode45, + treeNode46, + treeNode47, + treeNode48}); + System.Windows.Forms.TreeNode treeNode50 = new System.Windows.Forms.TreeNode("节点11"); + System.Windows.Forms.TreeNode treeNode51 = new System.Windows.Forms.TreeNode("节点12"); + System.Windows.Forms.TreeNode treeNode52 = new System.Windows.Forms.TreeNode("节点13"); + System.Windows.Forms.TreeNode treeNode53 = new System.Windows.Forms.TreeNode("节点14"); + System.Windows.Forms.TreeNode treeNode54 = new System.Windows.Forms.TreeNode("节点1", new System.Windows.Forms.TreeNode[] { + treeNode50, + treeNode51, + treeNode52, + treeNode53}); + System.Windows.Forms.TreeNode treeNode55 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode56 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode57 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode58 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode59 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode60 = new System.Windows.Forms.TreeNode("节点3"); + System.Windows.Forms.TreeNode treeNode61 = new System.Windows.Forms.TreeNode("节点0"); + System.Windows.Forms.TreeNode treeNode62 = new System.Windows.Forms.TreeNode("节点1"); + System.Windows.Forms.TreeNode treeNode63 = new System.Windows.Forms.TreeNode("节点2"); + System.Windows.Forms.TreeNode treeNode64 = new System.Windows.Forms.TreeNode("节点3"); this.uiComboTreeView3 = new Sunny.UI.UIComboTreeView(); this.uiComboTreeView4 = 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.uiTimePicker2 = new Sunny.UI.UITimePicker(); this.uiNumPadTextBox5 = new Sunny.UI.UINumPadTextBox(); + this.uiDatePicker5 = new Sunny.UI.UIDatePicker(); this.SuspendLayout(); // // uiComboTreeView3 @@ -126,35 +127,35 @@ namespace Sunny.UI.Demo this.uiComboTreeView3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiComboTreeView3.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView3.Name = "uiComboTreeView3"; - treeNode1.Name = "节点0"; - treeNode1.Text = "节点0"; - treeNode2.Name = "节点1"; - treeNode2.Text = "节点1"; - treeNode3.Name = "节点2"; - treeNode3.Text = "节点2"; - treeNode4.Name = "节点3"; - treeNode4.Text = "节点3"; - treeNode5.Name = "节点0"; - treeNode5.Text = "节点0"; - treeNode6.Name = "节点4"; - treeNode6.Text = "节点4"; - treeNode7.Name = "节点5"; - treeNode7.Text = "节点5"; - treeNode8.Name = "节点6"; - treeNode8.Text = "节点6"; - treeNode9.Name = "节点7"; - treeNode9.Text = "节点7"; - treeNode10.Name = "节点1"; - treeNode10.Text = "节点1"; - treeNode11.Name = "节点2"; - treeNode11.Text = "节点2"; - treeNode12.Name = "节点3"; - treeNode12.Text = "节点3"; + treeNode33.Name = "节点0"; + treeNode33.Text = "节点0"; + treeNode34.Name = "节点1"; + treeNode34.Text = "节点1"; + treeNode35.Name = "节点2"; + treeNode35.Text = "节点2"; + treeNode36.Name = "节点3"; + treeNode36.Text = "节点3"; + treeNode37.Name = "节点0"; + treeNode37.Text = "节点0"; + treeNode38.Name = "节点4"; + treeNode38.Text = "节点4"; + treeNode39.Name = "节点5"; + treeNode39.Text = "节点5"; + treeNode40.Name = "节点6"; + treeNode40.Text = "节点6"; + treeNode41.Name = "节点7"; + treeNode41.Text = "节点7"; + treeNode42.Name = "节点1"; + treeNode42.Text = "节点1"; + treeNode43.Name = "节点2"; + treeNode43.Text = "节点2"; + treeNode44.Name = "节点3"; + treeNode44.Text = "节点3"; this.uiComboTreeView3.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode5, - treeNode10, - treeNode11, - treeNode12}); + treeNode37, + treeNode42, + treeNode43, + treeNode44}); this.uiComboTreeView3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView3.ShowLines = true; 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.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView4.Name = "uiComboTreeView4"; - treeNode13.Name = "节点0"; - treeNode13.Text = "节点00"; - treeNode14.Name = "节点1"; - treeNode14.Text = "节点01"; - treeNode15.Name = "节点2"; - treeNode15.Text = "节点02"; - treeNode16.Name = "节点3"; - treeNode16.Text = "节点03"; - treeNode17.Name = "节点0"; - treeNode17.Text = "节点0"; - treeNode18.Name = "节点4"; - treeNode18.Text = "节点11"; - treeNode19.Name = "节点5"; - treeNode19.Text = "节点12"; - treeNode20.Name = "节点6"; - treeNode20.Text = "节点13"; - treeNode21.Name = "节点7"; - treeNode21.Text = "节点14"; - treeNode22.Name = "节点1"; - treeNode22.Text = "节点1"; - treeNode23.Name = "节点2"; - treeNode23.Text = "节点2"; - treeNode24.Name = "节点3"; - treeNode24.Text = "节点3"; + treeNode45.Name = "节点0"; + treeNode45.Text = "节点00"; + treeNode46.Name = "节点1"; + treeNode46.Text = "节点01"; + treeNode47.Name = "节点2"; + treeNode47.Text = "节点02"; + treeNode48.Name = "节点3"; + treeNode48.Text = "节点03"; + treeNode49.Name = "节点0"; + treeNode49.Text = "节点0"; + treeNode50.Name = "节点4"; + treeNode50.Text = "节点11"; + treeNode51.Name = "节点5"; + treeNode51.Text = "节点12"; + treeNode52.Name = "节点6"; + treeNode52.Text = "节点13"; + treeNode53.Name = "节点7"; + treeNode53.Text = "节点14"; + treeNode54.Name = "节点1"; + treeNode54.Text = "节点1"; + treeNode55.Name = "节点2"; + treeNode55.Text = "节点2"; + treeNode56.Name = "节点3"; + treeNode56.Text = "节点3"; this.uiComboTreeView4.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode17, - treeNode22, - treeNode23, - treeNode24}); + treeNode49, + treeNode54, + treeNode55, + treeNode56}); this.uiComboTreeView4.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView4.ShowLines = true; 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.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView2.Name = "uiComboTreeView2"; - treeNode25.Name = "节点0"; - treeNode25.Text = "节点0"; - treeNode26.Name = "节点1"; - treeNode26.Text = "节点1"; - treeNode27.Name = "节点2"; - treeNode27.Text = "节点2"; - treeNode28.Name = "节点3"; - treeNode28.Text = "节点3"; + treeNode57.Name = "节点0"; + treeNode57.Text = "节点0"; + treeNode58.Name = "节点1"; + treeNode58.Text = "节点1"; + treeNode59.Name = "节点2"; + treeNode59.Text = "节点2"; + treeNode60.Name = "节点3"; + treeNode60.Text = "节点3"; this.uiComboTreeView2.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode25, - treeNode26, - treeNode27, - treeNode28}); + treeNode57, + treeNode58, + treeNode59, + treeNode60}); this.uiComboTreeView2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView2.Size = new System.Drawing.Size(150, 29); 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.MinimumSize = new System.Drawing.Size(63, 0); this.uiComboTreeView1.Name = "uiComboTreeView1"; - treeNode29.Name = "节点0"; - treeNode29.Text = "节点0"; - treeNode30.Name = "节点1"; - treeNode30.Text = "节点1"; - treeNode31.Name = "节点2"; - treeNode31.Text = "节点2"; - treeNode32.Name = "节点3"; - treeNode32.Text = "节点3"; + treeNode61.Name = "节点0"; + treeNode61.Text = "节点0"; + treeNode62.Name = "节点1"; + treeNode62.Text = "节点1"; + treeNode63.Name = "节点2"; + treeNode63.Text = "节点2"; + treeNode64.Name = "节点3"; + treeNode64.Text = "节点3"; this.uiComboTreeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode29, - treeNode30, - treeNode31, - treeNode32}); + treeNode61, + treeNode62, + treeNode63, + treeNode64}); this.uiComboTreeView1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2); this.uiComboTreeView1.Size = new System.Drawing.Size(150, 29); this.uiComboTreeView1.SymbolSize = 24; @@ -855,11 +856,34 @@ namespace Sunny.UI.Demo this.uiNumPadTextBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; 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 // this.AllowShowTitle = true; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(765, 665); + this.Controls.Add(this.uiDatePicker5); this.Controls.Add(this.uiNumPadTextBox5); this.Controls.Add(this.uiTimePicker2); this.Controls.Add(this.uiDatetimePicker2); @@ -900,6 +924,7 @@ namespace Sunny.UI.Demo this.ShowTitle = true; this.Symbol = 61776; this.Text = "Combobox"; + this.Shown += new System.EventHandler(this.FCombobox_Shown); this.ResumeLayout(false); } @@ -941,5 +966,6 @@ namespace Sunny.UI.Demo private UIDatetimePicker uiDatetimePicker2; private UITimePicker uiTimePicker2; private UINumPadTextBox uiNumPadTextBox5; + private UIDatePicker uiDatePicker5; } } \ No newline at end of file diff --git a/SunnyUI.Demo/Controls/FCombobox.cs b/SunnyUI.Demo/Controls/FCombobox.cs index 789969bc..ad718e60 100644 --- a/SunnyUI.Demo/Controls/FCombobox.cs +++ b/SunnyUI.Demo/Controls/FCombobox.cs @@ -58,10 +58,6 @@ namespace Sunny.UI.Demo uiComboBox1.SetTipsText(uiToolTip1, "Hello World."); - //日期选择框文本设置为空 - uiDatePicker3.CanEmpty = true; - uiDatePicker3.Text = ""; - uiDatePicker4.Value = uiDatePicker1.Value = uiDatePicker2.Value = uiDatePicker3.Value = DateTime.Now.Date; uiDatetimePicker2.Value = uiDatetimePicker1.Value = DateTime.Now; uiTimePicker1.Value = uiTimePicker2.Value = DateTime.Now; @@ -169,5 +165,12 @@ namespace Sunny.UI.Demo { this.ShowInfoTip("Hello world."); } + + private void FCombobox_Shown(object sender, EventArgs e) + { + //日期选择框文本设置为空 + uiDatePicker5.CanEmpty = true; + uiDatePicker5.Text = ""; + } } } diff --git a/SunnyUI.Demo/Controls/FTreeView.Designer.cs b/SunnyUI.Demo/Controls/FTreeView.Designer.cs index 6039e613..c8aa6dc2 100644 --- a/SunnyUI.Demo/Controls/FTreeView.Designer.cs +++ b/SunnyUI.Demo/Controls/FTreeView.Designer.cs @@ -67,7 +67,9 @@ namespace Sunny.UI.Demo // // uiLine1 // + this.uiLine1.BackColor = System.Drawing.Color.Transparent; 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.MinimumSize = new System.Drawing.Size(16, 16); this.uiLine1.Name = "uiLine1"; @@ -75,7 +77,6 @@ namespace Sunny.UI.Demo this.uiLine1.TabIndex = 21; this.uiLine1.Text = "UITreeView"; this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.uiLine1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // uiTreeView1 // @@ -138,13 +139,12 @@ namespace Sunny.UI.Demo treeNode15, treeNode16, treeNode20}); - this.uiTreeView1.ShowLines = true; + this.uiTreeView1.ScrollBarStyleInherited = false; this.uiTreeView1.ShowText = false; this.uiTreeView1.Size = new System.Drawing.Size(266, 313); this.uiTreeView1.TabIndex = 20; this.uiTreeView1.Text = null; this.uiTreeView1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; - this.uiTreeView1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // // FTreeView // diff --git a/SunnyUI.Demo/FMain.cs b/SunnyUI.Demo/FMain.cs index 52a16bf8..2cc91065 100644 --- a/SunnyUI.Demo/FMain.cs +++ b/SunnyUI.Demo/FMain.cs @@ -5,6 +5,10 @@ using System.Windows.Forms; namespace Sunny.UI.Demo { + /// + /// Windows10、Windows11 建议用UIForm2，更接近原生窗体使用体验，用UIForm也可以 + /// WindowsXP、Windows7 建议使用UIForm + /// public partial class FMain : UIForm2 { public FMain() diff --git a/SunnyUI.Demo/Forms/FDialogs.cs b/SunnyUI.Demo/Forms/FDialogs.cs index d904fafc..e98b4cbc 100644 --- a/SunnyUI.Demo/Forms/FDialogs.cs +++ b/SunnyUI.Demo/Forms/FDialogs.cs @@ -19,13 +19,13 @@ namespace Sunny.UI.Demo private void btnInfo_Click(object sender, EventArgs e) { - this.ShowInfoDialog("默认信息提示框"); this.ShowInfoDialog2("默认信息提示框"); + this.ShowInfoDialog("默认信息提示框"); } private void btnAsk_Click(object sender, EventArgs e) { - if (this.ShowAskDialog("确认信息提示框")) + if (this.ShowAskDialog2("确认信息提示框", true)) { this.ShowSuccessTip("您点击了确定按钮"); } @@ -34,7 +34,7 @@ namespace Sunny.UI.Demo this.ShowErrorTip("您点击了取消按钮"); } - if (this.ShowAskDialog2("确认信息提示框")) + if (this.ShowAskDialog("确认信息提示框")) { this.ShowSuccessTip("您点击了确定按钮"); } @@ -46,20 +46,20 @@ namespace Sunny.UI.Demo private void btnSuccess_Click(object sender, EventArgs e) { - this.ShowSuccessDialog("正确信息提示框", false, 3000); this.ShowSuccessDialog2("正确信息提示框", false, 3000); + this.ShowSuccessDialog("正确信息提示框", false, 3000); } private void btnWarn_Click(object sender, EventArgs e) { - this.ShowWarningDialog("警告信息提示框"); this.ShowWarningDialog2("警告信息提示框"); + this.ShowWarningDialog("警告信息提示框"); } private void btnError_Click(object sender, EventArgs e) { - this.ShowErrorDialog("错误信息提示框"); this.ShowErrorDialog2("错误信息提示框"); + this.ShowErrorDialog("错误信息提示框"); } private void btnStatus2_Click(object sender, EventArgs e) diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj index d2ba3269..ac7f97ab 100644 --- a/SunnyUI.Demo/SunnyUI.Demo.csproj +++ b/SunnyUI.Demo/SunnyUI.Demo.csproj @@ -41,20 +41,20 @@ app.manifest - - ..\packages\SunnyUI.3.6.8.1\lib\net472\SunnyUI.dll + + ..\packages\SunnyUI.3.6.9\lib\net472\SunnyUI.dll - - ..\packages\SunnyUI.COM.6.2.3\lib\net472\SunnyUI.COM.dll + + ..\packages\SunnyUI.COM.6.3.0\lib\net472\SunnyUI.COM.dll - - ..\packages\SunnyUI.Common.3.6.8.1\lib\net472\SunnyUI.Common.dll + + ..\packages\SunnyUI.Common.3.6.9\lib\net472\SunnyUI.Common.dll - - ..\packages\SunnyUI.FrameDecoder.7.0.7\lib\net472\SunnyUI.FrameDecoder.dll + + ..\packages\SunnyUI.FrameDecoder.7.1.1\lib\net472\SunnyUI.FrameDecoder.dll - - ..\packages\SunnyUI.Serialization.6.3.0\lib\net472\SunnyUI.Serialization.dll + + ..\packages\SunnyUI.Serialization.6.3.5\lib\net472\SunnyUI.Serialization.dll diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config index b36bd88e..a2cf0780 100644 --- a/SunnyUI.Demo/packages.config +++ b/SunnyUI.Demo/packages.config @@ -1,10 +1,10 @@  - - - - - + + + + + diff --git a/SunnyUI/Common/UIniFile.cs b/SunnyUI/Common/UIniFile.cs index ebcddfd5..7b1abade 100644 --- a/SunnyUI/Common/UIniFile.cs +++ b/SunnyUI/Common/UIniFile.cs @@ -299,34 +299,6 @@ namespace Sunny.UI /// public class IniFile : IniBase { - /// - /// 写结构 - /// - /// section - /// key - /// value - /// T - public void WriteStruct(string section, string key, T value) where T : struct - { - Write(section, key, value.ToBytes()); - } - - /// - /// 读结构 - /// - /// T - /// section - /// key - /// Normal - /// 结果 - public T ReadStruct(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(); - } - /// /// 写Byte数组 /// diff --git a/SunnyUI/Common/UMMFile.cs b/SunnyUI/Common/UMMFile.cs index 1b634e47..e8fe1756 100644 --- a/SunnyUI/Common/UMMFile.cs +++ b/SunnyUI/Common/UMMFile.cs @@ -194,29 +194,11 @@ namespace Sunny.UI public string Value { get; set; } } - /// - /// 析构函数 - /// - public void Dispose() + protected override void FinalStop() { - Stop(); - try - { - var mmf = MemoryMappedFile.OpenExisting(MapName); - mmf.Dispose(); - } - catch (Exception e) - { - Console.WriteLine(e); - } - } - - /// - /// 析构函数 - /// - ~MMFile() - { - Dispose(); + var mmf = MemoryMappedFile.OpenExisting(MapName); + mmf.Dispose(); + base.FinalStop(); } } diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj index 84b57a17..8656519a 100644 --- a/SunnyUI/SunnyUI.csproj +++ b/SunnyUI/SunnyUI.csproj @@ -9,7 +9,7 @@ SunnyUI.Net 是基于.Net Framework4.0+、.Net6、.Net8 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。 CopyRight © SunnyUI.Net 2012-2024 GPL-3.0-only - 3.6.8.1 + 3.6.9.0 ShenYonghua SunnyUI.Net SunnyUI @@ -72,7 +72,7 @@ - +