From 6f8c6a3b2277b92a24319f672811da113861cfc1 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期一, 23 九月 2024 10:42:30 +0800 Subject: [PATCH] 提交缺少修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.Designer.cs | 158 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 127 insertions(+), 31 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.Designer.cs index 2dd9a6e..e492f12 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsMainChoicePage.Designer.cs @@ -30,6 +30,8 @@ private void InitializeComponent() { ComponentResourceManager resources = new ComponentResourceManager(typeof(AssetsMainChoicePage)); + layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + BtnOK = new SimpleButton(); tabPane1 = new DevExpress.XtraBars.Navigation.TabPane(); tabNavigationPage1 = new DevExpress.XtraBars.Navigation.TabNavigationPage(); tabNavigationPage2 = new DevExpress.XtraBars.Navigation.TabNavigationPage(); @@ -44,6 +46,13 @@ fourLinkMatchingCtrl1 = new FourLinkMatchingCtrl(); tabNavigationPage7 = new DevExpress.XtraBars.Navigation.TabNavigationPage(); elbowsMatchingCtrl1 = new ElbowsMatchingCtrl(); + Root = new DevExpress.XtraLayout.LayoutControlGroup(); + layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); + layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); + ((ISupportInitialize)layoutControl1).BeginInit(); + layoutControl1.SuspendLayout(); ((ISupportInitialize)tabPane1).BeginInit(); tabPane1.SuspendLayout(); tabNavigationPage2.SuspendLayout(); @@ -52,7 +61,37 @@ tabNavigationPage5.SuspendLayout(); tabNavigationPage6.SuspendLayout(); tabNavigationPage7.SuspendLayout(); + ((ISupportInitialize)Root).BeginInit(); + ((ISupportInitialize)layoutControlItem1).BeginInit(); + ((ISupportInitialize)emptySpaceItem1).BeginInit(); + ((ISupportInitialize)layoutControlItem2).BeginInit(); + ((ISupportInitialize)emptySpaceItem2).BeginInit(); SuspendLayout(); + // + // layoutControl1 + // + layoutControl1.Controls.Add(BtnOK); + layoutControl1.Controls.Add(tabPane1); + layoutControl1.Dock = DockStyle.Fill; + layoutControl1.Location = new Point(0, 0); + layoutControl1.Name = "layoutControl1"; + layoutControl1.Root = Root; + layoutControl1.Size = new Size(960, 535); + layoutControl1.TabIndex = 1; + layoutControl1.Text = "layoutControl1"; + // + // BtnOK + // + BtnOK.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; + BtnOK.Appearance.Options.UseBackColor = true; + BtnOK.DialogResult = DialogResult.Cancel; + BtnOK.Location = new Point(870, 511); + BtnOK.Name = "BtnOK"; + BtnOK.Size = new Size(88, 22); + BtnOK.StyleController = layoutControl1; + BtnOK.TabIndex = 2; + BtnOK.Text = "纭畾"; + BtnOK.Click += btnComplete_Click; // // tabPane1 // @@ -63,13 +102,12 @@ tabPane1.Controls.Add(tabNavigationPage5); tabPane1.Controls.Add(tabNavigationPage6); tabPane1.Controls.Add(tabNavigationPage7); - tabPane1.Dock = DockStyle.Fill; - tabPane1.Location = new Point(0, 0); + tabPane1.Location = new Point(2, 2); tabPane1.Name = "tabPane1"; tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1, tabNavigationPage2, tabNavigationPage3, tabNavigationPage4, tabNavigationPage5, tabNavigationPage6, tabNavigationPage7 }); - tabPane1.RegularSize = new Size(960, 535); + tabPane1.RegularSize = new Size(956, 505); tabPane1.SelectedPage = tabNavigationPage2; - tabPane1.Size = new Size(960, 535); + tabPane1.Size = new Size(956, 505); tabPane1.TabIndex = 0; tabPane1.Text = "tabPane1"; // @@ -86,101 +124,147 @@ // // tabNavigationPage2 // - tabNavigationPage2.Caption = "姘存车鍖归厤鏄庣粏"; + tabNavigationPage2.Caption = "姘存车鍖归厤"; tabNavigationPage2.Controls.Add(pumpMatchingCtrl1); tabNavigationPage2.Name = "tabNavigationPage2"; - tabNavigationPage2.Size = new Size(960, 502); + tabNavigationPage2.Size = new Size(956, 472); // // pumpMatchingCtrl1 // pumpMatchingCtrl1.Dock = DockStyle.Fill; pumpMatchingCtrl1.Location = new Point(0, 0); pumpMatchingCtrl1.Name = "pumpMatchingCtrl1"; - pumpMatchingCtrl1.Size = new Size(960, 502); + pumpMatchingCtrl1.Size = new Size(956, 472); pumpMatchingCtrl1.TabIndex = 0; // // tabNavigationPage3 // - tabNavigationPage3.Caption = "闃�闂ㄥ尮閰嶆槑缁�"; + tabNavigationPage3.Caption = "闃�闂ㄥ尮閰�"; tabNavigationPage3.Controls.Add(valveMatchingCtrl1); tabNavigationPage3.Name = "tabNavigationPage3"; - tabNavigationPage3.Size = new Size(960, 502); + tabNavigationPage3.Size = new Size(956, 471); // // valveMatchingCtrl1 // valveMatchingCtrl1.Dock = DockStyle.Fill; valveMatchingCtrl1.Location = new Point(0, 0); valveMatchingCtrl1.Name = "valveMatchingCtrl1"; - valveMatchingCtrl1.Size = new Size(960, 502); + valveMatchingCtrl1.Size = new Size(956, 471); valveMatchingCtrl1.TabIndex = 0; // // tabNavigationPage4 // - tabNavigationPage4.Caption = "绠¢亾鍖归厤鏄庣粏"; + tabNavigationPage4.Caption = "绠¢亾鍖归厤"; tabNavigationPage4.Controls.Add(pipeLineMatchingCtrl1); tabNavigationPage4.Name = "tabNavigationPage4"; - tabNavigationPage4.Size = new Size(960, 502); + tabNavigationPage4.Size = new Size(956, 471); // // pipeLineMatchingCtrl1 // pipeLineMatchingCtrl1.Dock = DockStyle.Fill; pipeLineMatchingCtrl1.Location = new Point(0, 0); pipeLineMatchingCtrl1.Name = "pipeLineMatchingCtrl1"; - pipeLineMatchingCtrl1.Size = new Size(960, 502); + pipeLineMatchingCtrl1.Size = new Size(956, 471); pipeLineMatchingCtrl1.TabIndex = 0; // // tabNavigationPage5 // - tabNavigationPage5.Caption = "涓夐�氬尮閰嶆槑缁�"; + tabNavigationPage5.Caption = "涓夐�氬尮閰�"; tabNavigationPage5.Controls.Add(threeLinkMatchingCtrl1); tabNavigationPage5.Name = "tabNavigationPage5"; - tabNavigationPage5.Size = new Size(960, 502); + tabNavigationPage5.Size = new Size(956, 471); // // threeLinkMatchingCtrl1 // threeLinkMatchingCtrl1.Dock = DockStyle.Fill; threeLinkMatchingCtrl1.Location = new Point(0, 0); threeLinkMatchingCtrl1.Name = "threeLinkMatchingCtrl1"; - threeLinkMatchingCtrl1.Size = new Size(960, 502); + threeLinkMatchingCtrl1.Size = new Size(956, 471); threeLinkMatchingCtrl1.TabIndex = 0; // // tabNavigationPage6 // - tabNavigationPage6.Caption = "鍥涢�氬尮閰嶆槑缁�"; + tabNavigationPage6.Caption = "鍥涢�氬尮閰�"; tabNavigationPage6.Controls.Add(fourLinkMatchingCtrl1); tabNavigationPage6.Name = "tabNavigationPage6"; - tabNavigationPage6.Size = new Size(960, 502); + tabNavigationPage6.Size = new Size(956, 471); // // fourLinkMatchingCtrl1 // fourLinkMatchingCtrl1.Dock = DockStyle.Fill; fourLinkMatchingCtrl1.Location = new Point(0, 0); fourLinkMatchingCtrl1.Name = "fourLinkMatchingCtrl1"; - fourLinkMatchingCtrl1.Size = new Size(960, 502); + fourLinkMatchingCtrl1.Size = new Size(956, 471); fourLinkMatchingCtrl1.TabIndex = 0; // // tabNavigationPage7 // - tabNavigationPage7.Caption = "寮ご鍖归厤鏄庣粏"; + tabNavigationPage7.Caption = "寮ご鍖归厤"; tabNavigationPage7.Controls.Add(elbowsMatchingCtrl1); tabNavigationPage7.Name = "tabNavigationPage7"; - tabNavigationPage7.Size = new Size(960, 502); + tabNavigationPage7.Size = new Size(956, 471); // // elbowsMatchingCtrl1 // elbowsMatchingCtrl1.Dock = DockStyle.Fill; elbowsMatchingCtrl1.Location = new Point(0, 0); elbowsMatchingCtrl1.Name = "elbowsMatchingCtrl1"; - elbowsMatchingCtrl1.Size = new Size(960, 502); + elbowsMatchingCtrl1.Size = new Size(956, 471); elbowsMatchingCtrl1.TabIndex = 0; + // + // Root + // + Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + Root.GroupBordersVisible = false; + Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlItem2 }); + Root.Name = "Root"; + Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + Root.Size = new Size(960, 535); + Root.TextVisible = false; + // + // layoutControlItem1 + // + layoutControlItem1.Control = tabPane1; + layoutControlItem1.Location = new Point(0, 0); + layoutControlItem1.Name = "layoutControlItem1"; + layoutControlItem1.Size = new Size(960, 509); + layoutControlItem1.TextSize = new Size(0, 0); + layoutControlItem1.TextVisible = false; + // + // emptySpaceItem1 + // + emptySpaceItem1.AllowHotTrack = false; + emptySpaceItem1.Location = new Point(0, 509); + emptySpaceItem1.Name = "emptySpaceItem1"; + emptySpaceItem1.Size = new Size(868, 26); + emptySpaceItem1.TextSize = new Size(0, 0); + // + // layoutControlItem2 + // + layoutControlItem2.Control = BtnOK; + layoutControlItem2.Location = new Point(868, 509); + layoutControlItem2.Name = "layoutControlItem2"; + layoutControlItem2.Size = new Size(92, 26); + layoutControlItem2.TextSize = new Size(0, 0); + layoutControlItem2.TextVisible = false; + // + // emptySpaceItem2 + // + emptySpaceItem2.AllowHotTrack = false; + emptySpaceItem2.Location = new Point(0, 535); + emptySpaceItem2.Name = "emptySpaceItem1"; + emptySpaceItem2.Size = new Size(857, 26); + emptySpaceItem2.TextSize = new Size(0, 0); // // AssetsMainChoicePage // AutoScaleDimensions = new SizeF(7F, 14F); AutoScaleMode = AutoScaleMode.Font; - Controls.Add(tabPane1); + Controls.Add(layoutControl1); Name = "AssetsMainChoicePage"; Size = new Size(960, 535); + ((ISupportInitialize)layoutControl1).EndInit(); + layoutControl1.ResumeLayout(false); ((ISupportInitialize)tabPane1).EndInit(); tabPane1.ResumeLayout(false); tabNavigationPage2.ResumeLayout(false); @@ -189,24 +273,36 @@ tabNavigationPage5.ResumeLayout(false); tabNavigationPage6.ResumeLayout(false); tabNavigationPage7.ResumeLayout(false); + ((ISupportInitialize)Root).EndInit(); + ((ISupportInitialize)layoutControlItem1).EndInit(); + ((ISupportInitialize)emptySpaceItem1).EndInit(); + ((ISupportInitialize)layoutControlItem2).EndInit(); + ((ISupportInitialize)emptySpaceItem2).EndInit(); ResumeLayout(false); } #endregion + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraBars.Navigation.TabPane tabPane1; private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage1; private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage2; - private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage3; - private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage4; - private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage5; - private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage6; - private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage7; - private ThreeLinkMatchingCtrl threeLinkMatchingCtrl1; - private FourLinkMatchingCtrl fourLinkMatchingCtrl1; - private ElbowsMatchingCtrl elbowsMatchingCtrl1; private PumpMatchingCtrl pumpMatchingCtrl1; + private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage3; private ValveMatchingCtrl valveMatchingCtrl1; + private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage4; private PipeLineMatchingCtrl pipeLineMatchingCtrl1; + private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage5; + private ThreeLinkMatchingCtrl threeLinkMatchingCtrl1; + private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage6; + private FourLinkMatchingCtrl fourLinkMatchingCtrl1; + private DevExpress.XtraBars.Navigation.TabNavigationPage tabNavigationPage7; + private ElbowsMatchingCtrl elbowsMatchingCtrl1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2; + private SimpleButton BtnOK; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; } } -- Gitblit v1.9.3