diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-04-22 13:59:10 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-04-22 13:59:10 +0300 |
| commit | 531c3aba8b49d38f53890c61aa3addef3b5c28dd (patch) | |
| tree | 0a913689a8968bcea2e174d90f0d423ffa3ccaca /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views | |
| parent | 540272c93c7d0b4a12ea797c996f2c9ddf2a5bbb (diff) | |
| parent | 24e4a3e25a9ac161097a46b59aee637fe7bdaa50 (diff) | |
| download | Tango-531c3aba8b49d38f53890c61aa3addef3b5c28dd.tar.gz Tango-531c3aba8b49d38f53890c61aa3addef3b5c28dd.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml index bf1bc8778..29a563c72 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/MainView.xaml @@ -16,24 +16,12 @@ d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:EventsViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.EventsViewVM}"> <Grid> - <controls:MultiTransitionControl x:Name="TransitionControl" x:FieldModifier="internal" TransitionType="Slide"> - <controls:MultiTransitionControl.Controls> - <ContentControl Tag="HomeView"> - <local:HomeView/> - </ContentControl> - <ContentControl Tag="ApplicationLogsView"> - <local:ApplicationLogsView/> - </ContentControl> - <ContentControl Tag="EmbeddedLogsView"> - <local:EmbeddedLogsView/> - </ContentControl> - <ContentControl Tag="EventsView"> - <local:EventsView/> - </ContentControl> - <ContentControl Tag="TimelineView"> - <local:TimelineWrapperView /> - </ContentControl> - </controls:MultiTransitionControl.Controls> - </controls:MultiTransitionControl> + <controls:NavigationControl x:Name="TransitionControl" x:FieldModifier="internal" TransitionType="Slide"> + <local:HomeView controls:NavigationControl.NavigationName="HomeView" /> + <local:ApplicationLogsView controls:NavigationControl.NavigationName="ApplicationLogsView" /> + <local:EmbeddedLogsView controls:NavigationControl.NavigationName="EmbeddedLogsView" /> + <local:EventsView controls:NavigationControl.NavigationName="EventsView" /> + <local:TimelineWrapperView controls:NavigationControl.NavigationName="TimelineWrapperView" /> + </controls:NavigationControl> </Grid> </UserControl> |