no message
							parent
							
								
									9954d8f14a
								
							
						
					
					
						commit
						b8709e5f2e
					
				|  | @ -382,49 +382,6 @@ | ||||||
|             this.labelTitleMin.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; |             this.labelTitleMin.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; | ||||||
|             this.labelTitleMin.Wordwrap = false; |             this.labelTitleMin.Wordwrap = false; | ||||||
|             //  |             //  | ||||||
| <<<<<<< HEAD |  | ||||||
|             // labelStatusExpirePassword |  | ||||||
|             //  |  | ||||||
|             this.labelStatusExpirePassword.BackPictureBox = this.smartForm1; |  | ||||||
|             this.labelStatusExpirePassword.BackPictureBox1 = null; |  | ||||||
|             this.labelStatusExpirePassword.BackPictureBox2 = null; |  | ||||||
|             this.labelStatusExpirePassword.BorderColor = System.Drawing.Color.Black; |  | ||||||
|             this.labelStatusExpirePassword.BorderStyle = System.Windows.Forms.BorderStyle.None; |  | ||||||
|             this.labelStatusExpirePassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); |  | ||||||
|             this.labelStatusExpirePassword.ForeColor = System.Drawing.Color.DarkRed; |  | ||||||
|             this.labelStatusExpirePassword.InitVisible = true; |  | ||||||
|             this.labelStatusExpirePassword.LineSpacing = 0F; |  | ||||||
|             this.labelStatusExpirePassword.Location = new System.Drawing.Point(485, 332); |  | ||||||
|             this.labelStatusExpirePassword.Name = "labelStatusExpirePassword"; |  | ||||||
|             this.labelStatusExpirePassword.Size = new System.Drawing.Size(60, 26); |  | ||||||
|             this.labelStatusExpirePassword.TabIndex = 230; |  | ||||||
|             this.labelStatusExpirePassword.Text = "Expiry"; |  | ||||||
|             this.labelStatusExpirePassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; |  | ||||||
|             this.labelStatusExpirePassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; |  | ||||||
|             this.labelStatusExpirePassword.Wordwrap = false; |  | ||||||
|             this.labelStatusExpirePassword.Click += new System.EventHandler(this.labelStatusExpirePassword_Click); |  | ||||||
|             //  |  | ||||||
|             // labelStatusExpireAccount |  | ||||||
|             //  |  | ||||||
|             this.labelStatusExpireAccount.BackPictureBox = this.smartForm1; |  | ||||||
|             this.labelStatusExpireAccount.BackPictureBox1 = null; |  | ||||||
|             this.labelStatusExpireAccount.BackPictureBox2 = null; |  | ||||||
|             this.labelStatusExpireAccount.BorderColor = System.Drawing.Color.Black; |  | ||||||
|             this.labelStatusExpireAccount.BorderStyle = System.Windows.Forms.BorderStyle.None; |  | ||||||
|             this.labelStatusExpireAccount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); |  | ||||||
|             this.labelStatusExpireAccount.ForeColor = System.Drawing.Color.DarkRed; |  | ||||||
|             this.labelStatusExpireAccount.InitVisible = true; |  | ||||||
|             this.labelStatusExpireAccount.LineSpacing = 0F; |  | ||||||
|             this.labelStatusExpireAccount.Location = new System.Drawing.Point(485, 301); |  | ||||||
|             this.labelStatusExpireAccount.Name = "labelStatusExpireAccount"; |  | ||||||
|             this.labelStatusExpireAccount.Size = new System.Drawing.Size(60, 26); |  | ||||||
|             this.labelStatusExpireAccount.TabIndex = 229; |  | ||||||
|             this.labelStatusExpireAccount.Text = "만료"; |  | ||||||
|             this.labelStatusExpireAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; |  | ||||||
|             this.labelStatusExpireAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; |  | ||||||
|             this.labelStatusExpireAccount.Wordwrap = false; |  | ||||||
|             this.labelStatusExpireAccount.Click += new System.EventHandler(this.labelStatusExpireAccount_Click); |  | ||||||
| ======= |  | ||||||
|             // labelStatusExpiryPassword |             // labelStatusExpiryPassword | ||||||
|             //  |             //  | ||||||
|             this.labelStatusExpiryPassword.BackPictureBox = this.smartForm1; |             this.labelStatusExpiryPassword.BackPictureBox = this.smartForm1; | ||||||
|  | @ -466,7 +423,6 @@ | ||||||
|             this.labelStatusExpiryAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; |             this.labelStatusExpiryAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; | ||||||
|             this.labelStatusExpiryAccount.Wordwrap = false; |             this.labelStatusExpiryAccount.Wordwrap = false; | ||||||
|             this.labelStatusExpiryAccount.Click += new System.EventHandler(this.labelStatusExpireAccount_Click); |             this.labelStatusExpiryAccount.Click += new System.EventHandler(this.labelStatusExpireAccount_Click); | ||||||
| >>>>>>> d88b1aac3ab2ed3eef1ac2f12e1d7d6f19f8488c |  | ||||||
|             //  |             //  | ||||||
|             // labelAutomaticLogoutTime |             // labelAutomaticLogoutTime | ||||||
|             //  |             //  | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue