From 0dec8a74239cff769836cae577fbd84824070e83 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 21 Apr 2018 19:49:05 +0300
Subject: Implemented NavigationControl for better performance!!! Redesign of
 machine studio module initialization.

---
 .../Tango.MachineStudio.UI/Views/MainView.xaml     | 134 ++++++++++-----------
 1 file changed, 65 insertions(+), 69 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index a841a72cb..dd3d122b6 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -38,14 +38,14 @@
             </Style>
         </Grid.Style>
 
-        <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding ElementName=MenuToggleButton, Path=IsChecked}">
+        <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding Source={x:Reference MenuToggleButton}, Path=IsChecked}">
             <materialDesign:DrawerHost.LeftDrawerContent>
                 <DockPanel LastChildFill="False">
                     <StackPanel MinWidth="300" DockPanel.Dock="Top">
                         <Grid>
                             <ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" 
                                     HorizontalAlignment="Right" Margin="16"
-                                    IsChecked="{Binding ElementName=MenuToggleButton, Path=IsChecked, Mode=TwoWay}" />
+                                    IsChecked="{Binding Source={x:Reference MenuToggleButton}, Path=IsChecked, Mode=TwoWay}" />
 
                             <StackPanel Margin="5 0 0 0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                                 <Image Source="/Images/account.png" RenderOptions.BitmapScalingMode="Fant" VerticalAlignment="Center" Width="50" Height="50"></Image>
@@ -330,77 +330,73 @@
                         </Grid.RowDefinitions>
 
                         <Grid Grid.Row="1">
-                            <controls:MultiTransitionControl x:Name="TransitionControl" AlwaysFade="True" TransitionType="Zoom">
-                                <controls:MultiTransitionControl.Controls>
-                                    <ContentControl Tag="Home">
-                                        <Grid>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="150"/>
-                                                <RowDefinition Height="*"/>
-                                            </Grid.RowDefinitions>
-                                            <Grid>
-                                                <StackPanel Margin="30 20" HorizontalAlignment="Left">
-                                                    <TextBlock FontSize="35">Welcome to Machine Studio</TextBlock>
-                                                    <TextBlock HorizontalAlignment="Left" Margin="350 5 0 0" FontStyle="Italic" FontSize="16">The below modules are displayed according to your user roles and permissions.</TextBlock>
-                                                </StackPanel>
-                                            </Grid>
+                            <controls:NavigationControl x:Name="TransitionControl" TransitionAlwaysFades="True" TransitionType="Zoom">
+                                <Grid controls:NavigationControl.NavigationName="Home">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="150"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid>
+                                        <StackPanel Margin="30 20" HorizontalAlignment="Left">
+                                            <TextBlock FontSize="35">Welcome to Machine Studio</TextBlock>
+                                            <TextBlock HorizontalAlignment="Left" Margin="350 5 0 0" FontStyle="Italic" FontSize="16">The below modules are displayed according to your user roles and permissions.</TextBlock>
+                                        </StackPanel>
+                                    </Grid>
 
-                                            <Grid Grid.Row="2">
-                                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                                                    <ItemsControl ItemsSource="{Binding StudioModuleLoader.UserModules}" Margin="10">
-                                                        <ItemsControl.ItemsPanel>
-                                                            <ItemsPanelTemplate>
-                                                                <WrapPanel IsItemsHost="True"></WrapPanel>
-                                                            </ItemsPanelTemplate>
-                                                        </ItemsControl.ItemsPanel>
+                                    <Grid Grid.Row="2">
+                                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                                            <ItemsControl ItemsSource="{Binding StudioModuleLoader.UserModules}" Margin="10">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <WrapPanel IsItemsHost="True"></WrapPanel>
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
 
