diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-11-05 15:17:41 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-11-05 15:17:41 +0200 |
| commit | d7650679fedebb42e5fa9d4d482d7ccf657d6ab4 (patch) | |
| tree | c493dbbd56e2e3bf1260a21969e23ddaf787f375 /Software/Visual_Studio/PPC | |
| parent | 4c63f73496fc60026da9e363b3e85042733b4423 (diff) | |
| parent | f4f22e7088b672797e3e95f5a5fb5a96651c861e (diff) | |
| download | Tango-d7650679fedebb42e5fa9d4d482d7ccf657d6ab4.tar.gz Tango-d7650679fedebb42e5fa9d4d482d7ccf657d6ab4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml | 9 |
2 files changed, 4 insertions, 9 deletions
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> |