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-bak.Designer.cs | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git "a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg - \345\244\215\345\210\266.Designer.cs" b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg-bak.Designer.cs
similarity index 91%
rename from "WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg - \345\244\215\345\210\266.Designer.cs"
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg-bak.Designer.cs
index accba89..f94aac4 100644
--- "a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg - \345\244\215\345\210\266.Designer.cs"
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg-bak.Designer.cs
@@ -35,6 +35,8 @@
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();
@@ -61,6 +63,7 @@
layoutControl1.SuspendLayout();
((ISupportInitialize)navigationFrame1).BeginInit();
navigationFrame1.SuspendLayout();
+ navPageSelectModelFile.SuspendLayout();
navPageInputProjectInfo.SuspendLayout();
navPageSetMapLocation.SuspendLayout();
navPageGenerateProject.SuspendLayout();
@@ -143,17 +146,33 @@
//
// 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[] { navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navPageImportCompleted });
- navigationFrame1.SelectedPage = navPageInputProjectInfo;
+ navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navPageSelectModelFile, navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navPageImportCompleted });
+ navigationFrame1.SelectedPage = navPageSelectModelFile;
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
//
@@ -234,28 +253,28 @@
//
// stepPbSelectModelFile
//
- stepPbSelectModelFile.ContentBlock2.Caption = "褰曞叆椤圭洰淇℃伅";
+ stepPbSelectModelFile.ContentBlock2.Caption = "閫夋嫨妯″瀷鏂囦欢";
stepPbSelectModelFile.Name = "stepPbSelectModelFile";
stepPbSelectModelFile.State = DevExpress.XtraEditors.StepProgressBarItemState.Active;
//
// stepPbInputProjectInfo
//
- stepPbInputProjectInfo.ContentBlock2.Caption = "璁剧疆鍦板浘浣嶇疆";
+ stepPbInputProjectInfo.ContentBlock2.Caption = "褰曞叆椤圭洰淇℃伅";
stepPbInputProjectInfo.Name = "stepPbInputProjectInfo";
//
// stepPbSetMapLocation
//
- stepPbSetMapLocation.ContentBlock2.Caption = "鑷姩鐢熸垚椤圭洰";
+ stepPbSetMapLocation.ContentBlock2.Caption = "璁剧疆鍦板浘浣嶇疆";
stepPbSetMapLocation.Name = "stepPbSetMapLocation";
//
// stepPbGenerateProject
//
- stepPbGenerateProject.ContentBlock2.Caption = "椤圭洰瀵煎叆瀹屾垚";
+ stepPbGenerateProject.ContentBlock2.Caption = "鑷姩鐢熸垚椤圭洰";
stepPbGenerateProject.Name = "stepPbGenerateProject";
//
// stepPbImportCompleted
//
- stepPbImportCompleted.ContentBlock2.Caption = "椤圭洰灞曠ず缁撴灉";
+ stepPbImportCompleted.ContentBlock2.Caption = "椤圭洰瀵煎叆瀹屾垚";
stepPbImportCompleted.Name = "stepPbImportCompleted";
//
// Root
@@ -355,6 +374,7 @@
layoutControl1.ResumeLayout(false);
((ISupportInitialize)navigationFrame1).EndInit();
navigationFrame1.ResumeLayout(false);
+ navPageSelectModelFile.ResumeLayout(false);
navPageInputProjectInfo.ResumeLayout(false);
navPageSetMapLocation.ResumeLayout(false);
navPageGenerateProject.ResumeLayout(false);
@@ -383,6 +403,7 @@
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;
@@ -395,6 +416,7 @@
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