From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 d4cbf25..ff728ac 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.Designer.cs
@@ -82,7 +82,7 @@
//
// ribbonControl1
//
- ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
+ ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, barBtnEditPumpCurve, BarBtnEidtPumpPart, barButtonItem1, BarBtnPumpinformation, BarBtnEidtPumpProp, BtnDeleteAssetsPumpSeries });
@@ -94,7 +94,7 @@
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
- ribbonControl1.Size = new Size(713, 101);
+ ribbonControl1.Size = new Size(752, 77);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// BtnAdd
@@ -179,9 +179,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.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
@@ -193,8 +195,8 @@
dockPanel1.Margin = new Padding(0);
dockPanel1.Name = "dockPanel1";
dockPanel1.Options.ShowAutoHideButton = false;
- dockPanel1.OriginalSize = new Size(202, 200);
- dockPanel1.Size = new Size(202, 526);
+ dockPanel1.OriginalSize = new Size(233, 200);
+ dockPanel1.Size = new Size(163, 526);
dockPanel1.Text = "姘存车绯诲垪";
//
// dockPanel1_Container
@@ -202,7 +204,7 @@
dockPanel1_Container.Controls.Add(AssetsPumpSeriesTreeListCtrl1);
dockPanel1_Container.Location = new Point(3, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(195, 497);
+ dockPanel1_Container.Size = new Size(156, 497);
dockPanel1_Container.TabIndex = 0;
//
// AssetsPumpSeriesTreeListCtrl1
@@ -213,18 +215,18 @@
AssetsPumpSeriesTreeListCtrl1.Location = new Point(0, 0);
AssetsPumpSeriesTreeListCtrl1.Margin = new Padding(4, 5, 4, 5);
AssetsPumpSeriesTreeListCtrl1.Name = "AssetsPumpSeriesTreeListCtrl1";
- AssetsPumpSeriesTreeListCtrl1.Size = new Size(195, 497);
+ AssetsPumpSeriesTreeListCtrl1.Size = new Size(156, 497);
AssetsPumpSeriesTreeListCtrl1.TabIndex = 0;
//
// gridControl1
//
gridControl1.DataSource = currentViewModelBindingSource;
gridControl1.Dock = DockStyle.Fill;
- gridControl1.Location = new Point(0, 101);
+ gridControl1.Location = new Point(0, 77);
gridControl1.MainView = gridView1;
gridControl1.MenuManager = ribbonControl1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(713, 425);
+ gridControl1.Size = new Size(752, 449);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -355,10 +357,10 @@
//
layoutControl1.Controls.Add(sidePanel1);
layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(202, 0);
+ layoutControl1.Location = new Point(163, 0);
layoutControl1.Name = "layoutControl1";
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(713, 526);
+ layoutControl1.Size = new Size(752, 526);
layoutControl1.TabIndex = 6;
layoutControl1.Text = "layoutControl1";
//
@@ -368,7 +370,7 @@
sidePanel1.Controls.Add(ribbonControl1);
sidePanel1.Location = new Point(0, 0);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(713, 526);
+ sidePanel1.Size = new Size(752, 526);
sidePanel1.TabIndex = 3;
sidePanel1.Text = "sidePanel1";
//
@@ -379,7 +381,7 @@
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(713, 526);
+ Root.Size = new Size(752, 526);
Root.TextVisible = false;
//
// layoutControlItem1
@@ -388,7 +390,7 @@
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem1.Size = new Size(713, 526);
+ layoutControlItem1.Size = new Size(752, 526);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
@@ -413,7 +415,7 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
Controls.Add(dockPanel1);
- Margin = new Padding(2);
+ Margin = new Padding(2, 2, 2, 2);
Name = "PumpProductMainPage";
Size = new Size(915, 526);
((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
--
Gitblit v1.9.3