From ab65b0ac21e7fabfd8548538142d9a1b66a2ad3d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 十二月 2024 13:14:49 +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/03-factor/AssetsCoolingFactorMgrPage.Designer.cs | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AssetsCoolingFactorMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AssetsCoolingFactorMgrPage.Designer.cs
index f1f9073..b7e7712 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AssetsCoolingFactorMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AssetsCoolingFactorMgrPage.Designer.cs
@@ -30,11 +30,11 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(AssetsCoolingFactorMgrPage));
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -44,8 +44,10 @@
barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
barBtnUp = new DevExpress.XtraBars.BarButtonItem();
barBtnDown = new DevExpress.XtraBars.BarButtonItem();
+ barCkDrag = new DevExpress.XtraBars.BarCheckItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribPageGroupForBasic = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribPageGroupForMore = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
panelControl1 = new DevExpress.XtraEditors.PanelControl();
gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -62,8 +64,8 @@
colDetail = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
- barCkDrag = new DevExpress.XtraBars.BarCheckItem();
- ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
+ dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)panelControl1).BeginInit();
panelControl1.SuspendLayout();
@@ -72,6 +74,7 @@
((ISupportInitialize)gridView1).BeginInit();
((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
((ISupportInitialize)svgImg32).BeginInit();
+ ((ISupportInitialize)behaviorManager1).BeginInit();
SuspendLayout();
//
// ribbonControl1
@@ -90,7 +93,6 @@
ribbonControl1.Size = new Size(996, 128);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
-
//
// barBtnAdd
//
@@ -158,6 +160,14 @@
barBtnDown.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnDown.ItemClick += barBtnDown_ItemClick;
//
+ // barCkDrag
+ //
+ barCkDrag.Caption = "鎷栨嫿鎺掑簭";
+ barCkDrag.Id = 17;
+ barCkDrag.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDrag.ImageOptions.SvgImage");
+ barCkDrag.Name = "barCkDrag";
+ barCkDrag.CheckedChanged += barCkDrag_CheckedChanged;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGroupForBasic, ribbonPageGroup1, ribPageGroupForMore });
@@ -172,6 +182,14 @@
ribPageGroupForBasic.ItemLinks.Add(barBtnInfo);
ribPageGroupForBasic.Name = "ribPageGroupForBasic";
ribPageGroupForBasic.Text = "鍩虹";
+ //
+ // ribbonPageGroup1
+ //
+ ribbonPageGroup1.ItemLinks.Add(barCkDrag);
+ ribbonPageGroup1.ItemLinks.Add(barBtnUp);
+ ribbonPageGroup1.ItemLinks.Add(barBtnDown);
+ ribbonPageGroup1.Name = "ribbonPageGroup1";
+ ribbonPageGroup1.Text = "鎺掑簭";
//
// ribPageGroupForMore
//
@@ -210,9 +228,11 @@
//
// gridView1
//
+ behaviorManager1.SetBehaviors(gridView1, new DevExpress.Utils.Behaviors.Behavior[] { DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(DevExpress.XtraGrid.Extensions.ColumnViewDragDropSource), true, true, true, true, dragDropEvents1) });
gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMaterial, colCaliber, colCoefficient, colLowerLimit, colSortCode, colDescription, colDetail });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
+ gridView1.RowCellClick += gridView1_RowCellClick;
//
// colID
//
@@ -303,9 +323,9 @@
// repositoryItemButtonEdit1
//
repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage");
- editorButtonImageOptions4.SvgImageSize = new Size(20, 20);
- repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+ editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+ editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
+ repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -314,20 +334,9 @@
svgImg32.ImageSize = new Size(32, 32);
svgImg32.Add("top10percent", "image://svgimages/spreadsheet/top10percent.svg");
//
- // barCkDrag
+ // dragDropEvents1
//
- barCkDrag.Caption = "鎷栨嫿鎺掑簭";
- barCkDrag.Id = 17;
- barCkDrag.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDrag.ImageOptions.SvgImage");
- barCkDrag.Name = "barCkDrag";
- //
- // ribbonPageGroup1
- //
- ribbonPageGroup1.ItemLinks.Add(barCkDrag);
- ribbonPageGroup1.ItemLinks.Add(barBtnUp);
- ribbonPageGroup1.ItemLinks.Add(barBtnDown);
- ribbonPageGroup1.Name = "ribbonPageGroup1";
- ribbonPageGroup1.Text = "鎺掑簭";
+ dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
//
// AssetsCoolingFactorMgrPage
//
@@ -348,6 +357,7 @@
((ISupportInitialize)gridView1).EndInit();
((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
((ISupportInitialize)svgImg32).EndInit();
+ ((ISupportInitialize)behaviorManager1).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -383,5 +393,7 @@
private DevExpress.XtraGrid.Columns.GridColumn colDetail;
private DevExpress.XtraBars.BarCheckItem barCkDrag;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+ private DevExpress.Utils.DragDrop.DragDropEvents dragDropEvents1;
}
}
--
Gitblit v1.9.3