From e8260697137f503aa0170b7a36170fd7168e9b80 Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期五, 11 四月 2025 13:50:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowParas.Designer.cs | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.Designer.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.Designer.cs"
index cff0e21..7cae946 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.Designer.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.Designer.cs"
@@ -33,6 +33,7 @@
comboBoxType = new System.Windows.Forms.ComboBox();
metroToolTip绗叚姝ユ彁绀� = new DPumpHydr.WinFrmUI.RLT.Controls.MetroToolTip();
ribbonGroupBox1 = new DPumpHydr.WinFrmUI.RLT.Controls.RibbonGroupBox();
+ checkBox鏇茬嚎 = new System.Windows.Forms.CheckBox();
checkBox鍦嗗姬杩炴帴 = new System.Windows.Forms.CheckBox();
btnNextStep = new DPumpHydr.WinFrmUI.RLT.Controls.ForeverButtonSticky();
dungeonTabPage1 = new DPumpHydr.WinFrmUI.RLT.Controls.DungeonTabPage();
@@ -92,7 +93,7 @@
// comboBoxType
//
comboBoxType.FormattingEnabled = true;
- comboBoxType.Items.AddRange(new object[] { "涓績鍑哄彛", "渚ч潰鍑哄彛", "渚ч潰鍑哄彛锛堢洿绾块摼鎺ワ級" });
+ comboBoxType.Items.AddRange(new object[] { "涓績鍑哄彛", "渚ч潰鍑哄彛" });
comboBoxType.Location = new System.Drawing.Point(29, 0);
comboBoxType.Name = "comboBoxType";
comboBoxType.Size = new System.Drawing.Size(236, 23);
@@ -120,6 +121,7 @@
ribbonGroupBox1.BorderColorB = System.Drawing.Color.FromArgb(174, 178, 172);
ribbonGroupBox1.BorderColorC = System.Drawing.Color.FromArgb(194, 192, 200);
ribbonGroupBox1.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
+ ribbonGroupBox1.Controls.Add(checkBox鏇茬嚎);
ribbonGroupBox1.Controls.Add(checkBox鍦嗗姬杩炴帴);
ribbonGroupBox1.Controls.Add(btnNextStep);
ribbonGroupBox1.Controls.Add(dungeonTabPage1);
@@ -138,16 +140,28 @@
ribbonGroupBox1.Text = "鎵╂暎绠″弬鏁�";
ribbonGroupBox1.TitleHeight = 30;
//
+ // checkBox鏇茬嚎
+ //
+ checkBox鏇茬嚎.AutoSize = true;
+ checkBox鏇茬嚎.Checked = true;
+ checkBox鏇茬嚎.CheckState = System.Windows.Forms.CheckState.Checked;
+ checkBox鏇茬嚎.Location = new System.Drawing.Point(72, 31);
+ checkBox鏇茬嚎.Name = "checkBox鏇茬嚎";
+ checkBox鏇茬嚎.Size = new System.Drawing.Size(87, 21);
+ checkBox鏇茬嚎.TabIndex = 76;
+ checkBox鏇茬嚎.Text = "鏇茬嚎杩炴帴";
+ checkBox鏇茬嚎.UseVisualStyleBackColor = true;
+ checkBox鏇茬嚎.CheckedChanged += checkBox鏇茬嚎_CheckedChanged;
+ //
// checkBox鍦嗗姬杩炴帴
//
checkBox鍦嗗姬杩炴帴.AutoSize = true;
- checkBox鍦嗗姬杩炴帴.Location = new System.Drawing.Point(225, 31);
+ checkBox鍦嗗姬杩炴帴.Location = new System.Drawing.Point(165, 31);
checkBox鍦嗗姬杩炴帴.Name = "checkBox鍦嗗姬杩炴帴";
- checkBox鍦嗗姬杩炴帴.Size = new System.Drawing.Size(87, 21);
+ checkBox鍦嗗姬杩炴帴.Size = new System.Drawing.Size(117, 21);
checkBox鍦嗗姬杩炴帴.TabIndex = 75;
- checkBox鍦嗗姬杩炴帴.Text = "鍦嗗姬杩炴帴";
+ checkBox鍦嗗姬杩炴帴.Text = "鐩寸嚎鍦嗗姬杩炴帴";
checkBox鍦嗗姬杩炴帴.UseVisualStyleBackColor = true;
- checkBox鍦嗗姬杩炴帴.Visible = false;
checkBox鍦嗗姬杩炴帴.CheckedChanged += checkBox鍦嗗姬杩炴帴_CheckedChanged;
//
// btnNextStep
@@ -156,7 +170,7 @@
btnNextStep.BackColor = System.Drawing.Color.Transparent;
btnNextStep.BaseColor = System.Drawing.Color.FromArgb(128, 128, 255);
btnNextStep.Font = new System.Drawing.Font("Segoe UI", 9F);
- btnNextStep.Location = new System.Drawing.Point(225, 5);
+ btnNextStep.Location = new System.Drawing.Point(232, 5);
btnNextStep.Name = "btnNextStep";
btnNextStep.Rounded = false;
btnNextStep.Size = new System.Drawing.Size(90, 20);
@@ -182,7 +196,7 @@
dungeonTabPage1.PageEdgeBorderColor = System.Drawing.Color.FromArgb(201, 198, 195);
dungeonTabPage1.PageEdgeColor = System.Drawing.Color.FromArgb(247, 246, 246);
dungeonTabPage1.SelectedIndex = 0;
- dungeonTabPage1.Size = new System.Drawing.Size(326, 493);
+ dungeonTabPage1.Size = new System.Drawing.Size(333, 476);
dungeonTabPage1.TabIndex = 73;
//
// tabPage1
@@ -191,7 +205,7 @@
tabPage1.Location = new System.Drawing.Point(4, 28);
tabPage1.Name = "tabPage1";
tabPage1.Padding = new System.Windows.Forms.Padding(3);
- tabPage1.Size = new System.Drawing.Size(318, 461);
+ tabPage1.Size = new System.Drawing.Size(325, 444);
tabPage1.TabIndex = 0;
tabPage1.Text = "鍑哄彛鍙傛暟";
//
@@ -202,7 +216,7 @@
tabPage2.Location = new System.Drawing.Point(4, 28);
tabPage2.Name = "tabPage2";
tabPage2.Padding = new System.Windows.Forms.Padding(3);
- tabPage2.Size = new System.Drawing.Size(318, 461);
+ tabPage2.Size = new System.Drawing.Size(325, 444);
tabPage2.TabIndex = 1;
tabPage2.Text = "9,10鏂潰";
//
@@ -213,7 +227,7 @@
ctrlSection910Posi1.Location = new System.Drawing.Point(3, 3);
ctrlSection910Posi1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
ctrlSection910Posi1.Name = "ctrlSection910Posi1";
- ctrlSection910Posi1.Size = new System.Drawing.Size(312, 455);
+ ctrlSection910Posi1.Size = new System.Drawing.Size(319, 438);
ctrlSection910Posi1.TabIndex = 0;
//
// mBtn鏇存柊妯″瀷
@@ -222,7 +236,7 @@
mBtn鏇存柊妯″瀷.BackColor = System.Drawing.Color.Transparent;
mBtn鏇存柊妯″瀷.BaseColor = System.Drawing.Color.FromArgb(35, 168, 109);
mBtn鏇存柊妯″瀷.Font = new System.Drawing.Font("Segoe UI", 9F);
- mBtn鏇存柊妯″瀷.Location = new System.Drawing.Point(15, 5);
+ mBtn鏇存柊妯″瀷.Location = new System.Drawing.Point(22, 5);
mBtn鏇存柊妯″瀷.Name = "mBtn鏇存柊妯″瀷";
mBtn鏇存柊妯″瀷.Rounded = false;
mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(90, 20);
@@ -262,5 +276,6 @@
private System.Windows.Forms.ComboBox comboBoxType;
private RLT.Controls.ForeverButtonSticky btnNextStep;
private System.Windows.Forms.CheckBox checkBox鍦嗗姬杩炴帴;
+ private System.Windows.Forms.CheckBox checkBox鏇茬嚎;
}
}
--
Gitblit v1.9.3