merge

2 files changed, 26 insertions, 10 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 696cc051f..640c3c1df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -50,18 +50,16 @@
                             <TextBlock><Run>v</Run><Run Text="{Binding ApplicationManager.CoreVersion,Mode=OneWay}"></Run></TextBlock>
                             <TextBlock FontWeight="SemiBold">Build Date:</TextBlock>
                             <TextBlock Text="{Binding ApplicationManager.BuildDate,Mode=OneWay}"></TextBlock>
-                            <TextBlock FontWeight="SemiBold">Environment Mode:</TextBlock>
+                            <TextBlock FontWeight="SemiBold">Data Mode:</TextBlock>
                             <TextBlock Text="{Binding MachineStudioSettings.Environment,Mode=OneWay}"></TextBlock>
-                            <TextBlock FontWeight="SemiBold">Environment Slot:</TextBlock>
+                            <TextBlock FontWeight="SemiBold">Environment:</TextBlock>
                             <TextBlock Text="{Binding MachineStudioSettings.DeploymentSlot,Mode=OneWay}"></TextBlock>
                             <TextBlock FontWeight="SemiBold">Machine Service:</TextBlock>
-                            <TextBlock Text="{Binding MachineStudioSettings.DeploymentSlot,Converter={StaticResource EnumToDescriptionConverter},Mode=OneWay}"></TextBlock>
+                            <TextBlock Text="{Binding MachineStudioSettings.MachineServiceAddress}"></TextBlock>
                             <TextBlock FontWeight="SemiBold">Data Source:</TextBlock>
                             <TextBlock><Run Text="{Binding DataSource.Address,Mode=OneWay}"></Run>
                                 <Run>(</Run><Run Foreground="Gray" Text="{Binding DataSource.Catalog,Mode=OneWay}"></Run><Run>)</Run>
                             </TextBlock>
-                            <TextBlock FontWeight="SemiBold">Allow BETA Updates:</TextBlock>
-                            <ToggleButton IsChecked="{Binding MachineStudioSettings.AcceptBetaRelease,Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Bottom"></ToggleButton>
                         </controls:TableGrid>
 
                         <DockPanel Margin="0 0 0 0">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
index 84f4b2d92..9acd0386a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
@@ -14,7 +14,18 @@
     <UserControl.Resources>
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
     </UserControl.Resources>
-    
+
+    <UserControl.Style>
+        <Style TargetType="UserControl">
+            <Setter Property="Cursor" Value="Arrow"></Setter>
+            <Style.Triggers>
+                <DataTrigger Binding="{Binding IsFree}" Value="False">
+                    <Setter Property="Cursor" Value="Wait"></Setter>
+                </DataTrigger>
+            </Style.Triggers>
+        </Style>
+    </UserControl.Style>
+
     <Grid>
         <Grid Margin="10">
             <Grid.RowDefinitions>
@@ -47,10 +58,17 @@
                         <LineBreak/>
                         <Run>Press 'SELECT' to browse for an .tfp file (Tango Firmware Package).</Run>
                                 </TextBlock>
-                                <DockPanel Margin="0 30 0 0" Width="600" HorizontalAlignment="Left">
-                                    <Button DockPanel.Dock="Right" Margin="10 0 0 0" Command="{Binding SelectCommand}">SELECT</Button>
-                                    <TextBox Style="{x:Null}" VerticalContentAlignment="Center" BorderBrush="{StaticResource AccentColorBrush}" Padding="5 0" Foreground="DimGray" IsReadOnly="True" Text="{Binding SelectedFile,Mode=OneWay}"></TextBox>
-                                </DockPanel>
+                                <StackPanel>
+                                    <DockPanel Margin="0 30 0 0" Width="600" HorizontalAlignment="Left">
+                                        <Button DockPanel.Dock="Right" Margin="10 0 0 0" Command="{Binding SelectCommand}">SELECT</Button>
+                                        <TextBox Style="{x:Null}" VerticalContentAlignment="Center" BorderBrush="{StaticResource AccentColorBrush}" Padding="5 0" Foreground="DimGray" IsReadOnly="True" Text="{Binding SelectedFile,Mode=OneWay}"></TextBox>
+                                    </DockPanel>
+
+                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                        <RadioButton IsChecked="{Binding DFU,Mode=TwoWay}">DFU</RadioButton>
+                                        <RadioButton IsChecked="{Binding UploadTFP,Mode=TwoWay}" Margin="20 0 0 0">DFU &amp; Package</RadioButton>
+                                    </StackPanel>
+                                </StackPanel>
                             </StackPanel>
 
                             <Grid Height="60" Grid.Row="1">