From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期二, 17 十二月 2024 09:44:04 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/01-series/AssetsCoolingSeriesMgrTreeCtrl.Designer.cs | 115 ++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 73 insertions(+), 42 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/01-series/AssetsCoolingSeriesMgrTreeCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/01-series/AssetsCoolingSeriesMgrTreeCtrl.Designer.cs index 23e5cc5..4ae3465 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/01-series/AssetsCoolingSeriesMgrTreeCtrl.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/01-series/AssetsCoolingSeriesMgrTreeCtrl.Designer.cs @@ -51,20 +51,24 @@ barBtnCollpseAll = new DevExpress.XtraBars.BarButtonItem(); barBtnSearchBox = new DevExpress.XtraBars.BarButtonItem(); barCkTreeLine = new DevExpress.XtraBars.BarCheckItem(); + barCkDrag = new DevExpress.XtraBars.BarCheckItem(); + barBtnRefresh = new DevExpress.XtraBars.BarButtonItem(); barDockControlTop = new DevExpress.XtraBars.BarDockControl(); barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); barDockControlRight = new DevExpress.XtraBars.BarDockControl(); + barBtnAdd = new DevExpress.XtraBars.BarButtonItem(); + barBtnEdit = new DevExpress.XtraBars.BarButtonItem(); + barBtnDelete = new DevExpress.XtraBars.BarButtonItem(); + barBtnInfo = new DevExpress.XtraBars.BarButtonItem(); repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); searchControl1 = new SearchControl(); Root = new LayoutControlGroup(); layoutControlItem1 = new LayoutControlItem(); layoutControlItem2 = new LayoutControlItem(); - barBtnAdd = new DevExpress.XtraBars.BarButtonItem(); - barBtnEdit = new DevExpress.XtraBars.BarButtonItem(); - barBtnDelete = new DevExpress.XtraBars.BarButtonItem(); - barBtnInfo = new DevExpress.XtraBars.BarButtonItem(); popupMenu1 = new DevExpress.XtraBars.PopupMenu(components); + behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components); + dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)treeList1).BeginInit(); @@ -75,6 +79,7 @@ ((ISupportInitialize)layoutControlItem1).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)popupMenu1).BeginInit(); + ((ISupportInitialize)behaviorManager1).BeginInit(); SuspendLayout(); // // layoutControl1 @@ -92,6 +97,7 @@ // // treeList1 // + behaviorManager1.SetBehaviors(treeList1, new DevExpress.Utils.Behaviors.Behavior[] { DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(TreeListDragDropSource), true, true, true, true, dragDropEvents1) }); treeList1.Columns.AddRange(new TreeListColumn[] { colName }); treeList1.Location = new Point(0, 24); treeList1.MenuManager = barManager1; @@ -106,6 +112,7 @@ treeList1.TreeViewFieldName = "Name"; treeList1.ViewStyle = TreeListViewStyle.TreeView; treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged; + treeList1.MouseClick += treeList1_MouseClick; // // colName // @@ -125,22 +132,21 @@ barManager1.DockControls.Add(barDockControlLeft); barManager1.DockControls.Add(barDockControlRight); barManager1.Form = this; - barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnExpandAll, barBtnCollpseAll, barBtnSearchBox, barCkTreeLine, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo }); - barManager1.MaxItemId = 10; + barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnExpandAll, barBtnCollpseAll, barBtnSearchBox, barCkTreeLine, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo, barCkDrag, barBtnRefresh }); + barManager1.MaxItemId = 13; // // bar1 // - bar1.BarName = "Custom 1"; - bar1.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Top; + bar1.BarName = "Custom1"; bar1.DockCol = 0; bar1.DockRow = 0; bar1.DockStyle = DevExpress.XtraBars.BarDockStyle.Top; - bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAdd), new DevExpress.XtraBars.LinkPersistInfo(barBtnEdit), new DevExpress.XtraBars.LinkPersistInfo(barBtnDelete), new DevExpress.XtraBars.LinkPersistInfo(barBtnInfo) }); + bar1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnExpandAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnCollpseAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnSearchBox), new DevExpress.XtraBars.LinkPersistInfo(barCkTreeLine), new DevExpress.XtraBars.LinkPersistInfo(barCkDrag), new DevExpress.XtraBars.LinkPersistInfo(barBtnRefresh) }); bar1.OptionsBar.AllowQuickCustomization = false; - bar1.OptionsBar.DrawDragBorder = false; + bar1.OptionsBar.DrawBorder = false; bar1.OptionsBar.MultiLine = true; bar1.OptionsBar.UseWholeRow = true; - bar1.Text = "Custom 1"; + bar1.Text = "Custom1"; // // barBtnExpandAll // @@ -174,6 +180,22 @@ barCkTreeLine.Name = "barCkTreeLine"; barCkTreeLine.CheckedChanged += barCkTreeLine_CheckedChanged; // + // barCkDrag + // + barCkDrag.Caption = "鎷栨嫿鎺掑簭"; + barCkDrag.Id = 11; + barCkDrag.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDrag.ImageOptions.SvgImage"); + barCkDrag.Name = "barCkDrag"; + barCkDrag.CheckedChanged += barCkDrag_CheckedChanged; + // + // barBtnRefresh + // + barBtnRefresh.Caption = "鍒锋柊"; + barBtnRefresh.Id = 12; + barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage"); + barBtnRefresh.Name = "barBtnRefresh"; + barBtnRefresh.ItemClick += barBtnRefresh_ItemClick; + // // barDockControlTop // barDockControlTop.CausesValidation = false; @@ -205,6 +227,34 @@ barDockControlRight.Location = new Point(235, 24); barDockControlRight.Manager = barManager1; barDockControlRight.Size = new Size(0, 636); + // + // barBtnAdd + // + barBtnAdd.Caption = "鏂板"; + barBtnAdd.Id = 6; + barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage"); + barBtnAdd.Name = "barBtnAdd"; + // + // barBtnEdit + // + barBtnEdit.Caption = "缂栬緫"; + barBtnEdit.Id = 7; + barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage"); + barBtnEdit.Name = "barBtnEdit"; + // + // barBtnDelete + // + barBtnDelete.Caption = "鍒犻櫎"; + barBtnDelete.Id = 8; + barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage"); + barBtnDelete.Name = "barBtnDelete"; + // + // barBtnInfo + // + barBtnInfo.Caption = "璇︾粏淇℃伅"; + barBtnInfo.Id = 9; + barBtnInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnInfo.ImageOptions.SvgImage"); + barBtnInfo.Name = "barBtnInfo"; // // repositoryItemButtonEdit1 // @@ -257,39 +307,16 @@ layoutControlItem2.TextSize = new Size(0, 0); layoutControlItem2.TextVisible = false; // - // barBtnAdd - // - barBtnAdd.Caption = "鏂板"; - barBtnAdd.Id = 6; - barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage"); - barBtnAdd.Name = "barBtnAdd"; - // - // barBtnEdit - // - barBtnEdit.Caption = "缂栬緫"; - barBtnEdit.Id = 7; - barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage"); - barBtnEdit.Name = "barBtnEdit"; - // - // barBtnDelete - // - barBtnDelete.Caption = "鍒犻櫎"; - barBtnDelete.Id = 8; - barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage"); - barBtnDelete.Name = "barBtnDelete"; - // - // barBtnInfo - // - barBtnInfo.Caption = "璇︾粏淇℃伅"; - barBtnInfo.Id = 9; - barBtnInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnInfo.ImageOptions.SvgImage"); - barBtnInfo.Name = "barBtnInfo"; - // // popupMenu1 // - popupMenu1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnExpandAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnCollpseAll), new DevExpress.XtraBars.LinkPersistInfo(barBtnSearchBox), new DevExpress.XtraBars.LinkPersistInfo(barCkTreeLine) }); + popupMenu1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAdd), new DevExpress.XtraBars.LinkPersistInfo(barBtnEdit), new DevExpress.XtraBars.LinkPersistInfo(barBtnDelete), new DevExpress.XtraBars.LinkPersistInfo(barBtnInfo) }); popupMenu1.Manager = barManager1; popupMenu1.Name = "popupMenu1"; + popupMenu1.BeforePopup += popupMenu1_BeforePopup; + // + // dragDropEvents1 + // + dragDropEvents1.DragDrop += dragDropEvents1_DragDrop; // // AssetsCoolingSeriesMgrTreeCtrl // @@ -312,6 +339,7 @@ ((ISupportInitialize)layoutControlItem1).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)popupMenu1).EndInit(); + ((ISupportInitialize)behaviorManager1).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -321,7 +349,6 @@ private DevExpress.XtraLayout.LayoutControl layoutControl1; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraBars.BarManager barManager1; - private DevExpress.XtraBars.Bar bar1; private DevExpress.XtraBars.BarButtonItem barBtnExpandAll; private DevExpress.XtraBars.BarDockControl barDockControlTop; private DevExpress.XtraBars.BarDockControl barDockControlBottom; @@ -337,12 +364,16 @@ private DevExpress.XtraTreeList.Columns.TreeListColumn colName; private DevExpress.XtraEditors.SimpleButton btnImportProject; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; - private DevExpress.XtraBars.BarButtonItem barBtnRefresh; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraBars.BarButtonItem barBtnAdd; private DevExpress.XtraBars.BarButtonItem barBtnEdit; private DevExpress.XtraBars.BarButtonItem barBtnDelete; private DevExpress.XtraBars.BarButtonItem barBtnInfo; private DevExpress.XtraBars.PopupMenu popupMenu1; + private DevExpress.XtraBars.Bar bar1; + private DevExpress.XtraBars.BarCheckItem barCkDrag; + private DevExpress.XtraBars.BarButtonItem barBtnRefresh; + private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1; + private DevExpress.Utils.DragDrop.DragDropEvents dragDropEvents1; } } -- Gitblit v1.9.3