From 1d8832e8e8e862a296f80c18ae2f1dac40419b68 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 29 十月 2024 18:09:01 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs
index 8cb3a8e..bde1fd0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs
@@ -39,8 +39,10 @@
barBtnEditPumpCurve = new DevExpress.XtraBars.BarButtonItem();
BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
+ barCheckSorter = new DevExpress.XtraBars.BarCheckItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
@@ -50,7 +52,6 @@
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colCode = new DevExpress.XtraGrid.Columns.GridColumn();
- colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colDefaultValue = new DevExpress.XtraGrid.Columns.GridColumn();
colFormat = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -61,6 +62,7 @@
barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
svgImage32 = new DevExpress.Utils.SvgImageCollection(components);
sidePanel1 = new DevExpress.XtraEditors.SidePanel();
+ behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
@@ -71,15 +73,16 @@
((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
sidePanel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)behaviorManager1).BeginInit();
SuspendLayout();
//
// ribbonControl1
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEditPumpCurve, BtnAdd, BtnDelete, barCheckSorter });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 19;
+ ribbonControl1.MaxItemId = 20;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -91,7 +94,7 @@
//
// barBtnEditPumpCurve
//
- barBtnEditPumpCurve.Caption = "缂栬緫灞炴��";
+ barBtnEditPumpCurve.Caption = "缂栬緫";
barBtnEditPumpCurve.Id = 13;
barBtnEditPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditPumpCurve.ImageOptions.SvgImage");
barBtnEditPumpCurve.Name = "barBtnEditPumpCurve";
@@ -99,7 +102,7 @@
//
// BtnAdd
//
- BtnAdd.Caption = "澧炲姞灞炴��";
+ BtnAdd.Caption = "澧炲姞";
BtnAdd.Id = 15;
BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
BtnAdd.Name = "BtnAdd";
@@ -107,15 +110,23 @@
//
// BtnDelete
//
- BtnDelete.Caption = "鍒犻櫎灞炴��";
+ BtnDelete.Caption = "鍒犻櫎";
BtnDelete.Id = 16;
BtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDelete.ImageOptions.SvgImage");
BtnDelete.Name = "BtnDelete";
BtnDelete.ItemClick += BtnDelete_ItemClick;
//
+ // barCheckSorter
+ //
+ barCheckSorter.Caption = "鎺掑簭";
+ barCheckSorter.Id = 19;
+ barCheckSorter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCheckSorter.ImageOptions.SvgImage");
+ barCheckSorter.Name = "barCheckSorter";
+ barCheckSorter.ItemClick += barCheckItemSorter_ItemClick;
+ //
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -127,8 +138,16 @@
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "鍩虹鍔熻兘";
//
+ // ribbonPageGroup2
+ //
+ ribbonPageGroup2.ItemLinks.Add(barCheckSorter);
+ ribbonPageGroup2.Name = "ribbonPageGroup2";
+ ribbonPageGroup2.Text = "鏇村";
+ //
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
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" });
@@ -139,6 +158,7 @@
dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanel1.ID = new Guid("20cba9f0-4c76-45ad-a0f6-714fb6b14171");
dockPanel1.Location = new Point(0, 0);
+ dockPanel1.Margin = new Padding(0);
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(200, 200);
dockPanel1.Size = new Size(200, 547);
@@ -183,7 +203,8 @@
//
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colSortCode, colDescription, colDefaultValue, colFormat, colIsNull, colUnitName, ColPropEdit });
+ gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colDescription, colDefaultValue, colFormat, colIsNull, colUnitName, ColPropEdit });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
@@ -198,6 +219,7 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
+ colName.Width = 197;
//
// colCode
//
@@ -208,16 +230,7 @@
colCode.Name = "colCode";
colCode.Visible = true;
colCode.VisibleIndex = 1;
- //
- // colSortCode
- //
- colSortCode.AppearanceCell.Options.UseTextOptions = true;
- colSortCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colSortCode.Caption = "鎺掑簭鐮�";
- colSortCode.FieldName = "SortCode";
- colSortCode.Name = "colSortCode";
- colSortCode.Visible = true;
- colSortCode.VisibleIndex = 6;
+ colCode.Width = 178;
//
// colDescription
//
@@ -227,7 +240,8 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 7;
+ colDescription.VisibleIndex = 6;
+ colDescription.Width = 207;
//
// colDefaultValue
//
@@ -236,6 +250,7 @@
colDefaultValue.Name = "colDefaultValue";
colDefaultValue.Visible = true;
colDefaultValue.VisibleIndex = 2;
+ colDefaultValue.Width = 92;
//
// colFormat
//
@@ -244,6 +259,7 @@
colFormat.Name = "colFormat";
colFormat.Visible = true;
colFormat.VisibleIndex = 3;
+ colFormat.Width = 86;
//
// colIsNull
//
@@ -252,6 +268,7 @@
colIsNull.Name = "colIsNull";
colIsNull.Visible = true;
colIsNull.VisibleIndex = 5;
+ colIsNull.Width = 91;
//
// colUnitName
//
@@ -260,6 +277,7 @@
colUnitName.Name = "colUnitName";
colUnitName.Visible = true;
colUnitName.VisibleIndex = 4;
+ colUnitName.Width = 95;
//
// ColPropEdit
//
@@ -268,7 +286,8 @@
ColPropEdit.Name = "ColPropEdit";
ColPropEdit.OptionsColumn.AllowEdit = false;
ColPropEdit.Visible = true;
- ColPropEdit.VisibleIndex = 8;
+ ColPropEdit.VisibleIndex = 7;
+ ColPropEdit.Width = 62;
//
// repositoryItemButtonEdit1
//
@@ -287,8 +306,7 @@
// svgImage32
//
svgImage32.ImageSize = new Size(32, 32);
- svgImage32.Add("bletter", "image://svgimages/outlook inspired/bletter.svg");
- svgImage32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
+ svgImage32.Add("documentproperties", "image://svgimages/richedit/documentproperties.svg");
//
// sidePanel1
//
@@ -323,6 +341,7 @@
((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
sidePanel1.ResumeLayout(false);
sidePanel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)behaviorManager1).EndInit();
ResumeLayout(false);
}
@@ -342,17 +361,19 @@
private DevExpress.XtraBars.BarButtonItem barButtonItem1;
private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn colCode;
- private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
private BindingSource propViewModelBindingSource;
private DevExpress.XtraGrid.Columns.GridColumn colDefaultValue;
private DevExpress.XtraGrid.Columns.GridColumn colFormat;
private DevExpress.XtraGrid.Columns.GridColumn colIsNull;
private DevExpress.XtraGrid.Columns.GridColumn colUnitName;
- private SysPropGroupTreeListCtrl propGroupTreeListCtrl1;
+ public SysPropGroupTreeListCtrl propGroupTreeListCtrl1;
private DevExpress.XtraGrid.Columns.GridColumn ColPropEdit;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.Utils.SvgImageCollection svgImage32;
private DevExpress.XtraEditors.SidePanel sidePanel1;
+ private DevExpress.XtraBars.BarCheckItem barCheckSorter;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
}
}
--
Gitblit v1.9.3