From facdda630bc2a16c2a61e5db6e4387e257202d44 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 11:40:38 +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/03-mgr/XhsProjectMgrPage.Designer.cs | 135 +++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 66 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs
index 26b9f24..8f19459 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs
@@ -29,22 +29,22 @@
private void InitializeComponent()
{
components = new Container();
- EditorButtonImageOptions editorButtonImageOptions1 = new EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ EditorButtonImageOptions editorButtonImageOptions3 = new EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectMgrPage));
- EditorButtonImageOptions editorButtonImageOptions2 = new EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- ColModelState = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ EditorButtonImageOptions editorButtonImageOptions4 = new EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ ColModelStatus = new DevExpress.XtraTreeList.Columns.TreeListColumn();
repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
svgImg16 = new DevExpress.Utils.SvgImageCollection(components);
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
- barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
+ barBtnImport = new DevExpress.XtraBars.BarButtonItem();
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
barBtnInfo = new DevExpress.XtraBars.BarButtonItem();
@@ -55,10 +55,10 @@
barBtnCollpseAll = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
- BtnAddBimfaceFile = new DevExpress.XtraBars.BarButtonItem();
+ btnUploadBimface = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetMap = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribPageGroupForBasic = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
- ribPageGroupForHydro = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribPageGroupBimface = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribPageGroupForMore = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
treeList1 = new DevExpress.XtraTreeList.TreeList();
@@ -85,28 +85,28 @@
((ISupportInitialize)svgImg32).BeginInit();
SuspendLayout();
//
- // ColModelState
+ // ColModelStatus
//
- ColModelState.Caption = "妯″瀷鐘舵��";
- ColModelState.ColumnEdit = repositoryItemImageComboBox1;
- ColModelState.FieldName = "ModelStatus";
- ColModelState.Name = "ColModelState";
- ColModelState.Visible = true;
- ColModelState.VisibleIndex = 7;
- ColModelState.Width = 20;
+ ColModelStatus.Caption = "妯″瀷鐘舵��";
+ ColModelStatus.ColumnEdit = repositoryItemImageComboBox1;
+ ColModelStatus.FieldName = "ModelStatus";
+ ColModelStatus.Name = "ColModelStatus";
+ ColModelStatus.Visible = true;
+ ColModelStatus.VisibleIndex = 7;
+ ColModelStatus.Width = 20;
//
// repositoryItemImageComboBox1
//
repositoryItemImageComboBox1.AutoHeight = false;
- serializableAppearanceObject1.Options.UseTextOptions = true;
- serializableAppearanceObject1.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- serializableAppearanceObject2.Options.UseTextOptions = true;
- serializableAppearanceObject2.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
- serializableAppearanceObject3.Options.UseTextOptions = true;
- serializableAppearanceObject3.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
- serializableAppearanceObject4.Options.UseTextOptions = true;
- serializableAppearanceObject4.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
- repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Ellipsis, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+ serializableAppearanceObject9.Options.UseTextOptions = true;
+ serializableAppearanceObject9.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ serializableAppearanceObject10.Options.UseTextOptions = true;
+ serializableAppearanceObject10.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ serializableAppearanceObject11.Options.UseTextOptions = true;
+ serializableAppearanceObject11.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ serializableAppearanceObject12.Options.UseTextOptions = true;
+ serializableAppearanceObject12.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+ repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Ellipsis, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
repositoryItemImageComboBox1.HtmlImages = svgImg16;
repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
repositoryItemImageComboBox1.SmallImages = svgImg16;
@@ -127,9 +127,9 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo, barBtnViewHydro, barBtnViewBimface, barCkTreeLine, barBtnExpandAll, barBtnCollpseAll, barBtnSearch, barBtnRefresh, BtnAddBimfaceFile });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnImport, barBtnEdit, barBtnDelete, barBtnInfo, barBtnViewHydro, barBtnViewBimface, barCkTreeLine, barBtnExpandAll, barBtnCollpseAll, barBtnSearch, barBtnRefresh, btnUploadBimface, barBtnSetMap });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 15;
+ ribbonControl1.MaxItemId = 16;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010;
@@ -142,13 +142,13 @@
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
- // barBtnAdd
+ // barBtnImport
//
- barBtnAdd.Caption = "娣诲姞";
- barBtnAdd.Id = 1;
- barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
- barBtnAdd.Name = "barBtnAdd";
- barBtnAdd.ItemClick += barBtnAdd_ItemClick;
+ barBtnImport.Caption = "瀵煎叆椤圭洰";
+ barBtnImport.Id = 1;
+ barBtnImport.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
+ barBtnImport.Name = "barBtnImport";
+ barBtnImport.ItemClick += barBtnImport_ItemClick;
//
// barBtnEdit
//
@@ -177,7 +177,7 @@
//
// barBtnViewHydro
//
- barBtnViewHydro.Caption = "妯″瀷";
+ barBtnViewHydro.Caption = "姘村姏妯″瀷";
barBtnViewHydro.Id = 5;
barBtnViewHydro.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnViewHydro.ImageOptions.SvgImage");
barBtnViewHydro.Name = "barBtnViewHydro";
@@ -185,7 +185,7 @@
//
// barBtnViewBimface
//
- barBtnViewBimface.Caption = "妯″瀷";
+ barBtnViewBimface.Caption = "涓夌淮妯″瀷";
barBtnViewBimface.Id = 6;
barBtnViewBimface.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnViewBimface.ImageOptions.SvgImage");
barBtnViewBimface.Name = "barBtnViewBimface";
@@ -234,41 +234,45 @@
barBtnRefresh.Name = "barBtnRefresh";
barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
//
- // BtnAddBimfaceFile
+ // btnUploadBimface
//
- BtnAddBimfaceFile.Caption = "瀵煎叆鏂囦欢";
- BtnAddBimfaceFile.Id = 14;
- BtnAddBimfaceFile.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddBimfaceFile.ImageOptions.SvgImage");
- BtnAddBimfaceFile.Name = "BtnAddBimfaceFile";
- BtnAddBimfaceFile.ItemClick += BtnAddBimfaceFile_ItemClick;
+ btnUploadBimface.Caption = "涓婁紶妯″瀷";
+ btnUploadBimface.Id = 14;
+ btnUploadBimface.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddBimfaceFile.ImageOptions.SvgImage");
+ btnUploadBimface.Name = "btnUploadBimface";
+ btnUploadBimface.ItemClick += barBtnUploadBimface_ItemClick;
+ //
+ // barBtnSetMap
+ //
+ barBtnSetMap.Caption = "浣嶇疆";
+ barBtnSetMap.Id = 15;
+ barBtnSetMap.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMap.ImageOptions.SvgImage");
+ barBtnSetMap.Name = "barBtnSetMap";
+ barBtnSetMap.ItemClick += barBtnSetMap_ItemClick;
//
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGroupForBasic, ribPageGroupForHydro, ribPageGroupBimface, ribPageGroupForMore });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGroupForBasic, ribPageGroupBimface, ribPageGroupForMore });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
// ribPageGroupForBasic
//
- ribPageGroupForBasic.ItemLinks.Add(barBtnAdd);
+ ribPageGroupForBasic.ItemLinks.Add(barBtnImport);
+ ribPageGroupForBasic.ItemLinks.Add(btnUploadBimface);
ribPageGroupForBasic.ItemLinks.Add(barBtnEdit);
+ ribPageGroupForBasic.ItemLinks.Add(barBtnSetMap);
ribPageGroupForBasic.ItemLinks.Add(barBtnDelete);
- ribPageGroupForBasic.ItemLinks.Add(BtnAddBimfaceFile);
ribPageGroupForBasic.ItemLinks.Add(barBtnInfo);
ribPageGroupForBasic.Name = "ribPageGroupForBasic";
ribPageGroupForBasic.Text = "鍩虹";
//
- // ribPageGroupForHydro
- //
- ribPageGroupForHydro.ItemLinks.Add(barBtnViewHydro);
- ribPageGroupForHydro.Name = "ribPageGroupForHydro";
- ribPageGroupForHydro.Text = "姘村姏";
- //
// ribPageGroupBimface
//
ribPageGroupBimface.ItemLinks.Add(barBtnViewBimface);
+ ribPageGroupBimface.ItemLinks.Add(barBtnViewHydro);
ribPageGroupBimface.Name = "ribPageGroupBimface";
- ribPageGroupBimface.Text = "涓夌淮";
+ ribPageGroupBimface.Text = "妯″瀷";
//
// ribPageGroupForMore
//
@@ -285,7 +289,7 @@
treeList1.Appearance.HeaderPanel.Options.UseTextOptions = true;
treeList1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
treeList1.BorderStyle = BorderStyles.NoBorder;
- treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colNO, colName, colAddress, colCustomer, colFlags, colTagName, colDescription, ColModelState, colSimulation });
+ treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colNO, colName, colAddress, colCustomer, colFlags, colTagName, colDescription, ColModelStatus, colSimulation });
treeList1.DataSource = xhsProjectMgrViewModelBindingSource;
treeList1.Dock = DockStyle.Fill;
treeList1.Location = new Point(0, 1);
@@ -296,7 +300,6 @@
treeList1.Size = new Size(1424, 541);
treeList1.TabIndex = 1;
treeList1.RowCellClick += treeList1_RowCellClick;
- treeList1.CustomDrawRow += treeList1_CustomDrawRow;
//
// colNO
//
@@ -385,9 +388,9 @@
// repositoryItemButtonEdit1
//
repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
- editorButtonImageOptions2.SvgImageSize = new Size(25, 25);
- repositoryItemButtonEdit1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+ editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage");
+ editorButtonImageOptions4.SvgImageSize = new Size(25, 25);
+ repositoryItemButtonEdit1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = TextEditStyles.HideTextEditor;
//
@@ -440,13 +443,12 @@
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribPageGroupForBasic;
private DevExpress.XtraTreeList.TreeList treeList1;
- private DevExpress.XtraBars.BarButtonItem barBtnAdd;
+ private DevExpress.XtraBars.BarButtonItem barBtnImport;
private DevExpress.XtraBars.BarButtonItem barBtnEdit;
private DevExpress.XtraBars.BarButtonItem barBtnDelete;
private DevExpress.XtraBars.BarButtonItem barBtnInfo;
private DevExpress.XtraBars.BarButtonItem barBtnViewHydro;
private DevExpress.XtraBars.BarButtonItem barBtnViewBimface;
- private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribPageGroupForHydro;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribPageGroupBimface;
private DevExpress.XtraTreeList.Columns.TreeListColumn colNO;
private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
@@ -464,11 +466,12 @@
private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.Utils.SvgImageCollection svgImg32;
- private DevExpress.XtraTreeList.Columns.TreeListColumn ColModelState;
+ private DevExpress.XtraTreeList.Columns.TreeListColumn ColModelStatus;
private DevExpress.XtraTreeList.Columns.TreeListColumn colSimulation;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
private DevExpress.Utils.SvgImageCollection svgImg16;
- private DevExpress.XtraBars.BarButtonItem BtnAddBimfaceFile;
+ private DevExpress.XtraBars.BarButtonItem btnUploadBimface;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetMap;
}
}
--
Gitblit v1.9.3