From e645e84144f312c8b26832f0a356a006bd8c0c2a Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Mon, 30 May 2022 17:11:19 +0300
Subject: Merged MS batch conversion branch.

---
 .../Modules/Tango.MachineStudio.RML/Views/RmlView.xaml             | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 6a5c4de9b..a9b943525 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -179,6 +179,13 @@
                                             </Border.Effect>
                                             <Grid>
                                                 <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Margin="20 0 0 0" FontSize="16">COLOR CONVERSION</TextBlock>
+
+                                                <Button ToolTip="Import LAB data from CSV and export the conversion results to a new CSV file" FontSize="11" Foreground="{StaticResource DarkGrayBrush200}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" VerticalAlignment="Bottom" Padding="0" Command="{Binding BatchConversionCommand}" Margin="0 0 5 0">
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <materialDesign:PackIcon Kind="FolderMultipleOutline" Foreground="{StaticResource DimGrayBrush}" Width="16" Height="26" />
+                                                        <TextBlock VerticalAlignment="Center" Margin="5 0 0 0">Batch Conversion</TextBlock>
+                                                    </StackPanel>
+                                                </Button>
                                             </Grid>
                                         </Border>
                                         <local:ColorConversionView x:Name="colorConversionView" Margin="0 0 0 0"  Grid.Column="0" DataContext="{Binding ColorConversionViewVM}"/>
-- 
cgit v1.3.1