diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-04-21 19:49:05 +0300 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-04-21 19:49:05 +0300 |
| commit | 0dec8a74239cff769836cae577fbd84824070e83 (patch) | |
| tree | d6cc24ee53454b3f17f1580e90de38238555b6bd /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml | |
| parent | 4df1724226c0d0941b970dbe71b1476e3c3e9902 (diff) | |
| download | Tango-0dec8a74239cff769836cae577fbd84824070e83.tar.gz Tango-0dec8a74239cff769836cae577fbd84824070e83.zip | |
Implemented NavigationControl for better performance!!!
Redesign of machine studio module initialization.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml index 6d8d86a8c..1dfe4c18f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml @@ -17,25 +17,13 @@ <Viewbox Stretch="Fill"> <Grid x:Name="grid" Width="1920" Height="1100"> <Grid> - <sharedControls:MultiTransitionControl AlwaysFade="True" TransitionType="Zoom" x:Name="TransitionControl" x:FieldModifier="public"> - <sharedControls:MultiTransitionControl.Controls> - <ContentControl Tag="LoadingView"> - <views:LoadingView></views:LoadingView> - </ContentControl> - <ContentControl Tag="LoginView" Visibility="Hidden"> - <views:LoginView></views:LoginView> - </ContentControl> - <ContentControl Tag="MainView" Visibility="Hidden"> - <views:MainView></views:MainView> - </ContentControl> - <ContentControl Tag="ShutdownView" Visibility="Hidden"> - <views:ShutdownView></views:ShutdownView> - </ContentControl> - <ContentControl Tag="UpdateView" Visibility="Hidden"> - <views:UpdateView></views:UpdateView> - </ContentControl> - </sharedControls:MultiTransitionControl.Controls> - </sharedControls:MultiTransitionControl> + <sharedControls:NavigationControl TransitionAlwaysFades="True" TransitionType="Zoom" x:Name="TransitionControl" x:FieldModifier="public"> + <views:LoadingView sharedControls:NavigationControl.NavigationName="LoadingView"></views:LoadingView> + <views:LoginView sharedControls:NavigationControl.NavigationName="LoginView"></views:LoginView> + <views:MainView sharedControls:NavigationControl.NavigationName="MainView"></views:MainView> + <views:ShutdownView sharedControls:NavigationControl.NavigationName="ShutdownView"></views:ShutdownView> + <views:UpdateView sharedControls:NavigationControl.NavigationName="UpdateView"></views:UpdateView> + </sharedControls:NavigationControl> <Grid Background="Black" Opacity="0.7" x:Name="shadowGrid" Visibility="Hidden"> |