diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-03-04 02:26:30 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-03-04 02:26:30 +0200 |
| commit | 485f8da4b55ae19f0a21792314ae2b096d48dab4 (patch) | |
| tree | 5a7402d91175f409330c052980c596a77e813d7a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml | |
| parent | 9dedf143c3ac44ca593e735861f4e1e2e6f947c9 (diff) | |
| download | Tango-485f8da4b55ae19f0a21792314ae2b096d48dab4.tar.gz Tango-485f8da4b55ae19f0a21792314ae2b096d48dab4.zip | |
Implemented Embroidery Editor.
Implemented Create job from embroidery file.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml index 49735d345..2115f2503 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml @@ -88,6 +88,7 @@ </Grid> <Grid DockPanel.Dock="Bottom" Margin="0 20 0 0"> + <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="20 0 0 0"> <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveJobCommand}"> <StackPanel Orientation="Horizontal"> @@ -174,7 +175,7 @@ <DataGridTemplateColumn.CellTemplate> <DataTemplate> <TextBlock VerticalAlignment="Center" FontSize="14"> - <Run Text="{Binding Length,Mode=OneWay}"></Run> + <Run Text="{Binding Length,Mode=OneWay,StringFormat=N2}"></Run> <Run Text="m" Foreground="Gray"></Run> </TextBlock> </DataTemplate> @@ -197,7 +198,7 @@ <ItemsControl.ItemsPanel> <ItemsPanelTemplate> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" MaxWidth="110"> - + </StackPanel> </ItemsPanelTemplate> </ItemsControl.ItemsPanel> @@ -235,6 +236,13 @@ </controls:MultiSelectDataGrid> </Grid> </DockPanel> + + <Button Command="{Binding ImportEmbroideryFileCommand}" Margin="20 0 0 -100" Foreground="Black" FontSize="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Style="{StaticResource emptyButton}" Cursor="Hand"> + <StackPanel Orientation="Horizontal"> + <Image Source="../Images/sewing-machine.png" Width="32"></Image> + <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" TextDecorations="Underline">Import Embroidery File</TextBlock> + </StackPanel> + </Button> </Grid> </Grid> </Grid> |