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/03-pipe/SetSchemePipeListCtrl.Designer.cs | 203 +++++++++++++-------------------------------------
1 files changed, 53 insertions(+), 150 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.Designer.cs
index e5baced..1b87fc5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/01-set/03-pipe/SetSchemePipeListCtrl.Designer.cs
@@ -29,27 +29,12 @@
private void InitializeComponent()
{
components = new Container();
- EditorButtonImageOptions editorButtonImageOptions5 = new EditorButtonImageOptions();
+ EditorButtonImageOptions editorButtonImageOptions1 = new EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(SetSchemePipeListCtrl));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = 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();
- EditorButtonImageOptions editorButtonImageOptions2 = new EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- EditorButtonImageOptions editorButtonImageOptions7 = new EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = 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();
hydroPipeViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -69,11 +54,10 @@
colCalcuHeadLoss = 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();
- buttonEditSet = new ButtonEdit();
- buttonEditSearch = new ButtonEdit();
+ generalSearchAndSelectCtrl1 = new GeneralSearchAndSelectCtrl();
imgCmbLinkStatus = new ImageComboBoxEdit();
txtName = new TextEdit();
txtModelType = new TextEdit();
@@ -85,8 +69,6 @@
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)hydroPipeViewModelBindingSource).BeginInit();
@@ -94,8 +76,6 @@
((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
- ((ISupportInitialize)buttonEditSet.Properties).BeginInit();
- ((ISupportInitialize)buttonEditSearch.Properties).BeginInit();
((ISupportInitialize)imgCmbLinkStatus.Properties).BeginInit();
((ISupportInitialize)txtName.Properties).BeginInit();
((ISupportInitialize)txtModelType.Properties).BeginInit();
@@ -107,8 +87,6 @@
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem5).BeginInit();
- ((ISupportInitialize)emptySpaceItem2).BeginInit();
((ISupportInitialize)layoutControlItem9).BeginInit();
SuspendLayout();
//
@@ -116,12 +94,12 @@
//
gridControl1.DataSource = hydroPipeViewModelBindingSource;
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 = 7;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -131,7 +109,7 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colLinkStatus, colDiameter, colLength, colMaterial, colRoughness, colMinorLoss, colCalcuFlow, colCalcuVelocity, colCalcuHeadLoss, colFlags, colDescription, colSet });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colLinkStatus, colDiameter, colLength, colMaterial, colRoughness, colMinorLoss, colCalcuFlow, colCalcuVelocity, colCalcuHeadLoss, colFlags, colDescription, colSelect });
gridView1.DetailHeight = 550;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
@@ -279,31 +257,30 @@
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;
- editorButtonImageOptions5.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions5.SvgImage");
- editorButtonImageOptions5.SvgImageSize = new Size(20, 20);
- repositoryItemButtonEdit1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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, true, 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(buttonEditSet);
- layoutControl1.Controls.Add(buttonEditSearch);
+ layoutControl1.Controls.Add(generalSearchAndSelectCtrl1);
layoutControl1.Controls.Add(gridControl1);
layoutControl1.Controls.Add(imgCmbLinkStatus);
layoutControl1.Controls.Add(txtName);
@@ -319,79 +296,43 @@
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
- // buttonEditSet
+ // generalSearchAndSelectCtrl1
//
- 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 = 6;
- buttonEditSet.ButtonClick += buttonEditSet_ButtonClick;
- //
- // buttonEditSearch
- //
- buttonEditSearch.Location = new Point(803, 9);
- buttonEditSearch.Name = "buttonEditSearch";
- buttonEditSearch.Properties.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
- buttonEditSearch.Properties.AllowHtmlDraw = DevExpress.Utils.DefaultBoolean.False;
- buttonEditSearch.Properties.BeepOnError = true;
- editorButtonImageOptions2.EnableTransparency = false;
- editorButtonImageOptions2.Location = ImageLocation.MiddleLeft;
- editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
- editorButtonImageOptions2.SvgImageSize = new Size(14, 14);
- editorButtonImageOptions7.EnableTransparency = false;
- editorButtonImageOptions7.Location = ImageLocation.MiddleLeft;
- editorButtonImageOptions7.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions7.SvgImage");
- editorButtonImageOptions7.SvgImageSize = new Size(14, 14);
- buttonEditSearch.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "鎼滅储", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "鎼滅储", "Search", null, DevExpress.Utils.ToolTipAnchor.Default), new EditorButton(ButtonPredefines.Glyph, "娓呯┖", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "娓呯┖", "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 = 5;
- buttonEditSearch.ButtonClick += buttonEditSearch_ButtonClick;
+ generalSearchAndSelectCtrl1.Location = new Point(803, 9);
+ generalSearchAndSelectCtrl1.Name = "generalSearchAndSelectCtrl1";
+ generalSearchAndSelectCtrl1.Size = new Size(394, 37);
+ generalSearchAndSelectCtrl1.TabIndex = 9;
//
// imgCmbLinkStatus
//
- imgCmbLinkStatus.Location = new Point(657, 9);
+ imgCmbLinkStatus.Location = new Point(657, 13);
imgCmbLinkStatus.Name = "imgCmbLinkStatus";
- imgCmbLinkStatus.Properties.AutoHeight = false;
imgCmbLinkStatus.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
- imgCmbLinkStatus.Size = new Size(142, 33);
+ imgCmbLinkStatus.Size = new Size(142, 28);
imgCmbLinkStatus.StyleController = layoutControl1;
imgCmbLinkStatus.TabIndex = 4;
//
// txtName
//
- txtName.Location = new Point(57, 9);
+ txtName.Location = new Point(57, 13);
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(457, 9);
+ txtModelType.Location = new Point(457, 13);
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(257, 9);
+ txtCode.Location = new Point(257, 13);
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;
//
@@ -410,106 +351,75 @@
// groupForHead
//
groupForHead.GroupStyle = DevExpress.Utils.GroupStyle.Title;
- groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, layoutControlItem8, layoutControlItem1, layoutControlItem5, emptySpaceItem2 });
+ groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, layoutControlItem8, layoutControlItem1 });
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;
//
// 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, 37);
- layoutControlItem4.MinSize = new Size(200, 37);
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);
//
// layoutControlItem2
//
+ layoutControlItem2.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
layoutControlItem2.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
layoutControlItem2.Control = txtCode;
layoutControlItem2.Location = new Point(200, 0);
- layoutControlItem2.MaxSize = new Size(200, 37);
- layoutControlItem2.MinSize = new Size(200, 37);
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);
//
// layoutControlItem3
//
+ layoutControlItem3.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
layoutControlItem3.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
layoutControlItem3.Control = txtModelType;
layoutControlItem3.Location = new Point(400, 0);
- layoutControlItem3.MaxSize = new Size(200, 37);
- layoutControlItem3.MinSize = new Size(200, 37);
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);
//
// layoutControlItem8
//
+ layoutControlItem8.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
layoutControlItem8.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
layoutControlItem8.Control = imgCmbLinkStatus;
layoutControlItem8.Location = new Point(600, 0);
- layoutControlItem8.MaxSize = new Size(200, 37);
- layoutControlItem8.MinSize = new Size(200, 37);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(200, 37);
- layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ layoutControlItem8.Size = new Size(200, 41);
layoutControlItem8.Text = "鐘舵��:";
layoutControlItem8.TextSize = new Size(42, 22);
//
// layoutControlItem1
//
- layoutControlItem1.Control = buttonEditSearch;
+ layoutControlItem1.Control = generalSearchAndSelectCtrl1;
layoutControlItem1.Location = new Point(800, 0);
- layoutControlItem1.MaxSize = new Size(174, 37);
- layoutControlItem1.MinSize = new Size(174, 37);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(174, 37);
- layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ layoutControlItem1.Size = new Size(398, 41);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = buttonEditSet;
- layoutControlItem5.Location = new Point(1092, 0);
- layoutControlItem5.MaxSize = new Size(106, 37);
- layoutControlItem5.MinSize = new Size(106, 37);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(106, 37);
- layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlItem5.TextSize = new Size(0, 0);
- layoutControlItem5.TextVisible = false;
- //
- // emptySpaceItem2
- //
- emptySpaceItem2.AllowHotTrack = false;
- emptySpaceItem2.Location = new Point(974, 0);
- emptySpaceItem2.Name = "emptySpaceItem2";
- emptySpaceItem2.Size = new Size(118, 37);
- emptySpaceItem2.TextSize = new Size(0, 0);
//
// layoutControlItem9
//
layoutControlItem9.Control = gridControl1;
- layoutControlItem9.Location = new Point(0, 51);
+ layoutControlItem9.Location = new Point(0, 55);
layoutControlItem9.Name = "layoutControlItem9";
layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlItem9.Size = new Size(1200, 349);
+ layoutControlItem9.Size = new Size(1200, 345);
layoutControlItem9.TextSize = new Size(0, 0);
layoutControlItem9.TextVisible = false;
//
@@ -527,8 +437,6 @@
((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
- ((ISupportInitialize)buttonEditSet.Properties).EndInit();
- ((ISupportInitialize)buttonEditSearch.Properties).EndInit();
((ISupportInitialize)imgCmbLinkStatus.Properties).EndInit();
((ISupportInitialize)txtName.Properties).EndInit();
((ISupportInitialize)txtModelType.Properties).EndInit();
@@ -540,8 +448,6 @@
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem5).EndInit();
- ((ISupportInitialize)emptySpaceItem2).EndInit();
((ISupportInitialize)layoutControlItem9).EndInit();
ResumeLayout(false);
}
@@ -579,12 +485,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
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 ButtonEdit buttonEditSet;
- private ButtonEdit buttonEditSearch;
+ private GeneralSearchAndSelectCtrl generalSearchAndSelectCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
}
}
--
Gitblit v1.9.3