From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs | 58 ++++++++--------------------------------------------------
1 files changed, 8 insertions(+), 50 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
index f94aac4..aa13cbd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
@@ -35,8 +35,6 @@
btnNext = new DevExpress.XtraEditors.SimpleButton();
btnCancel = new DevExpress.XtraEditors.SimpleButton();
navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame();
- navPageSelectModelFile = new DevExpress.XtraBars.Navigation.NavigationPage();
- selectXhsProjectModelFileWizardPage = new SelectXhsProjectModelFileWizardPage();
navPageInputProjectInfo = new DevExpress.XtraBars.Navigation.NavigationPage();
inputXhsProjectInfoWizardPage = new InputXhsProjectInfoWizardPage();
navPageSetMapLocation = new DevExpress.XtraBars.Navigation.NavigationPage();
@@ -47,10 +45,7 @@
importXhsProjectCompletedWizardPage = new ImportXhsProjectCompletedCtrl();
stepProgressBar1 = new DevExpress.XtraEditors.StepProgressBar();
stepPbSelectModelFile = new DevExpress.XtraEditors.StepProgressBarItem();
- stepPbInputProjectInfo = new DevExpress.XtraEditors.StepProgressBarItem();
stepPbSetMapLocation = new DevExpress.XtraEditors.StepProgressBarItem();
- stepPbGenerateProject = new DevExpress.XtraEditors.StepProgressBarItem();
- stepPbImportCompleted = new DevExpress.XtraEditors.StepProgressBarItem();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -63,7 +58,6 @@
layoutControl1.SuspendLayout();
((ISupportInitialize)navigationFrame1).BeginInit();
navigationFrame1.SuspendLayout();
- navPageSelectModelFile.SuspendLayout();
navPageInputProjectInfo.SuspendLayout();
navPageSetMapLocation.SuspendLayout();
navPageGenerateProject.SuspendLayout();
@@ -146,33 +140,17 @@
//
// navigationFrame1
//
- navigationFrame1.Controls.Add(navPageSelectModelFile);
navigationFrame1.Controls.Add(navPageInputProjectInfo);
navigationFrame1.Controls.Add(navPageSetMapLocation);
navigationFrame1.Controls.Add(navPageGenerateProject);
navigationFrame1.Controls.Add(navPageImportCompleted);
navigationFrame1.Location = new Point(12, 120);
navigationFrame1.Name = "navigationFrame1";
- navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navPageSelectModelFile, navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navPageImportCompleted });
- navigationFrame1.SelectedPage = navPageSelectModelFile;
+ navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navPageImportCompleted });
+ navigationFrame1.SelectedPage = navPageInputProjectInfo;
navigationFrame1.Size = new Size(1089, 537);
navigationFrame1.TabIndex = 5;
navigationFrame1.Text = "navigationFrame1";
- //
- // navPageSelectModelFile
- //
- navPageSelectModelFile.Caption = "navPageSelectModelFile";
- navPageSelectModelFile.Controls.Add(selectXhsProjectModelFileWizardPage);
- navPageSelectModelFile.Name = "navPageSelectModelFile";
- navPageSelectModelFile.Size = new Size(1089, 537);
- //
- // selectXhsProjectModelFileWizardPage
- //
- selectXhsProjectModelFileWizardPage.Dock = DockStyle.Fill;
- selectXhsProjectModelFileWizardPage.Location = new Point(0, 0);
- selectXhsProjectModelFileWizardPage.Name = "selectXhsProjectModelFileWizardPage";
- selectXhsProjectModelFileWizardPage.Size = new Size(1089, 537);
- selectXhsProjectModelFileWizardPage.TabIndex = 0;
//
// navPageInputProjectInfo
//
@@ -198,6 +176,8 @@
//
// setXhsProjectMapLocationWizardPage
//
+ setXhsProjectMapLocationWizardPage.AllowComplete = false;
+ setXhsProjectMapLocationWizardPage.AllowNext = false;
setXhsProjectMapLocationWizardPage.Dock = DockStyle.Fill;
setXhsProjectMapLocationWizardPage.Location = new Point(0, 0);
setXhsProjectMapLocationWizardPage.Name = "setXhsProjectMapLocationWizardPage";
@@ -240,42 +220,26 @@
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(stepPbSelectModelFile);
- stepProgressBar1.Items.Add(stepPbInputProjectInfo);
stepProgressBar1.Items.Add(stepPbSetMapLocation);
- stepProgressBar1.Items.Add(stepPbGenerateProject);
- stepProgressBar1.Items.Add(stepPbImportCompleted);
stepProgressBar1.Location = new Point(12, 12);
stepProgressBar1.Name = "stepProgressBar1";
- stepProgressBar1.SelectedItemIndex = 0;
+ stepProgressBar1.SelectedItemIndex = 1;
stepProgressBar1.Size = new Size(1089, 104);
stepProgressBar1.StyleController = layoutControl1;
stepProgressBar1.TabIndex = 4;
+ stepProgressBar1.Visible = false;
//
// stepPbSelectModelFile
//
- stepPbSelectModelFile.ContentBlock2.Caption = "閫夋嫨妯″瀷鏂囦欢";
+ stepPbSelectModelFile.ContentBlock2.Caption = "褰曞叆椤圭洰淇℃伅";
stepPbSelectModelFile.Name = "stepPbSelectModelFile";
stepPbSelectModelFile.State = DevExpress.XtraEditors.StepProgressBarItemState.Active;
- //
- // stepPbInputProjectInfo
- //
- stepPbInputProjectInfo.ContentBlock2.Caption = "褰曞叆椤圭洰淇℃伅";
- stepPbInputProjectInfo.Name = "stepPbInputProjectInfo";
//
// stepPbSetMapLocation
//
stepPbSetMapLocation.ContentBlock2.Caption = "璁剧疆鍦板浘浣嶇疆";
stepPbSetMapLocation.Name = "stepPbSetMapLocation";
- //
- // stepPbGenerateProject
- //
- stepPbGenerateProject.ContentBlock2.Caption = "鑷姩鐢熸垚椤圭洰";
- stepPbGenerateProject.Name = "stepPbGenerateProject";
- //
- // stepPbImportCompleted
- //
- stepPbImportCompleted.ContentBlock2.Caption = "椤圭洰瀵煎叆瀹屾垚";
- stepPbImportCompleted.Name = "stepPbImportCompleted";
+ stepPbSetMapLocation.State = DevExpress.XtraEditors.StepProgressBarItemState.Active;
//
// Root
//
@@ -374,7 +338,6 @@
layoutControl1.ResumeLayout(false);
((ISupportInitialize)navigationFrame1).EndInit();
navigationFrame1.ResumeLayout(false);
- navPageSelectModelFile.ResumeLayout(false);
navPageInputProjectInfo.ResumeLayout(false);
navPageSetMapLocation.ResumeLayout(false);
navPageGenerateProject.ResumeLayout(false);
@@ -398,12 +361,8 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraEditors.StepProgressBarItem stepPbSelectModelFile;
- private DevExpress.XtraEditors.StepProgressBarItem stepPbInputProjectInfo;
private DevExpress.XtraEditors.StepProgressBarItem stepPbSetMapLocation;
- private DevExpress.XtraEditors.StepProgressBarItem stepPbGenerateProject;
- private DevExpress.XtraEditors.StepProgressBarItem stepPbImportCompleted;
private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame1;
- private DevExpress.XtraBars.Navigation.NavigationPage navPageSelectModelFile;
private DevExpress.XtraBars.Navigation.NavigationPage navPageInputProjectInfo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.SimpleButton btnPrev;
@@ -416,7 +375,6 @@
private DevExpress.XtraBars.Navigation.NavigationPage navPageSetMapLocation;
private DevExpress.XtraBars.Navigation.NavigationPage navPageGenerateProject;
private DevExpress.XtraBars.Navigation.NavigationPage navPageImportCompleted;
- private SelectXhsProjectModelFileWizardPage selectXhsProjectModelFileWizardPage;
private InputXhsProjectInfoWizardPage inputXhsProjectInfoWizardPage;
private SetXhsProjectMapLocationWizardPage setXhsProjectMapLocationWizardPage;
private GenerateXhsProjectWizardPage generateXhsProjectWizardPage;
--
Gitblit v1.9.3