MS LITE

5 files changed, 49 insertions, 22 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
index 14fcc3a37..6643edbb7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml
@@ -5,12 +5,15 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters;assembly=Tango.MachineStudio.Common"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
              d:DesignHeight="720" d:DesignWidth="1280" Cursor="Wait" DataContext="{Binding LoadingViewVM, Source={StaticResource Locator}}" Background="Transparent">
 
     <UserControl.Resources>
         <converters:VersionToShortVersionConverter x:Key="VersionToShortVersionConverter" />
+        <commonConverters:IsLiteToVisibilityInverseConverter x:Key="IsLiteToVisibilityInverseConverter" />
+        <commonConverters:IsLiteToVisibilityConverter x:Key="IsLiteToVisibilityConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -19,6 +22,7 @@
                 <Image Source="{StaticResource MachineBig}" RenderOptions.BitmapScalingMode="Fant" Width="130"></Image>
                 <StackPanel Orientation="Horizontal">
                     <TextBlock FontSize="70" Foreground="{StaticResource AccentColorBrush}">Machine Studio</TextBlock>
+                    <TextBlock Visibility="{Binding Converter={StaticResource IsLiteToVisibilityConverter}}" Foreground="{StaticResource BlackForegroundBrush}" VerticalAlignment="Bottom" Margin="5 0 0 20">LITE</TextBlock>
                 </StackPanel>
                 <TextBlock HorizontalAlignment="Right" FontSize="18" Margin="0 0 -50 0" Foreground="{StaticResource AccentColorBrush}">Twine Solutions</TextBlock>
                 <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" IsActive="{Binding IsLoading}"></mahapps:ProgressRing>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml
index 9a3b3405e..c3ee5cf49 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoginView.xaml
@@ -10,6 +10,7 @@
              xmlns:automation="clr-namespace:Tango.MachineStudio.Common.Automation;assembly=Tango.MachineStudio.Common"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:helpers="clr-namespace:Tango.SharedUI.Helpers;assembly=Tango.SharedUI"
+             xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters;assembly=Tango.MachineStudio.Common"
              xmlns:common="clr-namespace:Tango.MachineStudio.Common;assembly=Tango.MachineStudio.Common"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
@@ -20,6 +21,8 @@
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
+        <commonConverters:IsLiteToVisibilityInverseConverter x:Key="IsLiteToVisibilityInverseConverter" />
+        <commonConverters:IsLiteToVisibilityConverter x:Key="IsLiteToVisibilityConverter" />
     </UserControl.Resources>
 
 
@@ -44,17 +47,20 @@
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="40">
             <Image Source="{StaticResource MachineBig}" RenderOptions.BitmapScalingMode="Fant" Width="100"></Image>
             <TextBlock Margin="20 0 0 0" VerticalAlignment="Center" FontSize="70" Foreground="{StaticResource AccentColorBrush}">Machine Studio</TextBlock>
+            <TextBlock Visibility="{Binding Converter={StaticResource IsLiteToVisibilityConverter}}" Foreground="{StaticResource BlackForegroundBrush}" VerticalAlignment="Bottom" Margin="5 0 0 20">LITE</TextBlock>
         </StackPanel>
 
         <Grid>
-            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="-600 110 0 0" Visibility="{Binding ShowLoggingDetails,Converter={StaticResource BooleanToVisibilityConverter}}">
-                <RadioButton ToolTip="Login using your an active directory account" IsChecked="{Binding IsActiveDirectory}" FontSize="16" VerticalContentAlignment="Center" Padding="10 0 0 0">
-                    <Image Source="/Images/active_directory.png" Stretch="Uniform" Height="80" RenderOptions.BitmapScalingMode="Fant" />
-                </RadioButton>
-                <RadioButton ToolTip="Login using a standard Machine Studio account" IsChecked="{Binding IsStandardUser}" FontSize="16" Margin="0 20 0 0" VerticalContentAlignment="Center" Padding="10 0 0 0">
-                    <Image Source="/Images/machinestudio_login.png" Stretch="Uniform" Height="55" RenderOptions.BitmapScalingMode="Fant" />
-                </RadioButton>
-            </StackPanel>
+            <Border Visibility="{Binding Converter={StaticResource IsLiteToVisibilityInverseConverter}}">
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="-600 110 0 0" Visibility="{Binding ShowLoggingDetails,Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <RadioButton ToolTip="Login using your an active directory account" IsChecked="{Binding IsActiveDirectory}" FontSize="16" VerticalContentAlignment="Center" Padding="10 0 0 0">
+                        <Image Source="/Images/active_directory.png" Stretch="Uniform" Height="80" RenderOptions.BitmapScalingMode="Fant" />
+                    </RadioButton>
+                    <RadioButton ToolTip="Login using a standard Machine Studio account" IsChecked="{Binding IsStandardUser}" FontSize="16" Margin="0 20 0 0" VerticalContentAlignment="Center" Padding="10 0 0 0">
+                        <Image Source="/Images/machinestudio_login.png" Stretch="Uniform" Height="55" RenderOptions.BitmapScalingMode="Fant" />
+                    </RadioButton>
+                </StackPanel>
+            </Border>
             <DockPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="320" Margin="0 120 0 0" Height="510">
 
                 <Grid DockPanel.Dock="Bottom" Margin="25 20 0 0" >
