From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs
index c526929..acd1144 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs
@@ -52,6 +52,7 @@
barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
sidePanel1 = new DevExpress.XtraEditors.SidePanel();
+ btnRefresh = new DevExpress.XtraBars.BarButtonItem();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
@@ -66,9 +67,9 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, BtnPropEdit, barBtnUpdateParent, barCheckSorter });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, BtnPropEdit, barBtnUpdateParent, barCheckSorter, btnRefresh });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 23;
+ ribbonControl1.MaxItemId = 24;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -145,6 +146,7 @@
ribbonPageGroup2.ItemLinks.Add(BtnPropEdit);
ribbonPageGroup2.ItemLinks.Add(barBtnUpdateParent);
ribbonPageGroup2.ItemLinks.Add(barCheckSorter);
+ ribbonPageGroup2.ItemLinks.Add(btnRefresh);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "鏇村";
//
@@ -263,6 +265,14 @@
sidePanel1.TabIndex = 9;
sidePanel1.Text = "sidePanel1";
//
+ // btnRefresh
+ //
+ btnRefresh.Caption = "鍒锋柊";
+ btnRefresh.Id = 23;
+ btnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem2.ImageOptions.SvgImage");
+ btnRefresh.Name = "btnRefresh";
+ btnRefresh.ItemClick += btnRefresh_ItemClick;
+ //
// SysCatalogManageMainPanel
//
Appearance.BackColor = SystemColors.Control;
@@ -309,5 +319,6 @@
private DevExpress.XtraEditors.SidePanel sidePanel1;
private DevExpress.XtraBars.BarButtonItem barBtnUpdateParent;
private DevExpress.XtraBars.BarCheckItem barCheckSorter;
+ private DevExpress.XtraBars.BarButtonItem btnRefresh;
}
}
--
Gitblit v1.9.3