parent
							
								
									c05d578772
								
							
						
					
					
						commit
						19b19d5271
					
				|  | @ -38,6 +38,7 @@ | ||||||
|             this.smartTimerUpdate = new SmartX.SmartTimer(); |             this.smartTimerUpdate = new SmartX.SmartTimer(); | ||||||
|             this.smartSerialPort2 = new SmartX.SmartSerialPort(this.components); |             this.smartSerialPort2 = new SmartX.SmartSerialPort(this.components); | ||||||
|             this.timerForMainBoard = new SmartX.SmartTimer(); |             this.timerForMainBoard = new SmartX.SmartTimer(); | ||||||
|  |             this.smartTimerReboot = new SmartX.SmartTimer(); | ||||||
|             this.smartGroupBox1.SuspendLayout(); |             this.smartGroupBox1.SuspendLayout(); | ||||||
|             this.SuspendLayout(); |             this.SuspendLayout(); | ||||||
|             //  |             //  | ||||||
|  | @ -105,7 +106,7 @@ | ||||||
|             this.labelMessage2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |             this.labelMessage2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); | ||||||
|             this.labelMessage2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); |             this.labelMessage2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); | ||||||
|             this.labelMessage2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; |             this.labelMessage2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; | ||||||
|             this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); |             this.labelMessage2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); | ||||||
|             this.labelMessage2.LineSpacing = 0F; |             this.labelMessage2.LineSpacing = 0F; | ||||||
|             this.labelMessage2.Location = new System.Drawing.Point(43, 84); |             this.labelMessage2.Location = new System.Drawing.Point(43, 84); | ||||||
|             this.labelMessage2.Name = "labelMessage2"; |             this.labelMessage2.Name = "labelMessage2"; | ||||||
|  | @ -169,7 +170,7 @@ | ||||||
|             this.labelMessage1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |             this.labelMessage1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); | ||||||
|             this.labelMessage1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); |             this.labelMessage1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); | ||||||
|             this.labelMessage1.BorderStyle = SmartX.SmartLabel.BorderStyles.None; |             this.labelMessage1.BorderStyle = SmartX.SmartLabel.BorderStyles.None; | ||||||
|             this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); |             this.labelMessage1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); | ||||||
|             this.labelMessage1.LineSpacing = 0F; |             this.labelMessage1.LineSpacing = 0F; | ||||||
|             this.labelMessage1.Location = new System.Drawing.Point(43, 62); |             this.labelMessage1.Location = new System.Drawing.Point(43, 62); | ||||||
|             this.labelMessage1.Name = "labelMessage1"; |             this.labelMessage1.Name = "labelMessage1"; | ||||||
|  | @ -234,6 +235,15 @@ | ||||||
|             this.timerForMainBoard.TimeFormStringSeparator = ":"; |             this.timerForMainBoard.TimeFormStringSeparator = ":"; | ||||||
|             this.timerForMainBoard.Tick += new System.EventHandler(this.timerForMainBoard_Tick); |             this.timerForMainBoard.Tick += new System.EventHandler(this.timerForMainBoard_Tick); | ||||||
|             //  |             //  | ||||||
|  |             // smartTimerReboot | ||||||
|  |             //  | ||||||
|  |             this.smartTimerReboot.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; | ||||||
|  |             this.smartTimerReboot.Interval = 3000; | ||||||
|  |             this.smartTimerReboot.IntervalSeries = null; | ||||||
|  |             this.smartTimerReboot.TimeCount = ((long)(1000000)); | ||||||
|  |             this.smartTimerReboot.TimeFormStringSeparator = ":"; | ||||||
|  |             this.smartTimerReboot.Tick += new System.EventHandler(this.smartTimerReboot_Tick); | ||||||
|  |             //  | ||||||
|             // DialogFormProgressBar |             // DialogFormProgressBar | ||||||
|             //  |             //  | ||||||
|             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); | ||||||
|  | @ -262,5 +272,6 @@ | ||||||
|         private SmartX.SmartSerialPort smartSerialPort2; |         private SmartX.SmartSerialPort smartSerialPort2; | ||||||
|         private SmartX.SmartButton buttonOK; |         private SmartX.SmartButton buttonOK; | ||||||
|         private SmartX.SmartTimer timerForMainBoard; |         private SmartX.SmartTimer timerForMainBoard; | ||||||
|  |         private SmartX.SmartTimer smartTimerReboot; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @ -11,6 +11,7 @@ using System.Collections.ObjectModel; | ||||||
| 
 | 
 | ||||||
| using SmartX; | using SmartX; | ||||||
| using INT_PT002.DataStore; | using INT_PT002.DataStore; | ||||||
|  | using INT_PT002.Forms; | ||||||
| 
 | 
 | ||||||