@@ -87,7 +93,7 @@
 
                 <Grid>
                     <StackPanel Visibility="{Binding ShowLoggingDetails,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <TextBlock HorizontalAlignment="Center" FontSize="24">Login to your account</TextBlock>
+                        
                         <Image Source="/Images/login.png" RenderOptions.BitmapScalingMode="Fant" Width="100" Margin="0 20 0 0"></Image>
                         <DockPanel Margin="0 20 0 0">
                             <materialDesign:PackIcon Margin="0 0 0 0" Width="20" Height="20" VerticalAlignment="Top" Foreground="{Binding ElementName=txtEmail, Path=BorderBrush}" Kind="EmailOutline" />
@@ -97,7 +103,7 @@
                                         <Setter Property="materialDesign:HintAssist.Hint" Value="Active Directory Email"></Setter>
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding IsStandardUser}" Value="True">
-                                                <Setter Property="materialDesign:HintAssist.Hint" Value="Machine Studio Email"></Setter>
+                                                <Setter Property="materialDesign:HintAssist.Hint" Value="Email"></Setter>
                                             </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
@@ -108,9 +114,13 @@
                             <materialDesign:PackIcon Margin="0 0 0 0" Width="20" Height="20" VerticalAlignment="Top" Foreground="{Binding ElementName=txtPass, Path=BorderBrush}" Kind="Key" />
                             <PasswordBox x:Name="txtPass" helpers:PasswordHelper.Attach="True" helpers:PasswordHelper.Password="{Binding Password,Mode=TwoWay}" Margin="5 0 0 0" materialDesign:HintAssist.FloatingScale="0.50" materialDesign:HintAssist.Hint="Password" materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0" FontSize="20" Style="{StaticResource MaterialDesignFloatingHintPasswordBox}" AutomationProperties.IsRequiredForForm="True" />
                         </DockPanel>
+                        <DockPanel Margin="0 20 0 0" Visibility="{Binding Converter={StaticResource IsLiteToVisibilityConverter}}">
+                            <materialDesign:PackIcon Margin="0 0 0 0" Width="20" Height="20" VerticalAlignment="Top" Foreground="{Binding ElementName=txtMachine, Path=BorderBrush}" Kind="Barcode" />
+                            <TextBox x:Name="txtMachine" Text="{Binding SerialNumber}" Margin="5 0 0 0" materialDesign:HintAssist.FloatingScale="0.50" materialDesign:HintAssist.Hint="Machine Serial Number" materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0" FontSize="20" AutomationProperties.IsRequiredForForm="True" />
+                        </DockPanel>
                         <DockPanel Margin="0 40 0 0" IsEnabled="{Binding EnableSlotSelection}">
                             <materialDesign:PackIcon Margin="0 0 0 0" Width="20" Height="20" VerticalAlignment="Top" Foreground="{Binding ElementName=combo, Path=BorderBrush}" Kind="Settings" />
-                            <ComboBox x:Name="combo" ItemsSource="{Binding Source={x:Type web:DeploymentSlot},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding DeploymentSlot}" SelectedValuePath="Value" DisplayMemberPath="DisplayName" Margin="5 0 0 0" materialDesign:HintAssist.FloatingScale="0.50" materialDesign:HintAssist.Hint="Environment" materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0" FontSize="20" />
+                            <ComboBox x:Name="combo" ItemsSource="{Binding Environments}" SelectedItem="{Binding DeploymentSlot}" Margin="5 0 0 0" materialDesign:HintAssist.FloatingScale="0.50" materialDesign:HintAssist.Hint="Environment" materialDesign:TextFieldAssist.TextBoxViewMargin="1 0 1 0" FontSize="20" />
                         </DockPanel>
                         <TextBlock Visibility="{Binding EnableSlotSelection,Converter={StaticResource BooleanToVisibilityInverseConverter}}" Margin="25 0 0 0" FontSize="10" Foreground="Gray">Environment selection requires restarting the application</TextBlock>
                         <CheckBox Margin="25 20 0 0" IsChecked="{Binding RememberMe}">Remember me</CheckBox>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 59b9fe67f..e4758a311 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -9,6 +9,7 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:emulations="clr-namespace:Tango.Emulations.ExternalBridge;assembly=Tango.Emulations"
              xmlns:controls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
