diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 16:19:50 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 16:19:50 +0200 |
| commit | 68be90b29a5ea3776481ee8e2fde33083c11c670 (patch) | |
| tree | b12900aae40c50df19c67be1a5cba630ad13e334 /Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage | |
| parent | 65e6368cbe7eeddd02bbd43ae5159ab4b762165f (diff) | |
| download | Tango-68be90b29a5ea3776481ee8e2fde33083c11c670.tar.gz Tango-68be90b29a5ea3776481ee8e2fde33083c11c670.zip | |
Implemented PPC events history.
Fixed PPC storage inserted navigation.
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml | 73 |
2 files changed, 45 insertions, 32 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs index 688f82fe7..06cd0661d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/ViewModels/MainViewVM.cs @@ -117,9 +117,9 @@ namespace Tango.PPC.Storage.ViewModels { InvokeUI(async () => { - if (await NotificationProvider.ShowQuestion("Disk Inserted. Do you want to browse?")) + if (await NotificationProvider.ShowQuestion("Storage device inserted. Do you want to browse?")) { - await NavigationManager.NavigateTo(Common.Navigation.NavigationView.StorageView); + await NavigationManager.NavigateTo<StorageModule>(); } }); } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml index 2ff1d5936..74307c9ce 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml @@ -18,38 +18,51 @@ </UserControl.InputBindings> <Grid> - <Grid Margin="10"> - <DockPanel> + <Grid Background="{StaticResource TangoMidBackgroundBrush}"> + <Grid.RowDefinitions> + <RowDefinition Height="Auto"/> + <RowDefinition Height="1*"/> + </Grid.RowDefinitions> - <Grid DockPanel.Dock="Top" Visibility="{Binding Request.Intent,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter=SaveFile}"> - <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}" Padding="20"> - <StackPanel> - <TextBlock Text="{Binding Request.Title}" FontSize="{StaticResource TangoHeaderFontSize}"></TextBlock> - <DockPanel Margin="0 10 0 0"> - <touch:TouchButton Command="{Binding SaveCommand}" Margin="20 0 0 0" Height="50" Width="200" Style="{StaticResource TangoHollowButton}" CornerRadius="0" DockPanel.Dock="Right"> - <touch:TouchButton.Content> - SAVE - </touch:TouchButton.Content> - </touch:TouchButton> - <touch:TouchTextBox x:Name="txtFileName" KeyboardAction="Go" FocusSelectionMode="SelectAll" VerticalAlignment="Bottom" Text="{Binding FileName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" /> - </DockPanel> - </StackPanel> - </Border> - </Grid> + <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">Storage</TextBlock> + </Border> + <Grid Margin="10" Grid.Row="1"> + <DockPanel> - <explorer:ExplorerControl x:Name="explorer" CurrentPath="{Binding CurrentPath,Mode=TwoWay}" FileSelectedCommand="{Binding FileSelectedCommand}" Filter="{Binding Request.Filter}"> - <explorer:ExplorerControl.Style> - <Style TargetType="explorer:ExplorerControl" BasedOn="{StaticResource {x:Type explorer:ExplorerControl}}"> - <Setter Property="EnableFileSelection" Value="True"></Setter> - <Style.Triggers> - <DataTrigger Binding="{Binding Request.Intent}" Value="SaveFile"> - <Setter Property="EnableFileSelection" Value="False"></Setter> - </DataTrigger> - </Style.Triggers> - </Style> - </explorer:ExplorerControl.Style> - </explorer:ExplorerControl> - </DockPanel> + <Grid DockPanel.Dock="Top" Visibility="{Binding Request.Intent,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter=SaveFile}"> + <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}" Padding="20"> + <StackPanel> + <TextBlock Text="{Binding Request.Title}" FontSize="{StaticResource TangoHeaderFontSize}"></TextBlock> + <DockPanel Margin="0 10 0 0"> + <touch:TouchButton Command="{Binding SaveCommand}" Margin="20 0 0 0" Height="50" Width="200" Style="{StaticResource TangoHollowButton}" CornerRadius="0" DockPanel.Dock="Right"> + <touch:TouchButton.Content> + SAVE + </touch:TouchButton.Content> + </touch:TouchButton> + <touch:TouchTextBox x:Name="txtFileName" KeyboardAction="Go" FocusSelectionMode="SelectAll" VerticalAlignment="Bottom" Text="{Binding FileName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" /> + </DockPanel> + </StackPanel> + </Border> + </Grid> + + <explorer:ExplorerControl x:Name="explorer" CurrentPath="{Binding CurrentPath,Mode=TwoWay}" FileSelectedCommand="{Binding FileSelectedCommand}" Filter="{Binding Request.Filter}"> + <explorer:ExplorerControl.Style> + <Style TargetType="explorer:ExplorerControl" BasedOn="{StaticResource {x:Type explorer:ExplorerControl}}"> + <Setter Property="EnableFileSelection" Value="True"></Setter> + <Style.Triggers> + <DataTrigger Binding="{Binding Request.Intent}" Value="SaveFile"> + <Setter Property="EnableFileSelection" Value="False"></Setter> + </DataTrigger> + </Style.Triggers> + </Style> + </explorer:ExplorerControl.Style> + </explorer:ExplorerControl> + </DockPanel> + </Grid> </Grid> </Grid> </UserControl> |