유저설정 수정

INT_PT002/Controls/User/ControlMenuUserUserEditor.cs

@@ -111,7 +111,6 @@ namespace INT_PT002.Controls
 
             this.labelExpiryDateOfAccount.Enabled = true;
             this.labelExpiryDateOfPassword.Enabled = true;
-            this.labelAutomaticLogoutTime.Enabled = true;
             this.SetEnableID(true);
             this.SetEnablePassword(true);
         }
@@ -285,6 +284,9 @@ namespace INT_PT002.Controls
                     this.buttonLevel2.ButtonUp();
                     this.buttonLevel3.ButtonUp();
                     this.buttonLevel1.ButtonDown();
+                    this.buttonLevel1.Enabled = true;
+                    this.buttonLevel2.Enabled = true;
+                    this.buttonLevel3.Enabled = true;
 
                     this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL1_NAME;
 
@@ -306,6 +308,9 @@ namespace INT_PT002.Controls
                     this.buttonLevel1.ButtonUp();
                     this.buttonLevel3.ButtonUp();
                     this.buttonLevel2.ButtonDown();
+                    this.buttonLevel1.Enabled = true;
+                    this.buttonLevel2.Enabled = true;
+                    this.buttonLevel3.Enabled = true;
 
                     this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL2_NAME;
 
@@ -327,6 +332,9 @@ namespace INT_PT002.Controls
                     this.buttonLevel1.ButtonUp();
                     this.buttonLevel2.ButtonUp();
                     this.buttonLevel3.ButtonDown();
+                    this.buttonLevel1.Enabled = true;
+                    this.buttonLevel2.Enabled = true;
+                    this.buttonLevel3.Enabled = true;
 
                     this.labelAccessRight.Text = this.ParentForm.ParentForm.SystemConfig.LEVEL3_NAME;
 
@@ -348,6 +356,9 @@ namespace INT_PT002.Controls
                     this.buttonLevel1.ButtonUp();
                     this.buttonLevel2.ButtonUp();
                     this.buttonLevel3.ButtonUp();
+                    this.buttonLevel1.Enabled = false;
+                    this.buttonLevel2.Enabled = false;
+                    this.buttonLevel3.Enabled = false;
 
                     this.labelAccessRight.Text = "Admin";
 
@@ -369,6 +380,9 @@ namespace INT_PT002.Controls
                     this.buttonLevel1.ButtonUp();
                     this.buttonLevel2.ButtonUp();
                     this.buttonLevel3.ButtonUp();
+                    this.buttonLevel1.Enabled = true;
+                    this.buttonLevel2.Enabled = true;
+                    this.buttonLevel3.Enabled = true;
 
                     this.labelAccessRight.Text = "";
 
@@ -596,8 +610,6 @@ namespace INT_PT002.Controls
                     this.labelExpiryDateOfAccount.BackColor = Color.Silver;
                     this.labelExpiryDateOfPassword.Enabled = false;
                     this.labelExpiryDateOfPassword.BackColor = Color.Silver;
-                    this.labelAutomaticLogoutTime.Enabled = false;
-                    this.labelAutomaticLogoutTime.BackColor = Color.Silver;
                     this.buttonDelete.Enabled = true;
 
                     DialogFormMessage dlg = new DialogFormMessage(Define.E_MessageBoxIcon.Asterisk, code, message1, message2, 0);

INT_PT002/DataStore/User.cs

@@ -439,12 +439,12 @@ namespace INT_PT002.DataStore
         {
             this.IsUpdate = false;
 
-            this.ID = "-";
+            this.ID = "";
-            this.Password = "-";
+            this.Password = "";
 
-            this.PreviousPassword1 = "-";
+            this.PreviousPassword1 = "";
-            this.PreviousPassword2 = "-";
+            this.PreviousPassword2 = "";
-            this.PreviousPassword3 = "-";
+            this.PreviousPassword3 = "";
 
             this.ExpireAccount = 0;
             this.ExpirePassword = 0;

INT_PT002/DialogForms/DialogFormMessage.cs

@@ -724,7 +724,7 @@ namespace INT_PT002.DialogForms
 
             this.Location = new Point(x, y);
 
-            this.Size = new Size(450, 155);
+            this.Size = new Size(452, 157);
         }
 
         private void PictureBoxVisible(bool bValue)
@@ -742,7 +742,6 @@ namespace INT_PT002.DialogForms
             base.OnLoad(e);
 
             this.InitializeControl();
-            this.Size = new Size(450, 155);
         }
         #endregion
 

INT_PT002/DialogForms/DialogFormProgressBar.cs

@@ -678,6 +678,11 @@ namespace INT_PT002.DialogForms
             else
                 this.UpdateMainBoardFail(this.Language);
         }
+        private void smartTimerReboot_Tick(object sender, EventArgs e)
+        {
+            this.smartTimerReboot.Stop();
+            SmartX.SmartConfigs.ReBoot();
+        }
 
         private void buttonOK_Click(object sender, EventArgs e)
         {
@@ -686,11 +691,5 @@ namespace INT_PT002.DialogForms
             this.Close();
         }
         #endregion
-
-        private void smartTimerReboot_Tick(object sender, EventArgs e)
-        {
-            this.smartTimerReboot.Stop();
-            SmartX.SmartConfigs.ReBoot();
-        }
     }
 }

INT_PT002/DialogForms/DialogFormYesNo.cs

@@ -330,6 +330,7 @@ namespace INT_PT002.DialogForms
             y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
 
             this.Location = new Point(x, y);
+            this.Size = new Size(452, 157);
         }
         #endregion
 
@@ -339,7 +340,6 @@ namespace INT_PT002.DialogForms
             base.OnLoad(e);
 
             this.InitializeControl();
-            this.Size = new Size(450, 155);
         }
         #endregion
 

INT_PT002/Part11_UserManager/UserManager.Structure.cs

@@ -347,11 +347,11 @@ namespace INT_PT002.Part11_UserManager
             [MarshalAs(UnmanagedType.Struct)]
             public DateTime_t expire_account_date;
 
-            [MarshalAs(UnmanagedType.Struct)]
-            public MenuID_t menuID;
-
             [MarshalAs(UnmanagedType.I4)]
             public Int32 active_level;
+
+            [MarshalAs(UnmanagedType.Struct)]
+            public MenuID_t menuID;
         } 
         #endregion