From c25ad1f3a62a9de62700cc8a16a886fe06733391 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期四, 02 一月 2025 21:15:09 +0800
Subject: [PATCH] 参数风格
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.Designer.cs | 70 ++-
Client/DesktopMain/MainWindow/frmMainWindow.Designer.cs | 388 ++++++++++----------
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowParas.cs | 18
WinFrmUI/DPumpHydr.WinFrmUI.RLT/Controls/GroupBox/RibbonGroupBox.cs | 16
Client/DesktopMain/DPumpHydr.DesktopMain.csproj | 1
Client/DesktopMain/MainWindow/frmMainWindow.cs | 79 ++-
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowType.Designer.cs | 51 +-
WinFrmUI/DPumpHydr.WinFrmUI.Volute/加厚/ctrlThicknessParas.resx | 2
WinFrmUI/DPumpHydr.WinFrmUI.Volute/加厚/ctrlThicknessParas.Designer.cs | 103 ++--
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionShapeInfo18.Designer.cs | 128 +++---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionShapeInfo18.resx | 4
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowParas.Designer.cs | 102 ++--
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionBundleInfo.Designer.cs | 153 ++++---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionShapeInfo18.cs | 5
14 files changed, 577 insertions(+), 543 deletions(-)
diff --git a/Client/DesktopMain/DPumpHydr.DesktopMain.csproj b/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
index b11276f..102ab06 100644
--- a/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
+++ b/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
@@ -24,6 +24,7 @@
<ItemGroup>
<Compile Remove="MainRibbonCmdHelper.cs" />
+ <Compile Remove="MainWindow\frmMainWindow.Designer - 鍓湰.cs" />
<Compile Remove="MainWindow\frmMainWindowAntdUI.cs" />
<Compile Remove="MainWindow\frmMainWindowAntdUI.Designer.cs" />
<Compile Remove="MainWindow\frmMainWindowRLT.cs" />
diff --git a/Client/DesktopMain/MainWindow/frmMainWindow.Designer.cs b/Client/DesktopMain/MainWindow/frmMainWindow.Designer.cs
index 5aadfbc..29c75cb 100644
--- a/Client/DesktopMain/MainWindow/frmMainWindow.Designer.cs
+++ b/Client/DesktopMain/MainWindow/frmMainWindow.Designer.cs
@@ -33,35 +33,35 @@
mainForm = new WinFrmUI.RLT.Forms.NightForm();
mainPanel = new System.Windows.Forms.Panel();
UserPicture = new ParrotPictureBox();
- nightPanel1 = new NightPanel();
+ leftMenuPanel = new NightPanel();
LibraryMenu = new NightPanel();
LibraryIcon = new System.Windows.Forms.PictureBox();
LibrarySeparator = new SpaceSeparatorVertical();
- HelpMenu = new NightPanel();
+ SettingMenu = new NightPanel();
SettingIcon = new System.Windows.Forms.PictureBox();
- HelpSeparator = new SpaceSeparatorVertical();
- GameMenu = new NightPanel();
- GameIcon = new System.Windows.Forms.PictureBox();
- GameSeparator = new SpaceSeparatorVertical();
+ SettingSeparator = new SpaceSeparatorVertical();
+ FindMenu = new NightPanel();
+ FindIcon = new System.Windows.Forms.PictureBox();
+ FindSeparator = new SpaceSeparatorVertical();
VoluteMenu = new NightPanel();
- AppIcon = new System.Windows.Forms.PictureBox();
- AppSeparator = new SpaceSeparatorVertical();
+ VoluteIcon = new System.Windows.Forms.PictureBox();
+ VoluteSeparator = new SpaceSeparatorVertical();
YeLunMenu = new NightPanel();
- HomeIcon = new System.Windows.Forms.PictureBox();
- HomeSeparator = new SpaceSeparatorVertical();
- nightControlBox1 = new NightControlBox();
+ YeLunIcon = new System.Windows.Forms.PictureBox();
+ YeLunSeparator = new SpaceSeparatorVertical();
+ topMenuBox = new NightControlBox();
mainForm.SuspendLayout();
- nightPanel1.SuspendLayout();
+ leftMenuPanel.SuspendLayout();
LibraryMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)LibraryIcon).BeginInit();
- HelpMenu.SuspendLayout();
+ SettingMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)SettingIcon).BeginInit();
- GameMenu.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)GameIcon).BeginInit();
+ FindMenu.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)FindIcon).BeginInit();
VoluteMenu.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)AppIcon).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)VoluteIcon).BeginInit();
YeLunMenu.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)HomeIcon).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)YeLunIcon).BeginInit();
SuspendLayout();
//
// mainForm
@@ -70,12 +70,12 @@
mainForm.BackColor = System.Drawing.Color.FromArgb(39, 39, 39);
mainForm.Controls.Add(mainPanel);
mainForm.Controls.Add(UserPicture);
- mainForm.Controls.Add(nightPanel1);
- mainForm.Controls.Add(nightControlBox1);
+ mainForm.Controls.Add(leftMenuPanel);
+ mainForm.Controls.Add(topMenuBox);
mainForm.Dock = System.Windows.Forms.DockStyle.Fill;
mainForm.DrawIcon = true;
mainForm.Font = new System.Drawing.Font("Segoe UI", 9F);
- mainForm.HeadColor = System.Drawing.Color.FromArgb(32, 32, 32);
+ mainForm.HeadColor = System.Drawing.Color.Black;
mainForm.Location = new System.Drawing.Point(0, 0);
mainForm.MinimumSize = new System.Drawing.Size(100, 42);
mainForm.Name = "mainForm";
@@ -89,6 +89,7 @@
//
// mainPanel
//
+ mainPanel.BackColor = System.Drawing.Color.White;
mainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
mainPanel.Location = new System.Drawing.Point(75, 31);
mainPanel.Name = "mainPanel";
@@ -98,20 +99,21 @@
// UserPicture
//
UserPicture.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+ UserPicture.BackColor = System.Drawing.Color.Black;
UserPicture.ColorLeft = System.Drawing.Color.White;
UserPicture.ColorRight = System.Drawing.Color.White;
UserPicture.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
UserPicture.Cursor = System.Windows.Forms.Cursors.Hand;
UserPicture.FilterAlpha = 75;
UserPicture.FilterEnabled = false;
- UserPicture.Image = DPumpHydr.DesktopMain.Properties.Resources.user;
+ UserPicture.Image = Properties.Resources.user;
UserPicture.InterpolationType = System.Drawing.Drawing2D.InterpolationMode.HighQualityBilinear;
UserPicture.IsElipse = true;
UserPicture.IsParallax = false;
- UserPicture.Location = new System.Drawing.Point(1024, 2);
+ UserPicture.Location = new System.Drawing.Point(1032, 5);
UserPicture.Name = "UserPicture";
UserPicture.PixelOffsetType = System.Drawing.Drawing2D.PixelOffsetMode.HighQuality;
- UserPicture.Size = new System.Drawing.Size(27, 27);
+ UserPicture.Size = new System.Drawing.Size(22, 22);
UserPicture.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
UserPicture.TabIndex = 3;
UserPicture.Text = "UserPicture";
@@ -119,23 +121,23 @@
UserPicture.MouseEnter += UserPicture_MouseEnter;
UserPicture.MouseLeave += UserPicture_MouseLeave;
//
- // nightPanel1
+ // leftMenuPanel
//
- nightPanel1.Controls.Add(LibraryMenu);
- nightPanel1.Controls.Add(HelpMenu);
- nightPanel1.Controls.Add(GameMenu);
- nightPanel1.Controls.Add(VoluteMenu);
- nightPanel1.Controls.Add(YeLunMenu);
- nightPanel1.Dock = System.Windows.Forms.DockStyle.Left;
- nightPanel1.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
- nightPanel1.LeftSideColor = System.Drawing.Color.FromArgb(242, 93, 89);
- nightPanel1.Location = new System.Drawing.Point(0, 31);
- nightPanel1.Name = "nightPanel1";
- nightPanel1.Padding = new System.Windows.Forms.Padding(5);
- nightPanel1.RightSideColor = System.Drawing.Color.FromArgb(32, 32, 32);
- nightPanel1.Side = NightPanel.PanelSide.Right;
- nightPanel1.Size = new System.Drawing.Size(75, 769);
- nightPanel1.TabIndex = 1;
+ leftMenuPanel.Controls.Add(LibraryMenu);
+ leftMenuPanel.Controls.Add(SettingMenu);
+ leftMenuPanel.Controls.Add(FindMenu);
+ leftMenuPanel.Controls.Add(VoluteMenu);
+ leftMenuPanel.Controls.Add(YeLunMenu);
+ leftMenuPanel.Dock = System.Windows.Forms.DockStyle.Left;
+ leftMenuPanel.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
+ leftMenuPanel.LeftSideColor = System.Drawing.Color.FromArgb(242, 93, 89);
+ leftMenuPanel.Location = new System.Drawing.Point(0, 31);
+ leftMenuPanel.Name = "leftMenuPanel";
+ leftMenuPanel.Padding = new System.Windows.Forms.Padding(5);
+ leftMenuPanel.RightSideColor = System.Drawing.Color.Black;
+ leftMenuPanel.Side = NightPanel.PanelSide.Right;
+ leftMenuPanel.Size = new System.Drawing.Size(75, 769);
+ leftMenuPanel.TabIndex = 1;
//
// LibraryMenu
//
@@ -152,12 +154,12 @@
LibraryMenu.Side = NightPanel.PanelSide.Left;
LibraryMenu.Size = new System.Drawing.Size(65, 65);
LibraryMenu.TabIndex = 6;
- LibraryMenu.Click += Menu_Click;
//
// LibraryIcon
//
LibraryIcon.Enabled = false;
LibraryIcon.Image = Properties.Resources.Book;
+ LibraryIcon.InitialImage = null;
LibraryIcon.Location = new System.Drawing.Point(18, 17);
LibraryIcon.Name = "LibraryIcon";
LibraryIcon.Size = new System.Drawing.Size(30, 30);
@@ -179,27 +181,27 @@
LibrarySeparator.Text = "spaceSeparatorVertical5";
LibrarySeparator.Transparent = true;
//
- // HelpMenu
+ // SettingMenu
//
- HelpMenu.Controls.Add(SettingIcon);
- HelpMenu.Controls.Add(HelpSeparator);
- HelpMenu.Cursor = System.Windows.Forms.Cursors.Hand;
- HelpMenu.Dock = System.Windows.Forms.DockStyle.Bottom;
- HelpMenu.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
- HelpMenu.LeftSideColor = System.Drawing.Color.Transparent;
- HelpMenu.Location = new System.Drawing.Point(5, 699);
- HelpMenu.Name = "HelpMenu";
- HelpMenu.Padding = new System.Windows.Forms.Padding(5);
- HelpMenu.RightSideColor = System.Drawing.Color.FromArgb(69, 69, 69);
- HelpMenu.Side = NightPanel.PanelSide.Left;
- HelpMenu.Size = new System.Drawing.Size(65, 65);
- HelpMenu.TabIndex = 5;
- HelpMenu.Click += Menu_Click;
+ SettingMenu.Controls.Add(SettingIcon);
+ SettingMenu.Controls.Add(SettingSeparator);
+ SettingMenu.Cursor = System.Windows.Forms.Cursors.Hand;
+ SettingMenu.Dock = System.Windows.Forms.DockStyle.Bottom;
+ SettingMenu.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
+ SettingMenu.LeftSideColor = System.Drawing.Color.Transparent;
+ SettingMenu.Location = new System.Drawing.Point(5, 699);
+ SettingMenu.Name = "SettingMenu";
+ SettingMenu.Padding = new System.Windows.Forms.Padding(5);
+ SettingMenu.RightSideColor = System.Drawing.Color.FromArgb(69, 69, 69);
+ SettingMenu.Side = NightPanel.PanelSide.Left;
+ SettingMenu.Size = new System.Drawing.Size(65, 65);
+ SettingMenu.TabIndex = 5;
//
// SettingIcon
//
SettingIcon.Enabled = false;
SettingIcon.Image = Properties.Resources.setting;
+ SettingIcon.InitialImage = null;
SettingIcon.Location = new System.Drawing.Point(18, 17);
SettingIcon.Name = "SettingIcon";
SettingIcon.Size = new System.Drawing.Size(30, 30);
@@ -207,66 +209,66 @@
SettingIcon.TabIndex = 5;
SettingIcon.TabStop = false;
//
- // HelpSeparator
+ // SettingSeparator
//
- HelpSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
- HelpSeparator.Enabled = false;
- HelpSeparator.Font = new System.Drawing.Font("Verdana", 8F);
- HelpSeparator.Image = null;
- HelpSeparator.Location = new System.Drawing.Point(5, 17);
- HelpSeparator.Name = "HelpSeparator";
- HelpSeparator.NoRounding = false;
- HelpSeparator.Size = new System.Drawing.Size(4, 30);
- HelpSeparator.TabIndex = 7;
- HelpSeparator.Text = "spaceSeparatorVertical4";
- HelpSeparator.Transparent = true;
+ SettingSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ SettingSeparator.Enabled = false;
+ SettingSeparator.Font = new System.Drawing.Font("Verdana", 8F);
+ SettingSeparator.Image = null;
+ SettingSeparator.Location = new System.Drawing.Point(5, 17);
+ SettingSeparator.Name = "SettingSeparator";
+ SettingSeparator.NoRounding = false;
+ SettingSeparator.Size = new System.Drawing.Size(4, 30);
+ SettingSeparator.TabIndex = 7;
+ SettingSeparator.Text = "spaceSeparatorVertical4";
+ SettingSeparator.Transparent = true;
//
- // GameMenu
+ // FindMenu
//
- GameMenu.Controls.Add(GameIcon);
- GameMenu.Controls.Add(GameSeparator);
- GameMenu.Cursor = System.Windows.Forms.Cursors.Hand;
- GameMenu.Dock = System.Windows.Forms.DockStyle.Top;
- GameMenu.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
- GameMenu.LeftSideColor = System.Drawing.Color.Transparent;
- GameMenu.Location = new System.Drawing.Point(5, 135);
- GameMenu.Name = "GameMenu";
- GameMenu.Padding = new System.Windows.Forms.Padding(5);
- GameMenu.RightSideColor = System.Drawing.Color.FromArgb(69, 69, 69);
- GameMenu.Side = NightPanel.PanelSide.Left;
- GameMenu.Size = new System.Drawing.Size(65, 65);
- GameMenu.TabIndex = 4;
- GameMenu.Click += Menu_Click;
+ FindMenu.Controls.Add(FindIcon);
+ FindMenu.Controls.Add(FindSeparator);
+ FindMenu.Cursor = System.Windows.Forms.Cursors.Hand;
+ FindMenu.Dock = System.Windows.Forms.DockStyle.Top;
+ FindMenu.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
+ FindMenu.LeftSideColor = System.Drawing.Color.Transparent;
+ FindMenu.Location = new System.Drawing.Point(5, 135);
+ FindMenu.Name = "FindMenu";
+ FindMenu.Padding = new System.Windows.Forms.Padding(5);
+ FindMenu.RightSideColor = System.Drawing.Color.FromArgb(69, 69, 69);
+ FindMenu.Side = NightPanel.PanelSide.Left;
+ FindMenu.Size = new System.Drawing.Size(65, 65);
+ FindMenu.TabIndex = 4;
//
- // GameIcon
+ // FindIcon
//
- GameIcon.Enabled = false;
- GameIcon.Image = Properties.Resources.Search;
- GameIcon.Location = new System.Drawing.Point(18, 17);
- GameIcon.Name = "GameIcon";
- GameIcon.Size = new System.Drawing.Size(30, 30);
- GameIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- GameIcon.TabIndex = 2;
- GameIcon.TabStop = false;
+ FindIcon.Enabled = false;
+ FindIcon.Image = Properties.Resources.Search;
+ FindIcon.InitialImage = null;
+ FindIcon.Location = new System.Drawing.Point(18, 17);
+ FindIcon.Name = "FindIcon";
+ FindIcon.Size = new System.Drawing.Size(30, 30);
+ FindIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ FindIcon.TabIndex = 2;
+ FindIcon.TabStop = false;
//
- // GameSeparator
+ // FindSeparator
//
- GameSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
- GameSeparator.Enabled = false;
- GameSeparator.Font = new System.Drawing.Font("Verdana", 8F);
- GameSeparator.Image = null;
- GameSeparator.Location = new System.Drawing.Point(5, 17);
- GameSeparator.Name = "GameSeparator";
- GameSeparator.NoRounding = false;
- GameSeparator.Size = new System.Drawing.Size(4, 30);
- GameSeparator.TabIndex = 7;
- GameSeparator.Text = "spaceSeparatorVertical3";
- GameSeparator.Transparent = true;
+ FindSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ FindSeparator.Enabled = false;
+ FindSeparator.Font = new System.Drawing.Font("Verdana", 8F);
+ FindSeparator.Image = null;
+ FindSeparator.Location = new System.Drawing.Point(5, 17);
+ FindSeparator.Name = "FindSeparator";
+ FindSeparator.NoRounding = false;
+ FindSeparator.Size = new System.Drawing.Size(4, 30);
+ FindSeparator.TabIndex = 7;
+ FindSeparator.Text = "spaceSeparatorVertical3";
+ FindSeparator.Transparent = true;
//
// VoluteMenu
//
- VoluteMenu.Controls.Add(AppIcon);
- VoluteMenu.Controls.Add(AppSeparator);
+ VoluteMenu.Controls.Add(VoluteIcon);
+ VoluteMenu.Controls.Add(VoluteSeparator);
VoluteMenu.Cursor = System.Windows.Forms.Cursors.Hand;
VoluteMenu.Dock = System.Windows.Forms.DockStyle.Top;
VoluteMenu.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
@@ -275,41 +277,41 @@
VoluteMenu.Name = "VoluteMenu";
VoluteMenu.Padding = new System.Windows.Forms.Padding(5);
VoluteMenu.RightSideColor = System.Drawing.Color.FromArgb(69, 69, 69);
- VoluteMenu.Side = NightPanel.PanelSide.Right;
+ VoluteMenu.Side = NightPanel.PanelSide.Left;
VoluteMenu.Size = new System.Drawing.Size(65, 65);
VoluteMenu.TabIndex = 3;
- VoluteMenu.Click += Menu_Click;
//
- // AppIcon
+ // VoluteIcon
//
- AppIcon.Enabled = false;
- AppIcon.Image = DPumpHydr.DesktopMain.Properties.Resources.woke;
- AppIcon.Location = new System.Drawing.Point(18, 17);
- AppIcon.Name = "AppIcon";
- AppIcon.Size = new System.Drawing.Size(30, 30);
- AppIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- AppIcon.TabIndex = 3;
- AppIcon.TabStop = false;
+ VoluteIcon.Enabled = false;
+ VoluteIcon.Image = Properties.Resources.woke;
+ VoluteIcon.InitialImage = null;
+ VoluteIcon.Location = new System.Drawing.Point(18, 17);
+ VoluteIcon.Name = "VoluteIcon";
+ VoluteIcon.Size = new System.Drawing.Size(30, 30);
+ VoluteIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ VoluteIcon.TabIndex = 3;
+ VoluteIcon.TabStop = false;
//
- // AppSeparator
+ // VoluteSeparator
//
- AppSeparator.BackColor = System.Drawing.Color.Transparent;
- AppSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- AppSeparator.Enabled = false;
- AppSeparator.Font = new System.Drawing.Font("Verdana", 8F);
- AppSeparator.Image = null;
- AppSeparator.Location = new System.Drawing.Point(5, 17);
- AppSeparator.Name = "AppSeparator";
- AppSeparator.NoRounding = false;
- AppSeparator.Size = new System.Drawing.Size(4, 30);
- AppSeparator.TabIndex = 7;
- AppSeparator.Text = "spaceSeparatorVertical2";
- AppSeparator.Transparent = true;
+ VoluteSeparator.BackColor = System.Drawing.Color.Transparent;
+ VoluteSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ VoluteSeparator.Enabled = false;
+ VoluteSeparator.Font = new System.Drawing.Font("Verdana", 8F);
+ VoluteSeparator.Image = null;
+ VoluteSeparator.Location = new System.Drawing.Point(5, 17);
+ VoluteSeparator.Name = "VoluteSeparator";
+ VoluteSeparator.NoRounding = false;
+ VoluteSeparator.Size = new System.Drawing.Size(4, 30);
+ VoluteSeparator.TabIndex = 7;
+ VoluteSeparator.Text = "spaceSeparatorVertical2";
+ VoluteSeparator.Transparent = true;
//
// YeLunMenu
//
- YeLunMenu.Controls.Add(HomeIcon);
- YeLunMenu.Controls.Add(HomeSeparator);
+ YeLunMenu.Controls.Add(YeLunIcon);
+ YeLunMenu.Controls.Add(YeLunSeparator);
YeLunMenu.Cursor = System.Windows.Forms.Cursors.Hand;
YeLunMenu.Dock = System.Windows.Forms.DockStyle.Top;
YeLunMenu.ForeColor = System.Drawing.Color.FromArgb(250, 250, 250);
@@ -321,57 +323,57 @@
YeLunMenu.Side = NightPanel.PanelSide.Left;
YeLunMenu.Size = new System.Drawing.Size(65, 65);
YeLunMenu.TabIndex = 2;
- YeLunMenu.Click += Menu_Click;
//
- // HomeIcon
+ // YeLunIcon
//
- HomeIcon.Enabled = false;
- HomeIcon.Image = Properties.Resources.yelun;
- HomeIcon.Location = new System.Drawing.Point(18, 17);
- HomeIcon.Name = "HomeIcon";
- HomeIcon.Size = new System.Drawing.Size(30, 30);
- HomeIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- HomeIcon.TabIndex = 4;
- HomeIcon.TabStop = false;
+ YeLunIcon.Enabled = false;
+ YeLunIcon.Image = Properties.Resources.yelun;
+ YeLunIcon.InitialImage = null;
+ YeLunIcon.Location = new System.Drawing.Point(18, 17);
+ YeLunIcon.Name = "YeLunIcon";
+ YeLunIcon.Size = new System.Drawing.Size(30, 30);
+ YeLunIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ YeLunIcon.TabIndex = 4;
+ YeLunIcon.TabStop = false;
//
- // HomeSeparator
+ // YeLunSeparator
//
- HomeSeparator.BackColor = System.Drawing.Color.Transparent;
- HomeSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
- HomeSeparator.Enabled = false;
- HomeSeparator.Font = new System.Drawing.Font("Verdana", 8F);
- HomeSeparator.Image = null;
- HomeSeparator.Location = new System.Drawing.Point(5, 17);
- HomeSeparator.Name = "HomeSeparator";
- HomeSeparator.NoRounding = false;
- HomeSeparator.Size = new System.Drawing.Size(4, 30);
- HomeSeparator.TabIndex = 7;
- HomeSeparator.Text = "spaceSeparatorVertical1";
- HomeSeparator.Transparent = true;
+ YeLunSeparator.BackColor = System.Drawing.Color.Transparent;
+ YeLunSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ YeLunSeparator.Enabled = false;
+ YeLunSeparator.Font = new System.Drawing.Font("Verdana", 8F);
+ YeLunSeparator.Image = null;
+ YeLunSeparator.Location = new System.Drawing.Point(5, 17);
+ YeLunSeparator.Name = "YeLunSeparator";
+ YeLunSeparator.NoRounding = false;
+ YeLunSeparator.Size = new System.Drawing.Size(4, 30);
+ YeLunSeparator.TabIndex = 7;
+ YeLunSeparator.Text = "spaceSeparatorVertical1";
+ YeLunSeparator.Transparent = true;
//
- // nightControlBox1
+ // topMenuBox
//
- nightControlBox1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
- nightControlBox1.BackColor = System.Drawing.Color.Transparent;
- nightControlBox1.CloseHoverColor = System.Drawing.Color.FromArgb(199, 80, 80);
- nightControlBox1.CloseHoverForeColor = System.Drawing.Color.White;
- nightControlBox1.Cursor = System.Windows.Forms.Cursors.Hand;
- nightControlBox1.DefaultLocation = true;
- nightControlBox1.DisableMaximizeColor = System.Drawing.Color.FromArgb(105, 105, 105);
- nightControlBox1.DisableMinimizeColor = System.Drawing.Color.FromArgb(105, 105, 105);
- nightControlBox1.EnableCloseColor = System.Drawing.Color.FromArgb(160, 160, 160);
- nightControlBox1.EnableMaximizeButton = true;
- nightControlBox1.EnableMaximizeColor = System.Drawing.Color.FromArgb(160, 160, 160);
- nightControlBox1.EnableMinimizeButton = true;
- nightControlBox1.EnableMinimizeColor = System.Drawing.Color.FromArgb(160, 160, 160);
- nightControlBox1.Location = new System.Drawing.Point(1061, 0);
- nightControlBox1.MaximizeHoverColor = System.Drawing.Color.FromArgb(15, 255, 255, 255);
- nightControlBox1.MaximizeHoverForeColor = System.Drawing.Color.White;
- nightControlBox1.MinimizeHoverColor = System.Drawing.Color.FromArgb(15, 255, 255, 255);
- nightControlBox1.MinimizeHoverForeColor = System.Drawing.Color.White;
- nightControlBox1.Name = "nightControlBox1";
- nightControlBox1.Size = new System.Drawing.Size(139, 31);
- nightControlBox1.TabIndex = 0;
+ topMenuBox.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+ topMenuBox.BackColor = System.Drawing.Color.Transparent;
+ topMenuBox.CloseHoverColor = System.Drawing.Color.FromArgb(199, 80, 80);
+ topMenuBox.CloseHoverForeColor = System.Drawing.Color.White;
+ topMenuBox.Cursor = System.Windows.Forms.Cursors.Hand;
+ topMenuBox.DefaultLocation = true;
+ topMenuBox.DisableMaximizeColor = System.Drawing.Color.FromArgb(105, 105, 105);
+ topMenuBox.DisableMinimizeColor = System.Drawing.Color.FromArgb(105, 105, 105);
+ topMenuBox.EnableCloseColor = System.Drawing.Color.FromArgb(128, 128, 255);
+ topMenuBox.EnableMaximizeButton = true;
+ topMenuBox.EnableMaximizeColor = System.Drawing.Color.FromArgb(128, 128, 255);
+ topMenuBox.EnableMinimizeButton = true;
+ topMenuBox.EnableMinimizeColor = System.Drawing.Color.FromArgb(128, 128, 255);
+ topMenuBox.Location = new System.Drawing.Point(1061, 0);
+ topMenuBox.MaximizeHoverColor = System.Drawing.Color.FromArgb(15, 255, 255, 255);
+ topMenuBox.MaximizeHoverForeColor = System.Drawing.Color.White;
+ topMenuBox.MinimizeHoverColor = System.Drawing.Color.FromArgb(15, 255, 255, 255);
+ topMenuBox.MinimizeHoverForeColor = System.Drawing.Color.White;
+ topMenuBox.Name = "topMenuBox";
+ topMenuBox.Size = new System.Drawing.Size(139, 31);
+ topMenuBox.TabIndex = 0;
//
// frmMainWindow
//
@@ -389,40 +391,40 @@
Text = "DPumpHydr.WinFrmUI.RLT Store";
TransparencyKey = System.Drawing.Color.Fuchsia;
mainForm.ResumeLayout(false);
- nightPanel1.ResumeLayout(false);
+ leftMenuPanel.ResumeLayout(false);
LibraryMenu.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)LibraryIcon).EndInit();
- HelpMenu.ResumeLayout(false);
+ SettingMenu.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)SettingIcon).EndInit();
- GameMenu.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)GameIcon).EndInit();
+ FindMenu.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)FindIcon).EndInit();
VoluteMenu.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)AppIcon).EndInit();
+ ((System.ComponentModel.ISupportInitialize)VoluteIcon).EndInit();
YeLunMenu.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)HomeIcon).EndInit();
+ ((System.ComponentModel.ISupportInitialize)YeLunIcon).EndInit();
ResumeLayout(false);
}
#endregion
private DPumpHydr.WinFrmUI.RLT.Forms.NightForm mainForm;
- private DPumpHydr.WinFrmUI.RLT.Controls.NightControlBox nightControlBox1;
- private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel nightPanel1;
+ private DPumpHydr.WinFrmUI.RLT.Controls.NightControlBox topMenuBox;
+ private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel leftMenuPanel;
private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel YeLunMenu;
- private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical HomeSeparator;
+ private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical YeLunSeparator;
private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel VoluteMenu;
- private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical AppSeparator;
+ private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical VoluteSeparator;
private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel LibraryMenu;
private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical LibrarySeparator;
- private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel HelpMenu;
- private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical HelpSeparator;
- private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel GameMenu;
- private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical GameSeparator;
+ private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel SettingMenu;
+ private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical SettingSeparator;
+ private DPumpHydr.WinFrmUI.RLT.Controls.NightPanel FindMenu;
+ private DPumpHydr.WinFrmUI.RLT.Controls.SpaceSeparatorVertical FindSeparator;
private System.Windows.Forms.PictureBox LibraryIcon;
private System.Windows.Forms.PictureBox SettingIcon;
- private System.Windows.Forms.PictureBox GameIcon;
- private System.Windows.Forms.PictureBox AppIcon;
- private System.Windows.Forms.PictureBox HomeIcon;
+ private System.Windows.Forms.PictureBox FindIcon;
+ private System.Windows.Forms.PictureBox VoluteIcon;
+ private System.Windows.Forms.PictureBox YeLunIcon;
private DPumpHydr.WinFrmUI.RLT.Controls.ParrotPictureBox UserPicture;
private System.Windows.Forms.Panel mainPanel;
}
diff --git a/Client/DesktopMain/MainWindow/frmMainWindow.cs b/Client/DesktopMain/MainWindow/frmMainWindow.cs
index 0df003e..2eaea58 100644
--- a/Client/DesktopMain/MainWindow/frmMainWindow.cs
+++ b/Client/DesktopMain/MainWindow/frmMainWindow.cs
@@ -1,4 +1,5 @@
锘縰sing DPumpHydr.WinFrmUI.RLT.Controls;
+using DPumpHydr.WinFrmUI.RLT.Manager;
using System;
using System.Diagnostics;
using System.Drawing;
@@ -13,7 +14,12 @@
InitializeComponent();
this.WindowState = FormWindowState.Maximized;
this.Load += FrmMainWindow_Load;
-
+
+ LibraryMenu.Click += Menu_Click;
+ SettingMenu.Click += Menu_Click;
+ FindMenu.Click += Menu_Click;
+ VoluteMenu.Click += Menu_Click;
+ YeLunMenu.Click += Menu_Click;
}
@@ -24,55 +30,71 @@
page.Name = "MainViewPage";
page.Dock = DockStyle.Fill;
this.mainPanel.Controls.Add(page);
+ VoluteSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ VoluteMenu.Side = NightPanel.PanelSide.Right;
mainForm.AppIcon = DPumpHydr.DesktopMain.Properties.Resources.AppIcon256;
+
}
private void Menu_Click(object sender, EventArgs e)
{
- NightPanel Menu = sender as NightPanel;
+ NightPanel leftMenu = sender as NightPanel;
- if (Menu.Name == "YeLunMenu")
+ if (leftMenu.Name == "YeLunMenu")
{
- HomeSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = HomePage;
+ YeLunSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ YeLunMenu.Side = NightPanel.PanelSide.Right;
+
+ //metroStyleManager1.Style = DPumpHydr.WinFrmUI.RLT.Enum.Metro.Style.Light;
}
else
{
- HomeSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ YeLunSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
YeLunMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "VoluteMenu")
+ if (leftMenu.Name == "VoluteMenu")
{
- AppSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = AppPage;
+ VoluteSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ VoluteMenu.Side = NightPanel.PanelSide.Right;
}
else
{
- AppSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ VoluteSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
VoluteMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "GameMenu")
+ if (leftMenu.Name == "FindMenu")
{
- GameSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
+ FindSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ FindMenu.Side = NightPanel.PanelSide.Right;
//Pages.SelectedTab = GamePage;
}
else
{
- GameSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
- GameMenu.Side = NightPanel.PanelSide.Left;
+ FindSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ FindMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "SettingIcon")
+ if (leftMenu.Name == "SettingMenu")
+ {
+ SettingSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ SettingMenu.Side = NightPanel.PanelSide.Right;
+ //Pages.SelectedTab = LibraryPage;
+ }
+ else
+ {
+ SettingSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ SettingMenu.Side = NightPanel.PanelSide.Left;
+ }
+
+ if (leftMenu.Name == "LibraryMenu")
{
LibrarySeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = LibraryPage;
+ //HelpImage.Image = DPumpHydr.DesktopMain.Properties.Resources.Help;
+ LibraryMenu.Side = NightPanel.PanelSide.Right;
+ //Pages.SelectedTab = HelpPage;
}
else
{
@@ -80,21 +102,8 @@
LibraryMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "HelpMenu")
- {
- HelpSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- //HelpImage.Image = DPumpHydr.DesktopMain.Properties.Resources.Help;
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = HelpPage;
- }
- else
- {
- HelpSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
- HelpMenu.Side = NightPanel.PanelSide.Left;
- }
-
- Menu.Refresh();
- Menu.Invalidate();
+ leftMenu.Refresh();
+ leftMenu.Invalidate();
}
private void UserPicture_MouseEnter(object sender, EventArgs e)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Controls/GroupBox/RibbonGroupBox.cs b/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Controls/GroupBox/RibbonGroupBox.cs
index c1679f8..19a134c 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Controls/GroupBox/RibbonGroupBox.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Controls/GroupBox/RibbonGroupBox.cs
@@ -111,7 +111,15 @@
Font = new("Tahoma", 10, FontStyle.Bold);
Size = new(170, 90);
}
-
+ public int _titleHeight = 30;
+ public int TitleHeight
+ {
+ get => _titleHeight;
+ set
+ {
+ _titleHeight = value;
+ }
+ }
protected override void OnPaint(PaintEventArgs e)
{
Bitmap B = new(Width, Height);
@@ -138,16 +146,16 @@
G.DrawRectangle(p2, 2, 2, Width - 5, Height - 5);
//G.DrawString(Text, t, New SolidBrush(Color.FromArgb(50, 50, 50)), New Rectangle(-1, 1, Width - 1, 25), New StringFormat() With {.Alignment = StringAlignment.Center, .LineAlignment = StringAlignment.Center})
- G.DrawString(Text, Font, new SolidBrush(ForeColor), new Rectangle(0, 1, Width - 1, 25), new StringFormat
+ G.DrawString(Text, Font, new SolidBrush(ForeColor), new Rectangle(0, 4, Width - 1, 4+24), new StringFormat
{
Alignment = StringAlignment.Center,
LineAlignment = StringAlignment.Center
});
Pen UnderlinePen = new(new SolidBrush(LineColorA), 3);
- G.DrawLine(UnderlinePen, 20, 24, Width - 20, 24);
+ G.DrawLine(UnderlinePen, 20, _titleHeight, Width - 20, _titleHeight);
Pen UnderlinePen2 = new(new SolidBrush(LineColorB), 1);
- G.DrawLine(UnderlinePen2, 20, 27, Width - 20, 27);
+ G.DrawLine(UnderlinePen2, 20, _titleHeight+3, Width - 20, _titleHeight+3);
e.Graphics.DrawImage(B, 0, 0);
G.Dispose();
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 271f824..71308eb 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"
@@ -29,12 +29,13 @@
private void InitializeComponent()
{
metroTile鎵╂暎绠″舰鐘� = new RLT.Controls.MetroTile();
- crownLabel4 = new RLT.Controls.CrownLabel();
thunderGroupBox1 = new RLT.Controls.ThunderGroupBox();
- mBtn鏇存柊妯″瀷 = new RLT.Controls.MaterialButton();
metroToolTip绗叚姝ユ彁绀� = new RLT.Controls.MetroToolTip();
panel = new System.Windows.Forms.Panel();
+ ribbonGroupBox1 = new RLT.Controls.RibbonGroupBox();
+ mBtn鏇存柊妯″瀷 = new RLT.Controls.ForeverButtonSticky();
thunderGroupBox1.SuspendLayout();
+ ribbonGroupBox1.SuspendLayout();
SuspendLayout();
//
// metroTile鎵╂暎绠″舰鐘�
@@ -47,7 +48,7 @@
metroTile鎵╂暎绠″舰鐘�.HoverColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鎵╂暎绠″舰鐘�.HoverTextColor = System.Drawing.Color.White;
metroTile鎵╂暎绠″舰鐘�.IsDerivedStyle = true;
- metroTile鎵╂暎绠″舰鐘�.Location = new System.Drawing.Point(70, 31);
+ metroTile鎵╂暎绠″舰鐘�.Location = new System.Drawing.Point(8, 28);
metroTile鎵╂暎绠″舰鐘�.Name = "metroTile鎵╂暎绠″舰鐘�";
metroTile鎵╂暎绠″舰鐘�.NormalBorderColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鎵╂暎绠″舰鐘�.NormalColor = System.Drawing.Color.FromArgb(65, 177, 225);
@@ -55,24 +56,13 @@
metroTile鎵╂暎绠″舰鐘�.PressBorderColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鎵╂暎绠″舰鐘�.PressColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鎵╂暎绠″舰鐘�.PressTextColor = System.Drawing.Color.White;
- metroTile鎵╂暎绠″舰鐘�.Size = new System.Drawing.Size(192, 182);
+ metroTile鎵╂暎绠″舰鐘�.Size = new System.Drawing.Size(236, 188);
metroTile鎵╂暎绠″舰鐘�.Style = RLT.Enum.Metro.Style.Light;
metroTile鎵╂暎绠″舰鐘�.StyleManager = null;
metroTile鎵╂暎绠″舰鐘�.TabIndex = 25;
metroTile鎵╂暎绠″舰鐘�.ThemeAuthor = "Taiizor";
metroTile鎵╂暎绠″舰鐘�.ThemeName = "MetroLight";
metroTile鎵╂暎绠″舰鐘�.TileAlign = RLT.Enum.Metro.TileAlign.Topleft;
- //
- // crownLabel4
- //
- crownLabel4.AutoSize = true;
- crownLabel4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold);
- crownLabel4.ForeColor = System.Drawing.Color.Black;
- crownLabel4.Location = new System.Drawing.Point(13, 8);
- crownLabel4.Name = "crownLabel4";
- crownLabel4.Size = new System.Drawing.Size(90, 22);
- crownLabel4.TabIndex = 26;
- crownLabel4.Text = "鎵╂暎绠″弬鏁�";
//
// thunderGroupBox1
//
@@ -84,34 +74,11 @@
thunderGroupBox1.Controls.Add(metroTile鎵╂暎绠″舰鐘�);
thunderGroupBox1.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
thunderGroupBox1.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox1.Location = new System.Drawing.Point(3, 42);
+ thunderGroupBox1.Location = new System.Drawing.Point(44, 41);
thunderGroupBox1.Name = "thunderGroupBox1";
- thunderGroupBox1.Size = new System.Drawing.Size(315, 222);
+ thunderGroupBox1.Size = new System.Drawing.Size(251, 222);
thunderGroupBox1.TabIndex = 27;
thunderGroupBox1.Text = "鍙傛暟绀烘剰鍥�";
- //
- // mBtn鏇存柊妯″瀷
- //
- mBtn鏇存柊妯″瀷.AutoSize = false;
- mBtn鏇存柊妯″瀷.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- mBtn鏇存柊妯″瀷.Density = RLT.Controls.MaterialButton.MaterialButtonDensity.Default;
- mBtn鏇存柊妯″瀷.Depth = 0;
- mBtn鏇存柊妯″瀷.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
- mBtn鏇存柊妯″瀷.HighEmphasis = false;
- mBtn鏇存柊妯″瀷.Icon = null;
- mBtn鏇存柊妯″瀷.IconType = RLT.Controls.MaterialButton.MaterialIconType.Rebase;
- mBtn鏇存柊妯″瀷.Location = new System.Drawing.Point(219, 5);
- mBtn鏇存柊妯″瀷.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- mBtn鏇存柊妯″瀷.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.HOVER;
- mBtn鏇存柊妯″瀷.Name = "mBtn鏇存柊妯″瀷";
- mBtn鏇存柊妯″瀷.NoAccentTextColor = System.Drawing.Color.Empty;
- mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(90, 28);
- mBtn鏇存柊妯″瀷.TabIndex = 29;
- mBtn鏇存柊妯″瀷.Text = "鏇存柊妯″瀷";
- mBtn鏇存柊妯″瀷.Type = RLT.Controls.MaterialButton.MaterialButtonType.Outlined;
- mBtn鏇存柊妯″瀷.UseAccentColor = false;
- mBtn鏇存柊妯″瀷.UseVisualStyleBackColor = true;
- mBtn鏇存柊妯″瀷.Click += mBtn鏇存柊妯″瀷_Click;
//
// metroToolTip绗叚姝ユ彁绀�
//
@@ -127,35 +94,70 @@
//
// panel
//
- panel.Location = new System.Drawing.Point(3, 270);
+ panel.Location = new System.Drawing.Point(3, 269);
panel.Name = "panel";
- panel.Size = new System.Drawing.Size(315, 530);
+ panel.Size = new System.Drawing.Size(329, 550);
panel.TabIndex = 30;
+ //
+ // ribbonGroupBox1
+ //
+ ribbonGroupBox1.BackColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BaseColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BorderColorA = System.Drawing.Color.FromArgb(143, 143, 143);
+ 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(mBtn鏇存柊妯″瀷);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox1);
+ ribbonGroupBox1.Controls.Add(panel);
+ ribbonGroupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ ribbonGroupBox1.Font = new System.Drawing.Font("Tahoma", 10F, System.Drawing.FontStyle.Bold);
+ ribbonGroupBox1.ForeColor = System.Drawing.Color.Black;
+ ribbonGroupBox1.LineColorA = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.LineColorB = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.Location = new System.Drawing.Point(0, 0);
+ ribbonGroupBox1.Name = "ribbonGroupBox1";
+ ribbonGroupBox1.Size = new System.Drawing.Size(335, 808);
+ ribbonGroupBox1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ ribbonGroupBox1.TabIndex = 31;
+ ribbonGroupBox1.Text = "鎵╂暎绠″弬鏁�";
+ ribbonGroupBox1.TitleHeight = 30;
+ //
+ // mBtn鏇存柊妯″瀷
+ //
+ 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(225, 5);
+ mBtn鏇存柊妯″瀷.Name = "mBtn鏇存柊妯″瀷";
+ mBtn鏇存柊妯″瀷.Rounded = false;
+ mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(90, 20);
+ mBtn鏇存柊妯″瀷.TabIndex = 71;
+ mBtn鏇存柊妯″瀷.Text = "鏇存柊妯″瀷";
+ mBtn鏇存柊妯″瀷.TextColor = System.Drawing.Color.FromArgb(243, 243, 243);
+ mBtn鏇存柊妯″瀷.Click += mBtn鏇存柊妯″瀷_Click;
//
// ctrlSetOutflowParas
//
AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
BackColor = System.Drawing.SystemColors.ControlLight;
- Controls.Add(panel);
- Controls.Add(thunderGroupBox1);
- Controls.Add(mBtn鏇存柊妯″瀷);
- Controls.Add(crownLabel4);
+ Controls.Add(ribbonGroupBox1);
Margin = new System.Windows.Forms.Padding(4);
Name = "ctrlSetOutflowParas";
- Size = new System.Drawing.Size(325, 803);
+ Size = new System.Drawing.Size(335, 808);
thunderGroupBox1.ResumeLayout(false);
+ ribbonGroupBox1.ResumeLayout(false);
ResumeLayout(false);
- PerformLayout();
}
#endregion
private RLT.Controls.MetroTile metroTile鎵╂暎绠″舰鐘�;
- private RLT.Controls.CrownLabel crownLabel4;
private RLT.Controls.ThunderGroupBox thunderGroupBox1;
- private RLT.Controls.MaterialButton mBtn鏇存柊妯″瀷;
private RLT.Controls.MetroToolTip metroToolTip绗叚姝ユ彁绀�;
private System.Windows.Forms.Panel panel;
+ private RLT.Controls.RibbonGroupBox ribbonGroupBox1;
+ private RLT.Controls.ForeverButtonSticky mBtn鏇存柊妯″瀷;
}
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
index 14be823..609172a 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
@@ -54,7 +54,7 @@
};
_sidelineExitControl.Dock = DockStyle.Top;
}
- _sidelineExitControl.SetA_state(false);
+ _sidelineExitControl.SetA_state(false);
panel.Controls.Add(_sidelineExitControl);
return;
case eOutflowStyle.渚ч潰鍑哄彛_鏇茬嚎杩炴帴:
@@ -90,9 +90,9 @@
public void InitialParas(
eOutflowStyle style,
- ViewModel.HdrBaseInfo hdrBaseInfo ,
- ViewModel.GeomBaseInfo geomBaseInfo ,
- ViewModel.SectionBundleInfo sectionBundleInfo )
+ ViewModel.HdrBaseInfo hdrBaseInfo,
+ ViewModel.GeomBaseInfo geomBaseInfo,
+ ViewModel.SectionBundleInfo sectionBundleInfo)
{
SetOutflowStyle(style);
//鍑哄彛鐩村緞鏍囧噯鍖�
@@ -122,7 +122,7 @@
}
else
{
- _sidelineExitControl.InitialParas(hdrBaseInfo, geomBaseInfo, sectionBundleInfo);
+ _sidelineExitControl.InitialParas(hdrBaseInfo, geomBaseInfo, sectionBundleInfo);
_sidelineExitControl.IsInvokeRefreshShapeAble = false;
_sidelineExitControl.SetBindingData(_outflowParas);
_sidelineExitControl.IsInvokeRefreshShapeAble = true;
@@ -137,9 +137,9 @@
350,400,450,500,600,
700,800,900,1000,1200,
1400,1600,1800,2000,5000,100000};
-
+
for (int i = 0; i < iFlangeCodeList.Count() - 1; i++)
- {
+ {
if (mm < iFlangeCodeList[i])
return iFlangeCodeList[i];
}
@@ -163,7 +163,7 @@
return _outflowParas;
}
- public void SetBindingData(eOutflowStyle style, ViewModel.OtuflowParas paras)
+ public void SetBindingData(eOutflowStyle style, ViewModel.OtuflowParas paras)
{
SetOutflowStyle(style);
if (_stype == eOutflowStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
@@ -188,7 +188,7 @@
public void ShowPage(DPumpHydr.ViewModel.eWizardStepDiretion step_direction)
{
-
+
if (step_direction == DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘)
{
var resp = OnRefreshShape3D(_outflowParas);
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowType.Designer.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowType.Designer.cs"
index e748c4c..c794e16 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowType.Designer.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowType.Designer.cs"
@@ -29,12 +29,13 @@
private void InitializeComponent()
{
metroTile鍑哄彛鍥剧墖 = new RLT.Controls.MetroTile();
- crownLabel4 = new RLT.Controls.CrownLabel();
thunderGroupBox1 = new RLT.Controls.ThunderGroupBox();
RBtn渚ч潰鍑哄彛鐩寸嚎 = new RLT.Controls.RibbonRadioButton();
RBtn涓績鍑哄彛 = new RLT.Controls.RibbonRadioButton();
RBtn渚ч潰鍑哄彛鏇茬嚎 = new RLT.Controls.RibbonRadioButton();
+ ribbonGroupBox1 = new RLT.Controls.RibbonGroupBox();
thunderGroupBox1.SuspendLayout();
+ ribbonGroupBox1.SuspendLayout();
SuspendLayout();
//
// metroTile鍑哄彛鍥剧墖
@@ -47,7 +48,7 @@
metroTile鍑哄彛鍥剧墖.HoverColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鍑哄彛鍥剧墖.HoverTextColor = System.Drawing.Color.White;
metroTile鍑哄彛鍥剧墖.IsDerivedStyle = true;
- metroTile鍑哄彛鍥剧墖.Location = new System.Drawing.Point(68, 33);
+ metroTile鍑哄彛鍥剧墖.Location = new System.Drawing.Point(63, 44);
metroTile鍑哄彛鍥剧墖.Name = "metroTile鍑哄彛鍥剧墖";
metroTile鍑哄彛鍥剧墖.NormalBorderColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鍑哄彛鍥剧墖.NormalColor = System.Drawing.Color.FromArgb(65, 177, 225);
@@ -63,17 +64,6 @@
metroTile鍑哄彛鍥剧墖.ThemeName = "MetroLight";
metroTile鍑哄彛鍥剧墖.TileAlign = RLT.Enum.Metro.TileAlign.Topleft;
//
- // crownLabel4
- //
- crownLabel4.AutoSize = true;
- crownLabel4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold);
- crownLabel4.ForeColor = System.Drawing.Color.Black;
- crownLabel4.Location = new System.Drawing.Point(5, 8);
- crownLabel4.Name = "crownLabel4";
- crownLabel4.Size = new System.Drawing.Size(90, 22);
- crownLabel4.TabIndex = 25;
- crownLabel4.Text = "鎵╂暎绠＄被鍨�";
- //
// thunderGroupBox1
//
thunderGroupBox1.BackColor = System.Drawing.SystemColors.Control;
@@ -86,9 +76,9 @@
thunderGroupBox1.Controls.Add(RBtn渚ч潰鍑哄彛鏇茬嚎);
thunderGroupBox1.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
thunderGroupBox1.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox1.Location = new System.Drawing.Point(10, 225);
+ thunderGroupBox1.Location = new System.Drawing.Point(17, 236);
thunderGroupBox1.Name = "thunderGroupBox1";
- thunderGroupBox1.Size = new System.Drawing.Size(308, 112);
+ thunderGroupBox1.Size = new System.Drawing.Size(278, 112);
thunderGroupBox1.TabIndex = 26;
thunderGroupBox1.Text = "閫夋嫨鍑哄彛绫诲瀷";
//
@@ -155,29 +145,50 @@
RBtn渚ч潰鍑哄彛鏇茬嚎.TextRenderingType = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
RBtn渚ч潰鍑哄彛鏇茬嚎.CheckedChanged += RBtn渚ч潰鍑哄彛鏇茬嚎_CheckedChanged;
//
+ // ribbonGroupBox1
+ //
+ ribbonGroupBox1.BackColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BaseColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BorderColorA = System.Drawing.Color.FromArgb(143, 143, 143);
+ 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(metroTile鍑哄彛鍥剧墖);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox1);
+ ribbonGroupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ ribbonGroupBox1.Font = new System.Drawing.Font("Tahoma", 10F, System.Drawing.FontStyle.Bold);
+ ribbonGroupBox1.ForeColor = System.Drawing.Color.Black;
+ ribbonGroupBox1.LineColorA = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.LineColorB = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.Location = new System.Drawing.Point(0, 0);
+ ribbonGroupBox1.Name = "ribbonGroupBox1";
+ ribbonGroupBox1.Size = new System.Drawing.Size(325, 784);
+ ribbonGroupBox1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ ribbonGroupBox1.TabIndex = 27;
+ ribbonGroupBox1.Text = "閫夋嫨鍑哄彛绫诲瀷";
+ ribbonGroupBox1.TitleHeight = 30;
+ //
// ctrlSetOutflowType
//
AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
BackColor = System.Drawing.SystemColors.ControlLight;
- Controls.Add(thunderGroupBox1);
- Controls.Add(metroTile鍑哄彛鍥剧墖);
- Controls.Add(crownLabel4);
+ Controls.Add(ribbonGroupBox1);
Margin = new System.Windows.Forms.Padding(4);
Name = "ctrlSetOutflowType";
Size = new System.Drawing.Size(325, 784);
thunderGroupBox1.ResumeLayout(false);
+ ribbonGroupBox1.ResumeLayout(false);
ResumeLayout(false);
- PerformLayout();
}
#endregion
private RLT.Controls.MetroTile metroTile鍑哄彛鍥剧墖;
- private RLT.Controls.CrownLabel crownLabel4;
private RLT.Controls.ThunderGroupBox thunderGroupBox1;
private RLT.Controls.RibbonRadioButton RBtn渚ч潰鍑哄彛鐩寸嚎;
private RLT.Controls.RibbonRadioButton RBtn涓績鍑哄彛;
private RLT.Controls.RibbonRadioButton RBtn渚ч潰鍑哄彛鏇茬嚎;
+ private RLT.Controls.RibbonGroupBox ribbonGroupBox1;
}
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.Designer.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.Designer.cs"
index 9e85309..7e19287 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.Designer.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.Designer.cs"
@@ -28,40 +28,21 @@
/// </summary>
private void InitializeComponent()
{
- thunderGroupBox1 = new RLT.Controls.ThunderGroupBox();
skyLabel铚楀鍘氬害 = new RLT.Controls.SkyLabel();
mTextBoxEdit鍘氬害 = new RLT.Controls.MaterialTextBoxEdit();
metroToolTip鎻愮ず = new RLT.Controls.MetroToolTip();
- materialButton1 = new RLT.Controls.MaterialButton();
- thunderGroupBox1.SuspendLayout();
+ ribbonGroupBox1 = new RLT.Controls.RibbonGroupBox();
+ mBtn鏇存柊妯″瀷 = new RLT.Controls.ForeverButtonSticky();
+ ribbonGroupBox1.SuspendLayout();
SuspendLayout();
//
- // thunderGroupBox1
- //
- thunderGroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
- thunderGroupBox1.BackColor = System.Drawing.SystemColors.Control;
- thunderGroupBox1.BodyColorA = System.Drawing.Color.Silver;
- thunderGroupBox1.BodyColorB = System.Drawing.Color.DarkGray;
- thunderGroupBox1.BodyColorC = System.Drawing.SystemColors.ButtonFace;
- thunderGroupBox1.BodyColorD = System.Drawing.SystemColors.ButtonFace;
- thunderGroupBox1.Controls.Add(materialButton1);
- thunderGroupBox1.Controls.Add(skyLabel铚楀鍘氬害);
- thunderGroupBox1.Controls.Add(mTextBoxEdit鍘氬害);
- thunderGroupBox1.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
- thunderGroupBox1.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox1.Location = new System.Drawing.Point(6, 3);
- thunderGroupBox1.Name = "thunderGroupBox1";
- thunderGroupBox1.Size = new System.Drawing.Size(311, 109);
- thunderGroupBox1.TabIndex = 20;
- thunderGroupBox1.Text = "铚楀３鍘氬害";
- //
- // skyLabel铚楀骞冲潎閫熷害
+ // skyLabel铚楀鍘氬害
//
skyLabel铚楀鍘氬害.AutoSize = true;
skyLabel铚楀鍘氬害.Font = new System.Drawing.Font("Swis721 BlkCn BT", 7F, System.Drawing.FontStyle.Bold);
skyLabel铚楀鍘氬害.ForeColor = System.Drawing.Color.DeepPink;
- skyLabel铚楀鍘氬害.Location = new System.Drawing.Point(12, 88);
- skyLabel铚楀鍘氬害.Name = "skyLabel铚楀骞冲潎閫熷害";
+ skyLabel铚楀鍘氬害.Location = new System.Drawing.Point(50, 97);
+ skyLabel铚楀鍘氬害.Name = "skyLabel铚楀鍘氬害";
skyLabel铚楀鍘氬害.Size = new System.Drawing.Size(71, 12);
skyLabel铚楀鍘氬害.TabIndex = 29;
skyLabel铚楀鍘氬害.Text = "璇疯緭鍏ュ帤搴︼紒";
@@ -80,7 +61,7 @@
mTextBoxEdit鍘氬害.HideSelection = true;
mTextBoxEdit鍘氬害.Hint = "铚楀鍘氬害";
mTextBoxEdit鍘氬害.LeadingIcon = null;
- mTextBoxEdit鍘氬害.Location = new System.Drawing.Point(12, 37);
+ mTextBoxEdit鍘氬害.Location = new System.Drawing.Point(50, 46);
mTextBoxEdit鍘氬害.MaxLength = 32767;
mTextBoxEdit鍘氬害.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
mTextBoxEdit鍘氬害.Name = "mTextBoxEdit鍘氬害";
@@ -106,7 +87,7 @@
mTextBoxEdit鍘氬害.Leave += mTextBoxEdit铚楀骞冲潎閫熷害_Leave;
mTextBoxEdit鍘氬害.TextChanged += mTextBoxEdit铚楀骞冲潎閫熷害_TextChanged;
//
- // metroToolTip绗笁姝ユ彁绀�
+ // metroToolTip鎻愮ず
//
metroToolTip鎻愮ず.BackColor = System.Drawing.Color.White;
metroToolTip鎻愮ず.BorderColor = System.Drawing.Color.FromArgb(204, 204, 204);
@@ -118,48 +99,62 @@
metroToolTip鎻愮ず.ThemeAuthor = "";
metroToolTip鎻愮ず.ThemeName = "";
//
- // materialButton1
+ // ribbonGroupBox1
//
- materialButton1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- materialButton1.Density = RLT.Controls.MaterialButton.MaterialButtonDensity.Default;
- materialButton1.Depth = 0;
- materialButton1.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
- materialButton1.HighEmphasis = false;
- materialButton1.Icon = null;
- materialButton1.IconType = RLT.Controls.MaterialButton.MaterialIconType.Rebase;
- materialButton1.Location = new System.Drawing.Point(221, 49);
- materialButton1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- materialButton1.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.HOVER;
- materialButton1.Name = "materialButton1";
- materialButton1.NoAccentTextColor = System.Drawing.Color.Empty;
- materialButton1.Size = new System.Drawing.Size(64, 36);
- materialButton1.TabIndex = 6;
- materialButton1.Text = "鍒锋柊";
- materialButton1.Type = RLT.Controls.MaterialButton.MaterialButtonType.Outlined;
- materialButton1.UseAccentColor = false;
- materialButton1.UseVisualStyleBackColor = true;
- materialButton1.Click += materialButton1_Click;
+ ribbonGroupBox1.BackColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BaseColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BorderColorA = System.Drawing.Color.FromArgb(143, 143, 143);
+ 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(mBtn鏇存柊妯″瀷);
+ ribbonGroupBox1.Controls.Add(skyLabel铚楀鍘氬害);
+ ribbonGroupBox1.Controls.Add(mTextBoxEdit鍘氬害);
+ ribbonGroupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ ribbonGroupBox1.Font = new System.Drawing.Font("Tahoma", 10F, System.Drawing.FontStyle.Bold);
+ ribbonGroupBox1.ForeColor = System.Drawing.Color.Black;
+ ribbonGroupBox1.LineColorA = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.LineColorB = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.Location = new System.Drawing.Point(0, 0);
+ ribbonGroupBox1.Name = "ribbonGroupBox1";
+ ribbonGroupBox1.Size = new System.Drawing.Size(335, 808);
+ ribbonGroupBox1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ ribbonGroupBox1.TabIndex = 21;
+ ribbonGroupBox1.Text = "鍘氬害";
+ ribbonGroupBox1.TitleHeight = 30;
+ //
+ // mBtn鏇存柊妯″瀷
+ //
+ 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(225, 5);
+ mBtn鏇存柊妯″瀷.Name = "mBtn鏇存柊妯″瀷";
+ mBtn鏇存柊妯″瀷.Rounded = false;
+ mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(90, 20);
+ mBtn鏇存柊妯″瀷.TabIndex = 72;
+ mBtn鏇存柊妯″瀷.Text = "鏇存柊妯″瀷";
+ mBtn鏇存柊妯″瀷.TextColor = System.Drawing.Color.FromArgb(243, 243, 243);
//
// ctrlThicknessParas
//
AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
BackColor = System.Drawing.SystemColors.ControlLight;
- Controls.Add(thunderGroupBox1);
+ Controls.Add(ribbonGroupBox1);
Margin = new System.Windows.Forms.Padding(4);
Name = "ctrlThicknessParas";
- Size = new System.Drawing.Size(320, 808);
- thunderGroupBox1.ResumeLayout(false);
- thunderGroupBox1.PerformLayout();
+ Size = new System.Drawing.Size(335, 808);
+ ribbonGroupBox1.ResumeLayout(false);
+ ribbonGroupBox1.PerformLayout();
ResumeLayout(false);
}
#endregion
-
- private RLT.Controls.ThunderGroupBox thunderGroupBox1;
private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit鍘氬害;
private RLT.Controls.MetroToolTip metroToolTip鎻愮ず;
private RLT.Controls.SkyLabel skyLabel铚楀鍘氬害;
- private RLT.Controls.MaterialButton materialButton1;
+ private RLT.Controls.RibbonGroupBox ribbonGroupBox1;
+ private RLT.Controls.ForeverButtonSticky mBtn鏇存柊妯″瀷;
}
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.resx" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.resx"
index 2f77e3e..04d607b 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.resx"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\212\240\345\216\232/ctrlThicknessParas.resx"
@@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="metroToolTip绗笁姝ユ彁绀�.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="metroToolTip鎻愮ず.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.Designer.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.Designer.cs"
index c6185d0..c852cc6 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.Designer.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.Designer.cs"
@@ -46,17 +46,18 @@
RBtn鐜瀷 = new RLT.Controls.RibbonRadioButton();
RBtn鍙岃湕澹冲瀷 = new RLT.Controls.RibbonRadioButton();
RBtn铻烘棆鍨� = new RLT.Controls.RibbonRadioButton();
- crownLabel4 = new RLT.Controls.CrownLabel();
metroToolTip绗竴姝ユ彁绀� = new RLT.Controls.MetroToolTip();
thunderGroupBox4 = new RLT.Controls.ThunderGroupBox();
skyLabel鍩哄渾瀹藉害 = new RLT.Controls.SkyLabel();
mTextBoxEdit鍩哄渾瀹藉害 = new RLT.Controls.MaterialTextBoxEdit();
skyLabel鍩哄渾鐩村緞 = new RLT.Controls.SkyLabel();
mTextBoxEdit鍩哄渾鐩村緞 = new RLT.Controls.MaterialTextBoxEdit();
+ ribbonGroupBox1 = new RLT.Controls.RibbonGroupBox();
thunderGroupBox3.SuspendLayout();
thunderGroupBox2.SuspendLayout();
thunderGroupBox1.SuspendLayout();
thunderGroupBox4.SuspendLayout();
+ ribbonGroupBox1.SuspendLayout();
SuspendLayout();
//
// thunderGroupBox3
@@ -73,9 +74,9 @@
thunderGroupBox3.Controls.Add(mTextBoxEdit鍑哄彛鐩村緞);
thunderGroupBox3.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 12F, System.Drawing.FontStyle.Bold);
thunderGroupBox3.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox3.Location = new System.Drawing.Point(7, 364);
+ thunderGroupBox3.Location = new System.Drawing.Point(5, 383);
thunderGroupBox3.Name = "thunderGroupBox3";
- thunderGroupBox3.Size = new System.Drawing.Size(311, 169);
+ thunderGroupBox3.Size = new System.Drawing.Size(310, 169);
thunderGroupBox3.TabIndex = 18;
thunderGroupBox3.Text = "鍙惰疆鍑犱綍鍙傛暟";
//
@@ -196,9 +197,9 @@
thunderGroupBox2.Controls.Add(mTextBoxEdit鎬绘祦閲�);
thunderGroupBox2.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 12F, System.Drawing.FontStyle.Bold);
thunderGroupBox2.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox2.Location = new System.Drawing.Point(7, 128);
+ thunderGroupBox2.Location = new System.Drawing.Point(5, 144);
thunderGroupBox2.Name = "thunderGroupBox2";
- thunderGroupBox2.Size = new System.Drawing.Size(311, 232);
+ thunderGroupBox2.Size = new System.Drawing.Size(310, 232);
thunderGroupBox2.TabIndex = 17;
thunderGroupBox2.Text = "璁捐鍙傛暟";
//
@@ -288,7 +289,7 @@
RBtn鍙屽惛娉�.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
RBtn鍙屽惛娉�.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
RBtn鍙屽惛娉�.ForeColor = System.Drawing.Color.FromArgb(40, 40, 40);
- RBtn鍙屽惛娉�.Location = new System.Drawing.Point(157, 6);
+ RBtn鍙屽惛娉�.Location = new System.Drawing.Point(157, 5);
RBtn鍙屽惛娉�.Name = "RBtn鍙屽惛娉�";
RBtn鍙屽惛娉�.Size = new System.Drawing.Size(133, 16);
RBtn鍙屽惛娉�.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
@@ -361,7 +362,7 @@
mTextBoxEdit鎬绘祦閲�.SelectionLength = 0;
mTextBoxEdit鎬绘祦閲�.SelectionStart = 0;
mTextBoxEdit鎬绘祦閲�.ShortcutsEnabled = true;
- mTextBoxEdit鎬绘祦閲�.Size = new System.Drawing.Size(281, 48);
+ mTextBoxEdit鎬绘祦閲�.Size = new System.Drawing.Size(277, 48);
mTextBoxEdit鎬绘祦閲�.TabIndex = 3;
mTextBoxEdit鎬绘祦閲�.TabStop = false;
mTextBoxEdit鎬绘祦閲�.Text = "璇疯緭鍏ユ�绘祦閲�";
@@ -375,7 +376,6 @@
//
// thunderGroupBox1
//
- thunderGroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
thunderGroupBox1.BackColor = System.Drawing.Color.Transparent;
thunderGroupBox1.BodyColorA = System.Drawing.Color.Silver;
thunderGroupBox1.BodyColorB = System.Drawing.Color.DarkGray;
@@ -387,9 +387,9 @@
thunderGroupBox1.Controls.Add(RBtn铻烘棆鍨�);
thunderGroupBox1.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 12F, System.Drawing.FontStyle.Bold);
thunderGroupBox1.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox1.Location = new System.Drawing.Point(7, 25);
+ thunderGroupBox1.Location = new System.Drawing.Point(5, 40);
thunderGroupBox1.Name = "thunderGroupBox1";
- thunderGroupBox1.Size = new System.Drawing.Size(311, 100);
+ thunderGroupBox1.Size = new System.Drawing.Size(310, 100);
thunderGroupBox1.TabIndex = 16;
thunderGroupBox1.Text = "绫诲瀷";
//
@@ -477,17 +477,6 @@
RBtn铻烘棆鍨�.Text = "铻烘棆鍨�";
RBtn铻烘棆鍨�.TextRenderingType = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
//
- // crownLabel4
- //
- crownLabel4.AutoSize = true;
- crownLabel4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold);
- crownLabel4.ForeColor = System.Drawing.Color.Black;
- crownLabel4.Location = new System.Drawing.Point(20, 0);
- crownLabel4.Name = "crownLabel4";
- crownLabel4.Size = new System.Drawing.Size(170, 22);
- crownLabel4.TabIndex = 15;
- crownLabel4.Text = "绗竴姝ワ細杈撳叆鍩烘湰鍙傛暟";
- //
// metroToolTip绗竴姝ユ彁绀�
//
metroToolTip绗竴姝ユ彁绀�.BackColor = System.Drawing.Color.White;
@@ -513,9 +502,9 @@
thunderGroupBox4.Controls.Add(mTextBoxEdit鍩哄渾鐩村緞);
thunderGroupBox4.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 12F, System.Drawing.FontStyle.Bold);
thunderGroupBox4.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox4.Location = new System.Drawing.Point(7, 537);
+ thunderGroupBox4.Location = new System.Drawing.Point(5, 555);
thunderGroupBox4.Name = "thunderGroupBox4";
- thunderGroupBox4.Size = new System.Drawing.Size(312, 172);
+ thunderGroupBox4.Size = new System.Drawing.Size(310, 172);
thunderGroupBox4.TabIndex = 20;
thunderGroupBox4.Text = "铚楀３鍑犱綍鍙傛暟";
//
@@ -613,16 +602,37 @@
mTextBoxEdit鍩哄渾鐩村緞.UseAccent = false;
mTextBoxEdit鍩哄渾鐩村緞.UseSystemPasswordChar = false;
//
+ // ribbonGroupBox1
+ //
+ ribbonGroupBox1.BackColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BaseColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BorderColorA = System.Drawing.Color.FromArgb(143, 143, 143);
+ 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(thunderGroupBox1);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox4);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox2);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox3);
+ ribbonGroupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ ribbonGroupBox1.Font = new System.Drawing.Font("Tahoma", 10F, System.Drawing.FontStyle.Bold);
+ ribbonGroupBox1.ForeColor = System.Drawing.Color.Black;
+ ribbonGroupBox1.LineColorA = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.LineColorB = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.Location = new System.Drawing.Point(0, 0);
+ ribbonGroupBox1.Name = "ribbonGroupBox1";
+ ribbonGroupBox1.Size = new System.Drawing.Size(326, 786);
+ ribbonGroupBox1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ ribbonGroupBox1.TabIndex = 21;
+ ribbonGroupBox1.Text = "杈撳叆鍩烘湰鍙傛暟";
+ ribbonGroupBox1.TitleHeight = 30;
+ //
// ctrlHdrBaseInfo
//
AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
BackColor = System.Drawing.SystemColors.ControlLight;
- Controls.Add(thunderGroupBox4);
- Controls.Add(thunderGroupBox3);
- Controls.Add(thunderGroupBox2);
- Controls.Add(thunderGroupBox1);
- Controls.Add(crownLabel4);
+ Controls.Add(ribbonGroupBox1);
Margin = new System.Windows.Forms.Padding(4);
Name = "ctrlHdrBaseInfo";
Size = new System.Drawing.Size(326, 786);
@@ -633,8 +643,8 @@
thunderGroupBox1.ResumeLayout(false);
thunderGroupBox4.ResumeLayout(false);
thunderGroupBox4.PerformLayout();
+ ribbonGroupBox1.ResumeLayout(false);
ResumeLayout(false);
- PerformLayout();
}
#endregion
@@ -653,7 +663,6 @@
private RLT.Controls.RibbonRadioButton RBtn鐜瀷;
private RLT.Controls.RibbonRadioButton RBtn鍙岃湕澹冲瀷;
private RLT.Controls.RibbonRadioButton RBtn铻烘棆鍨�;
- private RLT.Controls.CrownLabel crownLabel4;
private RLT.Controls.MetroToolTip metroToolTip绗竴姝ユ彁绀�;
private RLT.Controls.SkyLabel skyLabel鍑哄彛瀹藉害;
private RLT.Controls.SkyLabel skyLabel鍑哄彛鐩村緞;
@@ -665,5 +674,6 @@
private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit鍩哄渾瀹藉害;
private RLT.Controls.SkyLabel skyLabel鍩哄渾鐩村緞;
private RLT.Controls.MaterialTextBoxEdit mTextBoxEdit鍩哄渾鐩村緞;
+ private RLT.Controls.RibbonGroupBox ribbonGroupBox1;
}
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.Designer.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.Designer.cs"
index 3b588e6..b666fc2 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.Designer.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.Designer.cs"
@@ -29,13 +29,12 @@
private void InitializeComponent()
{
thunderGroupBox1 = new RLT.Controls.ThunderGroupBox();
+ mBtn璁＄畻鏂潰闈㈢Н = new RLT.Controls.MetroButton();
label3 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
textBoxK3 = new System.Windows.Forms.TextBox();
textBoxV3 = new System.Windows.Forms.TextBox();
crownLabel1 = new RLT.Controls.CrownLabel();
- mBtn璁＄畻鏂潰闈㈢Н = new RLT.Controls.MaterialButton();
- crownLabel4 = new RLT.Controls.CrownLabel();
thunderGroupBox2 = new RLT.Controls.ThunderGroupBox();
RBtn鐭╁舰 = new RLT.Controls.RibbonRadioButton();
metroTile鐭╁舰 = new RLT.Controls.MetroTile();
@@ -91,10 +90,12 @@
crownLabel3 = new RLT.Controls.CrownLabel();
crownLabel2 = new RLT.Controls.CrownLabel();
metroToolTip绗笁姝ユ彁绀� = new RLT.Controls.MetroToolTip();
- mBtn鏇存柊妯″瀷 = new RLT.Controls.MaterialButton();
+ ribbonGroupBox1 = new RLT.Controls.RibbonGroupBox();
+ mBtn鏇存柊妯″瀷 = new RLT.Controls.ForeverButtonSticky();
thunderGroupBox1.SuspendLayout();
thunderGroupBox2.SuspendLayout();
thunderGroupBox3.SuspendLayout();
+ ribbonGroupBox1.SuspendLayout();
SuspendLayout();
//
// thunderGroupBox1
@@ -105,19 +106,46 @@
thunderGroupBox1.BodyColorB = System.Drawing.Color.DarkGray;
thunderGroupBox1.BodyColorC = System.Drawing.SystemColors.ButtonFace;
thunderGroupBox1.BodyColorD = System.Drawing.SystemColors.ButtonFace;
+ thunderGroupBox1.Controls.Add(mBtn璁＄畻鏂潰闈㈢Н);
thunderGroupBox1.Controls.Add(label3);
thunderGroupBox1.Controls.Add(label2);
thunderGroupBox1.Controls.Add(textBoxK3);
thunderGroupBox1.Controls.Add(textBoxV3);
thunderGroupBox1.Controls.Add(crownLabel1);
- thunderGroupBox1.Controls.Add(mBtn璁＄畻鏂潰闈㈢Н);
thunderGroupBox1.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
thunderGroupBox1.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox1.Location = new System.Drawing.Point(3, 44);
+ thunderGroupBox1.Location = new System.Drawing.Point(5, 40);
thunderGroupBox1.Name = "thunderGroupBox1";
- thunderGroupBox1.Size = new System.Drawing.Size(326, 109);
+ thunderGroupBox1.Size = new System.Drawing.Size(323, 109);
thunderGroupBox1.TabIndex = 20;
thunderGroupBox1.Text = "杈撳叆鏂潰骞冲潎閫熷害";
+ //
+ // mBtn璁＄畻鏂潰闈㈢Н
+ //
+ mBtn璁＄畻鏂潰闈㈢Н.DisabledBackColor = System.Drawing.Color.FromArgb(120, 65, 177, 225);
+ mBtn璁＄畻鏂潰闈㈢Н.DisabledBorderColor = System.Drawing.Color.FromArgb(120, 65, 177, 225);
+ mBtn璁＄畻鏂潰闈㈢Н.DisabledForeColor = System.Drawing.Color.Gray;
+ mBtn璁＄畻鏂潰闈㈢Н.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
+ mBtn璁＄畻鏂潰闈㈢Н.HoverBorderColor = System.Drawing.Color.FromArgb(95, 207, 255);
+ mBtn璁＄畻鏂潰闈㈢Н.HoverColor = System.Drawing.Color.FromArgb(95, 207, 255);
+ mBtn璁＄畻鏂潰闈㈢Н.HoverTextColor = System.Drawing.Color.White;
+ mBtn璁＄畻鏂潰闈㈢Н.IsDerivedStyle = true;
+ mBtn璁＄畻鏂潰闈㈢Н.Location = new System.Drawing.Point(191, 61);
+ mBtn璁＄畻鏂潰闈㈢Н.Name = "mBtn璁＄畻鏂潰闈㈢Н";
+ mBtn璁＄畻鏂潰闈㈢Н.NormalBorderColor = System.Drawing.Color.FromArgb(65, 177, 225);
+ mBtn璁＄畻鏂潰闈㈢Н.NormalColor = System.Drawing.Color.FromArgb(65, 177, 225);
+ mBtn璁＄畻鏂潰闈㈢Н.NormalTextColor = System.Drawing.Color.White;
+ mBtn璁＄畻鏂潰闈㈢Н.PressBorderColor = System.Drawing.Color.FromArgb(35, 147, 195);
+ mBtn璁＄畻鏂潰闈㈢Н.PressColor = System.Drawing.Color.FromArgb(35, 147, 195);
+ mBtn璁＄畻鏂潰闈㈢Н.PressTextColor = System.Drawing.Color.White;
+ mBtn璁＄畻鏂潰闈㈢Н.Size = new System.Drawing.Size(101, 25);
+ mBtn璁＄畻鏂潰闈㈢Н.Style = RLT.Enum.Metro.Style.Light;
+ mBtn璁＄畻鏂潰闈㈢Н.StyleManager = null;
+ mBtn璁＄畻鏂潰闈㈢Н.TabIndex = 36;
+ mBtn璁＄畻鏂潰闈㈢Н.Text = "璁＄畻鏂潰闈㈢Н";
+ mBtn璁＄畻鏂潰闈㈢Н.ThemeAuthor = "Taiizor";
+ mBtn璁＄畻鏂潰闈㈢Н.ThemeName = "MetroLight";
+ mBtn璁＄畻鏂潰闈㈢Н.Click += mBtn璁＄畻鏂潰闈㈢Н_Click;
//
// label3
//
@@ -165,39 +193,6 @@
crownLabel1.TabIndex = 18;
crownLabel1.Text = "閲囩敤姝ｅ父鏂潰";
//
- // mBtn璁＄畻鏂潰闈㈢Н
- //
- mBtn璁＄畻鏂潰闈㈢Н.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- mBtn璁＄畻鏂潰闈㈢Н.Density = RLT.Controls.MaterialButton.MaterialButtonDensity.Default;
- mBtn璁＄畻鏂潰闈㈢Н.Depth = 0;
- mBtn璁＄畻鏂潰闈㈢Н.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
- mBtn璁＄畻鏂潰闈㈢Н.HighEmphasis = false;
- mBtn璁＄畻鏂潰闈㈢Н.Icon = null;
- mBtn璁＄畻鏂潰闈㈢Н.IconType = RLT.Controls.MaterialButton.MaterialIconType.Rebase;
- mBtn璁＄畻鏂潰闈㈢Н.Location = new System.Drawing.Point(191, 49);
- mBtn璁＄畻鏂潰闈㈢Н.Margin = new System.Windows.Forms.Padding(2);
- mBtn璁＄畻鏂潰闈㈢Н.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.HOVER;
- mBtn璁＄畻鏂潰闈㈢Н.Name = "mBtn璁＄畻鏂潰闈㈢Н";
- mBtn璁＄畻鏂潰闈㈢Н.NoAccentTextColor = System.Drawing.Color.Empty;
- mBtn璁＄畻鏂潰闈㈢Н.Size = new System.Drawing.Size(101, 36);
- mBtn璁＄畻鏂潰闈㈢Н.TabIndex = 6;
- mBtn璁＄畻鏂潰闈㈢Н.Text = "璁＄畻鍚勬柇闈�";
- mBtn璁＄畻鏂潰闈㈢Н.Type = RLT.Controls.MaterialButton.MaterialButtonType.Outlined;
- mBtn璁＄畻鏂潰闈㈢Н.UseAccentColor = false;
- mBtn璁＄畻鏂潰闈㈢Н.UseVisualStyleBackColor = true;
- mBtn璁＄畻鏂潰闈㈢Н.Click += mBtn璁＄畻鏂潰闈㈢Н_Click;
- //
- // crownLabel4
- //
- crownLabel4.AutoSize = true;
- crownLabel4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold);
- crownLabel4.ForeColor = System.Drawing.Color.Black;
- crownLabel4.Location = new System.Drawing.Point(3, 10);
- crownLabel4.Name = "crownLabel4";
- crownLabel4.Size = new System.Drawing.Size(74, 22);
- crownLabel4.TabIndex = 21;
- crownLabel4.Text = "鏂潰鍙傛暟";
- //
// thunderGroupBox2
//
thunderGroupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
@@ -214,9 +209,9 @@
thunderGroupBox2.Controls.Add(metroTile瀵圭О姊舰);
thunderGroupBox2.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
thunderGroupBox2.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox2.Location = new System.Drawing.Point(3, 156);
+ thunderGroupBox2.Location = new System.Drawing.Point(5, 153);
thunderGroupBox2.Name = "thunderGroupBox2";
- thunderGroupBox2.Size = new System.Drawing.Size(326, 158);
+ thunderGroupBox2.Size = new System.Drawing.Size(321, 158);
thunderGroupBox2.TabIndex = 22;
thunderGroupBox2.Text = "纭畾鏂潰褰㈢姸";
//
@@ -419,9 +414,9 @@
thunderGroupBox3.Controls.Add(crownLabel2);
thunderGroupBox3.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
thunderGroupBox3.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox3.Location = new System.Drawing.Point(3, 319);
+ thunderGroupBox3.Location = new System.Drawing.Point(5, 314);
thunderGroupBox3.Name = "thunderGroupBox3";
- thunderGroupBox3.Size = new System.Drawing.Size(326, 324);
+ thunderGroupBox3.Size = new System.Drawing.Size(321, 324);
thunderGroupBox3.TabIndex = 24;
thunderGroupBox3.Text = "鍚勪釜鎴潰鍙傛暟";
//
@@ -784,7 +779,7 @@
skyTextBox鏂潰H18.TextAlignment = System.Windows.Forms.HorizontalAlignment.Center;
skyTextBox鏂潰H18.UnknownBackColor = System.Drawing.Color.FromArgb(43, 43, 43);
skyTextBox鏂潰H18.UseSystemPasswordChar = false;
- skyTextBox鏂潰H18.TextChanged += skyTextBox鏂潰VIIIy2_TextChanged;
+ skyTextBox鏂潰H18.TextChanged += skyTextBox鏂潰VIIIy2_TextChanged;
//
// skyTextBox鏂潰r18
//
@@ -807,7 +802,7 @@
skyTextBox鏂潰r18.TextAlignment = System.Windows.Forms.HorizontalAlignment.Center;
skyTextBox鏂潰r18.UnknownBackColor = System.Drawing.Color.FromArgb(43, 43, 43);
skyTextBox鏂潰r18.UseSystemPasswordChar = false;
- skyTextBox鏂潰r18.TextChanged += skyTextBox鏂潰VIIIy2_TextChanged;
+ skyTextBox鏂潰r18.TextChanged += skyTextBox鏂潰VIIIy2_TextChanged;
//
// crownLabel7
//
@@ -984,7 +979,7 @@
skyTextBox鏂潰y18.TextAlignment = System.Windows.Forms.HorizontalAlignment.Center;
skyTextBox鏂潰y18.UnknownBackColor = System.Drawing.Color.FromArgb(43, 43, 43);
skyTextBox鏂潰y18.UseSystemPasswordChar = false;
- skyTextBox鏂潰y18.TextChanged += skyTextBox鏂潰VIIIy1_TextChanged;
+ skyTextBox鏂潰y18.TextChanged += skyTextBox鏂潰VIIIy1_TextChanged;
//
// crownLabely1
//
@@ -1295,27 +1290,43 @@
metroToolTip绗笁姝ユ彁绀�.ThemeAuthor = "";
metroToolTip绗笁姝ユ彁绀�.ThemeName = "";
//
+ // ribbonGroupBox1
+ //
+ ribbonGroupBox1.BackColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BaseColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BorderColorA = System.Drawing.Color.FromArgb(143, 143, 143);
+ 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(mBtn鏇存柊妯″瀷);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox1);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox2);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox3);
+ ribbonGroupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ ribbonGroupBox1.Font = new System.Drawing.Font("Tahoma", 10F, System.Drawing.FontStyle.Bold);
+ ribbonGroupBox1.ForeColor = System.Drawing.Color.Black;
+ ribbonGroupBox1.LineColorA = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.LineColorB = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.Location = new System.Drawing.Point(0, 0);
+ ribbonGroupBox1.Name = "ribbonGroupBox1";
+ ribbonGroupBox1.Size = new System.Drawing.Size(335, 808);
+ ribbonGroupBox1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ ribbonGroupBox1.TabIndex = 31;
+ ribbonGroupBox1.Text = "鏂潰鍙傛暟";
+ ribbonGroupBox1.TitleHeight = 30;
+ //
// mBtn鏇存柊妯″瀷
//
- mBtn鏇存柊妯″瀷.AutoSize = false;
- mBtn鏇存柊妯″瀷.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- mBtn鏇存柊妯″瀷.Density = RLT.Controls.MaterialButton.MaterialButtonDensity.Default;
- mBtn鏇存柊妯″瀷.Depth = 0;
- mBtn鏇存柊妯″瀷.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
- mBtn鏇存柊妯″瀷.HighEmphasis = false;
- mBtn鏇存柊妯″瀷.Icon = null;
- mBtn鏇存柊妯″瀷.IconType = RLT.Controls.MaterialButton.MaterialIconType.Rebase;
- mBtn鏇存柊妯″瀷.Location = new System.Drawing.Point(211, 6);
- mBtn鏇存柊妯″瀷.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- mBtn鏇存柊妯″瀷.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.HOVER;
+ 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(225, 5);
mBtn鏇存柊妯″瀷.Name = "mBtn鏇存柊妯″瀷";
- mBtn鏇存柊妯″瀷.NoAccentTextColor = System.Drawing.Color.Empty;
- mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(90, 28);
- mBtn鏇存柊妯″瀷.TabIndex = 30;
+ mBtn鏇存柊妯″瀷.Rounded = false;
+ mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(90, 20);
+ mBtn鏇存柊妯″瀷.TabIndex = 34;
mBtn鏇存柊妯″瀷.Text = "鏇存柊妯″瀷";
- mBtn鏇存柊妯″瀷.Type = RLT.Controls.MaterialButton.MaterialButtonType.Outlined;
- mBtn鏇存柊妯″瀷.UseAccentColor = false;
- mBtn鏇存柊妯″瀷.UseVisualStyleBackColor = true;
+ mBtn鏇存柊妯″瀷.TextColor = System.Drawing.Color.FromArgb(243, 243, 243);
mBtn鏇存柊妯″瀷.Click += mBtn鏇存柊妯″瀷_Click;
//
// ctrlSectionBundleInfo
@@ -1323,28 +1334,22 @@
AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
BackColor = System.Drawing.SystemColors.ControlLight;
- Controls.Add(mBtn鏇存柊妯″瀷);
- Controls.Add(thunderGroupBox3);
- Controls.Add(thunderGroupBox2);
- Controls.Add(crownLabel4);
- Controls.Add(thunderGroupBox1);
+ Controls.Add(ribbonGroupBox1);
Margin = new System.Windows.Forms.Padding(4);
Name = "ctrlSectionBundleInfo";
- Size = new System.Drawing.Size(332, 808);
+ Size = new System.Drawing.Size(335, 808);
thunderGroupBox1.ResumeLayout(false);
thunderGroupBox1.PerformLayout();
thunderGroupBox2.ResumeLayout(false);
thunderGroupBox3.ResumeLayout(false);
thunderGroupBox3.PerformLayout();
+ ribbonGroupBox1.ResumeLayout(false);
ResumeLayout(false);
- PerformLayout();
}
#endregion
private RLT.Controls.ThunderGroupBox thunderGroupBox1;
- private RLT.Controls.CrownLabel crownLabel4;
- private RLT.Controls.MaterialButton mBtn璁＄畻鏂潰闈㈢Н;
private RLT.Controls.CrownLabel crownLabel1;
private RLT.Controls.ThunderGroupBox thunderGroupBox2;
private RLT.Controls.MetroTile metroTile瀵圭О姊舰;
@@ -1405,6 +1410,8 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox textBoxK3;
private System.Windows.Forms.TextBox textBoxV3;
- private RLT.Controls.MaterialButton mBtn鏇存柊妯″瀷;
+ private RLT.Controls.RibbonGroupBox ribbonGroupBox1;
+ private RLT.Controls.MetroButton mBtn璁＄畻鏂潰闈㈢Н;
+ private RLT.Controls.ForeverButtonSticky mBtn鏇存柊妯″瀷;
}
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.Designer.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.Designer.cs"
index 85d9797..2df3ff8 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.Designer.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.Designer.cs"
@@ -28,7 +28,6 @@
/// </summary>
private void InitializeComponent()
{
- crownLabel4 = new RLT.Controls.CrownLabel();
thunderGroupBox1 = new RLT.Controls.ThunderGroupBox();
skyLabely1 = new RLT.Controls.SkyLabel();
skyLabely2 = new RLT.Controls.SkyLabel();
@@ -48,24 +47,14 @@
mTextBoxEditR1 = new RLT.Controls.MaterialTextBoxEdit();
mTextBoxEditR2 = new RLT.Controls.MaterialTextBoxEdit();
mTextBoxEditR4 = new RLT.Controls.MaterialTextBoxEdit();
- mBtn鏇存柊妯″瀷 = new RLT.Controls.MaterialButton();
metroToolTip绗洓姝ユ彁绀� = new RLT.Controls.MetroToolTip();
skyLabelR1 = new RLT.Controls.SkyLabel();
- crownLabelindex = new RLT.Controls.CrownLabel();
+ ribbonGroupBox1 = new RLT.Controls.RibbonGroupBox();
+ mBtn鏇存柊妯″瀷 = new RLT.Controls.ForeverButtonSticky();
thunderGroupBox1.SuspendLayout();
thunderGroupBox2.SuspendLayout();
+ ribbonGroupBox1.SuspendLayout();
SuspendLayout();
- //
- // crownLabel4
- //
- crownLabel4.AutoSize = true;
- crownLabel4.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold);
- crownLabel4.ForeColor = System.Drawing.Color.Black;
- crownLabel4.Location = new System.Drawing.Point(3, 5);
- crownLabel4.Name = "crownLabel4";
- crownLabel4.Size = new System.Drawing.Size(178, 22);
- crownLabel4.TabIndex = 23;
- crownLabel4.Text = "绗洓姝ワ細纭 鏂潰";
//
// thunderGroupBox1
//
@@ -81,9 +70,9 @@
thunderGroupBox1.Controls.Add(mTextBoxEdity2);
thunderGroupBox1.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
thunderGroupBox1.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox1.Location = new System.Drawing.Point(3, 210);
+ thunderGroupBox1.Location = new System.Drawing.Point(5, 189);
thunderGroupBox1.Name = "thunderGroupBox1";
- thunderGroupBox1.Size = new System.Drawing.Size(313, 238);
+ thunderGroupBox1.Size = new System.Drawing.Size(315, 238);
thunderGroupBox1.TabIndex = 22;
thunderGroupBox1.Text = "瑙掑害1";
//
@@ -367,7 +356,7 @@
metroTile鏂潰褰㈢姸.HoverColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鏂潰褰㈢姸.HoverTextColor = System.Drawing.Color.White;
metroTile鏂潰褰㈢姸.IsDerivedStyle = true;
- metroTile鏂潰褰㈢姸.Location = new System.Drawing.Point(73, 44);
+ metroTile鏂潰褰㈢姸.Location = new System.Drawing.Point(75, 37);
metroTile鏂潰褰㈢姸.Name = "metroTile鏂潰褰㈢姸";
metroTile鏂潰褰㈢姸.NormalBorderColor = System.Drawing.Color.FromArgb(65, 177, 225);
metroTile鏂潰褰㈢姸.NormalColor = System.Drawing.Color.FromArgb(65, 177, 225);
@@ -400,7 +389,7 @@
thunderGroupBox2.Controls.Add(mTextBoxEditu);
thunderGroupBox2.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
thunderGroupBox2.ForeColor = System.Drawing.Color.Black;
- thunderGroupBox2.Location = new System.Drawing.Point(4, 627);
+ thunderGroupBox2.Location = new System.Drawing.Point(5, 553);
thunderGroupBox2.Name = "thunderGroupBox2";
thunderGroupBox2.Size = new System.Drawing.Size(325, 224);
thunderGroupBox2.TabIndex = 23;
@@ -495,7 +484,7 @@
mTextBoxEditR1.HideSelection = true;
mTextBoxEditR1.Hint = "R1";
mTextBoxEditR1.LeadingIcon = null;
- mTextBoxEditR1.Location = new System.Drawing.Point(6, 454);
+ mTextBoxEditR1.Location = new System.Drawing.Point(15, 433);
mTextBoxEditR1.MaxLength = 32767;
mTextBoxEditR1.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
mTextBoxEditR1.Name = "mTextBoxEditR1";
@@ -535,7 +524,7 @@
mTextBoxEditR2.HideSelection = true;
mTextBoxEditR2.Hint = "R2";
mTextBoxEditR2.LeadingIcon = null;
- mTextBoxEditR2.Location = new System.Drawing.Point(6, 520);
+ mTextBoxEditR2.Location = new System.Drawing.Point(15, 499);
mTextBoxEditR2.MaxLength = 32767;
mTextBoxEditR2.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
mTextBoxEditR2.Name = "mTextBoxEditR2";
@@ -572,7 +561,7 @@
mTextBoxEditR4.HideSelection = true;
mTextBoxEditR4.Hint = "R4";
mTextBoxEditR4.LeadingIcon = null;
- mTextBoxEditR4.Location = new System.Drawing.Point(166, 520);
+ mTextBoxEditR4.Location = new System.Drawing.Point(175, 499);
mTextBoxEditR4.MaxLength = 32767;
mTextBoxEditR4.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.OUT;
mTextBoxEditR4.Name = "mTextBoxEditR4";
@@ -595,29 +584,6 @@
mTextBoxEditR4.UseAccent = false;
mTextBoxEditR4.UseSystemPasswordChar = false;
//
- // mBtn鏇存柊妯″瀷
- //
- mBtn鏇存柊妯″瀷.AutoSize = false;
- mBtn鏇存柊妯″瀷.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- mBtn鏇存柊妯″瀷.Density = RLT.Controls.MaterialButton.MaterialButtonDensity.Default;
- mBtn鏇存柊妯″瀷.Depth = 0;
- mBtn鏇存柊妯″瀷.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 10F, System.Drawing.FontStyle.Bold);
- mBtn鏇存柊妯″瀷.HighEmphasis = false;
- mBtn鏇存柊妯″瀷.Icon = null;
- mBtn鏇存柊妯″瀷.IconType = RLT.Controls.MaterialButton.MaterialIconType.Rebase;
- mBtn鏇存柊妯″瀷.Location = new System.Drawing.Point(3, 577);
- mBtn鏇存柊妯″瀷.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- mBtn鏇存柊妯″瀷.MouseState = RLT.Helper.MaterialDrawHelper.MaterialMouseState.HOVER;
- mBtn鏇存柊妯″瀷.Name = "mBtn鏇存柊妯″瀷";
- mBtn鏇存柊妯″瀷.NoAccentTextColor = System.Drawing.Color.Empty;
- mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(310, 33);
- mBtn鏇存柊妯″瀷.TabIndex = 30;
- mBtn鏇存柊妯″瀷.Text = " 鏇存柊妯″瀷 ";
- mBtn鏇存柊妯″瀷.Type = RLT.Controls.MaterialButton.MaterialButtonType.Outlined;
- mBtn鏇存柊妯″瀷.UseAccentColor = false;
- mBtn鏇存柊妯″瀷.UseVisualStyleBackColor = true;
- mBtn鏇存柊妯″瀷.Click += mBtn鏇存柊妯″瀷_Click;
- //
// metroToolTip绗洓姝ユ彁绀�
//
metroToolTip绗洓姝ユ彁绀�.BackColor = System.Drawing.Color.White;
@@ -635,52 +601,75 @@
skyLabelR1.AutoSize = true;
skyLabelR1.Font = new System.Drawing.Font("Swis721 BlkCn BT", 7F, System.Drawing.FontStyle.Bold);
skyLabelR1.ForeColor = System.Drawing.Color.DeepPink;
- skyLabelR1.Location = new System.Drawing.Point(6, 505);
+ skyLabelR1.Location = new System.Drawing.Point(15, 484);
skyLabelR1.Name = "skyLabelR1";
skyLabelR1.Size = new System.Drawing.Size(55, 12);
skyLabelR1.TabIndex = 69;
skyLabelR1.Text = "璇疯緭鍏1!";
skyLabelR1.Visible = false;
//
- // crownLabelindex
+ // ribbonGroupBox1
//
- crownLabelindex.AutoSize = true;
- crownLabelindex.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold);
- crownLabelindex.ForeColor = System.Drawing.Color.Black;
- crownLabelindex.Location = new System.Drawing.Point(104, 5);
- crownLabelindex.Name = "crownLabelindex";
- crownLabelindex.Size = new System.Drawing.Size(0, 22);
- crownLabelindex.TabIndex = 70;
+ ribbonGroupBox1.BackColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BaseColor = System.Drawing.Color.Transparent;
+ ribbonGroupBox1.BorderColorA = System.Drawing.Color.FromArgb(143, 143, 143);
+ 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(mBtn鏇存柊妯″瀷);
+ ribbonGroupBox1.Controls.Add(metroTile鏂潰褰㈢姸);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox1);
+ ribbonGroupBox1.Controls.Add(skyLabelR1);
+ ribbonGroupBox1.Controls.Add(thunderGroupBox2);
+ ribbonGroupBox1.Controls.Add(mTextBoxEditR1);
+ ribbonGroupBox1.Controls.Add(mTextBoxEditR2);
+ ribbonGroupBox1.Controls.Add(mTextBoxEditR4);
+ ribbonGroupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ ribbonGroupBox1.Font = new System.Drawing.Font("Tahoma", 10F, System.Drawing.FontStyle.Bold);
+ ribbonGroupBox1.ForeColor = System.Drawing.Color.Black;
+ ribbonGroupBox1.LineColorA = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.LineColorB = System.Drawing.Color.FromArgb(126, 126, 126);
+ ribbonGroupBox1.Location = new System.Drawing.Point(0, 0);
+ ribbonGroupBox1.Name = "ribbonGroupBox1";
+ ribbonGroupBox1.Size = new System.Drawing.Size(335, 808);
+ ribbonGroupBox1.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ ribbonGroupBox1.TabIndex = 71;
+ ribbonGroupBox1.Text = "绗琻鏂潰";
+ ribbonGroupBox1.TitleHeight = 30;
+ //
+ // mBtn鏇存柊妯″瀷
+ //
+ 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(225, 5);
+ mBtn鏇存柊妯″瀷.Name = "mBtn鏇存柊妯″瀷";
+ mBtn鏇存柊妯″瀷.Rounded = false;
+ mBtn鏇存柊妯″瀷.Size = new System.Drawing.Size(90, 20);
+ mBtn鏇存柊妯″瀷.TabIndex = 70;
+ mBtn鏇存柊妯″瀷.Text = "鏇存柊妯″瀷";
+ mBtn鏇存柊妯″瀷.TextColor = System.Drawing.Color.FromArgb(243, 243, 243);
+ mBtn鏇存柊妯″瀷.Click += mBtn鏇存柊妯″瀷_Click;
//
// ctrlSectionShapeInfo18
//
AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
BackColor = System.Drawing.SystemColors.ControlLight;
- Controls.Add(crownLabelindex);
- Controls.Add(skyLabelR1);
- Controls.Add(mBtn鏇存柊妯″瀷);
- Controls.Add(mTextBoxEditR4);
- Controls.Add(mTextBoxEditR2);
- Controls.Add(mTextBoxEditR1);
- Controls.Add(thunderGroupBox2);
- Controls.Add(metroTile鏂潰褰㈢姸);
- Controls.Add(crownLabel4);
- Controls.Add(thunderGroupBox1);
+ Controls.Add(ribbonGroupBox1);
Margin = new System.Windows.Forms.Padding(4);
Name = "ctrlSectionShapeInfo18";
- Size = new System.Drawing.Size(325, 995);
+ Size = new System.Drawing.Size(335, 808);
thunderGroupBox1.ResumeLayout(false);
thunderGroupBox1.PerformLayout();
thunderGroupBox2.ResumeLayout(false);
thunderGroupBox2.PerformLayout();
+ ribbonGroupBox1.ResumeLayout(false);
+ ribbonGroupBox1.PerformLayout();
ResumeLayout(false);
- PerformLayout();
}
#endregion
-
- private RLT.Controls.CrownLabel crownLabel4;
private RLT.Controls.ThunderGroupBox thunderGroupBox1;
private RLT.Controls.MaterialTextBoxEdit mTextBoxEdity1;
private RLT.Controls.MetroTile metroTile鏂潰褰㈢姸;
@@ -695,7 +684,6 @@
private RLT.Controls.MaterialTextBoxEdit mTextBoxEditH;
private RLT.Controls.MaterialTextBoxEdit mTextBoxEditR2;
private RLT.Controls.MaterialTextBoxEdit mTextBoxEditR4;
- private RLT.Controls.MaterialButton mBtn鏇存柊妯″瀷;
private RLT.Controls.MetroToolTip metroToolTip绗洓姝ユ彁绀�;
private RLT.Controls.SkyLabel skyLabely1;
private RLT.Controls.SkyLabel skyLabelU;
@@ -703,6 +691,8 @@
private RLT.Controls.SkyLabel skyLabelW4;
private RLT.Controls.SkyLabel skyLabely2;
private RLT.Controls.SkyLabel skyLabelR1;
- private RLT.Controls.CrownLabel crownLabelindex;
+
+ private RLT.Controls.RibbonGroupBox ribbonGroupBox1;
+ private RLT.Controls.ForeverButtonSticky mBtn鏇存柊妯″瀷;
}
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs"
index 2c36d75..05285d6 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.cs"
@@ -1,5 +1,4 @@
-锘�
-using System;
+锘縰sing System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -38,7 +37,7 @@
this.mTextBoxEditR2.Text = vm.R_Right.ToString();
this.mTextBoxEditH.Text = vm.H.ToString();
this.mTextBoxEditR4.Text = vm.R_out.ToString();
- this.crownLabelindex.Text = "绗�" + vm.Index;
+ this.ribbonGroupBox1.Text = "绗�" + vm.Index+"鏂潰";
InitialModule();
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.resx" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.resx"
index 03aaea2..ff2ff9d 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.resx"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionShapeInfo18.resx"
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
--
Gitblit v1.9.3