From 342b10ed5f4ebbccf2d2868d211fbe91cf3e8d5d Mon Sep 17 00:00:00 2001 From: qin <a@163.com> Date: 星期三, 19 三月 2025 09:10:27 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/PBS.WinFrmUI.IBox/01-/MonitorConfigurationMgr.Designer.cs | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/WinFrmUI/PBS.WinFrmUI.IBox/01-/MonitorConfigurationMgr.Designer.cs b/WinFrmUI/PBS.WinFrmUI.IBox/01-/MonitorConfigurationMgr.Designer.cs index 99e04b0..19ee942 100644 --- a/WinFrmUI/PBS.WinFrmUI.IBox/01-/MonitorConfigurationMgr.Designer.cs +++ b/WinFrmUI/PBS.WinFrmUI.IBox/01-/MonitorConfigurationMgr.Designer.cs @@ -43,6 +43,7 @@ barSubItem3 = new DevExpress.XtraBars.BarSubItem(); BtnDeleteUnit = new DevExpress.XtraBars.BarButtonItem(); BtnDeletePoint = new DevExpress.XtraBars.BarButtonItem(); + BtnExport = new DevExpress.XtraBars.BarButtonItem(); ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); ribPageGroupForBasic = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); sidePanel1 = new DevExpress.XtraEditors.SidePanel(); @@ -54,10 +55,10 @@ ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39); ribbonControl1.ExpandCollapseItem.Id = 0; ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic; - ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnSave, barBtnUp, barBtnDown, barCkDrag, barSubItem1, BtnAddUnit, BtnAddPoint, barSubItem2, BtnEditUnit, BtnEditPoint, barSubItem3, BtnDeleteUnit, BtnDeletePoint }); + ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnSave, barBtnUp, barBtnDown, barCkDrag, barSubItem1, BtnAddUnit, BtnAddPoint, barSubItem2, BtnEditUnit, BtnEditPoint, barSubItem3, BtnDeleteUnit, BtnDeletePoint, BtnExport }); ribbonControl1.Location = new Point(0, 0); ribbonControl1.Margin = new Padding(3, 4, 3, 4); - ribbonControl1.MaxItemId = 30; + ribbonControl1.MaxItemId = 31; ribbonControl1.Name = "ribbonControl1"; ribbonControl1.OptionsMenuMinWidth = 377; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); @@ -75,6 +76,7 @@ barBtnSave.Id = 3; barBtnSave.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSave.ImageOptions.SvgImage"); barBtnSave.Name = "barBtnSave"; + barBtnSave.ItemClick += barBtnSave_ItemClick; // // barBtnUp // @@ -112,12 +114,14 @@ BtnAddUnit.Caption = "鏂板鏈虹粍"; BtnAddUnit.Id = 22; BtnAddUnit.Name = "BtnAddUnit"; + BtnAddUnit.ItemClick += BtnAddUnit_ItemClick; // // BtnAddPoint // BtnAddPoint.Caption = "鏂板娴嬬偣"; BtnAddPoint.Id = 23; BtnAddPoint.Name = "BtnAddPoint"; + BtnAddPoint.ItemClick += BtnAddPoint_ItemClick; // // barSubItem2 // @@ -132,12 +136,14 @@ BtnEditUnit.Caption = "淇敼鏈虹粍"; BtnEditUnit.Id = 25; BtnEditUnit.Name = "BtnEditUnit"; + BtnEditUnit.ItemClick += BtnEditUnit_ItemClick; // // BtnEditPoint // BtnEditPoint.Caption = "淇敼娴嬬偣"; BtnEditPoint.Id = 26; BtnEditPoint.Name = "BtnEditPoint"; + BtnEditPoint.ItemClick += BtnEditPoint_ItemClick; // // barSubItem3 // @@ -152,12 +158,22 @@ BtnDeleteUnit.Caption = "鍒犻櫎鏈虹粍"; BtnDeleteUnit.Id = 28; BtnDeleteUnit.Name = "BtnDeleteUnit"; + BtnDeleteUnit.ItemClick += BtnDeleteUnit_ItemClick; // // BtnDeletePoint // BtnDeletePoint.Caption = "鍒犻櫎娴嬬偣"; BtnDeletePoint.Id = 29; BtnDeletePoint.Name = "BtnDeletePoint"; + BtnDeletePoint.ItemClick += BtnDeletePoint_ItemClick; + // + // BtnExport + // + BtnExport.Caption = "瀵煎嚭"; + BtnExport.Id = 30; + BtnExport.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnExport.ImageOptions.SvgImage"); + BtnExport.Name = "BtnExport"; + BtnExport.ItemClick += BtnExport_ItemClick; // // ribbonPage1 // @@ -171,6 +187,7 @@ ribPageGroupForBasic.ItemLinks.Add(barSubItem2); ribPageGroupForBasic.ItemLinks.Add(barSubItem3); ribPageGroupForBasic.ItemLinks.Add(barBtnSave); + ribPageGroupForBasic.ItemLinks.Add(BtnExport); ribPageGroupForBasic.Name = "ribPageGroupForBasic"; ribPageGroupForBasic.Text = "鍩虹"; // @@ -219,5 +236,6 @@ private DevExpress.XtraBars.BarButtonItem BtnDeleteUnit; private DevExpress.XtraBars.BarButtonItem BtnDeletePoint; private DevExpress.XtraEditors.SidePanel sidePanel1; + private DevExpress.XtraBars.BarButtonItem BtnExport; } } -- Gitblit v1.9.3