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/03-mgr/XhsProjectMgrPage.Designer.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 1d77e21..98749ce 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
@@ -75,16 +75,18 @@
// ribbonControl1
//
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, barBtnPublish, barBtnDeprecated, barCkTreeLine, barBtnExpandAll, barBtnCollpseAll, barBtnSearch, barBtnRefresh });
- ribbonControl1.Location = new Point(1, 1);
+ ribbonControl1.Location = new Point(0, 0);
ribbonControl1.MaxItemId = 14;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
- ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
+ ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False;
+ ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(996, 128);
+ ribbonControl1.Size = new Size(998, 101);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -94,6 +96,7 @@
barBtnAdd.Id = 1;
barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
barBtnAdd.Name = "barBtnAdd";
+ barBtnAdd.ItemClick += barBtnAdd_ItemClick;
//
// barBtnEdit
//
@@ -101,6 +104,7 @@
barBtnEdit.Id = 2;
barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
barBtnEdit.Name = "barBtnEdit";
+ barBtnEdit.ItemClick += barBtnEdit_ItemClick;
//
// barBtnDelete
//
@@ -108,6 +112,7 @@
barBtnDelete.Id = 3;
barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
barBtnDelete.Name = "barBtnDelete";
+ barBtnDelete.ItemClick += barBtnDelete_ItemClick;
//
// barBtnInfo
//
@@ -115,6 +120,7 @@
barBtnInfo.Id = 4;
barBtnInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnInfo.ImageOptions.SvgImage");
barBtnInfo.Name = "barBtnInfo";
+ barBtnInfo.ItemClick += barBtnInfo_ItemClick;
//
// barBtnViewHydro
//
@@ -232,13 +238,14 @@
//
// treeList1
//
+ treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colNO, colName, colStartTime, colEndTime, colPublishStatus, colAddress, colCustomer, colFlags, colTagName, colDescription });
treeList1.DataSource = xhsProjectMgrViewModelBindingSource;
treeList1.Dock = DockStyle.Fill;
treeList1.Location = new Point(0, 1);
treeList1.MenuManager = ribbonControl1;
treeList1.Name = "treeList1";
- treeList1.Size = new Size(996, 539);
+ treeList1.Size = new Size(998, 568);
treeList1.TabIndex = 1;
//
// colNO
@@ -320,10 +327,10 @@
panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
panelControl1.Controls.Add(treeList1);
panelControl1.Dock = DockStyle.Fill;
- panelControl1.Location = new Point(1, 129);
+ panelControl1.Location = new Point(0, 101);
panelControl1.Name = "panelControl1";
panelControl1.Padding = new Padding(0, 1, 0, 0);
- panelControl1.Size = new Size(996, 540);
+ panelControl1.Size = new Size(998, 569);
panelControl1.TabIndex = 3;
//
// svgImg32
@@ -340,7 +347,6 @@
Controls.Add(panelControl1);
Controls.Add(ribbonControl1);
Name = "XhsProjectMgrPage";
- Padding = new Padding(1);
Size = new Size(998, 670);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)treeList1).EndInit();
--
Gitblit v1.9.3