Implemented NavigationControl for better performance!!!

Redesign of machine studio module initialization.

5 files changed, 17 insertions, 20 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
index b335f2d69..b56962df7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
@@ -16,7 +16,7 @@ namespace Tango.MachineStudio.UsersAndRoles.Navigation
         public void NavigateTo(UsersAndRolesNavigationView view)
         {
             LogManager.Log(String.Format("Navigating to view {0}...", view.ToString()));
-            MainView.Instance.TransitionControl.AutoNavigate(view.ToString());
+            MainView.Instance.TransitionControl.NavigateTo(view.ToString());
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
index c0d1326cf..ac471db06 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
@@ -38,11 +38,14 @@ namespace Tango.MachineStudio.UsersAndRoles
             }
         }
 
-        public override FrameworkElement MainView
+        /// <summary>
+        /// Gets the module entry point view type.
+        /// </summary>
+        public override Type MainViewType
         {
             get
             {
-                return new MainView();
+                return typeof(MainView);
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
index 90166f445..efe58b363 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
@@ -11,18 +11,10 @@
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid>
-        <controls:MultiTransitionControl x:Name="TransitionControl" TransitionType="Slide">
-            <controls:MultiTransitionControl.Controls>
-                <ContentControl Tag="OrganizationSelectionView">
-                    <local:OrganizationSelectionView/>
-                </ContentControl>
-                <ContentControl Tag="OrganizationManagementView">
-                    <local:OrganizationManagementView/>
-                </ContentControl>
-                <ContentControl Tag="UserManagementView">
-                    <local:UserManagementView/>
-                </ContentControl>
-            </controls:MultiTransitionControl.Controls>
-        </controls:MultiTransitionControl>
+        <controls:NavigationControl x:Name="TransitionControl" TransitionType="Slide">
+            <local:OrganizationSelectionView controls:NavigationControl.NavigationName="OrganizationSelectionView" />
+            <local:OrganizationManagementView controls:NavigationControl.NavigationName="OrganizationManagementView" />
+            <local:UserManagementView controls:NavigationControl.NavigationName="UserManagementView" />
+        </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
index e2c44a584..b9f513a1e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
@@ -13,20 +13,21 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using static Tango.SharedUI.Controls.MultiTransitionControl;
+using static Tango.SharedUI.Controls.NavigationControl;
 
 namespace Tango.MachineStudio.UsersAndRoles.Views
 {
     /// <summary>
     /// Interaction logic for OrganizationManagementView.xaml
     /// </summary>
-    public partial class OrganizationManagementView : UserControl , ITransitionView
+    public partial class OrganizationManagementView : UserControl , INavigationView
     {
         public OrganizationManagementView()
         {
             InitializeComponent();
         }
 
-        public void OnTransitionCompleted()
+        public void OnNavigated()
         {
             address_auto.Text = "";
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
index f2ff25637..d25932403 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
@@ -16,13 +16,14 @@ using Tango.BL.Entities;
 using Tango.DragAndDrop;
 using Tango.MachineStudio.UsersAndRoles.ViewModels;
 using static Tango.SharedUI.Controls.MultiTransitionControl;
+using static Tango.SharedUI.Controls.NavigationControl;
 
 namespace Tango.MachineStudio.UsersAndRoles.Views
 {
     /// <summary>
     /// Interaction logic for UserManagementView.xaml
     /// </summary>
-    public partial class UserManagementView : UserControl, ITransitionView
+    public partial class UserManagementView : UserControl, INavigationView
     {
         private MainViewVM _vm;
         
@@ -49,7 +50,7 @@ namespace Tango.MachineStudio.UsersAndRoles.Views
             }
         }
 
-        public void OnTransitionCompleted()
+        public void OnNavigated()
         {
             address_auto.Text = "";
         }