diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-11-25 08:51:51 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-11-25 08:51:51 +0200 |
| commit | c02a988bda6724dcbd1d689be2010ce55de59368 (patch) | |
| tree | f0e9bcc67c0db00fe04517b6bccbacb63a5214ac /Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml | |
| parent | 88a0169f624c77b77b21a871ace9e51a9245807d (diff) | |
| download | Tango-c02a988bda6724dcbd1d689be2010ce55de59368.tar.gz Tango-c02a988bda6724dcbd1d689be2010ce55de59368.zip | |
Storage Module!
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml | 30 |
1 files changed, 15 insertions, 15 deletions
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 690022e64..7eca6dba6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml @@ -16,7 +16,7 @@ d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> <UserControl.Resources> - <localConverters:NotificationItemConverter x:Key="NotificationItemConverter" /> + <localConverters:ItemBaseConverter x:Key="ItemBaseConverter" /> </UserControl.Resources> <Grid> @@ -33,7 +33,7 @@ <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}}"/> + <ContentControl Content="{Binding Converter={StaticResource ItemBaseConverter}}"/> </DockPanel> </touch:TouchButton> </DataTemplate> @@ -57,18 +57,19 @@ </Style> </touch:TouchIcon.Style> </touch:TouchIcon> - <touch:TouchIcon Width="20" Height="20" VerticalAlignment="Center" Margin="10 0 0 0" Icon="HddSolid"> - <touch:TouchIcon.Style> - <Style TargetType="touch:TouchIcon" BasedOn="{StaticResource {x:Type touch:TouchIcon}}"> - <Setter Property="Foreground" Value="{StaticResource TangoGrayBrush}"></Setter> - <Style.Triggers> - <DataTrigger Binding="{Binding StorageProvider.IsConnected}" Value="True"> - <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter> - </DataTrigger> - </Style.Triggers> - </Style> - </touch:TouchIcon.Style> - </touch:TouchIcon> + + <ItemsControl ItemsSource="{Binding NotificationProvider.TaskBarItems}"> + <ItemsControl.ItemsPanel> + <ItemsPanelTemplate> + <StackPanel Orientation="Horizontal" /> + </ItemsPanelTemplate> + </ItemsControl.ItemsPanel> + <ItemsControl.ItemTemplate> + <DataTemplate> + <ContentControl Width="20" Height="20" VerticalAlignment="Center" Margin="10 0 0 0" Content="{Binding Converter={StaticResource ItemBaseConverter}}"/> + </DataTemplate> + </ItemsControl.ItemTemplate> + </ItemsControl> <Grid></Grid> </DockPanel> </Border> @@ -81,7 +82,6 @@ <local:ExternalBridgeView></local:ExternalBridgeView> <local:MachineSetupView></local:MachineSetupView> <local:MachineUpdateView></local:MachineUpdateView> - <local:StorageView></local:StorageView> </controls:NavigationControl> </touch:TouchPanel> |