merge

1 files changed, 12 insertions, 55 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
index c0cb963e7..f0e9dc29c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
@@ -5,10 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
-             xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             Height="590" Width="800" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource Dialog.Foreground}" 
-             Background="{StaticResource Dialog.Background}">
+             Height="450" Width="800" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
     <Grid Margin="10">
         <DockPanel>
             <StackPanel DockPanel.Dock="Top">
@@ -25,60 +23,28 @@
                 <Button HorizontalAlignment="Right" DockPanel.Dock="Bottom" Height="40" Width="140" Command="{Binding CloseCommand}" Margin="10 0 0 0">CLOSE</Button>
             </Grid>
 
-            <Border Margin="0 20 0 0" Padding="10" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
-                <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}" VerticalAlignment="Top">
+            <Border Margin="0 40 0 0" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
+                <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Vertical" IsItemsHost="True"></StackPanel>
+                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Margin="0 0 0 4">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="40" />
-                                    <ColumnDefinition Width="160" />
-                                    <ColumnDefinition Width="1*" />
-                                </Grid.ColumnDefinitions>
-                                <material:PackIcon  VerticalAlignment="Center" Width="24" Height="24">
-                                    <material:PackIcon.Style>
-                                        <Style TargetType="material:PackIcon">
-                                            <Setter Property="Kind" Value="Check"></Setter>
-                                            <Setter Property="Foreground" Value="{StaticResource GreenBrush100}"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsValid}" Value="False">
-                                                    <Setter Property="Kind" Value="Alert"></Setter>
-                                                    <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding IsOverMax}" Value="True">
-                                                    <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                    <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
-                                                </DataTrigger>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Binding IsValid}" Value="True" />
-                                                        <Condition Binding="{Binding IsOverMax}" Value="False" />
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="Kind" Value="Check"></Setter>
-                                                    <Setter Property="Foreground" Value="{StaticResource GreenBrush100}"></Setter>
-                                                </MultiDataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </material:PackIcon.Style>
-                                </material:PackIcon>
-                                <!--<material:PackIcon Kind="AlertOctagon" VerticalAlignment="Center" Width="24" Height="24" Visibility="{Binding IsValid,Converter={StaticResource BoolToVisConverter}}" />-->
-
-                                <Border Grid.Column="1" Margin="5 0 0 0" Height="45" Width="150" CornerRadius="3" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                            <StackPanel Margin="15 0">
+                                <TextBlock HorizontalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+                                <Border Margin="0 5 0 0" Height="150" Width="50" CornerRadius="3" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                     <Grid>
-                                        <Border VerticalAlignment="Center" CornerRadius="3" Loaded="IdsPackLoaded" MinHeight="45" HorizontalAlignment="Left" MinWidth="5">
+                                        <Border CornerRadius="3" VerticalAlignment="Bottom" Loaded="IdsPackLoaded" MinHeight="5">
                                             <Border.Background>
-                                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                <LinearGradientBrush>
+                                                    <GradientStop Offset="0" Color="#4DFFFFFF" />
                                                     <GradientStop Offset="0.5" Color="{Binding IdsPack.LiquidType.LiquidTypeColor}" />
-                                                    <GradientStop Offset="1" Color="#4EFFFFFF" />
                                                 </LinearGradientBrush>
                                             </Border.Background>
                                         </Border>
-                                        <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" HorizontalAlignment="Left">
+                                        <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" VerticalAlignment="Bottom">
                                             <Rectangle.Style>
                                                 <Style TargetType="Rectangle">
                                                     <Style.Triggers>
@@ -103,18 +69,9 @@
                                                 </Style>
                                             </Rectangle.Style>
                                         </Rectangle>
-
-                                        
-                                            <TextBlock Foreground="#3B3B3B" HorizontalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}" VerticalAlignment="Center">
-                                                <TextBlock.Effect>
-                                                    <DropShadowEffect ShadowDepth="1" BlurRadius="1" Color="White" />
-                                                </TextBlock.Effect>
-                                            </TextBlock>
-                                        
                                     </Grid>
                                 </Border>
-                                <TextBlock Grid.Column="2" HorizontalAlignment="Left" Text="{Binding Message}" VerticalAlignment="Center" Margin="20,0,0,0" TextWrapping="Wrap" Foreground="{StaticResource RedBrush100}"></TextBlock>
-                            </Grid>                                                                                                                                                                                                                        
+                            </StackPanel>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>