X1 Future

10 files changed, 21 insertions, 18 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
index b2b770698..6488b1e98 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
@@ -70,9 +70,9 @@
                     <TabItem Header="UPDATES" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <local:MachineUpdatesView/>
                     </TabItem>
-                    <TabItem Header="TUP" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                    <!--<TabItem Header="TUP" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <local:TupView/>
-                    </TabItem>
+                    </TabItem>-->
                 </TabControl>
             </Grid>
         </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml
index bfcf221c9..dc8e8b47b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml
@@ -15,6 +15,9 @@
                         <DataTrigger Binding="{Binding MachineType}" Value="Eureka">
                             <Setter Property="Source" Value="../Images/Connections/eureka.png"></Setter>
                         </DataTrigger>
+                        <DataTrigger Binding="{Binding MachineType}" Value="X1">
+                            <Setter Property="Source" Value="../Images/Connections/x1.png"></Setter>
+                        </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </Image.Style>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs
index 6f754e306..0a3d412b2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MachineConnectionIcon.xaml.cs
@@ -67,7 +67,7 @@ namespace Tango.MachineStudio.Common.Controls
                 else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpFirmwareClient))
                 {
                     ExternalBridgeClientType = ExternalBridgeClientType.Tcp;
-                    MachineType = MachineTypes.Eureka;
+                    MachineType = ExternalBridgeClient.MachineType;
                 }
                 else if (ExternalBridgeClient.GetType() == typeof(ExternalBridgeTcpClient))
                 {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/x1.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/x1.png
new file mode 100644
index 000000000..afa683a31
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/Connections/x1.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index af0d6aab8..7c5daa81a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -453,10 +453,13 @@
     <Resource Include="Images\eureka_small.png" />
     <Resource Include="Images\machines.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Connections\x1.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index e0338a319..9f4787004 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -166,14 +166,6 @@ namespace Tango.MachineStudio.UI
             }
         }
 
-        public MachineLoginViewVM MachineLoginViewVM
-        {
-            get
-            {
-                return TangoIOC.Default.GetInstance<MachineLoginViewVM>();
-            }
-        }
-
         public UpdateViewVM UpdateViewVM
         {
             get
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
index 81d3f4243..9dcf03d40 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
+using Tango.Integration.ExternalBridge;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.PMR.Integration;
 using Tango.SharedUI;
@@ -16,6 +17,8 @@ namespace Tango.MachineStudio.UI.ViewModels
     /// <seealso cref="Tango.MachineStudio.Common.Notifications.DialogViewVM" />
     public class MachineLoginViewVM : DialogViewVM
     {
+        public IExternalBridgeSecureClient ExternalBridgeClient { get; set; }
+
         /// <summary>
         /// Gets or sets the machine password.
         /// </summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 293cccec4..5ba726700 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -667,10 +667,10 @@ namespace Tango.MachineStudio.UI.ViewModels
                 return;
             }
 
-            _notificationProvider.ShowModalDialog<MachineLoginViewVM>((login) =>
-            {
-                ConnectToMachineSecure(machine, login);
-            });
+            _notificationProvider.ShowModalDialog<MachineLoginViewVM, Views.MachineLoginView>(new MachineLoginViewVM() { ExternalBridgeClient = machine }, (login) =>
+               {
+                   ConnectToMachineSecure(machine, login);
+               }, () => { });
         }
 
         private void Machine_SessionClosed(object sender, EventArgs e)
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml
index ba5624592..8209637e6 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectionLostView.xaml
@@ -6,6 +6,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
              mc:Ignorable="d" 
              Width="559" Height="350" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:ConnectionLostViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource MainWindow.Foreground}">
     <Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml
index e4cdfe199..92ba1b46b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineLoginView.xaml
@@ -8,8 +8,9 @@
              xmlns:pmr="clr-namespace:Tango.PMR.Integration;assembly=Tango.PMR"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
              mc:Ignorable="d" 
-             d:DesignHeight="200" d:DesignWidth="550" Background="{StaticResource MainWindow.Background}" DataContext="{Binding MachineLoginViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
+             d:DesignHeight="200" d:DesignWidth="550" Background="{StaticResource MainWindow.Background}" Foreground="{StaticResource MainWindow.Foreground}">
 
     <UserControl.Resources>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
@@ -36,7 +37,7 @@
                 <StackPanel>
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
                         <Grid>
-                            <Image Source="{StaticResource MachineSmall}" Width="60" RenderOptions.BitmapScalingMode="Fant"></Image>
+                            <controls:MachineConnectionIcon Width="60" ExternalBridgeClient="{Binding ExternalBridgeClient}" />
                             <materialDesign:PackIcon Kind="Lock" VerticalAlignment="Bottom" Width="24" Height="24" HorizontalAlignment="Right" Foreground="{StaticResource AccentColorBrush}" />
                         </Grid>
                         <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="18" Text="Machine Login" Width="400"></TextBlock>