Merge branch 'main' of https://gitlab.com/IntechkoreaLCD/int_pt002

INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs

@@ -137,8 +137,6 @@ namespace INT_PT002.Controls
         {
             SmartSplash.Start(SmartSplash.BuiltInLoadingImages.PROCESSING1, 200);
             
-            this.ParentForm.Enabled = false;
-
             // ServoMotor 1
             this.labelMotor1Origin.Text = this.ParentForm.ParentForm.ServoMotorRead2(1, ServoMotorAddress.CMD21);
             this.labelMotor1Front1.Text = this.ParentForm.ParentForm.ServoMotorRead2(1, ServoMotorAddress.CMD16);
@@ -198,6 +196,9 @@ namespace INT_PT002.Controls
 
         public void DisplayRefresh()
         {
+            // 서보설정 읽는동안 Enable = false
+            this.ParentForm.Enabled = false;
+
             this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.IOTest;
             this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.IOTest);
 

INT_PT002/DialogForms/DialogFormLogOn.cs

@@ -69,6 +69,15 @@ namespace INT_PT002.Forms
         }
         #endregion
 
+        #region Override Member
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+
+            this.Size = new Size(600, 379);
+        }
+        #endregion
+
         #region Event Handler
         private void buttonLogOn_Click(object sender, EventArgs e)
         {

INT_PT002/DialogForms/DialogFormMessage.cs

@@ -723,6 +723,8 @@ namespace INT_PT002.DialogForms
             y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
 
             this.Location = new Point(x, y);
+
+            this.Size = new Size(450, 155);
         }
 
         private void PictureBoxVisible(bool bValue)

INT_PT002/DialogForms/DialogFormNumKeyPad.Designer.cs

@@ -257,7 +257,7 @@
             this.Controls.Add(this.labelCaption);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.Name = "DialogFormNumKeyPad";
-            this.Text = "DialogFormNumKeyPad1";
+            this.Text = "KeyPad";
             this.ResumeLayout(false);
 
         }

INT_PT002/DialogForms/DialogFormNumKeyPad.cs

@@ -101,7 +101,7 @@ namespace INT_PT002.DialogForms
 
             this.Location = new Point(x, y);
 
-            this.Size = new Size(250, 443);
+            this.Size = new Size(250, 415);
         }
 
         private void InputNumber(string key)

INT_PT002/DialogForms/DialogFormPasswordKeyPad.cs

@@ -101,6 +101,8 @@ namespace INT_PT002.DialogForms
 
             this.Location = new Point(x, y);
 
+            this.Size = new Size(250, 356);
+
             this.InputKey = "";
             this.labelScreen.Text = "";
         }