冲突

Shuxia Ning

2024-11-09 4999c3c3884084c10c8a4bb2426e92cb63600166

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/05-blunthead/SetHydroBluntheadDlg.Designer.cs

ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/05-blunthead/SetHydroBluntheadDlg.Designer.cs ÐÞ¸Ä
@@ -34,17 +34,14 @@
            txtMaterial = new DevExpress.XtraEditors.TextEdit();
            txtMinorLoss = new DevExpress.XtraEditors.TextEdit();
            txtElev = new DevExpress.XtraEditors.TextEdit();
            btnOk = new DevExpress.XtraEditors.SimpleButton();
            btnCancel = new DevExpress.XtraEditors.SimpleButton();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)txtCaliber.Properties).BeginInit();
@@ -52,36 +49,33 @@
            ((ISupportInitialize)txtMinorLoss.Properties).BeginInit();
            ((ISupportInitialize)txtElev.Properties).BeginInit();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem9).BeginInit();
            ((ISupportInitialize)layoutControlItem10).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
            layoutControl1.Controls.Add(txtCaliber);
            layoutControl1.Controls.Add(txtMaterial);
            layoutControl1.Controls.Add(txtMinorLoss);
            layoutControl1.Controls.Add(txtElev);
            layoutControl1.Controls.Add(btnOk);
            layoutControl1.Controls.Add(btnCancel);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(670, 266, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(457, 106);
            layoutControl1.Size = new Size(451, 103);
            layoutControl1.TabIndex = 1;
            layoutControl1.Text = "layoutControl1";
            // 
            // txtCaliber
            // 
            txtCaliber.Location = new Point(294, 12);
            txtCaliber.Location = new Point(291, 12);
            txtCaliber.Name = "txtCaliber";
            txtCaliber.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
            txtCaliber.Properties.DisplayFormat.FormatString = "{0}mm";
@@ -89,7 +83,7 @@
            txtCaliber.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtCaliber.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
            txtCaliber.Properties.NullValuePrompt = "mm";
            txtCaliber.Size = new Size(151, 20);
            txtCaliber.Size = new Size(148, 20);
            txtCaliber.StyleController = layoutControl1;
            txtCaliber.TabIndex = 2;
            // 
@@ -97,17 +91,17 @@
            // 
            txtMaterial.Location = new Point(76, 12);
            txtMaterial.Name = "txtMaterial";
            txtMaterial.Size = new Size(150, 20);
            txtMaterial.Size = new Size(147, 20);
            txtMaterial.StyleController = layoutControl1;
            txtMaterial.TabIndex = 0;
            // 
            // txtMinorLoss
            // 
            txtMinorLoss.Location = new Point(294, 36);
            txtMinorLoss.Location = new Point(291, 36);
            txtMinorLoss.Name = "txtMinorLoss";
            txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
            txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtMinorLoss.Size = new Size(151, 20);
            txtMinorLoss.Size = new Size(148, 20);
            txtMinorLoss.StyleController = layoutControl1;
            txtMinorLoss.TabIndex = 4;
            // 
@@ -120,33 +114,9 @@
            txtElev.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
            txtElev.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtElev.Properties.NullValuePrompt = "m";
            txtElev.Size = new Size(150, 20);
            txtElev.Size = new Size(147, 20);
            txtElev.StyleController = layoutControl1;
            txtElev.TabIndex = 3;
            // 
            // btnOk
            // 
            btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnOk.Appearance.Options.UseBackColor = true;
            btnOk.Location = new Point(271, 60);
            btnOk.Name = "btnOk";
            btnOk.Size = new Size(85, 22);
            btnOk.StyleController = layoutControl1;
            btnOk.TabIndex = 6;
            btnOk.Text = "确定";
            btnOk.Click += btnOk_Click;
            // 
            // btnCancel
            // 
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.DialogResult = DialogResult.Cancel;
            btnCancel.Location = new Point(360, 60);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(85, 22);
            btnCancel.StyleController = layoutControl1;
            btnCancel.TabIndex = 7;
            btnCancel.Text = "取消";
            // 
            // Root
            // 
@@ -154,49 +124,17 @@
            Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem1, layoutControlItem9, layoutControlItem10, layoutControlItem4 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem9, layoutControlItem10, layoutControlItem4, layoutControlItem5 });
            Root.Name = "Root";
            Root.Size = new Size(457, 106);
            Root.Size = new Size(451, 103);
            Root.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = btnCancel;
            layoutControlItem2.Location = new Point(348, 48);
            layoutControlItem2.MaxSize = new Size(89, 26);
            layoutControlItem2.MinSize = new Size(89, 26);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(89, 38);
            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = btnOk;
            layoutControlItem3.Location = new Point(259, 48);
            layoutControlItem3.MaxSize = new Size(89, 26);
            layoutControlItem3.MinSize = new Size(89, 26);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(89, 38);
            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem3.TextSize = new Size(0, 0);
            layoutControlItem3.TextVisible = false;
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 48);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(259, 38);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = txtElev;
            layoutControlItem1.Location = new Point(0, 24);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(218, 24);
            layoutControlItem1.Size = new Size(215, 59);
            layoutControlItem1.Text = "标高:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
@@ -205,25 +143,25 @@
            layoutControlItem9.Control = txtMaterial;
            layoutControlItem9.Location = new Point(0, 0);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(218, 24);
            layoutControlItem9.Size = new Size(215, 24);
            layoutControlItem9.Text = "材质:";
            layoutControlItem9.TextSize = new Size(52, 14);
            // 
            // layoutControlItem10
            // 
            layoutControlItem10.Control = txtCaliber;
            layoutControlItem10.Location = new Point(218, 0);
            layoutControlItem10.Location = new Point(215, 0);
            layoutControlItem10.Name = "layoutControlItem10";
            layoutControlItem10.Size = new Size(219, 24);
            layoutControlItem10.Size = new Size(216, 24);
            layoutControlItem10.Text = "口径:";
            layoutControlItem10.TextSize = new Size(52, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = txtMinorLoss;
            layoutControlItem4.Location = new Point(218, 24);
            layoutControlItem4.Location = new Point(215, 24);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(219, 24);
            layoutControlItem4.Size = new Size(216, 24);
            layoutControlItem4.Text = "局阻系数:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
@@ -231,11 +169,31 @@
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // 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(227, 60);
            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
            generalOkAndCancelCtrl1.Size = new Size(212, 31);
            generalOkAndCancelCtrl1.TabIndex = 8;
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = generalOkAndCancelCtrl1;
            layoutControlItem5.Location = new Point(215, 48);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(216, 35);
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            // 
            // SetHydroBluntheadDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(457, 106);
            ClientSize = new Size(451, 103);
            Controls.Add(layoutControl1);
            MaximizeBox = false;
            Name = "SetHydroBluntheadDlg";
@@ -248,14 +206,12 @@
            ((ISupportInitialize)txtMinorLoss.Properties).EndInit();
            ((ISupportInitialize)txtElev.Properties).EndInit();
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem9).EndInit();
            ((ISupportInitialize)layoutControlItem10).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ResumeLayout(false);
        }

@@ -263,12 +219,7 @@

        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraEditors.TextEdit txtElev;
        private DevExpress.XtraEditors.SimpleButton btnOk;
        private DevExpress.XtraEditors.SimpleButton btnCancel;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
        private DevExpress.XtraEditors.TextEdit txtMinorLoss;
@@ -280,5 +231,7 @@
        private DevExpress.XtraEditors.TextEdit txtMaterial;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
    }
}