diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-22 17:02:53 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-22 17:02:53 +0300 |
| commit | e1591a99369da5ec070e6642b330869801f709ec (patch) | |
| tree | de95c5f9b4b034a09ea1bfb9db80c57ba70779d3 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 3fe33a685c3ca7a8730dacffa5357f77d7e76a96 (diff) | |
| download | Tango-e1591a99369da5ec070e6642b330869801f709ec.tar.gz Tango-e1591a99369da5ec070e6642b330869801f709ec.zip | |
Implemented new notification panel.
Optimized usb port scanner.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs index 8668c4489..38616f39f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs @@ -15,6 +15,7 @@ using Tango.PPC.Common.Authentication; using Tango.PPC.Common.Modules; using Tango.PPC.Common.Navigation; using Tango.PPC.Common.Notifications; +using Tango.PPC.Common.Notifications.NotificationItems; using Tango.PPC.Jobs; using Tango.SharedUI; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml index 1ce18bff1..0ec12a244 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml @@ -9,6 +9,7 @@ xmlns:local="clr-namespace:Tango.PPC.UI.Views" xmlns:notifications="clr-namespace:Tango.PPC.UI.Notifications" xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch" + xmlns:components="clr-namespace:Tango.Touch.Components;assembly=Tango.Touch" xmlns:localConverters="clr-namespace:Tango.PPC.UI.Converters" mc:Ignorable="d" d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> @@ -28,7 +29,7 @@ CurrentDialog="{Binding NotificationProvider.CurrentDialog}"> <touch:TouchPanel.NotificationTemplate> <DataTemplate> - <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="0" Command="{Binding PressedCommand}"> + <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="0" Command="{Binding PressedCommand}" components:TransformationHelper.TransformWhenPressed="False"> <DockPanel> <touch:TouchIconButton DockPanel.Dock="Right" Background="Transparent" Padding="20" Style="{StaticResource TangoRoundTouchIconButton}" Command="{Binding CloseCommand}" CommandParameter="{Binding}" HorizontalAlignment="Right" MaxHeight="60" Width="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight}" Icon="Close" Foreground="White" /> <ContentControl Content="{Binding Converter={StaticResource NotificationItemConverter}}"/> |