冲突

duheng

2024-11-21 c653f2f6f2de553395b706de3a62fec5e4a6fbf7

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/15-visible/SetHydroVisualVisibleDlg.Designer.cs

copy from WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroVisualMonitorDlg.Designer.cs
copy to WinFrmUI/Yw.WinFrmUI.Hydro.Core/15-visible/SetHydroVisualVisibleDlg.Designer.cs
Îļþ´Ó WinFrmUI/Yw.WinFrmUI.Hydro.Core/12-monitor/01-set/SetHydroVisualMonitorDlg.Designer.cs ¸´ÖÆ
@@ -1,6 +1,6 @@
namespace Yw.WinFrmUI
{
    partial class SetHydroVisualMonitorDlg
    partial class SetHydroVisualVisibleDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -32,17 +32,17 @@
            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();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            setHydroVisualVisibleCtrl1 = new SetHydroVisualVisibleCtrl();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)ribbon).BeginInit();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            SuspendLayout();
            // 
            // ribbon
@@ -55,7 +55,7 @@
            ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbon.RibbonCaptionAlignment = DevExpress.XtraBars.Ribbon.RibbonCaptionAlignment.Left;
            ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
            ribbon.Size = new Size(591, 32);
            ribbon.Size = new Size(278, 32);
            // 
            // ribbonPage1
            // 
@@ -70,42 +70,16 @@
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(setHydroVisualVisibleCtrl1);
            layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
            layoutControl1.Controls.Add(setHydroVisualMonitorCtrl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 32);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(976, 355, 650, 400);
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(788, 328, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(591, 214);
            layoutControl1.Size = new Size(278, 549);
            layoutControl1.TabIndex = 2;
            layoutControl1.Text = "layoutControl1";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            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.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(591, 173);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // generalOkAndCancelCtrl1
            // 
@@ -113,39 +87,65 @@
            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.Location = new Point(2, 521);
            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
            generalOkAndCancelCtrl1.Size = new Size(587, 37);
            generalOkAndCancelCtrl1.TabIndex = 8;
            generalOkAndCancelCtrl1.Size = new Size(274, 26);
            generalOkAndCancelCtrl1.TabIndex = 7;
            // 
            // layoutControlItem2
            // Root
            // 
            layoutControlItem2.Control = generalOkAndCancelCtrl1;
            layoutControlItem2.Location = new Point(0, 173);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(591, 41);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(278, 549);
            Root.TextVisible = false;
            // 
            // SetHydroVisualMonitorDlg
            // layoutControlItem4
            // 
            layoutControlItem4.Control = generalOkAndCancelCtrl1;
            layoutControlItem4.Location = new Point(0, 519);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(278, 30);
            layoutControlItem4.TextSize = new Size(0, 0);
            layoutControlItem4.TextVisible = false;
            // 
            // setHydroVisualVisibleCtrl1
            // 
            setHydroVisualVisibleCtrl1.Location = new Point(2, 2);
            setHydroVisualVisibleCtrl1.Name = "setHydroVisualVisibleCtrl1";
            setHydroVisualVisibleCtrl1.Size = new Size(274, 515);
            setHydroVisualVisibleCtrl1.TabIndex = 8;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = setHydroVisualVisibleCtrl1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(278, 519);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // SetHydroVisualVisibleDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(591, 246);
            ClientSize = new Size(278, 581);
            Controls.Add(layoutControl1);
            Controls.Add(ribbon);
            FormBorderStyle = FormBorderStyle.SizableToolWindow;
            Name = "SetHydroVisualMonitorDlg";
            Name = "SetHydroVisualVisibleDlg";
            Ribbon = ribbon;
            RibbonVisibility = DevExpress.XtraBars.Ribbon.RibbonVisibility.Hidden;
            StartPosition = FormStartPosition.CenterParent;
            Text = "监测点";
            Text = "构件显示";
            ((ISupportInitialize)ribbon).EndInit();
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -157,9 +157,9 @@
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private SetHydroVisualMonitorCtrl setHydroVisualMonitorCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private SetHydroVisualVisibleCtrl setHydroVisualVisibleCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
    }
}