From a7c780692ab2d8072ad4cae0fecbf851c27231d9 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 20 十二月 2024 11:57:29 +0800 Subject: [PATCH] 曲线匹配修改 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs | 349 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 201 insertions(+), 148 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs index 79587bf..73f971c 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs @@ -29,70 +29,78 @@ private void InitializeComponent() { ComponentResourceManager resources = new ComponentResourceManager(typeof(CreateXhsSchemeDlg)); - layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + layoutControlMain = new DevExpress.XtraLayout.LayoutControl(); btnComplete = new SimpleButton(); btnPrev = new SimpleButton(); btnCancel = new SimpleButton(); - navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame(); - navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage(); + navigationFrameMain = new DevExpress.XtraBars.Navigation.NavigationFrame(); + navigationPageMain = new DevExpress.XtraBars.Navigation.NavigationPage(); createXhsSchemeInfoPage1 = new CreateXhsSchemeInfoPage(); - navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage(); - createXhsSchemePumpChangePage1 = new CreateXhsSchemePumpChangePage(); - btnNext = new SimpleButton(); + navigationPageStep = new DevExpress.XtraBars.Navigation.NavigationPage(); + layoutControlStep = new DevExpress.XtraLayout.LayoutControl(); stepProgressBar1 = new StepProgressBar(); - stepPbBasicInfo = new StepProgressBarItem(); - Root = new DevExpress.XtraLayout.LayoutControlGroup(); + navigationFrameStep = new DevExpress.XtraBars.Navigation.NavigationFrame(); + layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - itemForPrev = new DevExpress.XtraLayout.LayoutControlItem(); + btnNext = new SimpleButton(); + Root = new DevExpress.XtraLayout.LayoutControlGroup(); + itemPage = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); - itemForCancel = new DevExpress.XtraLayout.LayoutControlItem(); + itemForPrev = new DevExpress.XtraLayout.LayoutControlItem(); itemForNext = new DevExpress.XtraLayout.LayoutControlItem(); + itemForCancel = new DevExpress.XtraLayout.LayoutControlItem(); itemForComplete = new DevExpress.XtraLayout.LayoutControlItem(); - ((ISupportInitialize)layoutControl1).BeginInit(); - layoutControl1.SuspendLayout(); - ((ISupportInitialize)navigationFrame1).BeginInit(); - navigationFrame1.SuspendLayout(); - navigationPage1.SuspendLayout(); - navigationPage2.SuspendLayout(); + ((ISupportInitialize)layoutControlMain).BeginInit(); + layoutControlMain.SuspendLayout(); + ((ISupportInitialize)navigationFrameMain).BeginInit(); + navigationFrameMain.SuspendLayout(); + navigationPageMain.SuspendLayout(); + navigationPageStep.SuspendLayout(); + ((ISupportInitialize)layoutControlStep).BeginInit(); + layoutControlStep.SuspendLayout(); ((ISupportInitialize)stepProgressBar1).BeginInit(); - ((ISupportInitialize)Root).BeginInit(); + ((ISupportInitialize)navigationFrameStep).BeginInit(); + ((ISupportInitialize)layoutControlGroup1).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); - ((ISupportInitialize)itemForPrev).BeginInit(); + ((ISupportInitialize)Root).BeginInit(); + ((ISupportInitialize)itemPage).BeginInit(); + ((ISupportInitialize)layoutControlGroup2).BeginInit(); ((ISupportInitialize)emptySpaceItem1).BeginInit(); - ((ISupportInitialize)itemForCancel).BeginInit(); + ((ISupportInitialize)itemForPrev).BeginInit(); ((ISupportInitialize)itemForNext).BeginInit(); + ((ISupportInitialize)itemForCancel).BeginInit(); ((ISupportInitialize)itemForComplete).BeginInit(); SuspendLayout(); // - // layoutControl1 + // layoutControlMain // - layoutControl1.Controls.Add(btnComplete); - layoutControl1.Controls.Add(btnPrev); - layoutControl1.Controls.Add(btnCancel); - layoutControl1.Controls.Add(navigationFrame1); - layoutControl1.Controls.Add(btnNext); - layoutControl1.Controls.Add(stepProgressBar1); - layoutControl1.Dock = DockStyle.Fill; - layoutControl1.Location = new Point(0, 0); - layoutControl1.Margin = new Padding(4, 5, 4, 5); - layoutControl1.Name = "layoutControl1"; - layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1585, 699, 975, 600); - layoutControl1.Root = Root; - layoutControl1.Size = new Size(1517, 1003); - layoutControl1.TabIndex = 0; - layoutControl1.Text = "layoutControl1"; + layoutControlMain.Controls.Add(btnComplete); + layoutControlMain.Controls.Add(btnPrev); + layoutControlMain.Controls.Add(btnCancel); + layoutControlMain.Controls.Add(navigationFrameMain); + layoutControlMain.Controls.Add(btnNext); + layoutControlMain.Dock = DockStyle.Fill; + layoutControlMain.Location = new Point(0, 0); + layoutControlMain.Margin = new Padding(4, 5, 4, 5); + layoutControlMain.Name = "layoutControlMain"; + layoutControlMain.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(624, 591, 985, 593); + layoutControlMain.Root = Root; + layoutControlMain.Size = new Size(1517, 1003); + layoutControlMain.TabIndex = 0; + layoutControlMain.Text = "layoutControl1"; // // btnComplete // btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; btnComplete.Appearance.Options.UseBackColor = true; - btnComplete.Location = new Point(1321, 959); + btnComplete.Location = new Point(1320, 958); btnComplete.Margin = new Padding(4, 5, 4, 5); btnComplete.Name = "btnComplete"; btnComplete.Size = new Size(184, 32); - btnComplete.StyleController = layoutControl1; + btnComplete.StyleController = layoutControlMain; btnComplete.TabIndex = 14; btnComplete.Text = "瀹屾垚"; btnComplete.Click += btnComplete_Click; @@ -101,11 +109,11 @@ // btnPrev.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning; btnPrev.Appearance.Options.UseBackColor = true; - btnPrev.Location = new Point(760, 959); + btnPrev.Location = new Point(946, 958); btnPrev.Margin = new Padding(4, 5, 4, 5); btnPrev.Name = "btnPrev"; btnPrev.Size = new Size(183, 32); - btnPrev.StyleController = layoutControl1; + btnPrev.StyleController = layoutControlMain; btnPrev.TabIndex = 11; btnPrev.Text = "<涓婁竴姝�"; btnPrev.Click += btnPrev_Click; @@ -114,33 +122,33 @@ // btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger; btnCancel.Appearance.Options.UseBackColor = true; - btnCancel.Location = new Point(1134, 959); + btnCancel.Location = new Point(759, 958); btnCancel.Margin = new Padding(4, 5, 4, 5); btnCancel.Name = "btnCancel"; btnCancel.Size = new Size(183, 32); - btnCancel.StyleController = layoutControl1; + btnCancel.StyleController = layoutControlMain; btnCancel.TabIndex = 13; btnCancel.Text = "鍙栨秷"; btnCancel.Click += btnCancel_Click; // - // navigationFrame1 + // navigationFrameMain // - navigationFrame1.Controls.Add(navigationPage1); - navigationFrame1.Controls.Add(navigationPage2); - navigationFrame1.Location = new Point(12, 110); - navigationFrame1.Name = "navigationFrame1"; - navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2 }); - navigationFrame1.SelectedPage = navigationPage1; - navigationFrame1.Size = new Size(1493, 845); - navigationFrame1.TabIndex = 6; - navigationFrame1.Text = "navigationFrame1"; + navigationFrameMain.Controls.Add(navigationPageMain); + navigationFrameMain.Controls.Add(navigationPageStep); + navigationFrameMain.Location = new Point(0, 0); + navigationFrameMain.Name = "navigationFrameMain"; + navigationFrameMain.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPageMain, navigationPageStep }); + navigationFrameMain.SelectedPage = navigationPageMain; + navigationFrameMain.Size = new Size(1517, 945); + navigationFrameMain.TabIndex = 6; + navigationFrameMain.Text = "navigationFrame1"; // - // navigationPage1 + // navigationPageMain // - navigationPage1.Caption = "navigationPage1"; - navigationPage1.Controls.Add(createXhsSchemeInfoPage1); - navigationPage1.Name = "navigationPage1"; - navigationPage1.Size = new Size(1493, 845); + navigationPageMain.Caption = "navigationPage1"; + navigationPageMain.Controls.Add(createXhsSchemeInfoPage1); + navigationPageMain.Name = "navigationPageMain"; + navigationPageMain.Size = new Size(1517, 945); // // createXhsSchemeInfoPage1 // @@ -148,37 +156,28 @@ createXhsSchemeInfoPage1.Location = new Point(0, 0); createXhsSchemeInfoPage1.Margin = new Padding(4, 5, 4, 5); createXhsSchemeInfoPage1.Name = "createXhsSchemeInfoPage1"; - createXhsSchemeInfoPage1.Size = new Size(1493, 845); + createXhsSchemeInfoPage1.Size = new Size(1517, 945); createXhsSchemeInfoPage1.TabIndex = 0; // - // navigationPage2 + // navigationPageStep // - navigationPage2.Caption = "navigationPage2"; - navigationPage2.Controls.Add(createXhsSchemePumpChangePage1); - navigationPage2.Name = "navigationPage2"; - navigationPage2.Size = new Size(1493, 845); + navigationPageStep.Caption = "navigationPageStep"; + navigationPageStep.Controls.Add(layoutControlStep); + navigationPageStep.Name = "navigationPageStep"; + navigationPageStep.Size = new Size(1517, 945); // - // createXhsSchemePumpChangePage1 + // layoutControlStep // - createXhsSchemePumpChangePage1.Dock = DockStyle.Fill; - createXhsSchemePumpChangePage1.Location = new Point(0, 0); - createXhsSchemePumpChangePage1.Margin = new Padding(4, 5, 4, 5); - createXhsSchemePumpChangePage1.Name = "createXhsSchemePumpChangePage1"; - createXhsSchemePumpChangePage1.Size = new Size(1493, 845); - createXhsSchemePumpChangePage1.TabIndex = 0; - // - // btnNext - // - btnNext.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question; - btnNext.Appearance.Options.UseBackColor = true; - btnNext.Location = new Point(947, 959); - btnNext.Margin = new Padding(4, 5, 4, 5); - btnNext.Name = "btnNext"; - btnNext.Size = new Size(183, 32); - btnNext.StyleController = layoutControl1; - btnNext.TabIndex = 12; - btnNext.Text = "涓嬩竴姝�>"; - btnNext.Click += btnNext_Click; + layoutControlStep.Controls.Add(stepProgressBar1); + layoutControlStep.Controls.Add(navigationFrameStep); + layoutControlStep.Dock = DockStyle.Fill; + layoutControlStep.Location = new Point(0, 0); + layoutControlStep.Name = "layoutControlStep"; + layoutControlStep.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1369, 639, 975, 600); + layoutControlStep.Root = layoutControlGroup1; + layoutControlStep.Size = new Size(1517, 945); + layoutControlStep.TabIndex = 1; + layoutControlStep.Text = "姝ラ"; // // stepProgressBar1 // @@ -190,61 +189,114 @@ stepProgressBar1.IndicatorToContentBlockDistance = 9; stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage"); stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImageSize = new Size(20, 20); - stepProgressBar1.Items.Add(stepPbBasicInfo); - stepProgressBar1.Location = new Point(12, 12); + stepProgressBar1.Location = new Point(0, 0); stepProgressBar1.Margin = new Padding(4, 5, 4, 5); stepProgressBar1.MaximumSize = new Size(1556, 94); stepProgressBar1.MinimumSize = new Size(1400, 94); stepProgressBar1.Name = "stepProgressBar1"; stepProgressBar1.Padding = new Padding(43, 16, 14, 16); - stepProgressBar1.SelectedItemIndex = 0; stepProgressBar1.ShadowDrawMode = StepProgressBarShadowDrawMode.ActiveElements; stepProgressBar1.ShadowSize = 11; - stepProgressBar1.Size = new Size(1493, 94); - stepProgressBar1.StyleController = layoutControl1; + stepProgressBar1.Size = new Size(1517, 94); + stepProgressBar1.StyleController = layoutControlStep; stepProgressBar1.TabIndex = 5; stepProgressBar1.Visible = false; // - // stepPbBasicInfo + // navigationFrameStep // - stepPbBasicInfo.ContentBlock2.Caption = "鍩烘湰淇℃伅"; - stepPbBasicInfo.Name = "stepPbBasicInfo"; - stepPbBasicInfo.Options.Indicator.ActiveStateDrawMode = IndicatorDrawMode.Full; - stepPbBasicInfo.Options.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbBasicInfo.Options.Indicator.ActiveStateImageOptions.SvgImage"); - stepPbBasicInfo.Options.Indicator.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbBasicInfo.Options.Indicator.InactiveStateImageOptions.SvgImage"); - stepPbBasicInfo.State = StepProgressBarItemState.Active; + navigationFrameStep.Location = new Point(0, 94); + navigationFrameStep.Name = "navigationFrameStep"; + navigationFrameStep.SelectedPage = null; + navigationFrameStep.Size = new Size(1517, 851); + navigationFrameStep.TabIndex = 0; + navigationFrameStep.Text = "navigationFrame1"; // - // Root + // layoutControlGroup1 // - Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - Root.GroupBordersVisible = false; - Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, itemForPrev, emptySpaceItem1, itemForCancel, itemForNext, itemForComplete }); - Root.Name = "Root"; - Root.Size = new Size(1517, 1003); - Root.TextVisible = false; + layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + layoutControlGroup1.GroupBordersVisible = false; + layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 }); + layoutControlGroup1.Name = "Root"; + layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + layoutControlGroup1.Size = new Size(1517, 945); + layoutControlGroup1.TextVisible = false; // // layoutControlItem1 // - layoutControlItem1.Control = stepProgressBar1; - layoutControlItem1.Location = new Point(0, 0); + layoutControlItem1.Control = navigationFrameStep; + layoutControlItem1.Location = new Point(0, 94); layoutControlItem1.Name = "layoutControlItem1"; - layoutControlItem1.Size = new Size(1497, 98); + layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + layoutControlItem1.Size = new Size(1517, 851); layoutControlItem1.TextSize = new Size(0, 0); layoutControlItem1.TextVisible = false; // // layoutControlItem2 // - layoutControlItem2.Control = navigationFrame1; - layoutControlItem2.Location = new Point(0, 98); + layoutControlItem2.Control = stepProgressBar1; + layoutControlItem2.Location = new Point(0, 0); layoutControlItem2.Name = "layoutControlItem2"; - layoutControlItem2.Size = new Size(1497, 849); + layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + layoutControlItem2.Size = new Size(1517, 94); layoutControlItem2.TextSize = new Size(0, 0); layoutControlItem2.TextVisible = false; + // + // btnNext + // + btnNext.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question; + btnNext.Appearance.Options.UseBackColor = true; + btnNext.Location = new Point(1133, 958); + btnNext.Margin = new Padding(4, 5, 4, 5); + btnNext.Name = "btnNext"; + btnNext.Size = new Size(183, 32); + btnNext.StyleController = layoutControlMain; + btnNext.TabIndex = 12; + btnNext.Text = "涓嬩竴姝�>"; + btnNext.Click += btnNext_Click; + // + // Root + // + Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + Root.GroupBordersVisible = false; + Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { itemPage, layoutControlGroup2 }); + Root.Name = "Root"; + Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + Root.Size = new Size(1517, 1003); + Root.TextVisible = false; + // + // itemPage + // + itemPage.Control = navigationFrameMain; + itemPage.Location = new Point(0, 0); + itemPage.Name = "itemPage"; + itemPage.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + itemPage.Size = new Size(1517, 945); + itemPage.TextSize = new Size(0, 0); + itemPage.TextVisible = false; + // + // layoutControlGroup2 + // + layoutControlGroup2.GroupStyle = DevExpress.Utils.GroupStyle.Title; + layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1, itemForPrev, itemForNext, itemForComplete, itemForCancel }); + layoutControlGroup2.Location = new Point(0, 945); + layoutControlGroup2.Name = "layoutControlGroup2"; + layoutControlGroup2.Size = new Size(1517, 58); + layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + layoutControlGroup2.TextVisible = false; + // + // emptySpaceItem1 + // + emptySpaceItem1.AllowHotTrack = false; + emptySpaceItem1.Location = new Point(0, 0); + emptySpaceItem1.Name = "emptySpaceItem1"; + emptySpaceItem1.Size = new Size(746, 36); + emptySpaceItem1.TextSize = new Size(0, 0); // // itemForPrev // itemForPrev.Control = btnPrev; - itemForPrev.Location = new Point(748, 947); + itemForPrev.CustomizationFormText = "itemForPrev"; + itemForPrev.Location = new Point(933, 0); itemForPrev.MaxSize = new Size(187, 36); itemForPrev.MinSize = new Size(187, 36); itemForPrev.Name = "itemForPrev"; @@ -253,30 +305,10 @@ itemForPrev.TextSize = new Size(0, 0); itemForPrev.TextVisible = false; // - // emptySpaceItem1 - // - emptySpaceItem1.AllowHotTrack = false; - emptySpaceItem1.Location = new Point(0, 947); - emptySpaceItem1.Name = "emptySpaceItem1"; - emptySpaceItem1.Size = new Size(748, 36); - emptySpaceItem1.TextSize = new Size(0, 0); - // - // itemForCancel - // - itemForCancel.Control = btnCancel; - itemForCancel.Location = new Point(1122, 947); - itemForCancel.MaxSize = new Size(187, 36); - itemForCancel.MinSize = new Size(187, 36); - itemForCancel.Name = "itemForCancel"; - itemForCancel.Size = new Size(187, 36); - itemForCancel.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - itemForCancel.TextSize = new Size(0, 0); - itemForCancel.TextVisible = false; - // // itemForNext // itemForNext.Control = btnNext; - itemForNext.Location = new Point(935, 947); + itemForNext.Location = new Point(1120, 0); itemForNext.MaxSize = new Size(187, 36); itemForNext.MinSize = new Size(187, 36); itemForNext.Name = "itemForNext"; @@ -285,10 +317,22 @@ itemForNext.TextSize = new Size(0, 0); itemForNext.TextVisible = false; // + // itemForCancel + // + itemForCancel.Control = btnCancel; + itemForCancel.Location = new Point(746, 0); + itemForCancel.MaxSize = new Size(187, 36); + itemForCancel.MinSize = new Size(187, 36); + itemForCancel.Name = "itemForCancel"; + itemForCancel.Size = new Size(187, 36); + itemForCancel.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + itemForCancel.TextSize = new Size(0, 0); + itemForCancel.TextVisible = false; + // // itemForComplete // itemForComplete.Control = btnComplete; - itemForComplete.Location = new Point(1309, 947); + itemForComplete.Location = new Point(1307, 0); itemForComplete.MaxSize = new Size(188, 36); itemForComplete.MinSize = new Size(188, 36); itemForComplete.Name = "itemForComplete"; @@ -302,40 +346,43 @@ AutoScaleDimensions = new SizeF(10F, 22F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(1517, 1003); - Controls.Add(layoutControl1); + Controls.Add(layoutControlMain); Margin = new Padding(4, 5, 4, 5); Name = "CreateXhsSchemeDlg"; StartPosition = FormStartPosition.CenterParent; Text = "鍒涘缓鏂规"; - ((ISupportInitialize)layoutControl1).EndInit(); - layoutControl1.ResumeLayout(false); - ((ISupportInitialize)navigationFrame1).EndInit(); - navigationFrame1.ResumeLayout(false); - navigationPage1.ResumeLayout(false); - navigationPage2.ResumeLayout(false); + ((ISupportInitialize)layoutControlMain).EndInit(); + layoutControlMain.ResumeLayout(false); + ((ISupportInitialize)navigationFrameMain).EndInit(); + navigationFrameMain.ResumeLayout(false); + navigationPageMain.ResumeLayout(false); + navigationPageStep.ResumeLayout(false); + ((ISupportInitialize)layoutControlStep).EndInit(); + layoutControlStep.ResumeLayout(false); ((ISupportInitialize)stepProgressBar1).EndInit(); - ((ISupportInitialize)Root).EndInit(); + ((ISupportInitialize)navigationFrameStep).EndInit(); + ((ISupportInitialize)layoutControlGroup1).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); - ((ISupportInitialize)itemForPrev).EndInit(); + ((ISupportInitialize)Root).EndInit(); + ((ISupportInitialize)itemPage).EndInit(); + ((ISupportInitialize)layoutControlGroup2).EndInit(); ((ISupportInitialize)emptySpaceItem1).EndInit(); - ((ISupportInitialize)itemForCancel).EndInit(); + ((ISupportInitialize)itemForPrev).EndInit(); ((ISupportInitialize)itemForNext).EndInit(); + ((ISupportInitialize)itemForCancel).EndInit(); ((ISupportInitialize)itemForComplete).EndInit(); ResumeLayout(false); } #endregion - private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControl layoutControlMain; private StepProgressBar stepProgressBar1; - private StepProgressBarItem stepPbBasicInfo; private DevExpress.XtraLayout.LayoutControlGroup Root; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; - private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame1; - private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1; - private DevExpress.XtraBars.Navigation.NavigationPage navigationPage2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrameMain; + private DevExpress.XtraBars.Navigation.NavigationPage navigationPageMain; + private DevExpress.XtraLayout.LayoutControlItem itemPage; private SimpleButton btnComplete; private SimpleButton btnPrev; private SimpleButton btnCancel; @@ -346,6 +393,12 @@ private DevExpress.XtraLayout.LayoutControlItem itemForNext; private DevExpress.XtraLayout.LayoutControlItem itemForComplete; private CreateXhsSchemeInfoPage createXhsSchemeInfoPage1; - private CreateXhsSchemePumpChangePage createXhsSchemePumpChangePage1; + private DevExpress.XtraBars.Navigation.NavigationPage navigationPageStep; + private DevExpress.XtraLayout.LayoutControl layoutControlStep; + private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrameStep; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; } } \ No newline at end of file -- Gitblit v1.9.3