diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-11-06 18:06:45 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-11-06 18:06:45 +0200 |
| commit | c698425b1ab832fe351aff257815709c01950fc3 (patch) | |
| tree | 53e1c6439d54d4b4164b7e5f478066c1b00c6a25 /Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml | |
| parent | 202c532e87e8114151e9b38982dcc171347a78ce (diff) | |
| download | Tango-c698425b1ab832fe351aff257815709c01950fc3.tar.gz Tango-c698425b1ab832fe351aff257815709c01950fc3.zip | |
Implemented liquid quantity validation on PPC and MS.
Improved PPC full control view.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml index d83128007..4de00120f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/ExternalBridgeView.xaml @@ -7,14 +7,19 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:Tango.PPC.UI.ViewModels" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:localControls="clr-namespace:Tango.PPC.UI.Controls" xmlns:local="clr-namespace:Tango.PPC.UI.Views" mc:Ignorable="d" d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:ExternalBridgeViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.ExternalBridgeViewVM}" Background="{StaticResource TangoPrimaryBackgroundBrush}"> <Grid> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> - <Grid HorizontalAlignment="Center"> - <Image Source="/Images/machine-trans.png" Stretch="None" RenderOptions.BitmapScalingMode="Fant"></Image> - <touch:TouchIcon Icon="Wifi" Foreground="{StaticResource TangoGreenBrush}" Width="30" Height="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 25 30"> + <Grid HorizontalAlignment="Center" VerticalAlignment="Center" > + <Ellipse Stroke="{StaticResource TangoDarkForegroundBrush}" Width="50" Height="50"/> + <localControls:MachineStatusControl Margin="0 0 0 -1" VerticalAlignment="Center" DataContext="{Binding MachineProvider.MachineOperator}" /> + </Grid> + <Grid HorizontalAlignment="Center" Margin="0 20 0 0"> + <Image Source="/Images/machine.png" Stretch="None" RenderOptions.BitmapScalingMode="Fant"></Image> + <touch:TouchIcon Icon="Wifi" Foreground="{StaticResource TangoGreenBrush}" Width="30" Height="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 40 45"> <touch:TouchIcon.Style> <Style TargetType="touch:TouchIcon"> <Style.Triggers> |