From 4999c3c3884084c10c8a4bb2426e92cb63600166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:58:22 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/11-meter/HydroMeterListCtrl.Designer.cs | 137 ++++++++++++++++++++-------------------------
1 files changed, 62 insertions(+), 75 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/09-hydrant/HydroHydrantListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/11-meter/HydroMeterListCtrl.Designer.cs
similarity index 90%
copy from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/09-hydrant/HydroHydrantListCtrl.Designer.cs
copy to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/11-meter/HydroMeterListCtrl.Designer.cs
index c8cd685..3cb7f3a 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/09-hydrant/HydroHydrantListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/11-meter/HydroMeterListCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
- partial class HydroHydrantListCtrl
+ partial class HydroMeterListCtrl
{
/// <summary>
/// Required designer variable.
@@ -30,29 +30,25 @@
{
components = new Container();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroHydrantListCtrl));
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroMeterListCtrl));
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();
- hydroHydrantViewModelBindingSource = new BindingSource(components);
+ hydroMeterViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
colCode = new DevExpress.XtraGrid.Columns.GridColumn();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
- colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
colElev = new DevExpress.XtraGrid.Columns.GridColumn();
colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
- colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
- colSet = new DevExpress.XtraGrid.Columns.GridColumn();
- repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
btnReset = new DevExpress.XtraEditors.SimpleButton();
btnSet = new DevExpress.XtraEditors.SimpleButton();
@@ -70,10 +66,12 @@
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
+ colSet = new DevExpress.XtraGrid.Columns.GridColumn();
+ repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((ISupportInitialize)gridControl1).BeginInit();
- ((ISupportInitialize)hydroHydrantViewModelBindingSource).BeginInit();
+ ((ISupportInitialize)hydroMeterViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
- ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtName.Properties).BeginInit();
@@ -89,30 +87,30 @@
((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
SuspendLayout();
//
// gridControl1
//
- gridControl1.DataSource = hydroHydrantViewModelBindingSource;
+ gridControl1.DataSource = hydroMeterViewModelBindingSource;
gridControl1.Location = new Point(2, 50);
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
- gridControl1.Size = new Size(1399, 621);
+ gridControl1.Size = new Size(1500, 601);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
- // hydroHydrantViewModelBindingSource
+ // hydroMeterViewModelBindingSource
//
- hydroHydrantViewModelBindingSource.DataSource = typeof(HydroHydrantViewModel);
+ hydroMeterViewModelBindingSource.DataSource = typeof(HydroMeterViewModel);
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colCoefficient, colElev, colMinorLoss, colCalcuPress, colCalcuHead, colCalcuDemand, colFlags, colDescription, colSet });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colName, colCode, colModelType, colHasDb, colElev, colMinorLoss, colCalcuPress, colCalcuHead, colCalcuDemand, colFlags, colDescription, colSet });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsFind.AlwaysVisible = true;
- gridView1.RowCellClick += gridView1_RowCellClick;
//
// colDbLocked
//
@@ -132,7 +130,7 @@
colCode.MinWidth = 100;
colCode.Name = "colCode";
colCode.Visible = true;
- colCode.VisibleIndex = 1;
+ colCode.VisibleIndex = 2;
colCode.Width = 100;
//
// colName
@@ -142,7 +140,7 @@
colName.MinWidth = 100;
colName.Name = "colName";
colName.Visible = true;
- colName.VisibleIndex = 2;
+ colName.VisibleIndex = 1;
colName.Width = 100;
//
// colModelType
@@ -162,18 +160,8 @@
colHasDb.MinWidth = 40;
colHasDb.Name = "colHasDb";
colHasDb.Visible = true;
- colHasDb.VisibleIndex = 10;
+ colHasDb.VisibleIndex = 9;
colHasDb.Width = 40;
- //
- // colCoefficient
- //
- colCoefficient.FieldName = "Coefficient";
- colCoefficient.MaxWidth = 100;
- colCoefficient.MinWidth = 100;
- colCoefficient.Name = "colCoefficient";
- colCoefficient.Visible = true;
- colCoefficient.VisibleIndex = 7;
- colCoefficient.Width = 100;
//
// colElev
//
@@ -190,7 +178,7 @@
colMinorLoss.FieldName = "MinorLoss";
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 6;
+ colMinorLoss.VisibleIndex = 5;
//
// colCalcuPress
//
@@ -199,7 +187,7 @@
colCalcuPress.MinWidth = 100;
colCalcuPress.Name = "colCalcuPress";
colCalcuPress.Visible = true;
- colCalcuPress.VisibleIndex = 8;
+ colCalcuPress.VisibleIndex = 6;
colCalcuPress.Width = 100;
//
// colCalcuHead
@@ -209,7 +197,7 @@
colCalcuHead.MinWidth = 100;
colCalcuHead.Name = "colCalcuHead";
colCalcuHead.Visible = true;
- colCalcuHead.VisibleIndex = 9;
+ colCalcuHead.VisibleIndex = 7;
colCalcuHead.Width = 100;
//
// colCalcuDemand
@@ -219,15 +207,8 @@
colCalcuDemand.MinWidth = 100;
colCalcuDemand.Name = "colCalcuDemand";
colCalcuDemand.Visible = true;
- colCalcuDemand.VisibleIndex = 5;
+ colCalcuDemand.VisibleIndex = 8;
colCalcuDemand.Width = 100;
- //
- // colFlags
- //
- colFlags.FieldName = "Flags";
- colFlags.Name = "colFlags";
- colFlags.Visible = true;
- colFlags.VisibleIndex = 11;
//
// colDescription
//
@@ -235,29 +216,8 @@
colDescription.MinWidth = 100;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 12;
+ colDescription.VisibleIndex = 11;
colDescription.Width = 100;
- //
- // colSet
- //
- colSet.Caption = "璁剧疆";
- colSet.ColumnEdit = repositoryItemButtonEdit1;
- colSet.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
- colSet.MaxWidth = 60;
- colSet.MinWidth = 60;
- colSet.Name = "colSet";
- colSet.Visible = true;
- colSet.VisibleIndex = 13;
- colSet.Width = 60;
- //
- // repositoryItemButtonEdit1
- //
- repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
- editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
- repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.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 = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
// layoutControl1
//
@@ -273,7 +233,7 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1227, 184, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(1403, 673);
+ layoutControl1.Size = new Size(1504, 653);
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
@@ -292,7 +252,7 @@
//
btnSet.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
btnSet.Appearance.Options.UseBackColor = true;
- btnSet.Location = new Point(1293, 14);
+ btnSet.Location = new Point(1394, 14);
btnSet.Name = "btnSet";
btnSet.Size = new Size(96, 22);
btnSet.StyleController = layoutControl1;
@@ -346,7 +306,7 @@
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { groupForHead, layoutControlItem8 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(1403, 673);
+ Root.Size = new Size(1504, 653);
Root.TextVisible = false;
//
// groupForHead
@@ -354,7 +314,7 @@
groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem5, layoutControlItem6, layoutControlItem7 });
groupForHead.Location = new Point(0, 0);
groupForHead.Name = "groupForHead";
- groupForHead.Size = new Size(1403, 50);
+ groupForHead.Size = new Size(1504, 50);
groupForHead.Text = "鏌ヨ鏉′欢";
groupForHead.TextVisible = false;
//
@@ -399,7 +359,7 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(800, 0);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(479, 26);
+ emptySpaceItem1.Size = new Size(580, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem5
@@ -417,7 +377,7 @@
// layoutControlItem6
//
layoutControlItem6.Control = btnSet;
- layoutControlItem6.Location = new Point(1279, 0);
+ layoutControlItem6.Location = new Point(1380, 0);
layoutControlItem6.MaxSize = new Size(100, 26);
layoutControlItem6.MinSize = new Size(100, 26);
layoutControlItem6.Name = "layoutControlItem6";
@@ -444,21 +404,48 @@
layoutControlItem8.Location = new Point(0, 50);
layoutControlItem8.Name = "layoutControlItem8";
layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 2);
- layoutControlItem8.Size = new Size(1403, 623);
+ layoutControlItem8.Size = new Size(1504, 603);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
- // HydroHydrantListCtrl
+ // colFlags
+ //
+ colFlags.FieldName = "Flags";
+ colFlags.Name = "colFlags";
+ colFlags.Visible = true;
+ colFlags.VisibleIndex = 10;
+ //
+ // colSet
+ //
+ colSet.Caption = "璁剧疆";
+ colSet.ColumnEdit = repositoryItemButtonEdit1;
+ colSet.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colSet.MaxWidth = 60;
+ colSet.MinWidth = 60;
+ colSet.Name = "colSet";
+ colSet.Visible = true;
+ colSet.VisibleIndex = 12;
+ colSet.Width = 60;
+ //
+ // repositoryItemButtonEdit1
+ //
+ repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+ editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
+ repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.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 = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ //
+ // HydroMeterListCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
- Name = "HydroHydrantListCtrl";
- Size = new Size(1403, 673);
+ Name = "HydroMeterListCtrl";
+ Size = new Size(1504, 653);
((ISupportInitialize)gridControl1).EndInit();
- ((ISupportInitialize)hydroHydrantViewModelBindingSource).EndInit();
+ ((ISupportInitialize)hydroMeterViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
- ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)txtName.Properties).EndInit();
@@ -474,6 +461,7 @@
((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
ResumeLayout(false);
}
@@ -484,9 +472,8 @@
private DevExpress.XtraGrid.Columns.GridColumn colCode;
private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn colElev;
- private DevExpress.XtraGrid.Columns.GridColumn colCoefficient;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- private BindingSource hydroHydrantViewModelBindingSource;
+ private BindingSource hydroMeterViewModelBindingSource;
private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
private DevExpress.XtraGrid.Columns.GridColumn colModelType;
private DevExpress.XtraGrid.Columns.GridColumn colCalcuPress;
--
Gitblit v1.9.3