From d2f89d47afad3f3fe2f4266658b25f5baa101ea3 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:57:42 +0800
Subject: [PATCH] 接口冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/01-pump/SetSchemePumpListCtrl.Designer.cs | 218 +++++++++++++++--------------------------------------
1 files changed, 63 insertions(+), 155 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/01-pump/SetSchemePumpListCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/01-pump/SetSchemePumpListCtrl.Designer.cs
index 4982ecd..0b8803f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/01-pump/SetSchemePumpListCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/01-pump/SetSchemePumpListCtrl.Designer.cs
@@ -29,27 +29,12 @@
private void InitializeComponent()
{
components = new Container();
- EditorButtonImageOptions editorButtonImageOptions3 = new EditorButtonImageOptions();
+ EditorButtonImageOptions editorButtonImageOptions1 = new EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(SetSchemePumpListCtrl));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- EditorButtonImageOptions editorButtonImageOptions4 = new EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- EditorButtonImageOptions editorButtonImageOptions8 = new EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
- EditorButtonImageOptions editorButtonImageOptions6 = new EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
gridControl1 = new DevExpress.XtraGrid.GridControl();
hydroPumpViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -72,22 +57,19 @@
colCalcuE = new DevExpress.XtraGrid.Columns.GridColumn();
colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
- colSet = new DevExpress.XtraGrid.Columns.GridColumn();
+ colSelect = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ generalSearchAndSelectCtrl1 = new GeneralSearchAndSelectCtrl();
txtName = new TextEdit();
txtModelType = new TextEdit();
txtCode = new TextEdit();
- buttonEditSearch = new ButtonEdit();
- buttonEditSet = new ButtonEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
groupForHead = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)hydroPumpViewModelBindingSource).BeginInit();
@@ -98,16 +80,12 @@
((ISupportInitialize)txtName.Properties).BeginInit();
((ISupportInitialize)txtModelType.Properties).BeginInit();
((ISupportInitialize)txtCode.Properties).BeginInit();
- ((ISupportInitialize)buttonEditSearch.Properties).BeginInit();
- ((ISupportInitialize)buttonEditSet.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)groupForHead).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)layoutControlItem5).BeginInit();
- ((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
SuspendLayout();
//
@@ -115,12 +93,12 @@
//
gridControl1.DataSource = hydroPumpViewModelBindingSource;
gridControl1.EmbeddedNavigator.Margin = new Padding(6, 8, 6, 8);
- gridControl1.Location = new Point(0, 51);
+ gridControl1.Location = new Point(0, 55);
gridControl1.MainView = gridView1;
gridControl1.Margin = new Padding(4, 5, 4, 5);
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
- gridControl1.Size = new Size(1200, 349);
+ gridControl1.Size = new Size(1200, 345);
gridControl1.TabIndex = 6;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -130,7 +108,7 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colLinkStatus, colRatedP, colRatedQ, colRatedH, colRatedN, colRatedHz, colCurrentHz, colCurve, colCalcuQ, colCalcuH, colCalcuP, colCalcuE, colFlags, colDescription, colSet });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colLinkStatus, colRatedP, colRatedQ, colRatedH, colRatedN, colRatedHz, colCurrentHz, colCurve, colCalcuQ, colCalcuH, colCalcuP, colCalcuE, colFlags, colDescription, colSelect });
gridView1.DetailHeight = 550;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
@@ -300,35 +278,34 @@
colDescription.Name = "colDescription";
colDescription.Width = 143;
//
- // colSet
+ // colSelect
//
- colSet.Caption = "璁剧疆";
- colSet.ColumnEdit = repositoryItemButtonEdit1;
- colSet.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
- colSet.MaxWidth = 86;
- colSet.MinWidth = 86;
- colSet.Name = "colSet";
- colSet.Visible = true;
- colSet.VisibleIndex = 7;
- colSet.Width = 86;
+ colSelect.Caption = "閫夋嫨";
+ colSelect.ColumnEdit = repositoryItemButtonEdit1;
+ colSelect.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colSelect.MaxWidth = 86;
+ colSelect.MinWidth = 86;
+ colSelect.Name = "colSelect";
+ colSelect.Visible = true;
+ colSelect.VisibleIndex = 7;
+ colSelect.Width = 86;
//
// repositoryItemButtonEdit1
//
repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions3.SvgImage");
- editorButtonImageOptions3.SvgImageSize = new Size(20, 20);
- repositoryItemButtonEdit1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+ editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+ editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
+ repositoryItemButtonEdit1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = TextEditStyles.HideTextEditor;
//
// layoutControl1
//
+ layoutControl1.Controls.Add(generalSearchAndSelectCtrl1);
layoutControl1.Controls.Add(gridControl1);
layoutControl1.Controls.Add(txtName);
layoutControl1.Controls.Add(txtModelType);
layoutControl1.Controls.Add(txtCode);
- layoutControl1.Controls.Add(buttonEditSearch);
- layoutControl1.Controls.Add(buttonEditSet);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Margin = new Padding(4, 5, 4, 5);
@@ -339,74 +316,39 @@
layoutControl1.TabIndex = 3;
layoutControl1.Text = "layoutControl1";
//
+ // generalSearchAndSelectCtrl1
+ //
+ generalSearchAndSelectCtrl1.Location = new Point(603, 9);
+ generalSearchAndSelectCtrl1.Name = "generalSearchAndSelectCtrl1";
+ generalSearchAndSelectCtrl1.Size = new Size(594, 37);
+ generalSearchAndSelectCtrl1.TabIndex = 8;
+ //
// txtName
//
- txtName.Location = new Point(57, 9);
+ txtName.Location = new Point(57, 13);
txtName.Margin = new Padding(4, 5, 4, 5);
txtName.Name = "txtName";
- txtName.Properties.AutoHeight = false;
- txtName.Size = new Size(142, 33);
+ txtName.Size = new Size(142, 28);
txtName.StyleController = layoutControl1;
txtName.TabIndex = 0;
//
// txtModelType
//
- txtModelType.Location = new Point(257, 9);
+ txtModelType.Location = new Point(257, 13);
txtModelType.Margin = new Padding(4, 5, 4, 5);
txtModelType.Name = "txtModelType";
- txtModelType.Properties.AutoHeight = false;
- txtModelType.Size = new Size(142, 33);
+ txtModelType.Size = new Size(142, 28);
txtModelType.StyleController = layoutControl1;
txtModelType.TabIndex = 3;
//
// txtCode
//
- txtCode.Location = new Point(457, 9);
+ txtCode.Location = new Point(457, 13);
txtCode.Margin = new Padding(4, 5, 4, 5);
txtCode.Name = "txtCode";
- txtCode.Properties.AutoHeight = false;
- txtCode.Size = new Size(142, 33);
+ txtCode.Size = new Size(142, 28);
txtCode.StyleController = layoutControl1;
txtCode.TabIndex = 2;
- //
- // buttonEditSearch
- //
- buttonEditSearch.Location = new Point(603, 9);
- buttonEditSearch.Name = "buttonEditSearch";
- buttonEditSearch.Properties.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
- buttonEditSearch.Properties.AllowHtmlDraw = DevExpress.Utils.DefaultBoolean.False;
- buttonEditSearch.Properties.BeepOnError = true;
- editorButtonImageOptions4.EnableTransparency = false;
- editorButtonImageOptions4.Location = ImageLocation.MiddleLeft;
- editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage");
- editorButtonImageOptions4.SvgImageSize = new Size(14, 14);
- editorButtonImageOptions8.EnableTransparency = false;
- editorButtonImageOptions8.Location = ImageLocation.MiddleLeft;
- editorButtonImageOptions8.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions8.SvgImage");
- editorButtonImageOptions8.SvgImageSize = new Size(14, 14);
- buttonEditSearch.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "鎼滅储", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "鎼滅储", "Search", null, DevExpress.Utils.ToolTipAnchor.Default), new EditorButton(ButtonPredefines.Glyph, "娓呯┖", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "娓呯┖", "Clear", null, DevExpress.Utils.ToolTipAnchor.Default) });
- buttonEditSearch.Properties.ContextImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
- buttonEditSearch.Properties.TextEditStyle = TextEditStyles.HideTextEditor;
- buttonEditSearch.Properties.UseMaskAsDisplayFormat = true;
- buttonEditSearch.Size = new Size(170, 33);
- buttonEditSearch.StyleController = layoutControl1;
- buttonEditSearch.TabIndex = 4;
- buttonEditSearch.ButtonClick += buttonEditSearch_ButtonClick;
- //
- // buttonEditSet
- //
- buttonEditSet.Location = new Point(1095, 9);
- buttonEditSet.Name = "buttonEditSet";
- editorButtonImageOptions6.EnableTransparency = false;
- editorButtonImageOptions6.Location = ImageLocation.MiddleLeft;
- editorButtonImageOptions6.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions6.SvgImage");
- editorButtonImageOptions6.SvgImageSize = new Size(14, 14);
- buttonEditSet.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "璁剧疆", -1, true, true, true, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", "Set", null, DevExpress.Utils.ToolTipAnchor.Default) });
- buttonEditSet.Properties.TextEditStyle = TextEditStyles.HideTextEditor;
- buttonEditSet.Size = new Size(102, 33);
- buttonEditSet.StyleController = layoutControl1;
- buttonEditSet.TabIndex = 5;
- buttonEditSet.ButtonClick += buttonEditSet_ButtonClick;
//
// Root
//
@@ -423,11 +365,11 @@
// groupForHead
//
groupForHead.GroupStyle = DevExpress.Utils.GroupStyle.Title;
- groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem3, layoutControlItem5, layoutControlItem6, emptySpaceItem1, layoutControlItem2 });
+ groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem3, layoutControlItem2, layoutControlItem5 });
groupForHead.Location = new Point(0, 0);
groupForHead.Name = "groupForHead";
groupForHead.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 6, 6);
- groupForHead.Size = new Size(1200, 51);
+ groupForHead.Size = new Size(1200, 55);
groupForHead.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
groupForHead.Text = "鏌ヨ鏉′欢";
groupForHead.TextVisible = false;
@@ -435,81 +377,54 @@
// layoutControlItem4
//
layoutControlItem4.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
+ layoutControlItem4.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
layoutControlItem4.Control = txtName;
layoutControlItem4.Location = new Point(0, 0);
- layoutControlItem4.MaxSize = new Size(200, 0);
- layoutControlItem4.MinSize = new Size(200, 32);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(200, 37);
- layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ layoutControlItem4.Size = new Size(200, 41);
layoutControlItem4.Text = "鍚嶇О:";
layoutControlItem4.TextSize = new Size(42, 22);
//
// layoutControlItem3
//
layoutControlItem3.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
+ layoutControlItem3.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
layoutControlItem3.Control = txtModelType;
layoutControlItem3.Location = new Point(200, 0);
- layoutControlItem3.MaxSize = new Size(200, 0);
- layoutControlItem3.MinSize = new Size(200, 32);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(200, 37);
- layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ layoutControlItem3.Size = new Size(200, 41);
layoutControlItem3.Text = "鍨嬪彿:";
layoutControlItem3.TextSize = new Size(42, 22);
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = buttonEditSearch;
- layoutControlItem5.Location = new Point(600, 0);
- layoutControlItem5.MaxSize = new Size(174, 37);
- layoutControlItem5.MinSize = new Size(174, 37);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(174, 37);
- layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem5.TextSize = new Size(0, 0);
- layoutControlItem5.TextVisible = false;
- //
- // layoutControlItem6
- //
- layoutControlItem6.Control = buttonEditSet;
- layoutControlItem6.Location = new Point(1092, 0);
- layoutControlItem6.MaxSize = new Size(106, 37);
- layoutControlItem6.MinSize = new Size(106, 37);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(106, 37);
- layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem6.TextSize = new Size(0, 0);
- layoutControlItem6.TextVisible = false;
- //
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(774, 0);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(318, 37);
- emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem2
//
layoutControlItem2.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
+ layoutControlItem2.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
layoutControlItem2.Control = txtCode;
layoutControlItem2.Location = new Point(400, 0);
- layoutControlItem2.MaxSize = new Size(200, 0);
- layoutControlItem2.MinSize = new Size(200, 32);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(200, 37);
- layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ layoutControlItem2.Size = new Size(200, 41);
layoutControlItem2.Text = "缂栫爜:";
layoutControlItem2.TextSize = new Size(42, 22);
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
+ layoutControlItem5.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
+ layoutControlItem5.Control = generalSearchAndSelectCtrl1;
+ layoutControlItem5.Location = new Point(600, 0);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(598, 41);
+ layoutControlItem5.TextSize = new Size(0, 0);
+ layoutControlItem5.TextVisible = false;
//
// layoutControlItem1
//
layoutControlItem1.Control = gridControl1;
- layoutControlItem1.Location = new Point(0, 51);
+ layoutControlItem1.Location = new Point(0, 55);
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem1.Size = new Size(1200, 349);
+ layoutControlItem1.Size = new Size(1200, 345);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
@@ -530,16 +445,12 @@
((ISupportInitialize)txtName.Properties).EndInit();
((ISupportInitialize)txtModelType.Properties).EndInit();
((ISupportInitialize)txtCode.Properties).EndInit();
- ((ISupportInitialize)buttonEditSearch.Properties).EndInit();
- ((ISupportInitialize)buttonEditSet.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)groupForHead).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)layoutControlItem5).EndInit();
- ((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
ResumeLayout(false);
}
@@ -575,15 +486,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraGrid.Columns.GridColumn colFlags;
- private DevExpress.XtraGrid.Columns.GridColumn colSet;
+ private DevExpress.XtraGrid.Columns.GridColumn colSelect;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn colCurve;
- private ButtonEdit buttonEditSearch;
+ private GeneralSearchAndSelectCtrl generalSearchAndSelectCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private ButtonEdit buttonEditSet;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
}
}
--
Gitblit v1.9.3