From 26f45822a2a84af81e20ca543da98d3b822c5afd Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 17 二月 2025 21:25:59 +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 | 109 ++++++++++++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 48 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 49877a3..d461296 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
@@ -32,10 +32,10 @@
{
ComponentResourceManager resources = new ComponentResourceManager(typeof(ImportXhsProjectDlg));
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- btnComplete = new DevExpress.XtraEditors.SimpleButton();
- btnPrev = new DevExpress.XtraEditors.SimpleButton();
- btnNext = new DevExpress.XtraEditors.SimpleButton();
- btnCancel = new DevExpress.XtraEditors.SimpleButton();
+ btnComplete = new SimpleButton();
+ btnPrev = new SimpleButton();
+ btnNext = new SimpleButton();
+ btnCancel = new SimpleButton();
navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame();
navPageInputProjectInfo = new DevExpress.XtraBars.Navigation.NavigationPage();
inputXhsProjectInfoWizardPage = new InputXhsProjectInfoWizardPage();
@@ -44,10 +44,11 @@
navPageGenerateProject = new DevExpress.XtraBars.Navigation.NavigationPage();
generateXhsProjectWizardPage = new GenerateXhsProjectWizardPage();
navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
- projectResultShowPanel1 = new Xhs.ProjectResultShowPanel();
- stepProgressBar1 = new DevExpress.XtraEditors.StepProgressBar();
- stepPbSelectModelFile = new DevExpress.XtraEditors.StepProgressBarItem();
- stepPbSetMapLocation = new DevExpress.XtraEditors.StepProgressBarItem();
+ stepProgressBar1 = new StepProgressBar();
+ stepPbSelectModelFile = new StepProgressBarItem();
+ stepPbSetMapLocation = new StepProgressBarItem();
+ stepProgressBarItem1 = new StepProgressBarItem();
+ stepProgressBarItem2 = new StepProgressBarItem();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -56,7 +57,7 @@
itemForPrev = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
- importXhsProjectCompletedCtrl1 = new ImportXhsProjectCompletedCtrl();
+ projectResultShowPanel1 = new XhsProjectResultWizardPage();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)navigationFrame1).BeginInit();
@@ -147,11 +148,11 @@
navigationFrame1.Controls.Add(navPageSetMapLocation);
navigationFrame1.Controls.Add(navPageGenerateProject);
navigationFrame1.Controls.Add(navigationPage1);
- navigationFrame1.Location = new Point(12, 120);
+ navigationFrame1.Location = new Point(12, 76);
navigationFrame1.Name = "navigationFrame1";
navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navigationPage1 });
navigationFrame1.SelectedPage = navPageInputProjectInfo;
- navigationFrame1.Size = new Size(1089, 537);
+ navigationFrame1.Size = new Size(1089, 581);
navigationFrame1.TabIndex = 5;
navigationFrame1.Text = "navigationFrame1";
//
@@ -160,14 +161,14 @@
navPageInputProjectInfo.Caption = "navPageInputProjectInfo";
navPageInputProjectInfo.Controls.Add(inputXhsProjectInfoWizardPage);
navPageInputProjectInfo.Name = "navPageInputProjectInfo";
- navPageInputProjectInfo.Size = new Size(1089, 537);
+ navPageInputProjectInfo.Size = new Size(1089, 581);
//
// inputXhsProjectInfoWizardPage
//
inputXhsProjectInfoWizardPage.Dock = DockStyle.Fill;
inputXhsProjectInfoWizardPage.Location = new Point(0, 0);
inputXhsProjectInfoWizardPage.Name = "inputXhsProjectInfoWizardPage";
- inputXhsProjectInfoWizardPage.Size = new Size(1089, 537);
+ inputXhsProjectInfoWizardPage.Size = new Size(1089, 581);
inputXhsProjectInfoWizardPage.TabIndex = 0;
//
// navPageSetMapLocation
@@ -175,16 +176,14 @@
navPageSetMapLocation.Caption = "navPageSetMapLocation";
navPageSetMapLocation.Controls.Add(setXhsProjectMapLocationWizardPage);
navPageSetMapLocation.Name = "navPageSetMapLocation";
- navPageSetMapLocation.Size = new Size(1089, 537);
+ navPageSetMapLocation.Size = new Size(1089, 581);
//
// setXhsProjectMapLocationWizardPage
//
- setXhsProjectMapLocationWizardPage.AllowComplete = false;
- setXhsProjectMapLocationWizardPage.AllowNext = false;
setXhsProjectMapLocationWizardPage.Dock = DockStyle.Fill;
setXhsProjectMapLocationWizardPage.Location = new Point(0, 0);
setXhsProjectMapLocationWizardPage.Name = "setXhsProjectMapLocationWizardPage";
- setXhsProjectMapLocationWizardPage.Size = new Size(1089, 537);
+ setXhsProjectMapLocationWizardPage.Size = new Size(1089, 581);
setXhsProjectMapLocationWizardPage.TabIndex = 0;
//
// navPageGenerateProject
@@ -192,31 +191,22 @@
navPageGenerateProject.Caption = "navPageGenerateProject";
navPageGenerateProject.Controls.Add(generateXhsProjectWizardPage);
navPageGenerateProject.Name = "navPageGenerateProject";
- navPageGenerateProject.Size = new Size(1089, 537);
+ navPageGenerateProject.Size = new Size(1089, 581);
//
// generateXhsProjectWizardPage
//
generateXhsProjectWizardPage.Dock = DockStyle.Fill;
generateXhsProjectWizardPage.Location = new Point(0, 0);
generateXhsProjectWizardPage.Name = "generateXhsProjectWizardPage";
- generateXhsProjectWizardPage.Size = new Size(1089, 537);
+ generateXhsProjectWizardPage.Size = new Size(1089, 581);
generateXhsProjectWizardPage.TabIndex = 0;
//
// navigationPage1
//
navigationPage1.Caption = "navigationPage1";
- navigationPage1.Controls.Add(importXhsProjectCompletedCtrl1);
navigationPage1.Controls.Add(projectResultShowPanel1);
navigationPage1.Name = "navigationPage1";
- navigationPage1.Size = new Size(1089, 537);
- //
- // projectResultShowPanel1
- //
- projectResultShowPanel1.Dock = DockStyle.Fill;
- projectResultShowPanel1.Location = new Point(0, 0);
- projectResultShowPanel1.Name = "projectResultShowPanel1";
- projectResultShowPanel1.Size = new Size(1089, 537);
- projectResultShowPanel1.TabIndex = 0;
+ navigationPage1.Size = new Size(1089, 581);
//
// stepProgressBar1
//
@@ -225,29 +215,51 @@
stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImageSize = new Size(20, 20);
stepProgressBar1.Items.Add(stepPbSelectModelFile);
stepProgressBar1.Items.Add(stepPbSetMapLocation);
+ stepProgressBar1.Items.Add(stepProgressBarItem1);
+ stepProgressBar1.Items.Add(stepProgressBarItem2);
stepProgressBar1.Location = new Point(12, 12);
+ stepProgressBar1.MaximumSize = new Size(1089, 60);
+ stepProgressBar1.MinimumSize = new Size(1089, 60);
stepProgressBar1.Name = "stepProgressBar1";
+ stepProgressBar1.Padding = new Padding(30, 10, 10, 10);
stepProgressBar1.SelectedItemIndex = 0;
- stepProgressBar1.ShadowDrawMode = DevExpress.XtraEditors.StepProgressBarShadowDrawMode.ActiveElements;
- stepProgressBar1.Size = new Size(1089, 104);
+ stepProgressBar1.ShadowDrawMode = StepProgressBarShadowDrawMode.ActiveElements;
+ stepProgressBar1.Size = new Size(1089, 60);
stepProgressBar1.StyleController = layoutControl1;
stepProgressBar1.TabIndex = 4;
stepProgressBar1.Visible = false;
//
// stepPbSelectModelFile
//
- stepPbSelectModelFile.ContentBlock1.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSelectModelFile.ContentBlock1.ActiveStateImageOptions.SvgImage");
- stepPbSelectModelFile.ContentBlock1.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSelectModelFile.ContentBlock1.InactiveStateImageOptions.SvgImage");
stepPbSelectModelFile.ContentBlock2.Caption = "鍩烘湰淇℃伅";
stepPbSelectModelFile.Name = "stepPbSelectModelFile";
- stepPbSelectModelFile.State = DevExpress.XtraEditors.StepProgressBarItemState.Active;
+ stepPbSelectModelFile.Options.Indicator.ActiveStateDrawMode = IndicatorDrawMode.Full;
+ stepPbSelectModelFile.Options.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSelectModelFile.Options.Indicator.ActiveStateImageOptions.SvgImage");
+ stepPbSelectModelFile.Options.Indicator.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSelectModelFile.Options.Indicator.InactiveStateImageOptions.SvgImage");
+ stepPbSelectModelFile.State = StepProgressBarItemState.Active;
//
// stepPbSetMapLocation
//
- stepPbSetMapLocation.ContentBlock1.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSetMapLocation.ContentBlock1.ActiveStateImageOptions.SvgImage");
- stepPbSetMapLocation.ContentBlock1.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSetMapLocation.ContentBlock1.InactiveStateImageOptions.SvgImage");
- stepPbSetMapLocation.ContentBlock2.Caption = "璁剧疆鍦板浘浣嶇疆";
+ stepPbSetMapLocation.ContentBlock2.Caption = "璁剧疆浣嶇疆";
stepPbSetMapLocation.Name = "stepPbSetMapLocation";
+ stepPbSetMapLocation.Options.Indicator.ActiveStateDrawMode = IndicatorDrawMode.Full;
+ stepPbSetMapLocation.Options.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSetMapLocation.Options.Indicator.ActiveStateImageOptions.SvgImage");
+ stepPbSetMapLocation.Options.Indicator.InactiveStateDrawMode = IndicatorDrawMode.Full;
+ stepPbSetMapLocation.Options.Indicator.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepPbSetMapLocation.Options.Indicator.InactiveStateImageOptions.SvgImage");
+ //
+ // stepProgressBarItem1
+ //
+ stepProgressBarItem1.ContentBlock2.Caption = "鑷姩鐢熸垚";
+ stepProgressBarItem1.Name = "stepProgressBarItem1";
+ stepProgressBarItem1.Options.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBarItem1.Options.Indicator.ActiveStateImageOptions.SvgImage");
+ stepProgressBarItem1.Options.Indicator.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBarItem1.Options.Indicator.InactiveStateImageOptions.SvgImage");
+ //
+ // stepProgressBarItem2
+ //
+ stepProgressBarItem2.ContentBlock2.Caption = "缁撴灉灞曠ず";
+ stepProgressBarItem2.Name = "stepProgressBarItem2";
+ stepProgressBarItem2.Options.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBarItem2.Options.Indicator.ActiveStateImageOptions.SvgImage");
+ stepProgressBarItem2.Options.Indicator.InactiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBarItem2.Options.Indicator.InactiveStateImageOptions.SvgImage");
//
// Root
//
@@ -263,16 +275,16 @@
layoutControlItem1.Control = stepProgressBar1;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(1093, 108);
+ layoutControlItem1.Size = new Size(1093, 64);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
// layoutControlItem2
//
layoutControlItem2.Control = navigationFrame1;
- layoutControlItem2.Location = new Point(0, 108);
+ layoutControlItem2.Location = new Point(0, 64);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(1093, 541);
+ layoutControlItem2.Size = new Size(1093, 585);
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
//
@@ -332,13 +344,13 @@
itemForComplete.TextSize = new Size(0, 0);
itemForComplete.TextVisible = false;
//
- // importXhsProjectCompletedCtrl1
+ // projectResultShowPanel1
//
- importXhsProjectCompletedCtrl1.Dock = DockStyle.Fill;
- importXhsProjectCompletedCtrl1.Location = new Point(0, 0);
- importXhsProjectCompletedCtrl1.Name = "importXhsProjectCompletedCtrl1";
- importXhsProjectCompletedCtrl1.Size = new Size(1089, 537);
- importXhsProjectCompletedCtrl1.TabIndex = 1;
+ projectResultShowPanel1.Dock = DockStyle.Fill;
+ projectResultShowPanel1.Location = new Point(0, 0);
+ projectResultShowPanel1.Name = "projectResultShowPanel1";
+ projectResultShowPanel1.Size = new Size(1089, 581);
+ projectResultShowPanel1.TabIndex = 0;
//
// ImportXhsProjectDlg
//
@@ -396,7 +408,8 @@
private DevExpress.XtraEditors.SimpleButton btnComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1;
- private Xhs.ProjectResultShowPanel projectResultShowPanel1;
- private ImportXhsProjectCompletedCtrl importXhsProjectCompletedCtrl1;
+ private StepProgressBarItem stepProgressBarItem1;
+ private StepProgressBarItem stepProgressBarItem2;
+ private XhsProjectResultWizardPage projectResultShowPanel1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3