From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
index 3ecf3a0..1040647 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs
@@ -34,8 +34,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();
@@ -46,11 +48,11 @@
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colCode = new DevExpress.XtraGrid.Columns.GridColumn();
colExtendTypeDisPlayName = new DevExpress.XtraGrid.Columns.GridColumn();
- colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
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();
@@ -60,6 +62,7 @@
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImage32).BeginInit();
sidePanel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)behaviorManager1).BeginInit();
SuspendLayout();
//
// ribbonControl1
@@ -67,9 +70,9 @@
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
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 = 17;
+ ribbonControl1.MaxItemId = 19;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -81,7 +84,7 @@
//
// barBtnEditPumpCurve
//
- barBtnEditPumpCurve.Caption = "缂栬緫绫诲瀷";
+ barBtnEditPumpCurve.Caption = "缂栬緫";
barBtnEditPumpCurve.Id = 13;
barBtnEditPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditPumpCurve.ImageOptions.SvgImage");
barBtnEditPumpCurve.Name = "barBtnEditPumpCurve";
@@ -89,7 +92,7 @@
//
// BtnAdd
//
- BtnAdd.Caption = "澧炲姞绫诲瀷";
+ BtnAdd.Caption = "澧炲姞";
BtnAdd.Id = 15;
BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
BtnAdd.Name = "BtnAdd";
@@ -97,15 +100,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 = 18;
+ barCheckSorter.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCheckSorter.ImageOptions.SvgImage");
+ barCheckSorter.Name = "barCheckSorter";
+ barCheckSorter.CheckedChanged += barCheckItem1_CheckedChanged;
+ //
// 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";
//
@@ -117,8 +128,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" });
@@ -172,7 +191,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, colExtendTypeDisPlayName, colSortCode, colDescription });
+ gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colExtendTypeDisPlayName, colDescription });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
@@ -207,16 +227,6 @@
colExtendTypeDisPlayName.Visible = true;
colExtendTypeDisPlayName.VisibleIndex = 2;
//
- // 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 = 3;
- //
// colDescription
//
colDescription.AppearanceCell.Options.UseTextOptions = true;
@@ -225,7 +235,7 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 4;
+ colDescription.VisibleIndex = 3;
//
// barButtonItem1
//
@@ -236,8 +246,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("columntotalsposition", "image://svgimages/dashboards/columntotalsposition.svg");
//
// sidePanel1
//
@@ -271,6 +280,7 @@
((System.ComponentModel.ISupportInitialize)svgImage32).EndInit();
sidePanel1.ResumeLayout(false);
sidePanel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)behaviorManager1).EndInit();
ResumeLayout(false);
}
@@ -291,11 +301,13 @@
private BindingSource typeViewModelBindingSource;
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 SysModuleListBoxCtrl moduleTreeListCtrl1;
private DevExpress.XtraGrid.Columns.GridColumn colExtendTypeDisPlayName;
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