From 9561a5b3d930d5a52e70f97d5fe9d63d4bb1e067 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 5 Nov 2019 15:15:04 +0200
Subject: Implemented TouchClickableControl for PPC notifications.

---
 .../Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj   | 4 ++--
 Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml    | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'Software/Visual_Studio/PPC')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index d130a8002..2accc4f82 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -120,7 +120,6 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="ApplicationStates.cs" />
-    <Compile Include="Backup\IBackupManager.cs" />
     <Compile Include="Connection\DefaultMachineProvider.cs" />
     <Compile Include="Connection\IMachineProvider.cs" />
     <Compile Include="Connection\MachineOperatorChangedEventArgs.cs" />
@@ -373,6 +372,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Backup\" />
     <Folder Include="Scripting\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -385,7 +385,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 890d3863b..586fa987b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -238,15 +238,10 @@
                 <touch:TouchNotificationBar.NotificationTemplate>
                     <DataTemplate>
                         <components:Ripple Padding="0">
-                            <Grid Background="Transparent">
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="PreviewMouseUp">
-                                        <i:InvokeCommandAction Command="{Binding PressedCommand}" />
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
+                            <touch:TouchClickableControl Command="{Binding PressedCommand}">
                                 <ContentControl Content="{Binding Converter={StaticResource ItemBaseConverter}}"/>
                                 <touch:TouchIconButton Visibility="{Binding CanClose,Converter={StaticResource BooleanToVisibilityConverter}}" DockPanel.Dock="Right" Background="Transparent" Padding="35" Style="{StaticResource TangoRoundTouchIconButton}" Command="{Binding CloseCommand}" CommandParameter="{Binding}" HorizontalAlignment="Right" MaxHeight="90" Width="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight}" Icon="Close" Foreground="{StaticResource TangoDarkForegroundBrush}" />
-                            </Grid>
+                            </touch:TouchClickableControl>
                         </components:Ripple>
                     </DataTemplate>
                 </touch:TouchNotificationBar.NotificationTemplate>
-- 
cgit v1.3.1