aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2021-05-24 17:07:45 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2021-05-24 17:07:45 +0300
commitb29f337cff7513e0fe0e4b98e6bc7970da89e837 (patch)
tree2c43b877cadbba39b119ca96d37882be1998fa18 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
parentacf0ca21bf822f1b7a4a60bd4c2d732b2c5cb646 (diff)
downloadTango-b29f337cff7513e0fe0e4b98e6bc7970da89e837.tar.gz
Tango-b29f337cff7513e0fe0e4b98e6bc7970da89e837.zip
Created a new project Tango.MachineStudio.ThreadExtentions. Changes in Database.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
index b446c7cc7..0ef5850c6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/MainView.xaml
@@ -4,12 +4,16 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Tango.MachineStudio.ThreadExtensions.Views"
+ xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
xmlns:vm="clr-namespace:Tango.MachineStudio.ThreadExtensions.ViewModels"
xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
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">Thread Extensions</TextBlock>
+ <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide">
+ <local:ThreadExtensionsView />
+ <local:ThreadExtentionView/>
+ </controls:NavigationControl>
</Grid>
</UserControl>