From c3cacd847c2b2577ef5d815963d1d8f2b557c8ac Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 19 Aug 2019 19:02:58 +0300
Subject: PPC Graphic changes

---
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 54a3b72a9..6b1156ece 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -621,7 +621,7 @@
                                                 <Image Source="../Images/wind.png" Width="32"></Image>
                                                 <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Winding Method</TextBlock>
                                             </StackPanel>
-                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding WindingMethods}" SelectedItem="{Binding ActiveJob.WindingMethod}" DisplayMemberPath="Name" ></ComboBox>
+                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding WindingMethods}" SelectedItem="{Binding ActiveJob.WindingMethod}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
                                         </StackPanel>
                                     </Border>
 
@@ -631,7 +631,7 @@
                                                 <Image Source="../Images/thread.png" Width="32"></Image>
                                                 <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Spool</TextBlock>
                                             </StackPanel>
-                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding SpoolTypes}" SelectedItem="{Binding ActiveJob.SpoolType}" >
+                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding SpoolTypes}" SelectedItem="{Binding ActiveJob.SpoolType}" Style="{StaticResource TransparentComboBoxStyle}" >
                                                 <ComboBox.ToolTip>
                                                     <TextBlock>
                                                             <Run Text="{Binding ActiveJob.SpoolType.Name}"></Run>
@@ -753,7 +753,7 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
                                                                                     <StackPanel>
-- 
cgit v1.3.1


From e3964d5fa3e86408e00556c020d6d2f5b261e6f8 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 20 Aug 2019 12:06:56 +0300
Subject: Fixed issue with ValveTechItem loading.

---
 .../Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 1a1832120..8eb792f0d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -869,7 +869,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
             else if (item is ValveItem)
             {
                 (item as ValveItem).TechValve = Adapter.TechValves.FirstOrDefault(x => x.Guid == item.ItemGuid);
-                CreateElement<ValveElementEditor>(item);
+                var editor = CreateElement<ValveElementEditor>(item);
+                InitTechValveItem(editor.ValveItem);
             }
             else if (item is MeterItem)
             {
-- 
cgit v1.3.1


From 06e3100b305ba934b75b3da2ee54ccba8fb087a2 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 22 Aug 2019 11:55:35 +0300
Subject: MachineStudio. Changed  Foreground of "Start job" to white

---
 .../Modules/Tango.MachineStudio.Developer/Views/JobView.xaml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 6b1156ece..861a639d3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1260,7 +1260,7 @@
                                             <Button Height="60" Width="280" Command="{Binding StartJobCommand}" Click="OnJobStartClick">
                                                 <StackPanel Orientation="Horizontal">
                                                     <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="ClockFast" />
-                                                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="18">START JOB</TextBlock>
+                                                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="18" Foreground="{StaticResource WhiteTextBrush}">START JOB</TextBlock>
                                                 </StackPanel>
                                             </Button>
                                             <Button Height="60" Width="60" Margin="-60 0 0 0" Padding="0" Command="{Binding StartJobAndRecordCommand}" Click="OnJobStartClick" ToolTip="Start Job and Record">
@@ -1270,7 +1270,7 @@
                                         <Button Command="{Binding ToRunningJobCommand}" Width="280" Height="60" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
                                             <StackPanel Orientation="Horizontal">
                                                 <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="AlertCircle" />
-                                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="18">VIEW RUNNING JOB</TextBlock>
+                                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="18" Foreground="{StaticResource WhiteTextBrush}">VIEW RUNNING JOB</TextBlock>
                                             </StackPanel>
                                         </Button>
                                     </Grid>
-- 
cgit v1.3.1