diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml index 371caf5d7..2c895a789 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:Tango.MachineStudio.Technician.ViewModels" xmlns:global="clr-namespace:Tango.MachineStudio.Technician" + xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:editors="clr-namespace:Tango.Editors;assembly=Tango.Editors" xmlns:techItems="clr-namespace:Tango.MachineStudio.Technician.TechItems" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" @@ -14,7 +15,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Tango.MachineStudio.Technician.Views" mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineTechViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineTechViewVM}"> + d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MachineTechViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MachineTechViewVM}"> <UserControl.Resources> <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml"></ResourceDictionary> @@ -33,7 +34,7 @@ <RowDefinition Height="1*"/> </Grid.RowDefinitions> - <Menu Padding="5"> + <Menu Padding="5" Background="Transparent"> <MenuItem Header="File"></MenuItem> <MenuItem Header="Edit"></MenuItem> <MenuItem Header="View"></MenuItem> @@ -78,29 +79,34 @@ </Grid.ColumnDefinitions> <Grid> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="1*"/> + <ColumnDefinition Width="Auto"/> + </Grid.ColumnDefinitions> <editors:ElementsEditor x:Name="editor" Elements="{Binding Elements}" - ElementCreation="ElementsEditor_ElementCreation" - Margin="0 0 5 0" + ElementCreation="ElementsEditor_ElementCreation" RulerHeight="32" EditorWidth="1920" EditorHeight="1080" FontSize="10" - Background="#F1F1F1" - EditorBackground="White" - RulerBackground="White" + Background="Transparent" + EditorBackground="#70FFFFFF" + RulerBackground="Transparent" Foreground="{StaticResource AccentColorBrush}" SelectionFillBrush="#338D8D8D" SelectionStrokeBrush="{StaticResource AccentColorBrush}" BorderBrush="{StaticResource AccentColorBrush}" BorderThickness="1" /> + + <Slider Grid.Column="1" Orientation="Vertical" Margin="5" Maximum="3" Minimum="0.2" Value="{Binding ElementName=editor,Path=ScaleFactor}"></Slider> </Grid> <Grid Grid.Column="1"> - <StackPanel> - <TextBlock Margin="0 -30 0 0" DataContext="{Binding ElementName=editor,Path=SelectedElement.HostedElement.Data}" Text="{Binding Description}" FontSize="16" FontWeight="Bold" FontStyle="Italic"></TextBlock> - <GroupBox Header="BOUNDS" Padding="5"> + <DockPanel> + <TextBlock DockPanel.Dock="Top" Margin="0 -30 0 0" DataContext="{Binding ElementName=editor,Path=SelectedElement.HostedElement.Data}" Text="{Binding Description}" FontSize="16" FontWeight="Bold" FontStyle="Italic"></TextBlock> + <GroupBox DockPanel.Dock="Top" Header="BOUNDS" Padding="5"> <StackPanel> <!--Position--> <UniformGrid Columns="2" Margin="0 5 0 0"> @@ -142,6 +148,9 @@ <GroupBox Header="PROPERTIES" Margin="0 10 0 0"> <ContentControl DataContext="{Binding ElementName=editor,Path=SelectedElement.HostedElement}" Content="{Binding ElementName=editor,Path=SelectedElement.HostedElement}"> <ContentControl.Resources> + <DataTemplate DataType="{x:Type sys:Nullable}"> + + </DataTemplate> <DataTemplate DataType="{x:Type items:MonitorItem}"> <templates:MonitorTemplate/> </DataTemplate> @@ -151,7 +160,7 @@ </ContentControl.Resources> </ContentControl> </GroupBox> - </StackPanel> + </DockPanel> </Grid> </Grid> </Grid> |