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.Developer/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.Developer/Views')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index c4915a4c8..a3ac2f3b9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -395,19 +395,11 @@ <Grid Grid.Row="1"> - <controls:MultiTransitionControl x:Name="TransitionControl" TransitionType="Slide"> - <controls:MultiTransitionControl.Controls> - <ContentControl Tag="MachineJobSelectionView"> - <local:MachineJobSelectionView/> - </ContentControl> - <ContentControl Tag="JobView"> - <local:JobView/> - </ContentControl> - <ContentControl Tag="RunningJobView"> - <local:RunningJobView/> - </ContentControl> - </controls:MultiTransitionControl.Controls> - </controls:MultiTransitionControl> + <controls:NavigationControl x:Name="TransitionControl" TransitionType="Slide" KeepElementsAttached="True"> + <local:MachineJobSelectionView controls:NavigationControl.NavigationName="MachineJobSelectionView" /> + <local:JobView controls:NavigationControl.NavigationName="JobView" /> + <local:RunningJobView controls:NavigationControl.NavigationName="RunningJobView" /> + </controls:NavigationControl> </Grid> </Grid> </Grid> |