From 303568941753cda00f012d18f89d89e989ed8fe9 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 4 Feb 2018 11:58:41 +0200
Subject: Added main background image. Modified circle vector for brush stop
 edit fields.

---
 .../ViewModels/MainViewVM.cs                       |  2 -
 .../Views/MainView.xaml                            | 50 +++++++++++-----------
 .../Views/MainView.xaml                            |  2 +-
 3 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 1d0a52baf..09770e607 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -418,8 +418,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         public MainViewVM(IMainView view) : base(view, true)
         {
-            IsSideBarOpened = true;
-
             if (!this.DesignMode)
             {
                 Adapter = ObservablesEntitiesAdapter.Instance;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index 196b20157..22e162c0e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -21,7 +21,7 @@
              xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.InputBindings>
         <KeyBinding Key="Esc" Command="{Binding ExitFullScreenCommand}"></KeyBinding>
@@ -1049,16 +1049,16 @@
                                                                                                                                         </ItemsControl.ItemsPanel>
                                                                                                                                         <ItemsControl.ItemTemplate>
                                                                                                                                             <DataTemplate>
-                                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0">
-                                                                                                                                                    <Border.BorderBrush>
+                                                                                                                                                <ContentControl Style="{StaticResource numberBorder}" Width="50" Height="50" Margin="10 0 0 0">
+                                                                                                                                                    <ContentControl.Foreground>
                                                                                                                                                         <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                                                                                                    </Border.BorderBrush>
+                                                                                                                                                    </ContentControl.Foreground>
                                                                                                                                                     <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                                         <mahapps:NumericUpDown.Resources>
                                                                                                                                                             <Style TargetType="TextBox"/>
                                                                                                                                                         </mahapps:NumericUpDown.Resources>
                                                                                                                                                     </mahapps:NumericUpDown>
-                                                                                                                                                </Border>
+                                                                                                                                                </ContentControl>
                                                                                                                                             </DataTemplate>
                                                                                                                                         </ItemsControl.ItemTemplate>
                                                                                                                                     </ItemsControl>
@@ -1070,29 +1070,29 @@
                                                                                                                         <Setter Property="Content">
                                                                                                                             <Setter.Value>
                                                                                                                                 <StackPanel Orientation="Horizontal">
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF6F6F">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#FF6F6F" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#92FF92">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#92FF92" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#3C7EF4">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#3C7EF4" BorderThickness="1" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
                                                                                                                                     <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
                                                                                                                                 </StackPanel>
@@ -1103,37 +1103,37 @@
                                                                                                                         <Setter Property="Content">
                                                                                                                             <Setter.Value>
                                                                                                                                 <StackPanel Orientation="Horizontal">
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Cyan">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="Cyan" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Cyan, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Magenta">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="Magenta" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Magenta, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Yellow">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="Yellow" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Yellow, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Black">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="Black" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Black, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
                                                                                                                                     <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
                                                                                                                                         <Rectangle.Fill>
@@ -1149,29 +1149,29 @@
                                                                                                                         <Setter Property="Content">
                                                                                                                             <Setter.Value>
                                                                                                                                 <StackPanel Orientation="Horizontal">
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Gray">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="Gray" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding L, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF8A8A">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#FF8A8A" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding A, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FFFF8A">
+                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Foreground="#92FF92" Width="50" Height="50" Margin="10 0 0 0">
                                                                                                                                         <mahapps:NumericUpDown FontSize="14" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding B, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
                                                                                                                                                 <Style TargetType="TextBox"/>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
+                                                                                                                                    </ContentControl>
 
                                                                                                                                     <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
                                                                                                                                         <Rectangle.Fill>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
index 61259508a..6257fa2af 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
@@ -13,7 +13,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.Resources>
         <sharedConverters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
-- 
cgit v1.3.1