From 4e81425d99f39b8edc10660d72566c6c1408810d Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Thu, 23 Aug 2018 14:52:22 +0300
Subject: changes on other computers

---
 .../Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml   | 1 -
 .../Tango.MachineStudio.MachineDesigner/Views/MainView.xaml      | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
index 4d75651f7..e2dd7c5a9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
@@ -17,7 +17,6 @@
 
     <UserControl.Resources>
         <sharedConverters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
-        <providers:MachinesProvider x:Key="MachinesProvider"></providers:MachinesProvider>
 
         <Style x:Key="draggableGrid" TargetType="Grid">
             <Setter Property="RenderTransform">
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 4e3e31326..e12f85cdf 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
@@ -17,7 +17,6 @@
 
     <UserControl.Resources>
         <sharedConverters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
-        <providers:MachinesProvider x:Key="MachinesProvider"></providers:MachinesProvider>
 
         <Style x:Key="draggableGrid" TargetType="Grid">
             <Setter Property="RenderTransform">
@@ -89,7 +88,7 @@
                                 <TextBlock FontSize="30" FontStyle="Italic" VerticalAlignment="Center" Margin="50 10 10 0" Foreground="Silver" FontWeight="Bold">MACHINE DESIGNER</TextBlock>
                                 <StackPanel Orientation="Horizontal" Margin="20 10 0 0" VerticalAlignment="Center">
                                     <materialDesign:PackIcon Kind="BarcodeScan" VerticalAlignment="Bottom" Width="24" Height="24" Foreground="Silver"></materialDesign:PackIcon>
-                                    <autoComplete:AutoCompleteTextBox FontSize="16" FontWeight="Bold" FontStyle="Italic" Width="300" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Enter serial number" DisplayMember="SerialNumber" Provider="{StaticResource ResourceKey=MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}">
+                                    <autoComplete:AutoCompleteTextBox FontSize="16" FontWeight="Bold" FontStyle="Italic" Width="300" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Enter serial number" DisplayMember="SerialNumber" Provider="{Binding MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}">
                                         <autoComplete:AutoCompleteTextBox.ItemTemplate>
                                             <DataTemplate>
                                                 <TextBlock Text="{Binding SerialNumber}"></TextBlock>
@@ -99,6 +98,10 @@
                                             <TextBlock Text="Loading..." Margin="5" FontSize="14" />
                                         </autoComplete:AutoCompleteTextBox.LoadingContent>
                                     </autoComplete:AutoCompleteTextBox>
+
+                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Margin="10 0 0 0" Padding="0" Foreground="Gray" Width="40" Command="{Binding ResetCommand}" ToolTip="Reset the designer">
+                                        <materialDesign:PackIcon Kind="Refresh" Width="24" Height="24" />
+                                    </Button>
                                 </StackPanel>
                             </StackPanel>
                         </StackPanel>
@@ -417,7 +420,7 @@
                 </Grid>
             </Grid>
 
-            <Grid Grid.Column="1">
+            <Grid Grid.Column="1" IsEnabled="{Binding CanWork}">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
                     <RowDefinition Height="60"/>
-- 
cgit v1.3.1