冲突

duheng

2024-11-21 c653f2f6f2de553395b706de3a62fec5e4a6fbf7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroMonitorListDlg.Designer.cs

文件名从 WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroVisualMonitorDlg.Designer.cs 修改
@@ -1,6 +1,6 @@
锘縩amespace Yw.WinFrmUI
{
    partial class SetHydroVisualMonitorDlg
    partial class SetHydroMonitorListDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -32,10 +32,10 @@
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            setHydroVisualMonitorCtrl1 = new SetHydroVisualMonitorCtrl();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
            setHydroMonitorListCtrl1 = new SetHydroMonitorListCtrl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)ribbon).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
@@ -71,7 +71,7 @@
            // layoutControl1
            // 
            layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
            layoutControl1.Controls.Add(setHydroVisualMonitorCtrl1);
            layoutControl1.Controls.Add(setHydroMonitorListCtrl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 32);
            layoutControl1.Name = "layoutControl1";
@@ -80,6 +80,24 @@
            layoutControl1.Size = new Size(591, 214);
            layoutControl1.TabIndex = 2;
            layoutControl1.Text = "layoutControl1";
            // 
            // generalOkAndCancelCtrl1
            // 
            generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.Location = new Point(2, 186);
            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
            generalOkAndCancelCtrl1.Size = new Size(587, 26);
            generalOkAndCancelCtrl1.TabIndex = 8;
            // 
            // setHydroMonitorListCtrl1
            // 
            setHydroMonitorListCtrl1.Location = new Point(2, 2);
            setHydroMonitorListCtrl1.Name = "setHydroMonitorListCtrl1";
            setHydroMonitorListCtrl1.Size = new Size(587, 180);
            setHydroMonitorListCtrl1.TabIndex = 7;
            // 
            // Root
            // 
@@ -91,43 +109,25 @@
            Root.Size = new Size(591, 214);
            Root.TextVisible = false;
            // 
            // setHydroVisualMonitorCtrl1
            // 
            setHydroVisualMonitorCtrl1.Location = new Point(2, 2);
            setHydroVisualMonitorCtrl1.Name = "setHydroVisualMonitorCtrl1";
            setHydroVisualMonitorCtrl1.Size = new Size(587, 169);
            setHydroVisualMonitorCtrl1.TabIndex = 7;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = setHydroVisualMonitorCtrl1;
            layoutControlItem1.Control = setHydroMonitorListCtrl1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(591, 173);
            layoutControlItem1.Size = new Size(591, 184);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // generalOkAndCancelCtrl1
            // 
            generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.Location = new Point(2, 175);
            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
            generalOkAndCancelCtrl1.Size = new Size(587, 37);
            generalOkAndCancelCtrl1.TabIndex = 8;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = generalOkAndCancelCtrl1;
            layoutControlItem2.Location = new Point(0, 173);
            layoutControlItem2.Location = new Point(0, 184);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(591, 41);
            layoutControlItem2.Size = new Size(591, 30);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // SetHydroVisualMonitorDlg
            // SetHydroMonitorListDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
@@ -135,7 +135,7 @@
            Controls.Add(layoutControl1);
            Controls.Add(ribbon);
            FormBorderStyle = FormBorderStyle.SizableToolWindow;
            Name = "SetHydroVisualMonitorDlg";
            Name = "SetHydroMonitorListDlg";
            Ribbon = ribbon;
            RibbonVisibility = DevExpress.XtraBars.Ribbon.RibbonVisibility.Hidden;
            StartPosition = FormStartPosition.CenterParent;
@@ -157,7 +157,7 @@
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private SetHydroVisualMonitorCtrl setHydroVisualMonitorCtrl1;
        private SetHydroMonitorListCtrl setHydroMonitorListCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;