From f45bba0b5ecf73df67af6cb60e57ea956d82a8ab Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 30 七月 2024 14:36:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
index 7d308e5..f94aac4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
@@ -100,9 +100,9 @@
//
btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
btnComplete.Appearance.Options.UseBackColor = true;
- btnComplete.Location = new Point(975, 661);
+ btnComplete.Location = new Point(985, 661);
btnComplete.Name = "btnComplete";
- btnComplete.Size = new Size(126, 22);
+ btnComplete.Size = new Size(116, 22);
btnComplete.StyleController = layoutControl1;
btnComplete.TabIndex = 10;
btnComplete.Text = "瀹屾垚";
@@ -112,7 +112,7 @@
//
btnPrev.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
btnPrev.Appearance.Options.UseBackColor = true;
- btnPrev.Location = new Point(615, 661);
+ btnPrev.Location = new Point(625, 661);
btnPrev.Name = "btnPrev";
btnPrev.Size = new Size(116, 22);
btnPrev.StyleController = layoutControl1;
@@ -124,7 +124,7 @@
//
btnNext.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
btnNext.Appearance.Options.UseBackColor = true;
- btnNext.Location = new Point(735, 661);
+ btnNext.Location = new Point(745, 661);
btnNext.Name = "btnNext";
btnNext.Size = new Size(116, 22);
btnNext.StyleController = layoutControl1;
@@ -136,7 +136,7 @@
//
btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
btnCancel.Appearance.Options.UseBackColor = true;
- btnCancel.Location = new Point(855, 661);
+ btnCancel.Location = new Point(865, 661);
btnCancel.Name = "btnCancel";
btnCancel.Size = new Size(116, 22);
btnCancel.StyleController = layoutControl1;
@@ -307,7 +307,7 @@
// itemForCancel
//
itemForCancel.Control = btnCancel;
- itemForCancel.Location = new Point(843, 649);
+ itemForCancel.Location = new Point(853, 649);
itemForCancel.MaxSize = new Size(120, 26);
itemForCancel.MinSize = new Size(120, 26);
itemForCancel.Name = "itemForCancel";
@@ -319,7 +319,7 @@
// itemForNext
//
itemForNext.Control = btnNext;
- itemForNext.Location = new Point(723, 649);
+ itemForNext.Location = new Point(733, 649);
itemForNext.MaxSize = new Size(120, 26);
itemForNext.MinSize = new Size(120, 26);
itemForNext.Name = "itemForNext";
@@ -331,7 +331,7 @@
// itemForPrev
//
itemForPrev.Control = btnPrev;
- itemForPrev.Location = new Point(603, 649);
+ itemForPrev.Location = new Point(613, 649);
itemForPrev.MaxSize = new Size(120, 26);
itemForPrev.MinSize = new Size(120, 26);
itemForPrev.Name = "itemForPrev";
@@ -345,15 +345,18 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 649);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(603, 26);
+ emptySpaceItem1.Size = new Size(613, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// itemForComplete
//
itemForComplete.Control = btnComplete;
- itemForComplete.Location = new Point(963, 649);
+ itemForComplete.Location = new Point(973, 649);
+ itemForComplete.MaxSize = new Size(120, 26);
+ itemForComplete.MinSize = new Size(120, 26);
itemForComplete.Name = "itemForComplete";
- itemForComplete.Size = new Size(130, 26);
+ itemForComplete.Size = new Size(120, 26);
+ itemForComplete.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
itemForComplete.TextSize = new Size(0, 0);
itemForComplete.TextVisible = false;
//
--
Gitblit v1.9.3