+             xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters;assembly=Tango.MachineStudio.Common"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="400" Width="700" Height="500" Background="{StaticResource Dialog.Background}" DataContext="{Binding MachineConnectionViewVM, Source={StaticResource Locator}}" Foreground="{StaticResource MainWindow.Foreground}">
@@ -17,6 +18,7 @@
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter"></converters:BooleanToVisibilityInverseConverter>
         <converters:BooleanInverseConverter x:Key="BooleanInverseConverter"></converters:BooleanInverseConverter>
+        <commonConverters:IsLiteToVisibilityInverseConverter x:Key="IsLiteToVisibilityInverseConverter" />
     </UserControl.Resources>
 
     <Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index ea6e93412..e6bfbcca1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -29,6 +29,8 @@
         <commonConverters:PermissionToVisibilityConverter x:Key="PermissionToVisibilityConverter" />
         <converters:VersionToShortVersionConverter x:Key="VersionToShortVersionConverter" />
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
+        <commonConverters:IsLiteToVisibilityInverseConverter x:Key="IsLiteToVisibilityInverseConverter" />
+        <commonConverters:IsLiteToVisibilityConverter x:Key="IsLiteToVisibilityConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -67,7 +69,7 @@
                                     IsChecked="{Binding Source={x:Reference MenuToggleButton}, Path=IsChecked, Mode=TwoWay}" />
                         </Grid>
                         <StackPanel Margin="0 16 0 0">
-
+                            
                         </StackPanel>
                         <StackPanel Margin="10 10 0 0">
                             <TextBlock Foreground="{StaticResource borderBrush}" FontSize="16" FontWeight="Bold" FontStyle="Italic">MODULES</TextBlock>
@@ -128,7 +130,8 @@
                             <ToggleButton VerticalAlignment="Center" Style="{StaticResource MaterialDesignHamburgerToggleButton}" IsChecked="{Binding IsMenuOpened}"
                                         x:Name="MenuToggleButton"/>
 
-                            <StackPanel Margin="10 0 0 0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
+                            <TextBlock VerticalAlignment="Center" Visibility="{Binding Converter={StaticResource IsLiteToVisibilityConverter}}" Margin="10 0 0 0" Text="{Binding AuthenticationProvider.Machine.SerialNumber}" FontSize="{StaticResource LargeFontSize}" />
+                            <StackPanel Visibility="{Binding Converter={StaticResource IsLiteToVisibilityInverseConverter}}" Margin="10 0 0 0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                                 <Image Source="/Images/login_white.png" RenderOptions.BitmapScalingMode="Fant" VerticalAlignment="Center" Width="50" Height="50"></Image>
                                 <StackPanel Margin="0 5 0 0">
                                     <TextBlock FontSize="16" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" FontWeight="Bold" Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding AuthenticationProvider.CurrentUser.Contact.FullName}"></TextBlock>
@@ -154,7 +157,7 @@
                                 </StackPanel>
                             </StackPanel>
                         </StackPanel>
-                        <materialDesign:PopupBox DockPanel.Dock="Right" PlacementMode="BottomAndAlignRightEdges" StaysOpen="False" >
+                        <materialDesign:PopupBox Visibility="{Binding Converter={StaticResource IsLiteToVisibilityInverseConverter}}" DockPanel.Dock="Right" PlacementMode="BottomAndAlignRightEdges" StaysOpen="False" >
                             <StackPanel>
                                 <Button Command="{Binding ConnectCommand}">
                                     <StackPanel Orientation="Horizontal">
@@ -263,6 +266,7 @@
                                     <Image Source="{StaticResource MachineSmall}" RenderOptions.BitmapScalingMode="Fant"></Image>
                                     <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" FontSize="36" Text="Machine Studio">
                                     </TextBlock>
