diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-14 15:31:28 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-14 15:31:28 +0300 |
| commit | a282f06d5060617af3ba3b4c4ea6b9f03372df3d (patch) | |
| tree | fa76ceb90dc7e5ef7bfb0f6e6382dc9b3a34cbc1 /Software | |
| parent | 638606d27758a62c3369d4e0f335e12555334cc2 (diff) | |
| download | Tango-a282f06d5060617af3ba3b4c4ea6b9f03372df3d.tar.gz Tango-a282f06d5060617af3ba3b4c4ea6b9f03372df3d.zip | |
Fixed some issues with Machine Setup.
Diffstat (limited to 'Software')
4 files changed, 15 insertions, 11 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs index f40725a35..281c68a77 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -166,7 +166,7 @@ namespace Tango.PPC.Common.MachineSetup LogManager.Log("Copying latest updater utility to application path..."); //Copy new updater utility to app path. - File.Copy(Path.Combine(_newPackageTempFolder, "Tango.PPC.Updater.exe"), Path.Combine(PathHelper.GetStartupPath(), "Tango.PPC.Updater.exe")); + File.Copy(Path.Combine(_newPackageTempFolder, "Tango.PPC.Updater.exe"), Path.Combine(PathHelper.GetStartupPath(), "Tango.PPC.Updater.exe"), true); //Synchronize database diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml index 9ff98ce52..e67905eba 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineSetupView.xaml @@ -76,7 +76,7 @@ <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}">Setup completed successfully. Machine is ready!</TextBlock> </StackPanel> - <touch:TouchButton Margin="0 200 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding CompleteCommand}">START</touch:TouchButton> + <touch:TouchButton Margin="0 200 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding CompleteCommand}">RESTART</touch:TouchButton> </StackPanel> </StackPanel> </DockPanel> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml index 77a87d224..a5e63477f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml @@ -10,8 +10,8 @@ <Grid> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <Image Source="/Images/package.png" Width="200" /> - <TextBlock x:Name="txtStatus" Margin="0 100 0 0" FontSize="22" Text="Updating Tango..." HorizontalAlignment="Center"></TextBlock> - <ProgressBar x:Name="prog" Margin="0 30 0 0" Width="500" Height="10" Maximum="100" Value="50" BorderThickness="0" Foreground="#1c63ea"></ProgressBar> + <TextBlock x:Name="txtStatus" Margin="0 100 0 0" FontSize="16" Text="Updating Tango..." HorizontalAlignment="Center"></TextBlock> + <ProgressBar x:Name="prog" Margin="0 30 0 0" Width="500" Height="10" Maximum="100" Value="0" BorderThickness="0" Foreground="#1c63ea"></ProgressBar> </StackPanel> </Grid> </Window> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml.cs index 34e32a306..394d3292f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml.cs @@ -30,12 +30,12 @@ namespace Tango.PPC.Updater public MainWindow() { //Launch debugger.. -#if DEBUG - if (!Debugger.IsAttached) - { - Debugger.Launch(); - } -#endif +//#if DEBUG +// if (!Debugger.IsAttached) +// { +// Debugger.Launch(); +// } +//#endif if (!Directory.Exists(_sourceFolder)) { @@ -76,7 +76,11 @@ namespace Tango.PPC.Updater { Debug.WriteLine(ex.ToString()); ShowError(ex.Message); - StartTango(); + Process p = new Process(); + p.StartInfo.FileName = _appPath + "\\" + _msProcessName + ".exe"; + p.StartInfo.LoadUserProfile = true; + p.StartInfo.UseShellExecute = true; + p.Start(); Environment.Exit(0); } } |