Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 47 insertions, 47 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 8820fcd4d..63d22d365 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
@@ -53,13 +53,13 @@
                         EditorWidth="1920"
                         EditorHeight="1080"
                         FontSize="10" 
-                        Background="#7EFFFFFF" 
-                        EditorBackground="#70FFFFFF" 
+                        Background="{StaticResource TransparentBackgroundBrush450}" 
+                        EditorBackground="{StaticResource TransparentBackgroundBrush600}" 
                         RulerBackground="Transparent" 
-                        Foreground="#1EA9FF" 
-                        SelectionFillBrush="#338D8D8D" 
-                        SelectionStrokeBrush="#1EA9FF" 
-                        BorderBrush="#1EA9FF" 
+                        Foreground="{StaticResource BlueSelectionStrokBrush}" 
+                        SelectionFillBrush="{StaticResource SelectionFillBrush}" 
+                        SelectionStrokeBrush="{StaticResource BlueSelectionStrokBrush}" 
+                        BorderBrush="{StaticResource BlueSelectionStrokBrush}" 
                         BorderThickness="1">
 
                         <editors:ElementsEditor.Style>
@@ -77,40 +77,40 @@
                             <ContextMenu DataContext="{Binding Path=PlacementTarget, RelativeSource={RelativeSource Self}}">
                                 <MenuItem Header="Cut (Ctrl+X)" Command="{Binding CutCommand}" MinWidth="210">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Cut" Width="16" />
+                                        <fa:ImageAwesome Icon="Cut" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <MenuItem Header="Copy (Ctrl+C)" Command="{Binding CopyCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Copy" Width="16" />
+                                        <fa:ImageAwesome Icon="Copy" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="Paste (Ctrl+V)" Command="{Binding PasteCommand}">
+                                <MenuItem Header="Paste (Ctrl+V)" Command="{Binding PasteCommand}" >
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Paste" Width="16" />
+                                        <fa:ImageAwesome Icon="Paste" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <Separator/>
                                 <MenuItem Header="Undo (Ctrl+Z)" Command="{Binding UndoCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Undo" Width="16" />
+                                        <fa:ImageAwesome Icon="Undo" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <MenuItem Header="Redo (Ctrl+Y)" Command="{Binding RedoCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="RotateRight" Width="16"></fa:ImageAwesome>
+                                        <fa:ImageAwesome Icon="RotateRight" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <Separator/>
                                 <MenuItem Header="Delete (DELETE)" Command="{Binding DeleteCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Recycle" Width="16" />
+                                        <fa:ImageAwesome Icon="Recycle" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <Separator/>
                                 <MenuItem Header="Select All (Ctrl+A)" Command="{Binding SelectAllCommand}">
                                     <MenuItem.Icon>
-                                        <fa:ImageAwesome Icon="Th" Width="16" />
+                                        <fa:ImageAwesome Icon="Th" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                     </MenuItem.Icon>
                                 </MenuItem>
                             </ContextMenu>
@@ -136,109 +136,109 @@
                     <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
 
