From edfb5be5dc9037152975bd4354e95d5eff78ce2d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 29 十月 2024 18:07:09 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/04-dlg/SetHydroMarkDlg.Designer.cs | 118 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 41 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/04-dlg/SetHydroMarkDlg.Designer.cs
similarity index 60%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.Designer.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/04-dlg/SetHydroMarkDlg.Designer.cs
index c5bb7d8..9cd0102 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/SetHydroMarkCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/09-mark/04-dlg/SetHydroMarkDlg.Designer.cs
@@ -1,13 +1,13 @@
锘縩amespace Yw.WinFrmUI
{
- partial class SetHydroMarkCtrl
+ partial class SetHydroMarkDlg
{
- /// <summary>
+ /// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
- /// <summary>
+ /// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
@@ -20,23 +20,27 @@
base.Dispose(disposing);
}
- #region Component Designer generated code
+ #region Windows Form Designer generated code
- /// <summary>
- /// Required method for Designer support - do not modify
+ /// <summary>
+ /// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
+ ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
+ ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
+ ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
btnOk = new DevExpress.XtraEditors.SimpleButton();
btnCancel = new DevExpress.XtraEditors.SimpleButton();
- setHydroMarkPureCtrl1 = new SetHydroMarkPureCtrl();
+ setHydroMarkCtrl1 = new SetHydroMarkCtrl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+ ((ISupportInitialize)ribbon).BeginInit();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)Root).BeginInit();
@@ -46,27 +50,50 @@
((ISupportInitialize)emptySpaceItem1).BeginInit();
SuspendLayout();
//
+ // ribbon
+ //
+ ribbon.ExpandCollapseItem.Id = 0;
+ ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem });
+ ribbon.Location = new Point(0, 0);
+ ribbon.MaxItemId = 1;
+ ribbon.Name = "ribbon";
+ 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(312, 32);
+ //
+ // ribbonPage1
+ //
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
+ ribbonPage1.Name = "ribbonPage1";
+ ribbonPage1.Text = "ribbonPage1";
+ //
+ // ribbonPageGroup1
+ //
+ ribbonPageGroup1.Name = "ribbonPageGroup1";
+ ribbonPageGroup1.Text = "ribbonPageGroup1";
+ //
// layoutControl1
//
layoutControl1.Controls.Add(btnOk);
layoutControl1.Controls.Add(btnCancel);
- layoutControl1.Controls.Add(setHydroMarkPureCtrl1);
+ layoutControl1.Controls.Add(setHydroMarkCtrl1);
layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(0, 0);
+ layoutControl1.Location = new Point(0, 32);
layoutControl1.Name = "layoutControl1";
- layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(670, 266, 650, 400);
+ layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(976, 355, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(308, 555);
- layoutControl1.TabIndex = 0;
+ layoutControl1.Size = new Size(312, 453);
+ layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
//
// btnOk
//
btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
btnOk.Appearance.Options.UseBackColor = true;
- btnOk.Location = new Point(132, 531);
+ btnOk.Location = new Point(104, 419);
btnOk.Name = "btnOk";
- btnOk.Size = new Size(85, 22);
+ btnOk.Size = new Size(96, 22);
btnOk.StyleController = layoutControl1;
btnOk.TabIndex = 6;
btnOk.Text = "纭畾";
@@ -76,20 +103,20 @@
//
btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
btnCancel.Appearance.Options.UseBackColor = true;
- btnCancel.Location = new Point(221, 531);
+ btnCancel.DialogResult = DialogResult.Cancel;
+ btnCancel.Location = new Point(204, 419);
btnCancel.Name = "btnCancel";
- btnCancel.Size = new Size(85, 22);
+ btnCancel.Size = new Size(96, 22);
btnCancel.StyleController = layoutControl1;
btnCancel.TabIndex = 5;
btnCancel.Text = "鍙栨秷";
- btnCancel.Click += btnCancel_Click;
//
- // setHydroMarkPureCtrl1
+ // setHydroMarkCtrl1
//
- setHydroMarkPureCtrl1.Location = new Point(2, 2);
- setHydroMarkPureCtrl1.Name = "setHydroMarkPureCtrl1";
- setHydroMarkPureCtrl1.Size = new Size(304, 525);
- setHydroMarkPureCtrl1.TabIndex = 4;
+ setHydroMarkCtrl1.Location = new Point(12, 12);
+ setHydroMarkCtrl1.Name = "setHydroMarkCtrl1";
+ setHydroMarkCtrl1.Size = new Size(288, 403);
+ setHydroMarkCtrl1.TabIndex = 4;
//
// Root
//
@@ -97,27 +124,26 @@
Root.GroupBordersVisible = false;
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, emptySpaceItem1 });
Root.Name = "Root";
- Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(308, 555);
+ Root.Size = new Size(312, 453);
Root.TextVisible = false;
//
// layoutControlItem1
//
- layoutControlItem1.Control = setHydroMarkPureCtrl1;
+ layoutControlItem1.Control = setHydroMarkCtrl1;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(308, 529);
+ layoutControlItem1.Size = new Size(292, 407);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
// layoutControlItem2
//
layoutControlItem2.Control = btnCancel;
- layoutControlItem2.Location = new Point(219, 529);
- layoutControlItem2.MaxSize = new Size(89, 26);
- layoutControlItem2.MinSize = new Size(89, 26);
+ layoutControlItem2.Location = new Point(192, 407);
+ layoutControlItem2.MaxSize = new Size(100, 26);
+ layoutControlItem2.MinSize = new Size(100, 26);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(89, 26);
+ layoutControlItem2.Size = new Size(100, 26);
layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
@@ -125,11 +151,11 @@
// layoutControlItem3
//
layoutControlItem3.Control = btnOk;
- layoutControlItem3.Location = new Point(130, 529);
- layoutControlItem3.MaxSize = new Size(89, 26);
- layoutControlItem3.MinSize = new Size(89, 26);
+ layoutControlItem3.Location = new Point(92, 407);
+ layoutControlItem3.MaxSize = new Size(100, 26);
+ layoutControlItem3.MinSize = new Size(100, 26);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(89, 26);
+ layoutControlItem3.Size = new Size(100, 26);
layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
@@ -137,18 +163,24 @@
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 529);
+ emptySpaceItem1.Location = new Point(0, 407);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(130, 26);
+ emptySpaceItem1.Size = new Size(92, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
- // SetHydroMarkCtrl
+ // SetHydroMarkDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(312, 485);
Controls.Add(layoutControl1);
- Name = "SetHydroMarkCtrl";
- Size = new Size(308, 555);
+ Controls.Add(ribbon);
+ Name = "SetHydroMarkDlg";
+ Ribbon = ribbon;
+ RibbonVisibility = DevExpress.XtraBars.Ribbon.RibbonVisibility.Hidden;
+ StartPosition = FormStartPosition.CenterParent;
+ Text = "璁剧疆鏍囨敞";
+ ((ISupportInitialize)ribbon).EndInit();
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)Root).EndInit();
@@ -157,18 +189,22 @@
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)emptySpaceItem1).EndInit();
ResumeLayout(false);
+ PerformLayout();
}
#endregion
+ private DevExpress.XtraBars.Ribbon.RibbonControl ribbon;
+ private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraEditors.SimpleButton btnOk;
private DevExpress.XtraEditors.SimpleButton btnCancel;
- private SetHydroMarkPureCtrl setHydroMarkPureCtrl1;
+ private SetHydroMarkCtrl setHydroMarkCtrl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3