-                                                        <ItemsControl.ItemTemplate>
-                                                            <DataTemplate>
-                                                                <materialDesign:Card Width="300" Margin="10" Height="400" Visibility="{Binding InNewWindow,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                                    <Grid>
-                                                                        <Grid.RowDefinitions>
-                                                                            <RowDefinition Height="180" />
-                                                                            <RowDefinition Height="*" />
-                                                                            <RowDefinition Height="Auto" />
-                                                                        </Grid.RowDefinitions>
-                                                                        <Image Source="{Binding Image,Mode=OneWay}" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant" />
-                                                                        <Rectangle VerticalAlignment="Bottom" Stroke="Silver"></Rectangle>
-                                                                        <Button AutomationProperties.AutomationId="{Binding Name}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.StartModuleCommand}" CommandParameter="{Binding}" Grid.Row="0" Margin="0,0,20,-35" HorizontalAlignment="Right" Width="70" Height="70" VerticalAlignment="Bottom" Style="{StaticResource MaterialDesignFloatingActionMiniButton}" ToolTip="Start This Module">
-                                                                            <materialDesign:PackIcon Kind="Play" Width="30" Height="30" />
-                                                                        </Button>
-                                                                        <StackPanel Grid.Row="1" Margin="8,24,8,0">
-                                                                            <TextBlock FontWeight="Bold" FontSize="20" Text="{Binding Name,Mode=OneWay}"></TextBlock>
-                                                                            <TextBlock VerticalAlignment="Center" Margin="0 5 0 0" FontSize="14" TextWrapping="Wrap" Text="{Binding Description,Mode=OneWay}"></TextBlock>
-                                                                        </StackPanel>
-                                                                        <StackPanel Grid.Row="2" Margin="8" HorizontalAlignment="Right" Orientation="Horizontal">
-                                                                            <materialDesign:PopupBox Padding="2,0,2,0" Style="{StaticResource MaterialDesignToolPopupBox}">
-                                                                                <StackPanel>
-                                                                                    <Button Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.OpenModuleInWindowCommand}" CommandParameter="{Binding}">
-                                                                                        <StackPanel Orientation="Horizontal">
-                                                                                            <materialDesign:PackIcon Kind="ArrowTopRight" Width="24" Height="24" />
-                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Start in new window</TextBlock>
-                                                                                        </StackPanel>
-                                                                                    </Button>
-                                                                                    <Button>
-                                                                                        <StackPanel Orientation="Horizontal">
-                                                                                            <materialDesign:PackIcon Kind="Settings" Width="24" Height="24" />
-                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Settings</TextBlock>
-                                                                                        </StackPanel>
-                                                                                    </Button>
+                                                <ItemsControl.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <materialDesign:Card Width="300" Margin="10" Height="400" Visibility="{Binding InNewWindow,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                            <Grid>
+                                                                <Grid.RowDefinitions>
+                                                                    <RowDefinition Height="180" />
+                                                                    <RowDefinition Height="*" />
+                                                                    <RowDefinition Height="Auto" />
+                                                                </Grid.RowDefinitions>
+                                                                <Image Source="{Binding Image,Mode=OneWay}" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant" />
+                                                                <Rectangle VerticalAlignment="Bottom" Stroke="Silver"></Rectangle>
+                                                                <Button Tag="{Binding}" AutomationProperties.AutomationId="{Binding Name}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.StartModuleCommand}" CommandParameter="{Binding}" Grid.Row="0" Margin="0,0,20,-35" HorizontalAlignment="Right" Width="70" Height="70" VerticalAlignment="Bottom" Style="{StaticResource MaterialDesignFloatingActionMiniButton}" ToolTip="Start this module">
+                                                                    <materialDesign:PackIcon Kind="Play" Width="30" Height="30" />
+                                                                </Button>
+                                                                <StackPanel Grid.Row="1" Margin="8,24,8,0">
+                                                                    <TextBlock FontWeight="Bold" FontSize="20" Text="{Binding Name,Mode=OneWay}"></TextBlock>
+                                                                    <TextBlock VerticalAlignment="Center" Margin="0 5 0 0" FontSize="14" TextWrapping="Wrap" Text="{Binding Description,Mode=OneWay}"></TextBlock>
+                                                                </StackPanel>
+                                                                <StackPanel Grid.Row="2" Margin="8" HorizontalAlignment="Right" Orientation="Horizontal">
+                                                                    <materialDesign:PopupBox Padding="2,0,2,0" Style="{StaticResource MaterialDesignToolPopupBox}">
+                                                                        <StackPanel>
+                                                                            <Button Command="{Binding RelativeSource={RelativeSource AncestorType=local:MainView},Path=DataContext.OpenModuleInWindowCommand}" CommandParameter="{Binding}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <materialDesign:PackIcon Kind="ArrowTopRight" Width="24" Height="24" />
+                                                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Start in new window</TextBlock>
+                                                                                </StackPanel>
+                                                                            </Button>
+                                                                            <Button>
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <materialDesign:PackIcon Kind="Settings" Width="24" Height="24" />
+                                                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Settings</TextBlock>
                                                                                 </StackPanel>
-                                                                            </materialDesign:PopupBox>
+                                                                            </Button>
                                                                         </StackPanel>
-                                                                    </Grid>
-                                                                </materialDesign:Card>
-                                                            </DataTemplate>
-                                                        </ItemsControl.ItemTemplate>
-                                                    </ItemsControl>
-                                                </ScrollViewer>
-                                            </Grid>
-                                        </Grid>
-                                    </ContentControl>
-                                </controls:MultiTransitionControl.Controls>
-                            </controls:MultiTransitionControl>
+                                                                    </materialDesign:PopupBox>
+                                                                </StackPanel>
+                                                            </Grid>
+                                                        </materialDesign:Card>
+                                                    </DataTemplate>
+                                                </ItemsControl.ItemTemplate>
+                                            </ItemsControl>
+                                        </ScrollViewer>
+                                    </Grid>
+                                </Grid>
+                            </controls:NavigationControl>
                         </Grid>
                     </Grid>
 
-- 
cgit v1.3.1