aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-11-14 17:25:49 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-11-14 17:25:49 +0200
commitd2edfc56a8154c01a7ca9cfc47adccc8a07c3d94 (patch)
treec8c64b1499a480ac53e78d750d8d413e4cc76c65
parent4a20b12f9ed7810409c7240610ed8cf3d51450e2 (diff)
downloadTango-d2edfc56a8154c01a7ca9cfc47adccc8a07c3d94.tar.gz
Tango-d2edfc56a8154c01a7ca9cfc47adccc8a07c3d94.zip
Implemented job outline on PPC.
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml6
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs7
2 files changed, 9 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index b16aa1877..94210ec7d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -221,10 +221,10 @@
<Grid Visibility="{Binding IsDisplayJobOutline,Converter={StaticResource BooleanToVisibilityConverter}}" Background="{StaticResource TangoPrimaryBackgroundBrush}" Opacity="0.8"/>
- <Grid Visibility="{Binding IsDisplayJobOutline,Converter={StaticResource BooleanToVisibilityConverter}}">
+ <Grid Margin="0 -10 0 0" Visibility="{Binding IsDisplayJobOutline,Converter={StaticResource BooleanToVisibilityConverter}}">
<Grid>
- <touch:TouchScrollViewer Padding="10" Margin="0 0 0 100">
- <global:JobOutlineControl Margin="20" DataContext="{Binding JobOutlineTicket}" HorizontalAlignment="Left" />
+ <touch:TouchScrollViewer BorderThickness="0" Padding="10" Margin="0 0 0 100">
+ <global:JobOutlineControl BorderThickness="0" Margin="20" DataContext="{Binding JobOutlineTicket}" HorizontalAlignment="Left" />
</touch:TouchScrollViewer>
</Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index c7351aa4a..ed5ea2629 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -93,10 +93,15 @@ namespace Tango.PPC.UI.PPCApplication
/// </summary>
public bool IsShuttingDown { get; private set; }
+ private bool _isInTechnicianMode;
/// <summary>
/// Gets a value indicating whether the application is in technician mode.
/// </summary>
- public bool IsInTechnicianMode { get; private set; }
+ public bool IsInTechnicianMode
+ {
+ get { return _isInTechnicianMode; }
+ set { _isInTechnicianMode = value; RaisePropertyChangedAuto(); }
+ }
/// <summary>
/// Gets the application version.