diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views')
3 files changed, 11 insertions, 17 deletions
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 = ""; } |