From facdda630bc2a16c2a61e5db6e4387e257202d44 Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期三, 15 一月 2025 11:40:38 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs index 44cb2cf..a8e0e36 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/04-chart-edit/XhsValveMainPhartMinorLossPanel.Designer.cs @@ -34,8 +34,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(XhsValveMainPhartMinorLossPanel)); xtrPerform2dChart1 = new Yw.WinFrmUI.Phart.ValveViewChart(); sidePanel2 = new SidePanel(); - xhsValveMainPhartListCtrl1 = new XhsValveMainPhartListCtrl(); - ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); + ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); BtnAdd = new DevExpress.XtraBars.BarButtonItem(); barBtnImportByExcel = new DevExpress.XtraBars.BarButtonItem(); barBtnDelete = new DevExpress.XtraBars.BarButtonItem(); @@ -60,33 +59,25 @@ xtrPerform2dChart1.DefinePointVisible = false; xtrPerform2dChart1.Dock = DockStyle.Fill; xtrPerform2dChart1.LineVisible = false; - xtrPerform2dChart1.Location = new Point(164, 101); - xtrPerform2dChart1.Margin = new Padding(1, 1, 1, 1); + xtrPerform2dChart1.Location = new Point(0, 101); + xtrPerform2dChart1.Margin = new Padding(1); xtrPerform2dChart1.Name = "xtrPerform2dChart1"; - xtrPerform2dChart1.Size = new Size(578, 411); + xtrPerform2dChart1.Size = new Size(742, 411); xtrPerform2dChart1.TabIndex = 1; // // sidePanel2 // - sidePanel2.Controls.Add(xhsValveMainPhartListCtrl1); - sidePanel2.Dock = DockStyle.Fill; + sidePanel2.Dock = DockStyle.Fill; sidePanel2.Location = new Point(0, 0); - sidePanel2.Margin = new Padding(2, 2, 2, 2); + sidePanel2.Margin = new Padding(2); sidePanel2.Name = "sidePanel2"; - sidePanel2.Size = new Size(163, 388); + sidePanel2.Size = new Size(234, 388); sidePanel2.TabIndex = 4; sidePanel2.Text = "sidePanel2"; // // xhsValveMainPhartListCtrl1 // - xhsValveMainPhartListCtrl1.Appearance.BackColor = SystemColors.Control; - xhsValveMainPhartListCtrl1.Appearance.Options.UseBackColor = true; - xhsValveMainPhartListCtrl1.Dock = DockStyle.Fill; - xhsValveMainPhartListCtrl1.Location = new Point(0, 0); - xhsValveMainPhartListCtrl1.Name = "xhsValveMainPhartListCtrl1"; - xhsValveMainPhartListCtrl1.Size = new Size(163, 388); - xhsValveMainPhartListCtrl1.TabIndex = 0; - // + // // ribbonControl1 // ribbonControl1.ExpandCollapseItem.Id = 0; @@ -132,6 +123,7 @@ barBtnUpdateimportance.Id = 29; barBtnUpdateimportance.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateimportance.ImageOptions.SvgImage"); barBtnUpdateimportance.Name = "barBtnUpdateimportance"; + barBtnUpdateimportance.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnUpdateimportance.ItemClick += barBtnUpdateimportance_ItemClick; // // barBtnOtherName @@ -140,6 +132,7 @@ barBtnOtherName.Id = 30; barBtnOtherName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnOtherName.ImageOptions.SvgImage"); barBtnOtherName.Name = "barBtnOtherName"; + barBtnOtherName.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnOtherName.ItemClick += barBtnOtherName_ItemClick; // // barBtnEditChart @@ -148,6 +141,7 @@ barBtnEditChart.Id = 31; barBtnEditChart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditChart.ImageOptions.SvgImage"); barBtnEditChart.Name = "barBtnEditChart"; + barBtnEditChart.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnEditChart.ItemClick += barBtnEditChart_ItemClick; // // ribbonPage1 @@ -175,7 +169,7 @@ // dockManager1.DockingOptions.ShowCloseButton = false; dockManager1.Form = this; - dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 }); + dockManager1.HiddenPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 }); dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light; 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" }); // @@ -184,20 +178,23 @@ dockPanel1.Controls.Add(dockPanel1_Container); dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left; dockPanel1.ID = new Guid("202c2203-fb3a-4b47-a9cb-083c698bd2ac"); - dockPanel1.Location = new Point(0, 101); - dockPanel1.Margin = new Padding(2, 2, 2, 2); + dockPanel1.Location = new Point(0, 0); + dockPanel1.Margin = new Padding(2); dockPanel1.Name = "dockPanel1"; dockPanel1.OriginalSize = new Size(235, 200); - dockPanel1.Size = new Size(164, 411); + dockPanel1.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Left; + dockPanel1.SavedIndex = 0; + dockPanel1.Size = new Size(235, 411); dockPanel1.Text = "鏇茬嚎鍒楄〃"; + dockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden; // // dockPanel1_Container // dockPanel1_Container.Controls.Add(sidePanel2); dockPanel1_Container.Location = new Point(0, 23); - dockPanel1_Container.Margin = new Padding(2, 2, 2, 2); + dockPanel1_Container.Margin = new Padding(2); dockPanel1_Container.Name = "dockPanel1_Container"; - dockPanel1_Container.Size = new Size(163, 388); + dockPanel1_Container.Size = new Size(234, 388); dockPanel1_Container.TabIndex = 0; // // XhsValveMainPhartMinorLossPanel @@ -207,7 +204,6 @@ AutoScaleDimensions = new SizeF(7F, 14F); AutoScaleMode = AutoScaleMode.Font; Controls.Add(xtrPerform2dChart1); - Controls.Add(dockPanel1); Controls.Add(ribbonControl1); Margin = new Padding(4, 5, 4, 5); Name = "XhsValveMainPhartMinorLossPanel"; @@ -237,6 +233,6 @@ private DevExpress.XtraBars.BarButtonItem barBtnUpdateimportance; private DevExpress.XtraBars.BarButtonItem barBtnOtherName; private DevExpress.XtraBars.BarButtonItem barBtnEditChart; - private XhsValveMainPhartListCtrl xhsValveMainPhartListCtrl1; + // private XhsValveMainPhartListCtrl xhsValveMainPhartListCtrl1; } } -- Gitblit v1.9.3