冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Basic.Core/04-SysPropManage/SysPropManageMainPanel.Designer.cs

@@ -64,6 +64,7 @@
            sidePanel1 = new DevExpress.XtraEditors.SidePanel();
            behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
            dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
            btnRefresh = new DevExpress.XtraBars.BarButtonItem();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
@@ -81,9 +82,9 @@
            // 
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, barCheckSorter });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, barCheckSorter, btnRefresh });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 20;
            ribbonControl1.MaxItemId = 21;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -142,6 +143,7 @@
            // ribbonPageGroup2
            // 
            ribbonPageGroup2.ItemLinks.Add(barCheckSorter);
            ribbonPageGroup2.ItemLinks.Add(btnRefresh);
            ribbonPageGroup2.Name = "ribbonPageGroup2";
            ribbonPageGroup2.Text = "更多";
            // 
@@ -326,6 +328,14 @@
            // 
            dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
            // 
            // btnRefresh
            // 
            btnRefresh.Caption = "刷新";
            btnRefresh.Id = 20;
            btnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem2.ImageOptions.SvgImage");
            btnRefresh.Name = "btnRefresh";
            btnRefresh.ItemClick += btnRefresh_ItemClick;
            // 
            // SysPropManageMainPanel
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -382,5 +392,6 @@
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
        private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
        private DevExpress.Utils.DragDrop.DragDropEvents dragDropEvents1;
        private DevExpress.XtraBars.BarButtonItem btnRefresh;
    }
}