| namespace INT_PT002.DialogForms | namespace INT_PT002.DialogForms | ||||||
| { | { | ||||||
|  | @ -31,14 +32,11 @@ namespace INT_PT002.DialogForms | ||||||
|         public UpdateForMainBoard UpdateForMain; |         public UpdateForMainBoard UpdateForMain; | ||||||
| 
 | 
 | ||||||
|         private Define.E_LanguageID m_Language; |         private Define.E_LanguageID m_Language; | ||||||
|  | 
 | ||||||
|  |         private FormMain m_ParentForm; | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|         #region Constructor |         #region Constructor | ||||||
|         public DialogFormProgressBar() |  | ||||||
|         { |  | ||||||
|             InitializeComponent(); |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         public DialogFormProgressBar(int code, Define.E_LanguageID language) |         public DialogFormProgressBar(int code, Define.E_LanguageID language) | ||||||
|         { |         { | ||||||
|             InitializeComponent(); |             InitializeComponent(); | ||||||
|  | @ -49,6 +47,7 @@ namespace INT_PT002.DialogForms | ||||||
| 
 | 
 | ||||||
|             this.Code = code; |             this.Code = code; | ||||||
|             this.Language = language; |             this.Language = language; | ||||||
|  |             //this.ParentForm = parent; | ||||||
| 
 | 
 | ||||||
|             if (language == Define.E_LanguageID.Korean) |             if (language == Define.E_LanguageID.Korean) | ||||||
|             { |             { | ||||||
|  | @ -101,6 +100,7 @@ namespace INT_PT002.DialogForms | ||||||
|             this.Code = code; |             this.Code = code; | ||||||
|             this.UpdateForMain = updateForMain; |             this.UpdateForMain = updateForMain; | ||||||
|             this.Language = language; |             this.Language = language; | ||||||
|  |             //this.ParentForm = parent; | ||||||
| 
 | 
 | ||||||
|             if (language == Define.E_LanguageID.Korean) |             if (language == Define.E_LanguageID.Korean) | ||||||
|             { |             { | ||||||
|  | @ -150,6 +150,11 @@ namespace INT_PT002.DialogForms | ||||||
|             get { return this.m_Language; } |             get { return this.m_Language; } | ||||||
|             set { this.m_Language = value; } |             set { this.m_Language = value; } | ||||||
|         } |         } | ||||||
|  |         public FormMain ParentForm | ||||||
|  |         { | ||||||
|  |             get { return this.m_ParentForm; } | ||||||
|  |             private set { this.m_ParentForm = value; } | ||||||
|  |         } | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|         #region Method |         #region Method | ||||||
|  | @ -162,7 +167,7 @@ namespace INT_PT002.DialogForms | ||||||
| 
 | 
 | ||||||
|             this.Location = new Point(x, y); |             this.Location = new Point(x, y); | ||||||
| 
 | 
 | ||||||
|             this.Size = new Size(452, 195); |             this.Size = new Size(452, 197); | ||||||
|         } |         } | ||||||
|         private void DefaultSetting() |         private void DefaultSetting() | ||||||
|         { |         { | ||||||
|  | @ -180,9 +185,6 @@ namespace INT_PT002.DialogForms | ||||||
|             this.UpdateFileMainboardPath = this.USBPath + "UpdateFilesMain\\"; |             this.UpdateFileMainboardPath = this.USBPath + "UpdateFilesMain\\"; | ||||||
|             //this.OldFilePath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase) + "\\"; |             //this.OldFilePath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase) + "\\"; | ||||||
|             this.OldFilePath = "SD Card\\Run\\"; |             this.OldFilePath = "SD Card\\Run\\"; | ||||||
|             if (this.OldFilePath.StartsWith("\\F") == true) |  | ||||||
|                 this.RemoveFolderPath = "Flash Disk\\RemoveFile\\"; |  | ||||||
|             else |  | ||||||
|             this.RemoveFolderPath = "SD Card\\RemoveFile\\"; |             this.RemoveFolderPath = "SD Card\\RemoveFile\\"; | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|  | @ -605,6 +607,7 @@ namespace INT_PT002.DialogForms | ||||||
|                     break; |                     break; | ||||||
|             } |             } | ||||||
|             this.Refresh(); |             this.Refresh(); | ||||||
|  |             this.smartTimerReboot.Start(); | ||||||
|         } |         } | ||||||
|         #endregion |         #endregion | ||||||
| 
 | 
 | ||||||
|  | @ -683,5 +686,11 @@ namespace INT_PT002.DialogForms | ||||||
|             this.Close(); |             this.Close(); | ||||||
|         } |         } | ||||||
|         #endregion |         #endregion | ||||||
|  | 
 | ||||||
|  |         private void smartTimerReboot_Tick(object sender, EventArgs e) | ||||||
|  |         { | ||||||
|  |             this.smartTimerReboot.Stop(); | ||||||
|  |             SmartX.SmartConfigs.ReBoot(); | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @ -129,6 +129,9 @@ | ||||||
|   <metadata name="timerForMainBoard.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |   <metadata name="timerForMainBoard.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||||
|     <value>436, 17</value> |     <value>436, 17</value> | ||||||
|   </metadata> |   </metadata> | ||||||
|  |   <metadata name="smartTimerReboot.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> | ||||||
|  |     <value>595, 17</value> | ||||||
|  |   </metadata> | ||||||
|   <metadata name="$this.FormFactorShadowProperty" xml:space="preserve"> |   <metadata name="$this.FormFactorShadowProperty" xml:space="preserve"> | ||||||
|     <value>WEBPAD</value> |     <value>WEBPAD</value> | ||||||
|   </metadata> |   </metadata> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue