aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-03-18 12:54:12 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-03-18 12:54:12 +0200
commitfd2641e5aa4e915cc133310bd87d21278b84e50b (patch)
tree8ec40d665967281db7617d0b8a0cc785913a32ed /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
parent2836f1031bf9c1414a80620e040c1414a45c1648 (diff)
downloadTango-fd2641e5aa4e915cc133310bd87d21278b84e50b.tar.gz
Tango-fd2641e5aa4e915cc133310bd87d21278b84e50b.zip
Working on machine events !
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
index 83a6eece6..b988d0a76 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineSerialView.xaml
@@ -8,7 +8,7 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:vm="clr-namespace:Tango.MachineStudio.UI.ViewModels"
xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
- mc:Ignorable="d" Width="600" Height="400" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineSerialViewVM, IsDesignTimeCreatable=False}">
+ mc:Ignorable="d" Width="559" Height="266" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineSerialViewVM, IsDesignTimeCreatable=False}">
<UserControl.Resources>
<autoCompleteMachine:MachinesProvider x:Key="MachinesProvider" />
@@ -36,15 +36,15 @@
<Grid>
<StackPanel Margin="0 10 0 0" >
- <TextBlock TextWrapping="Wrap" TextAlignment="Center">
+ <TextBlock TextWrapping="Wrap">
<Run>Connecting directly to a machine's embedded firmware requires the selection of an existing machine from the database in order for machine studio to function properly.</Run>
<LineBreak/>
<LineBreak/>
<Run>Please select a 'virtual machine' by entering the machine serial number</Run>
</TextBlock>
- <StackPanel Orientation="Horizontal" Margin="0 80 0 0" Width="300">
- <materialDesign:PackIcon Kind="Key" Width="24" Height="24" />
+ <StackPanel Orientation="Horizontal" Margin="0 20 0 0" Width="300" HorizontalAlignment="Left">
+ <materialDesign:PackIcon Kind="BarcodeScan" VerticalAlignment="Bottom" Width="24" Height="24" />
<autoComplete:AutoCompleteTextBox HorizontalContentAlignment="Stretch" Width="300" Margin="10 0 0 0" FontSize="16" Provider="{StaticResource MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number / Name" DisplayMember="SerialNumber">
<autoComplete:AutoCompleteTextBox.ItemTemplate>
<DataTemplate>
@@ -65,7 +65,7 @@
</Grid>
<Grid Grid.Row="1">
- <Button HorizontalAlignment="Right" Width="140" Command="{Binding OKCommand}">OK</Button>
+ <Button HorizontalAlignment="Right" Width="140" Command="{Binding OKCommand}">CONNECT</Button>
</Grid>
</Grid>
</Grid>