From 5d8b95b69c1bf800f2a2ebee62c6f7181c0bd7c8 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 27 十一月 2024 16:35:46 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs
index 879d8b1..b02c353 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs
@@ -182,10 +182,11 @@
//
// dockManager1
//
+ dockManager1.AllowGlyphSkinning = true;
dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
- dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
+ dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Classic;
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
//
// dockPanel1
@@ -204,10 +205,10 @@
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(AssetsPumpSeriesTreeListCtrl1);
- dockPanel1_Container.Location = new Point(0, 34);
+ dockPanel1_Container.Location = new Point(4, 38);
dockPanel1_Container.Margin = new Padding(4, 5, 4, 5);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(201, 793);
+ dockPanel1_Container.Size = new Size(191, 785);
dockPanel1_Container.TabIndex = 0;
//
// AssetsPumpSeriesTreeListCtrl1
@@ -218,7 +219,7 @@
AssetsPumpSeriesTreeListCtrl1.Location = new Point(0, 0);
AssetsPumpSeriesTreeListCtrl1.Margin = new Padding(6, 8, 6, 8);
AssetsPumpSeriesTreeListCtrl1.Name = "AssetsPumpSeriesTreeListCtrl1";
- AssetsPumpSeriesTreeListCtrl1.Size = new Size(201, 793);
+ AssetsPumpSeriesTreeListCtrl1.Size = new Size(191, 785);
AssetsPumpSeriesTreeListCtrl1.TabIndex = 0;
//
// gridControl1
--
Gitblit v1.9.3