-                <Menu Padding="5" Background="#C6ECECEC" Visibility="{Binding HideMenu,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                <Menu Padding="5" Background="{StaticResource WhiteBrush100}" Visibility="{Binding HideMenu,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                     <MenuItem Header="File">
                         <MenuItem Command="{Binding NewProjectCommand}" MinWidth="180" Header="New" VerticalContentAlignment="Center">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="File" Width="16" />
+                                <fa:ImageAwesome Icon="File" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Command="{Binding OpenProjectCommand}" MinWidth="180" Header="Open" VerticalContentAlignment="Center">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="FolderOpen" Width="16" />
+                                <fa:ImageAwesome Icon="FolderOpen" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem MinWidth="180" Header="Import" VerticalContentAlignment="Center">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="ArrowRight" Width="16" />
+                                <fa:ImageAwesome Icon="ArrowRight" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
 
                             <MenuItem Header="Import Project Tabs" VerticalContentAlignment="Center" Command="{Binding ImportProjectTabsCommand}">
                                 <MenuItem.Icon>
-                                    <fa:ImageAwesome Icon="Table" Width="16" />
+                                    <fa:ImageAwesome Icon="Table" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                                 </MenuItem.Icon>
                             </MenuItem>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Save" Command="{Binding SaveProjectCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Save" Width="16" />
+                                <fa:ImageAwesome Icon="Save" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Save as" Command="{Binding SaveAsProjectCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Save" Width="16" />
+                                <fa:ImageAwesome Icon="Save" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Header="Edit">
                         <MenuItem Header="Cut (Ctrl+X)" Command="{Binding SelectedTab.Editor.CutCommand}" MinWidth="210">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Cut" Width="16" />
+                                <fa:ImageAwesome Icon="Cut" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Copy (Ctrl+C)" Command="{Binding SelectedTab.Editor.CopyCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Copy" Width="16" />
+                                <fa:ImageAwesome Icon="Copy" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Paste (Ctrl+V)" Command="{Binding SelectedTab.Editor.PasteCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Paste" Width="16" />
+                                <fa:ImageAwesome Icon="Paste" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Undo (Ctrl+Z)" Command="{Binding SelectedTab.Editor.UndoCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Undo" Width="16" />
+                                <fa:ImageAwesome Icon="Undo" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Redo (Ctrl+Y)" Command="{Binding SelectedTab.Editor.RedoCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="RotateRight" Width="16"></fa:ImageAwesome>
+                                <fa:ImageAwesome Icon="RotateRight" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Delete (DELETE)" Command="{Binding SelectedTab.Editor.DeleteCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Recycle" Width="16" />
+                                <fa:ImageAwesome Icon="Recycle" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Select All (Ctrl+A)" Command="{Binding SelectedTab.Editor.SelectAllCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Th" Width="16" />
+                                <fa:ImageAwesome Icon="Th" Width="16" Foreground="{StaticResource MainWindow.Foreground}" />
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Header="View">
                         <MenuItem Header="Zoom In" Command="{Binding SelectedTab.Editor.ZoomCommand}" CommandParameter="0.1">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="SearchPlus" Width="16" />
+                                <fa:ImageAwesome Icon="SearchPlus" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Zoom Out" Command="{Binding SelectedTab.Editor.ZoomCommand}" CommandParameter="-0.1">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="SearchMinus" Width="16" />
+                                <fa:ImageAwesome Icon="SearchMinus" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <Separator/>
                         <MenuItem Header="Reset Zoom" Command="{Binding SelectedTab.Editor.ResetZoomCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Search" Width="16" />
+                                <fa:ImageAwesome Icon="Search" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Header="Tools">
                         <MenuItem Header="Upload partial hardware configuration" Command="{Binding UploadPartialHardwareConfigurationCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Upload" Width="16" />
+                                <fa:ImageAwesome Icon="Upload" Width="16" Foreground="{StaticResource MainWindow.Foreground}"/>
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="Reset all graphs" Command="{Binding ResetGraphsCommand}">
                             <MenuItem.Icon>
-                                <fa:ImageAwesome Icon="Refresh" Width="16" />
+                                <fa:ImageAwesome Icon="Refresh" Width="16" Foreground="{StaticResource MainWindow.Foreground}" />
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
@@ -265,8 +265,8 @@
                                                     <Setter Property="BorderThickness" Value="1"></Setter>
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
-                                                            <Setter Property="Background" Value="White"></Setter>
-                                                            <Setter Property="BorderBrush" Value="#FF7575"></Setter>
+                                                            <Setter Property="Background" Value="{StaticResource WhiteBackgroundBrush}"></Setter>
+                                                            <Setter Property="BorderBrush" Value="{StaticResource RedBrush300}"></Setter>
                                                             <Setter Property="BorderThickness" Value="2"></Setter>
                                                         </DataTrigger>
                                                     </Style.Triggers>
@@ -327,8 +327,8 @@
                                                 <Setter Property="BorderThickness" Value="1"></Setter>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
-                                                        <Setter Property="Background" Value="White"></Setter>
-                                                        <Setter Property="BorderBrush" Value="#FF7575"></Setter>
+                                                        <Setter Property="Background" Value="{StaticResource WhiteBackgroundBrush}"></Setter>
+                                                        <Setter Property="BorderBrush" Value="{StaticResource RedBrush300}"></Setter>
                                                         <Setter Property="BorderThickness" Value="2"></Setter>
                                                         <DataTrigger.EnterActions>
                                                             <BeginStoryboard>
@@ -398,12 +398,12 @@
                                     </Border.ContextMenu>
                                     <Border.Style>
                                         <Style TargetType="Border">
-                                            <Setter Property="Background" Value="#CBCBCB"></Setter>
-                                            <Setter Property="TextElement.Foreground" Value="#202020"></Setter>
+                                            <Setter Property="Background" Value="{StaticResource LightGrayBrush150}"></Setter>
+                                            <Setter Property="TextElement.Foreground" Value="{StaticResource DarkGrayBrush}"></Setter>
                                             <Style.Triggers>
                                                 <DataTrigger Binding="{Binding IsSelected}" Value="True">
                                                     <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter>
-                                                    <Setter Property="TextElement.Foreground" Value="White"></Setter>
+                                                    <Setter Property="TextElement.Foreground" Value="{StaticResource WhiteTextBrush}"></Setter>
                                                 </DataTrigger>
                                                 <Trigger Property="IsMouseOver" Value="True">
                                                     <Setter Property="Opacity" Value="0.8"></Setter>
@@ -416,10 +416,10 @@
                                             <materialDesign:PackIcon Kind="Close">
                                                 <materialDesign:PackIcon.Style>
                                                     <Style TargetType="materialDesign:PackIcon">
-                                                        <Setter Property="Foreground" Value="#202020"></Setter>
+                                                        <Setter Property="Foreground" Value="{StaticResource DarkGrayBrush}"></Setter>
                                                         <Style.Triggers>
                                                             <DataTrigger Binding="{Binding IsSelected}" Value="True">
-                                                                <Setter Property="Foreground" Value="White"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource WhiteTextBrush}"></Setter>
                                                             </DataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
@@ -464,11 +464,11 @@
                                             <UniformGrid Columns="2" Margin="0 5 0 0">
                                                 <StackPanel Margin="0 0 5 0">
                                                     <TextBlock>Left</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Left}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Left}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                                 <StackPanel Margin="5 0 0 0">
                                                     <TextBlock>Top</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Top}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="0" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Top}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                             </UniformGrid>
 
@@ -476,11 +476,11 @@
                                             <UniformGrid Columns="2" Margin="0 20 0 0">
                                                 <StackPanel Margin="0 0 5 0">
                                                     <TextBlock>Width</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Width}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorWidth}" Value="{Binding SelectedTab.Editor.SelectedElement.Width}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                                 <StackPanel Margin="5 0 0 0">
                                                     <TextBlock>Height</TextBlock>
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Height}"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Margin="0 5 0 0" Minimum="10" Maximum="{Binding SelectedTab.Editor.EditorHeight}" Value="{Binding SelectedTab.Editor.SelectedElement.Height}"></mahapps:NumericUpDown>
                                                 </StackPanel>
                                             </UniformGrid>
 
@@ -491,7 +491,7 @@
                                                     <ColumnDefinition Width="20*"></ColumnDefinition>
                                                 </Grid.ColumnDefinitions>
                                                 <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" HorizontalAlignment="Left">Angle</TextBlock>
-                                                <mahapps:NumericUpDown Grid.Column="1" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Maximum="360" Minimum="-360" HasDecimals="False" Margin="0 5 0 0" Value="{Binding SelectedTab.Editor.SelectedElement.Angle}"></mahapps:NumericUpDown>
+                                                <mahapps:NumericUpDown Grid.Column="1" HorizontalContentAlignment="Center" BorderBrush="{StaticResource BorderBrushGainsboro}" Foreground="{StaticResource GrayBrush}" Maximum="360" Minimum="-360" HasDecimals="False" Margin="0 5 0 0" Value="{Binding SelectedTab.Editor.SelectedElement.Angle}"></mahapps:NumericUpDown>
                                             </Grid>
                                         </StackPanel>
                                     </GroupBox>