From 2bc7800e9f02fed6652f6b0defe1d978f186e914 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期一, 12 八月 2024 09:18:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserInfoCtrl.Designer.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserForm.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserInfoCtrl.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserForm.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserInfoCtrl.Designer.cs
index f1fa8c8..5756b6e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserForm.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/LoginUserInfoCtrl.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Organize
{
- partial class LoginUserForm
+ partial class LoginUserInfoCtrl
{
/// <summary>
/// Required designer variable.
@@ -72,6 +72,7 @@
//
// TextEditLoginName
//
+ TextEditLoginName.Enabled = false;
TextEditLoginName.Location = new Point(106, 12);
TextEditLoginName.Name = "TextEditLoginName";
TextEditLoginName.Size = new Size(310, 20);
@@ -85,6 +86,7 @@
//
// TextEditPassWord
//
+ TextEditPassWord.Enabled = false;
TextEditPassWord.Location = new Point(106, 36);
TextEditPassWord.Name = "TextEditPassWord";
TextEditPassWord.Size = new Size(310, 20);
@@ -98,6 +100,7 @@
//
// TextEditValidPassWord
//
+ TextEditValidPassWord.Enabled = false;
TextEditValidPassWord.Location = new Point(106, 60);
TextEditValidPassWord.Name = "TextEditValidPassWord";
TextEditValidPassWord.Size = new Size(310, 20);
@@ -154,12 +157,12 @@
emptySpaceItem1.Size = new Size(408, 47);
emptySpaceItem1.TextSize = new Size(0, 0);
//
- // LoginUserForm
+ // LoginUserInfoCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
- Name = "LoginUserForm";
+ Name = "LoginUserInfoCtrl";
Size = new Size(428, 139);
UseWaitCursor = true;
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
--
Gitblit v1.9.3