diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-12-14 19:04:41 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-12-14 19:04:41 +0200 |
| commit | 76a028f95dc2bdb2aba4a58ca298268be32a5879 (patch) | |
| tree | 3fcf9c26e35d7a754b8c06528879624a68a21a2f /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml | |
| parent | db58a90f0c08242491b96476e228b0d7f4a92a86 (diff) | |
| download | Tango-76a028f95dc2bdb2aba4a58ca298268be32a5879.tar.gz Tango-76a028f95dc2bdb2aba4a58ca298268be32a5879.zip | |
Implemented sites module on MS.
Implemented site selection on Machine Designer.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml index 80f9ae151..4ca82c4f7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml @@ -7,9 +7,13 @@ xmlns:vm="clr-namespace:Tango.MachineStudio.Sites.ViewModels" xmlns:global="clr-namespace:Tango.MachineStudio.Sites" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> <Grid IsEnabled="{Binding IsFree}"> - <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="70">Comming soon...</TextBlock> + <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide"> + <local:SitesView /> + <local:SiteDetailsView/> + </controls:NavigationControl> </Grid> </UserControl> |