1 files changed, 29 insertions, 14 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 320ce58aa..4b021e424 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
@@ -5,39 +5,54 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
-             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid Margin="20">
         <DockPanel>
             <Grid DockPanel.Dock="Top">
                 <StackPanel Orientation="Horizontal">
-                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToDispensersCommand}">
+                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToMachinesCommand}">
                         <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="#202020" ToolTip="Back to RML list" />
                     </Button>
-                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34">
-                        <Run>MACHINE</Run>
-                        <Run Text="{Binding ActiveMachine.SerialNumber}"></Run>
+                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34" Text="{Binding ActiveMachine.Name}">
+
                     </TextBlock>
                 </StackPanel>
 
-                <Button HorizontalAlignment="Right" Width="170" Height="45" Margin="0 0 20 0" VerticalAlignment="Center" Command="{Binding SaveCommand}">
-                    <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
-                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
-                    </StackPanel>
-                </Button>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 20 0">
+                    <Button  Width="170" Height="45"  VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
             </Grid>
 
             <Grid DockPanel.Dock="Bottom">
 
             </Grid>
 
-            <Grid Margin="0 20">
+            <Grid>
+                <TabControl Background="Transparent">
+                    <TabControl.Resources>
+                        <Style TargetType="TabPanel">
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </TabControl.Resources>
+                    <TabItem Header="SETTINGS">
+                        <local:MachineSettingsView/>
+                    </TabItem>
+                    <TabItem Header="CONFIGURATION">
+                        <local:ConfigurationView/>
+                    </TabItem>
+                    <TabItem Header="SPOOLS">
 
+                    </TabItem>
+                </TabControl>
             </Grid>
         </DockPanel>
     </Grid>