diff --git a/.gitignore b/.gitignore index 35879b2..6407fb2 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk +*.exe diff --git a/innosetup/Output/nxtuitrack-setup.exe b/innosetup/Output/nxtuitrack-setup.exe index 18dff11..89c7525 100644 Binary files a/innosetup/Output/nxtuitrack-setup.exe and b/innosetup/Output/nxtuitrack-setup.exe differ diff --git a/nxtuitracker.v11.suo b/nxtuitracker.v11.suo index 5a3c074..703c195 100644 Binary files a/nxtuitracker.v11.suo and b/nxtuitracker.v11.suo differ diff --git a/nxtuitracker/Form1.vb b/nxtuitracker/Form1.vb index c3e1037..da726d6 100644 --- a/nxtuitracker/Form1.vb +++ b/nxtuitracker/Form1.vb @@ -118,11 +118,11 @@ Public Class Form1 MessageBox.Show("Already using " & m_UI.Version & " Nextest UI Version", "Change UI", MessageBoxButtons.OK, MessageBoxIcon.Information) Exit Sub Else - Dim result As Integer - result = MessageBox.Show("Are you sure you want to change UI Version from " & m_UI.Version & " to " & sender.ToString, "Confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = vbNo Then - Exit Sub - End If + 'Dim result As Integer + 'result = MessageBox.Show("Are you sure you want to change UI Version from " & m_UI.Version & " to " & sender.ToString, "Confirmation", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + 'If result = vbNo Then + ' Exit Sub + 'End If End If frm_changeui.targetui = sender.ToString diff --git a/nxtuitracker/Form4.Designer.vb b/nxtuitracker/Form4.Designer.vb index 2abf7f5..7eada48 100644 --- a/nxtuitracker/Form4.Designer.vb +++ b/nxtuitracker/Form4.Designer.vb @@ -187,7 +187,7 @@ Partial Class frm_changeui Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(271, 26) Me.Button1.TabIndex = 26 - Me.Button1.Text = "Cancel" + Me.Button1.Text = "Proceed" Me.Button1.UseVisualStyleBackColor = True ' 'frm_changeui diff --git a/nxtuitracker/Form4.vb b/nxtuitracker/Form4.vb index 4af0a79..3424ef0 100644 --- a/nxtuitracker/Form4.vb +++ b/nxtuitracker/Form4.vb @@ -1,17 +1,18 @@ Public Class frm_changeui Dim skip As Boolean = False - Dim ongoing As Boolean = True + Dim status As Integer = 0 Public targetui As String Private Sub frm_changeui_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - If ongoing Then + If status = 1 Then If vbNo = MsgBox("Change UI is still in progress." & vbNewLine & "Are you sure you want to cancel?" & vbNewLine & "(This may cause unexpected behavior)", vbYesNo + vbExclamation, "Confirm") Then e.Cancel = True Else - bw_changeui.CancelAsync() + status = 0 Form1.WindowState = FormWindowState.Normal End If Else + status = 0 Form1.WindowState = FormWindowState.Normal End If @@ -19,25 +20,14 @@ Private Sub frm_changeui_Load(sender As Object, e As EventArgs) Handles Me.Load Form1.WindowState = FormWindowState.Minimized - bw_changeui.RunWorkerAsync() End Sub - - Private Sub frm_changeui_Shown(sender As Object, e As EventArgs) Handles Me.Shown - - End Sub - - Private Sub lbl_skip_MouseUp(sender As Object, e As MouseEventArgs) skip = True End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) - Me.Close() - End Sub - - Private Sub bw_changeui_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles bw_changeui.DoWork - ongoing = True + Private Sub change_ui() + status = 1 lbl_caldata.Text = "Copying ""caldata_" & targetui.Replace(".", "") & """ to ""caldata""" lbl_caldata_warning.Text = "" lbl_testhead_warning.Text = "" @@ -46,13 +36,16 @@ lbl_caldata.ForeColor = Color.Gray Label3.ForeColor = Color.Gray Label4.ForeColor = Color.Gray + Dim ping_result As Boolean = True + Dim mod_ctr As UInt64 = 0 While (skip = False And ping_result = True) - If My.Computer.Network.IsAvailable Then + If My.Computer.Network.IsAvailable And mod_ctr Mod 10 = 0 Then ping_result = My.Computer.Network.Ping("10.1.1.1") End If - System.Threading.Thread.Sleep(1000) + System.Threading.Thread.Sleep(100) Application.DoEvents() + mod_ctr += 1 End While If skip = True Then @@ -62,65 +55,99 @@ pic_chk1.BackColor = Color.LimeGreen End If - - skip = False - Label1.ForeColor = Color.Gray lbl_caldata.ForeColor = Color.Black Label3.ForeColor = Color.Gray Label4.ForeColor = Color.Gray - Dim tempctr As Integer = 50 + Dim tempctr As Integer = 30 While (tempctr > 0) System.Threading.Thread.Sleep(100) Application.DoEvents() tempctr -= 1 End While - 'Copy caldata + + 'Copy caldata (Ugly code below, I know) Dim new_caldata_path As String = "c:\nextest\" & "caldata_" & targetui.Replace(".", "") Dim old_caldata_path As String = "c:\nextest\caldata" - Dim default_caldata_path As String = "c:\nextest\" & "caldata_" & targetui.Substring(0, 2) & "xxx" - If FileIO.FileSystem.DirectoryExists(new_caldata_path) And System.IO.Directory.GetFiles(new_caldata_path).Count > 0 Then - If FileIO.FileSystem.DirectoryExists(old_caldata_path) Then - FileIO.FileSystem.DeleteDirectory(old_caldata_path, FileIO.DeleteDirectoryOption.DeleteAllContents) + Dim def_caldata_path As String = "c:\nextest\" & "caldata_" & targetui.Substring(0, 2) & "xxx" + Try + If System.IO.Directory.GetFiles(new_caldata_path).Count > 0 Then + If FileIO.FileSystem.DirectoryExists(old_caldata_path) Then + FileIO.FileSystem.DeleteDirectory(old_caldata_path, FileIO.DeleteDirectoryOption.DeleteAllContents) + Else + FileIO.FileSystem.CreateDirectory(old_caldata_path) + End If + + FileIO.FileSystem.CopyDirectory(new_caldata_path, old_caldata_path, True) + pic_chk2.BackColor = Color.LimeGreen Else - FileIO.FileSystem.CreateDirectory(old_caldata_path) + Try + If System.IO.Directory.GetFiles(def_caldata_path).Count > 0 Then + If FileIO.FileSystem.DirectoryExists(old_caldata_path) Then + FileIO.FileSystem.DeleteDirectory(old_caldata_path, FileIO.DeleteDirectoryOption.DeleteAllContents) + + Else + FileIO.FileSystem.CreateDirectory(old_caldata_path) + End If + + FileIO.FileSystem.CopyDirectory(def_caldata_path, old_caldata_path, True) + pic_chk2.BackColor = Color.LimeGreen + lbl_caldata.Text = "Copying from ""caldata_" & targetui.Substring(0, 2) & "xxx"" to ""caldata""" + Else + pic_chk2.BackColor = Color.Red + lbl_caldata_warning.Text = "No available caldata for " & targetui + Button1.Text = "Close" + status = 2 + Exit Sub + End If + Catch ex2 As Exception + pic_chk2.BackColor = Color.Red + lbl_caldata_warning.Text = "No available caldata for " & targetui + Button1.Text = "Close" + status = 2 + Exit Sub + End Try End If + Catch ex1 As Exception + Try + If System.IO.Directory.GetFiles(def_caldata_path).Count > 0 Then + If FileIO.FileSystem.DirectoryExists(old_caldata_path) Then + FileIO.FileSystem.DeleteDirectory(old_caldata_path, FileIO.DeleteDirectoryOption.DeleteAllContents) - FileIO.FileSystem.CopyDirectory(new_caldata_path, old_caldata_path, True) - pic_chk2.BackColor = Color.LimeGreen + Else + FileIO.FileSystem.CreateDirectory(old_caldata_path) + End If - ElseIf FileIO.FileSystem.DirectoryExists(default_caldata_path) And System.IO.Directory.GetFiles(default_caldata_path).Count > 0 Then - If FileIO.FileSystem.DirectoryExists(old_caldata_path) Then - FileIO.FileSystem.DeleteDirectory(old_caldata_path, FileIO.DeleteDirectoryOption.DeleteAllContents) - - Else - FileIO.FileSystem.CreateDirectory(old_caldata_path) - End If - - FileIO.FileSystem.CopyDirectory(default_caldata_path, old_caldata_path, True) - pic_chk2.BackColor = Color.Black - lbl_caldata_warning.Text = "Copying from ""caldata_" & targetui.Substring(0, 2) & "xxx"" to ""caldata""" - Else - pic_chk2.BackColor = Color.Red - lbl_caldata_warning.Text = "No available caldata for " & targetui - MsgBox("No available caldata for " & targetui & vbNewLine & "Change UI will abort", vbOKOnly + vbCritical, "Abort") - ongoing = False - Me.Close() - Exit Sub - End If + FileIO.FileSystem.CopyDirectory(def_caldata_path, old_caldata_path, True) + pic_chk2.BackColor = Color.LimeGreen + lbl_caldata.Text = "Copying from ""caldata_" & targetui.Substring(0, 2) & "xxx"" to ""caldata""" + Else + pic_chk2.BackColor = Color.Red + lbl_caldata_warning.Text = "No available caldata for " & targetui + Button1.Text = "Close" + status = 2 + Exit Sub + End If + Catch ex2 As Exception + pic_chk2.BackColor = Color.Red + lbl_caldata_warning.Text = "No available caldata for " & targetui + Button1.Text = "Close" + status = 2 + Exit Sub + End Try + End Try skip = False - Label1.ForeColor = Color.Gray lbl_caldata.ForeColor = Color.Gray Label3.ForeColor = Color.Black Label4.ForeColor = Color.Gray - tempctr = 50 + tempctr = 30 While (tempctr > 0) System.Threading.Thread.Sleep(100) Application.DoEvents() @@ -142,21 +169,27 @@ Label3.ForeColor = Color.Gray Label4.ForeColor = Color.Black - tempctr = 40 + tempctr = 30 While (tempctr > 0) System.Threading.Thread.Sleep(100) Application.DoEvents() tempctr -= 1 End While - ongoing = False + pic_chk4.BackColor = Color.LimeGreen Button1.Text = "Close" + status = 2 End Sub - Private Sub lbl_skip_Click(sender As Object, e As EventArgs) + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If status = 0 Then + Button1.Text = "Cancel" + Application.DoEvents() + change_ui() + Else + Me.Close() + End If End Sub - - End Class \ No newline at end of file diff --git a/nxtuitracker/bin/Debug/nxtuitrack.application b/nxtuitracker/bin/Debug/nxtuitrack.application index 455a8b5..35b3c80 100644 --- a/nxtuitracker/bin/Debug/nxtuitrack.application +++ b/nxtuitracker/bin/Debug/nxtuitrack.application @@ -14,7 +14,7 @@ - FBp3GJw6431bPYyCfW+sXfuh/jY= + tYPoBy7udcP1YDWq7pTHz5Roxx8= diff --git a/nxtuitracker/bin/Debug/nxtuitrack.exe b/nxtuitracker/bin/Debug/nxtuitrack.exe index 0c9f29a..4e252e2 100644 Binary files a/nxtuitracker/bin/Debug/nxtuitrack.exe and b/nxtuitracker/bin/Debug/nxtuitrack.exe differ diff --git a/nxtuitracker/bin/Debug/nxtuitrack.exe.manifest b/nxtuitracker/bin/Debug/nxtuitrack.exe.manifest index a04dae5..b254081 100644 --- a/nxtuitracker/bin/Debug/nxtuitrack.exe.manifest +++ b/nxtuitracker/bin/Debug/nxtuitrack.exe.manifest @@ -42,14 +42,14 @@ - + - Gs0cZ00hkvgR3ydyuF1RRjnmYBM= + pbp/++ayH18OpQ+efzKBU90kHzc= diff --git a/nxtuitracker/bin/Debug/nxtuitrack.pdb b/nxtuitracker/bin/Debug/nxtuitrack.pdb index 29ab199..3c89265 100644 Binary files a/nxtuitracker/bin/Debug/nxtuitrack.pdb and b/nxtuitracker/bin/Debug/nxtuitrack.pdb differ diff --git a/nxtuitracker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/nxtuitracker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 35da3e7..bd1910e 100644 Binary files a/nxtuitracker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/nxtuitracker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/nxtuitracker/obj/Debug/nxtuitrack.Form1.resources b/nxtuitracker/obj/Debug/nxtuitrack.Form1.resources index 3c5a856..c820c09 100644 Binary files a/nxtuitracker/obj/Debug/nxtuitrack.Form1.resources and b/nxtuitracker/obj/Debug/nxtuitrack.Form1.resources differ diff --git a/nxtuitracker/obj/Debug/nxtuitrack.application b/nxtuitracker/obj/Debug/nxtuitrack.application index 455a8b5..35b3c80 100644 --- a/nxtuitracker/obj/Debug/nxtuitrack.application +++ b/nxtuitracker/obj/Debug/nxtuitrack.application @@ -14,7 +14,7 @@ - FBp3GJw6431bPYyCfW+sXfuh/jY= + tYPoBy7udcP1YDWq7pTHz5Roxx8= diff --git a/nxtuitracker/obj/Debug/nxtuitrack.exe b/nxtuitracker/obj/Debug/nxtuitrack.exe index 0c9f29a..4e252e2 100644 Binary files a/nxtuitracker/obj/Debug/nxtuitrack.exe and b/nxtuitracker/obj/Debug/nxtuitrack.exe differ diff --git a/nxtuitracker/obj/Debug/nxtuitrack.exe.manifest b/nxtuitracker/obj/Debug/nxtuitrack.exe.manifest index a04dae5..b254081 100644 --- a/nxtuitracker/obj/Debug/nxtuitrack.exe.manifest +++ b/nxtuitracker/obj/Debug/nxtuitrack.exe.manifest @@ -42,14 +42,14 @@ - + - Gs0cZ00hkvgR3ydyuF1RRjnmYBM= + pbp/++ayH18OpQ+efzKBU90kHzc= diff --git a/nxtuitracker/obj/Debug/nxtuitrack.pdb b/nxtuitracker/obj/Debug/nxtuitrack.pdb index 29ab199..3c89265 100644 Binary files a/nxtuitracker/obj/Debug/nxtuitrack.pdb and b/nxtuitracker/obj/Debug/nxtuitrack.pdb differ diff --git a/nxtuitracker/obj/Debug/nxtuitracker.vbproj.FileListAbsolute.txt b/nxtuitracker/obj/Debug/nxtuitracker.vbproj.FileListAbsolute.txt index 45055e1..f200df4 100644 --- a/nxtuitracker/obj/Debug/nxtuitracker.vbproj.FileListAbsolute.txt +++ b/nxtuitracker/obj/Debug/nxtuitracker.vbproj.FileListAbsolute.txt @@ -32,3 +32,20 @@ D:\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.Resources.resources D:\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitracker.vbproj.GenerateResource.Cache D:\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.exe.manifest D:\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.application +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\bin\Debug\nxtuitrack.exe.config +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.exe +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.xml +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.pdb +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\bin\Debug\nxtuitrack.exe.manifest +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\bin\Debug\nxtuitrack.application +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\bin\Debug\nxtuitrack.exe +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\bin\Debug\nxtuitrack.pdb +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\bin\Debug\nxtuitrack.xml +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.Form1.resources +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.frm_env.resources +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.frm_mini.resources +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.frm_changeui.resources +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.Resources.resources +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitracker.vbproj.GenerateResource.Cache +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.exe.manifest +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\nxtuitracker\obj\Debug\nxtuitrack.application diff --git a/nxtuitracker/obj/Debug/nxtuitracker.vbproj.GenerateResource.Cache b/nxtuitracker/obj/Debug/nxtuitracker.vbproj.GenerateResource.Cache index 04a6081..3547f1b 100644 Binary files a/nxtuitracker/obj/Debug/nxtuitracker.vbproj.GenerateResource.Cache and b/nxtuitracker/obj/Debug/nxtuitracker.vbproj.GenerateResource.Cache differ diff --git a/systemservice/bin/Debug/systemservice.exe b/systemservice/bin/Debug/systemservice.exe index 9d83a89..521dbd6 100644 Binary files a/systemservice/bin/Debug/systemservice.exe and b/systemservice/bin/Debug/systemservice.exe differ diff --git a/systemservice/bin/Debug/systemservice.pdb b/systemservice/bin/Debug/systemservice.pdb index 93a459e..37dbf03 100644 Binary files a/systemservice/bin/Debug/systemservice.pdb and b/systemservice/bin/Debug/systemservice.pdb differ diff --git a/systemservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/systemservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 60f1036..a0cf3fa 100644 Binary files a/systemservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/systemservice/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/systemservice/obj/Debug/systemservice.exe b/systemservice/obj/Debug/systemservice.exe index 9d83a89..521dbd6 100644 Binary files a/systemservice/obj/Debug/systemservice.exe and b/systemservice/obj/Debug/systemservice.exe differ diff --git a/systemservice/obj/Debug/systemservice.pdb b/systemservice/obj/Debug/systemservice.pdb index 93a459e..37dbf03 100644 Binary files a/systemservice/obj/Debug/systemservice.pdb and b/systemservice/obj/Debug/systemservice.pdb differ diff --git a/systemservice/obj/Debug/systemservice.vbproj.FileListAbsolute.txt b/systemservice/obj/Debug/systemservice.vbproj.FileListAbsolute.txt index 596e8ff..7a4cc71 100644 --- a/systemservice/obj/Debug/systemservice.vbproj.FileListAbsolute.txt +++ b/systemservice/obj/Debug/systemservice.vbproj.FileListAbsolute.txt @@ -28,3 +28,13 @@ D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.vbproj.GenerateRe D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.exe D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.xml D:\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.pdb +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.exe.config +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.exe +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.pdb +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\bin\Debug\systemservice.xml +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.frm_system_svc.resources +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.Resources.resources +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.vbproj.GenerateResource.Cache +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.exe +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.xml +C:\Users\yebreo1\Desktop\Yet Folder\GitHub\nextesttracker\systemservice\obj\Debug\systemservice.pdb diff --git a/systemservice/obj/Debug/systemservice.vbproj.GenerateResource.Cache b/systemservice/obj/Debug/systemservice.vbproj.GenerateResource.Cache index bd31d64..c5f80be 100644 Binary files a/systemservice/obj/Debug/systemservice.vbproj.GenerateResource.Cache and b/systemservice/obj/Debug/systemservice.vbproj.GenerateResource.Cache differ