From 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 13:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
index 171c3c9..a117cb8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -72,10 +72,10 @@
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(264, 457);
+ this.panel1.Location = new System.Drawing.Point(230, 457);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(270, 276);
+ this.panel1.Size = new System.Drawing.Size(328, 276);
this.panel1.TabIndex = 243;
//
// comOrg
@@ -83,7 +83,7 @@
this.comOrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comOrg.Font = new System.Drawing.Font("Tahoma", 10F);
this.comOrg.FormattingEnabled = true;
- this.comOrg.Location = new System.Drawing.Point(100, 97);
+ this.comOrg.Location = new System.Drawing.Point(138, 97);
this.comOrg.Name = "comOrg";
this.comOrg.Size = new System.Drawing.Size(154, 29);
this.comOrg.TabIndex = 245;
@@ -91,7 +91,7 @@
// txtUser
//
this.txtUser.EditValue = "";
- this.txtUser.Location = new System.Drawing.Point(102, 9);
+ this.txtUser.Location = new System.Drawing.Point(138, 9);
this.txtUser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtUser.Name = "txtUser";
this.txtUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -102,7 +102,7 @@
//
// ckRemember
//
- this.ckRemember.Location = new System.Drawing.Point(102, 139);
+ this.ckRemember.Location = new System.Drawing.Point(138, 139);
this.ckRemember.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.ckRemember.Name = "ckRemember";
this.ckRemember.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -117,7 +117,7 @@
// txtPwd
//
this.txtPwd.EditValue = "";
- this.txtPwd.Location = new System.Drawing.Point(102, 53);
+ this.txtPwd.Location = new System.Drawing.Point(138, 53);
this.txtPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtPwd.Name = "txtPwd";
this.txtPwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -134,7 +134,7 @@
this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
- this.btnCancel.Location = new System.Drawing.Point(153, 193);
+ this.btnCancel.Location = new System.Drawing.Point(189, 193);
this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(103, 37);
@@ -150,10 +150,10 @@
this.labelControl3.Appearance.Options.UseTextOptions = true;
this.labelControl3.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.labelControl3.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
- this.labelControl3.Location = new System.Drawing.Point(6, 102);
+ this.labelControl3.Location = new System.Drawing.Point(21, 102);
this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(93, 18);
+ this.labelControl3.Size = new System.Drawing.Size(114, 18);
this.labelControl3.TabIndex = 233;
this.labelControl3.Text = "缁勭粐鏈烘瀯锛�";
//
@@ -164,7 +164,7 @@
this.btnLogin.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnLogin.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnLogin.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnLogin.ImageOptions.Image")));
- this.btnLogin.Location = new System.Drawing.Point(36, 193);
+ this.btnLogin.Location = new System.Drawing.Point(72, 193);
this.btnLogin.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(102, 37);
@@ -180,10 +180,10 @@
this.labelControl2.Appearance.Options.UseTextOptions = true;
this.labelControl2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.labelControl2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
- this.labelControl2.Location = new System.Drawing.Point(6, 59);
+ this.labelControl2.Location = new System.Drawing.Point(21, 59);
this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(93, 18);
+ this.labelControl2.Size = new System.Drawing.Size(114, 18);
this.labelControl2.TabIndex = 232;
this.labelControl2.Text = "瀵嗙爜锛�";
//
@@ -196,10 +196,10 @@
this.labelControl1.Appearance.Options.UseTextOptions = true;
this.labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.labelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
- this.labelControl1.Location = new System.Drawing.Point(6, 15);
+ this.labelControl1.Location = new System.Drawing.Point(21, 15);
this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(93, 18);
+ this.labelControl1.Size = new System.Drawing.Size(114, 18);
this.labelControl1.TabIndex = 231;
this.labelControl1.Text = "鐧诲綍甯愬彿锛�";
//
--
Gitblit v1.9.3