Improved and optimized transport layer transporter and adapter.

3 files changed, 34 insertions, 4 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs
index 0d6f7c75f..a3087ab5a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs
@@ -69,7 +69,7 @@ namespace Tango.PPC.MachineSettings
         {
             get
             {
-                return Permissions.RunMachineStudio;
+                return Permissions.RunPPCSettingsModule;
             }
         }
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 877374a40..61ce69e4e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core.DI;
 using Tango.PPC.Common;
+using Tango.PPC.Common.ExternalBridge;
 
 namespace Tango.PPC.MachineSettings.ViewModels
 {
@@ -14,6 +16,12 @@ namespace Tango.PPC.MachineSettings.ViewModels
     public class MainViewVM : PPCViewModel
     {
         /// <summary>
+        /// Gets or sets the external bridge service.
+        /// </summary>
+        [TangoInject]
+        public IPPCExternalBridgeService ExternalBridgeService { get; set; }
+
+        /// <summary>
         /// Called when the application has been started
         /// </summary>
         public override void OnApplicationStarted()
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index ff27b26f3..23d5a08a6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -2,13 +2,35 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.PPC.MachineSettings.ViewModels"
              xmlns:global="clr-namespace:Tango.PPC.MachineSettings"
              xmlns:local="clr-namespace:Tango.PPC.MachineSettings.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-    <Grid>
-            
+
+    <Grid Background="{StaticResource TangoMidBackgroundBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
+
+        <Border Padding="20" Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}">
+            <Border.Effect>
+                <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" />
+            </Border.Effect>
+            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold">Settings</TextBlock>
+        </Border>
+
+        <Grid Grid.Row="1">
+            <StackPanel Margin="50">
+                <controls:TableGrid RowHeight="40" MakeFirstColumnVerticalAlignmentBottom="False">
+                    <TextBlock VerticalAlignment="Center">Enable External Bridge Service</TextBlock>
+                    <touch:TouchToggleSlider HorizontalAlignment="Right" Width="90" IsChecked="{Binding ExternalBridgeService.Enabled}"></touch:TouchToggleSlider>
+                </controls:TableGrid>
+            </StackPanel>
+        </Grid>
     </Grid>
 </UserControl>