+                                    <TextBlock Visibility="{Binding Converter={StaticResource IsLiteToVisibilityConverter}}" Foreground="{StaticResource AccentColorBrush}" VerticalAlignment="Bottom" Margin="5 0 0 20">LITE</TextBlock>
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Height="60" HorizontalAlignment="Center">
                                     <StackPanel.Style>
@@ -474,7 +478,7 @@
                                         </Image>
                                     </Button>
 
-                                    <Button Cursor="Hand" Command="{Binding ReportIssueCommand}" IsEnabled="{Binding TFSClient.IsInitialized}">
+                                    <Button Visibility="{Binding Converter={StaticResource IsLiteToVisibilityInverseConverter}}" Cursor="Hand" Command="{Binding ReportIssueCommand}" IsEnabled="{Binding TFSClient.IsInitialized}">
                                         <Button.Style>
                                             <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
                                                 <Setter Property="ToolTip" Value="Report issue"></Setter>
@@ -489,6 +493,7 @@
                                         </Button.Style>
                                         <Image Margin="10 0 0 0" Source="/Images/bug.png" Width="24" RenderOptions.BitmapScalingMode="Fant" />
                                     </Button>
+                                    <Grid Visibility="{Binding Converter={StaticResource IsLiteToVisibilityInverseConverter}}">
                                     <Button Cursor="Hand" Command="{Binding OpenResolvedBugsCommand}">
                                         <Button.Style>
                                             <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
@@ -521,6 +526,7 @@
                                         </Button.ToolTip>
                                         <Image Margin="10 0 0 0" Source="/Images/bug-resolved.png" Width="24" RenderOptions.BitmapScalingMode="Fant" />
                                     </Button>
+                                    </Grid>
                                 </StackPanel>
                             </Grid>
                         </Grid>
@@ -538,14 +544,14 @@
                             <controls:NavigationControl x:Name="NavigationControl" TransitionAlwaysFades="True" TransitionType="Zoom">
                                 <Grid controls:NavigationControl.NavigationName="Home">
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="150"/>
+                                        <RowDefinition Height="0"/>
                                         <RowDefinition Height="*"/>
                                     </Grid.RowDefinitions>
                                     <Grid>
-                                        <StackPanel Margin="30 20" HorizontalAlignment="Left" TextElement.Foreground="#9A9A9A">
+                                        <!--<StackPanel Margin="30 20" HorizontalAlignment="Left" TextElement.Foreground="#9A9A9A">
                                             <TextBlock FontSize="35">Welcome to Machine Studio</TextBlock>
                                             <TextBlock HorizontalAlignment="Left" Margin="350 5 0 0" FontStyle="Italic" FontSize="16">The below modules are displayed according to your user roles and permissions.</TextBlock>
-                                        </StackPanel>
+                                        </StackPanel>-->
                                     </Grid>
 
                                     <Grid Grid.Row="2">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
index eb76bf4ec..40956a5a6 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml.cs
@@ -28,6 +28,7 @@ using Tango.Logging;
 using static Tango.SharedUI.Controls.NavigationControl;
 using Tango.Core.DI;
 using Tango.MachineStudio.Common.StudioApplication;
+using Tango.MachineStudio.Common.Buid;
 
 namespace Tango.MachineStudio.UI.Views
 {
@@ -57,6 +58,7 @@ namespace Tango.MachineStudio.UI.Views
                 LogManager.Default.Log("Loading modules views...");
 
                 var item = TangoIOC.Default.GetInstance<INotificationProvider>().PushTaskItem("Loading Modules...");
+                var buildProvider = TangoIOC.Default.GetInstance<IBuildProvider>();
 
                 var modules = _loader.UserModules.ToList();
 
@@ -83,14 +85,16 @@ namespace Tango.MachineStudio.UI.Views
                         _loader.UserModules.Add(module);
                     });
 
-                    UIHelper.DoEvents();
-
-                    Thread.Sleep(100);
+                    //if (buildProvider.BuildType != MSBuildType.Lite)
+                    //{
+                        UIHelper.DoEvents();
+                        Thread.Sleep(100);
+                    //}
                 }
 
                 item.Pop();
 
-                ThreadsHelper.InvokeUI(() => 
+                ThreadsHelper.InvokeUI(() =>
                 {
                     TangoIOC.Default.GetInstance<IStudioApplicationManager>().NotifyApplicationReady();
                 });
@@ -103,3 +107,4 @@ namespace Tango.MachineStudio.UI.Views
         }
     }
 }
+