From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +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/ValveManageMainPanel.Designer.cs | 83 +++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPanel.Designer.cs
index 8e61752..1ed6eb4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveManageMainPanel.Designer.cs
@@ -35,6 +35,7 @@
BtnEdit = new DevExpress.XtraBars.BarButtonItem();
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
BarBtnEidtPumpPart = new DevExpress.XtraBars.BarButtonItem();
+ barBtnValveLine = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
svgImageCollection1 = new DevExpress.Utils.SvgImageCollection(components);
@@ -53,7 +54,7 @@
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
valveTypeTreeListCtrl1 = new ValveTypeTreeListCtrl();
- barBtnValveLine = new DevExpress.XtraBars.BarButtonItem();
+ gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
sidePanel1.SuspendLayout();
@@ -68,15 +69,12 @@
// ribbonControl1
//
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
- ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, BarBtnEidtPumpPart, barBtnValveLine });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.Margin = new Padding(4, 5, 4, 5);
ribbonControl1.MaxItemId = 23;
ribbonControl1.Name = "ribbonControl1";
- ribbonControl1.OptionsMenuMinWidth = 471;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010;
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -84,7 +82,7 @@
ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(985, 148);
+ ribbonControl1.Size = new Size(603, 101);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -118,6 +116,14 @@
BarBtnEidtPumpPart.Id = 16;
BarBtnEidtPumpPart.Name = "BarBtnEidtPumpPart";
//
+ // barBtnValveLine
+ //
+ barBtnValveLine.Caption = "闃�闂ㄦ洸绾�";
+ barBtnValveLine.Id = 22;
+ barBtnValveLine.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnValveLine.ImageOptions.SvgImage");
+ barBtnValveLine.Name = "barBtnValveLine";
+ barBtnValveLine.ItemClick += barBtnValveLine_ItemClick;
+ //
// ribbonPage1
//
ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
@@ -143,10 +149,10 @@
sidePanel1.Controls.Add(gridControl1);
sidePanel1.Controls.Add(ribbonControl1);
sidePanel1.Dock = DockStyle.Fill;
- sidePanel1.Location = new Point(286, 0);
+ sidePanel1.Location = new Point(287, 0);
sidePanel1.Margin = new Padding(0);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(985, 817);
+ sidePanel1.Size = new Size(603, 520);
sidePanel1.TabIndex = 2;
sidePanel1.Text = "sidePanel1";
//
@@ -154,13 +160,11 @@
//
gridControl1.DataSource = valveMainViewModelBindingSource;
gridControl1.Dock = DockStyle.Fill;
- gridControl1.EmbeddedNavigator.Margin = new Padding(4, 5, 4, 5);
- gridControl1.Location = new Point(0, 148);
+ gridControl1.Location = new Point(0, 101);
gridControl1.MainView = gridView1;
- gridControl1.Margin = new Padding(4, 5, 4, 5);
gridControl1.MenuManager = ribbonControl1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(985, 669);
+ gridControl1.Size = new Size(603, 419);
gridControl1.TabIndex = 1;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -173,11 +177,9 @@
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colCoefficient, colDescription, colCreateName, colCreateTime });
- gridView1.DetailHeight = 550;
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colCoefficient, colDescription, colCreateName, colCreateTime, gridColumn1 });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
- gridView1.OptionsEditForm.PopupEditFormWidth = 1143;
gridView1.OptionsView.ShowGroupPanel = false;
//
// colName
@@ -185,77 +187,70 @@
colName.AppearanceCell.Options.UseTextOptions = true;
colName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colName.FieldName = "Name";
- colName.MinWidth = 29;
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 186;
+ colName.Width = 130;
//
// colCaliber
//
colCaliber.AppearanceCell.Options.UseTextOptions = true;
colCaliber.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colCaliber.FieldName = "Caliber";
- colCaliber.MinWidth = 29;
colCaliber.Name = "colCaliber";
colCaliber.Visible = true;
colCaliber.VisibleIndex = 3;
- colCaliber.Width = 186;
+ colCaliber.Width = 130;
//
// colMaterial
//
colMaterial.AppearanceCell.Options.UseTextOptions = true;
colMaterial.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colMaterial.FieldName = "Material";
- colMaterial.MinWidth = 29;
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
colMaterial.VisibleIndex = 4;
- colMaterial.Width = 186;
+ colMaterial.Width = 130;
//
// colCoefficient
//
colCoefficient.AppearanceCell.Options.UseTextOptions = true;
colCoefficient.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colCoefficient.FieldName = "Coefficient";
- colCoefficient.MinWidth = 29;
colCoefficient.Name = "colCoefficient";
colCoefficient.Visible = true;
colCoefficient.VisibleIndex = 5;
- colCoefficient.Width = 186;
+ colCoefficient.Width = 130;
//
// colDescription
//
colDescription.AppearanceCell.Options.UseTextOptions = true;
colDescription.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colDescription.FieldName = "Description";
- colDescription.MinWidth = 29;
colDescription.Name = "colDescription";
colDescription.Visible = true;
colDescription.VisibleIndex = 6;
- colDescription.Width = 283;
+ colDescription.Width = 198;
//
// colCreateName
//
colCreateName.AppearanceCell.Options.UseTextOptions = true;
colCreateName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colCreateName.FieldName = "CreateName";
- colCreateName.MinWidth = 29;
colCreateName.Name = "colCreateName";
colCreateName.Visible = true;
colCreateName.VisibleIndex = 1;
- colCreateName.Width = 186;
+ colCreateName.Width = 130;
//
// colCreateTime
//
colCreateTime.AppearanceCell.Options.UseTextOptions = true;
colCreateTime.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colCreateTime.FieldName = "CreateTime";
- colCreateTime.MinWidth = 29;
colCreateTime.Name = "colCreateTime";
colCreateTime.Visible = true;
colCreateTime.VisibleIndex = 2;
- colCreateTime.Width = 186;
+ colCreateTime.Width = 130;
//
// dockManager1
//
@@ -271,19 +266,17 @@
dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanel1.ID = new Guid("47edc533-9291-45bc-9b49-4f9f530da5d3");
dockPanel1.Location = new Point(0, 0);
- dockPanel1.Margin = new Padding(4, 5, 4, 5);
dockPanel1.Name = "dockPanel1";
- dockPanel1.OriginalSize = new Size(200, 200);
- dockPanel1.Size = new Size(286, 817);
+ dockPanel1.OriginalSize = new Size(287, 200);
+ dockPanel1.Size = new Size(287, 520);
dockPanel1.Text = "闃�闂ㄧ被鍨�";
//
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(valveTypeTreeListCtrl1);
- dockPanel1_Container.Location = new Point(4, 38);
- dockPanel1_Container.Margin = new Padding(4, 5, 4, 5);
+ dockPanel1_Container.Location = new Point(3, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(275, 775);
+ dockPanel1_Container.Size = new Size(280, 491);
dockPanel1_Container.TabIndex = 0;
//
// valveTypeTreeListCtrl1
@@ -292,30 +285,29 @@
valveTypeTreeListCtrl1.Appearance.Options.UseBackColor = true;
valveTypeTreeListCtrl1.Dock = DockStyle.Fill;
valveTypeTreeListCtrl1.Location = new Point(0, 0);
- valveTypeTreeListCtrl1.Margin = new Padding(6, 8, 6, 8);
+ valveTypeTreeListCtrl1.Margin = new Padding(4, 5, 4, 5);
valveTypeTreeListCtrl1.Name = "valveTypeTreeListCtrl1";
- valveTypeTreeListCtrl1.Size = new Size(275, 775);
+ valveTypeTreeListCtrl1.Size = new Size(280, 491);
valveTypeTreeListCtrl1.TabIndex = 0;
//
- // barBtnValveLine
+ // gridColumn1
//
- barBtnValveLine.Caption = "闃�闂ㄦ洸绾�";
- barBtnValveLine.Id = 22;
- barBtnValveLine.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnValveLine.ImageOptions.SvgImage");
- barBtnValveLine.Name = "barBtnValveLine";
- barBtnValveLine.ItemClick += barBtnValveLine_ItemClick;
+ gridColumn1.Caption = "闃�闂ㄧ姸鎬�";
+ gridColumn1.Name = "gridColumn1";
+ gridColumn1.Visible = true;
+ gridColumn1.VisibleIndex = 7;
//
// ValveManageMainPanel
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(10F, 22F);
+ AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(sidePanel1);
Controls.Add(dockPanel1);
- Margin = new Padding(6, 8, 6, 8);
+ Margin = new Padding(4, 5, 4, 5);
Name = "ValveManageMainPanel";
- Size = new Size(1271, 817);
+ Size = new Size(890, 520);
((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
((System.ComponentModel.ISupportInitialize)svgImageCollection1).EndInit();
sidePanel1.ResumeLayout(false);
@@ -355,5 +347,6 @@
private DevExpress.XtraGrid.Columns.GridColumn colCreateName;
private DevExpress.XtraGrid.Columns.GridColumn colCreateTime;
private DevExpress.XtraBars.BarButtonItem barBtnValveLine;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
--
Gitblit v1.9.3