From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Modules/Tango.PPC.Storage/Views/MainView.xaml  | 70 ++--------------------
 1 file changed, 6 insertions(+), 64 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml
index c57735a7b..74307c9ce 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Storage/Views/MainView.xaml
@@ -16,7 +16,7 @@
     <UserControl.InputBindings>
         <KeyBinding Key="Return" Command="{Binding SaveCommand}"></KeyBinding>
     </UserControl.InputBindings>
-
+    
     <Grid>
         <Grid Background="{StaticResource TangoMidBackgroundBrush}">
             <Grid.RowDefinitions>
@@ -32,89 +32,31 @@
             </Border>
             <Grid Margin="10" Grid.Row="1">
                 <DockPanel>
-                    <Grid DockPanel.Dock="Top">
-                        <Grid.Style>
-                            <Style TargetType="Grid">
-                                <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                <Style.Triggers>
-                                    <MultiDataTrigger>
-                                        <MultiDataTrigger.Conditions>
-                                            <Condition Binding="{Binding Request.Intent}" Value="LoadFiles" />
-                                            <Condition Binding="{Binding ElementName=explorer,Path=IsMultiSelecting}" Value="True" />
-                                        </MultiDataTrigger.Conditions>
-                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                    </MultiDataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Grid.Style>
-                        <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}" Padding="20">
-                            <StackPanel>
-                                <DockPanel Margin="0 0 0 0">
-                                    <touch:TouchButton Command="{Binding OpenCommand}" Margin="20 0 0 0" Height="55" Width="200" Style="{StaticResource TangoHollowButton}" CornerRadius="25" DockPanel.Dock="Right">
-                                        <touch:TouchButton.Content>
-                                            OPEN
-                                        </touch:TouchButton.Content>
-                                    </touch:TouchButton>
-                                    <Grid>
-                                        <TextBlock VerticalAlignment="Center" Foreground="{StaticResource TangoGrayTextBrush}">
-                                            <Run Text="{Binding SelectedItems.Count,Mode=OneWay}"></Run>
-                                            <Run>files selected</Run>
-                                        </TextBlock>
-                                    </Grid>
-                                </DockPanel>
-                            </StackPanel>
-                        </Border>
-                    </Grid>
-                    
-                    <Grid DockPanel.Dock="Top">
-                        <Grid.Style>
-                            <Style TargetType="Grid">
-                                <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding Request.Intent}" Value="SaveFile">
-                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding Request.Intent}" Value="SaveFiles">
-                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Grid.Style>
+
+                    <Grid DockPanel.Dock="Top" Visibility="{Binding Request.Intent,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter=SaveFile}">
                         <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}" Padding="20">
                             <StackPanel>
                                 <TextBlock Text="{Binding Request.Title}" FontSize="{StaticResource TangoHeaderFontSize}"></TextBlock>
                                 <DockPanel Margin="0 10 0 0">
-                                    <touch:TouchButton Command="{Binding SaveCommand}" Margin="20 0 0 0" Height="55" Width="200" Style="{StaticResource TangoHollowButton}" CornerRadius="25" DockPanel.Dock="Right">
+                                    <touch:TouchButton Command="{Binding SaveCommand}" Margin="20 0 0 0" Height="50" Width="200" Style="{StaticResource TangoHollowButton}" CornerRadius="0" DockPanel.Dock="Right">
                                         <touch:TouchButton.Content>
                                             SAVE
                                         </touch:TouchButton.Content>
                                     </touch:TouchButton>
-                                    <Grid>
-                                        <touch:TouchTextBox x:Name="txtFileName" Visibility="{Binding Request.Intent,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter=SaveFile}" KeyboardAction="Go" FocusSelectionMode="SelectAll" VerticalAlignment="Bottom" Text="{Binding FileName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
-                                        <TextBlock VerticalAlignment="Center" Foreground="{StaticResource TangoGrayTextBrush}" Visibility="{Binding Request.Intent,Converter={StaticResource EnumToVisibilityConverter},ConverterParameter=SaveFiles}">Select destination folder</TextBlock>
-                                    </Grid>
+                                    <touch:TouchTextBox x:Name="txtFileName" KeyboardAction="Go" FocusSelectionMode="SelectAll" VerticalAlignment="Bottom" Text="{Binding FileName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
                                 </DockPanel>
                             </StackPanel>
                         </Border>
                     </Grid>
 
-                    <explorer:ExplorerControl x:Name="explorer" CurrentPath="{Binding CurrentPath,Mode=TwoWay}" SelectedItems="{Binding SelectedItems}" FileSelectedCommand="{Binding FileSelectedCommand}" Filter="{Binding Request.Filter}" Visibility="{Binding DisplayItems,Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <explorer:ExplorerControl x:Name="explorer" CurrentPath="{Binding CurrentPath,Mode=TwoWay}" FileSelectedCommand="{Binding FileSelectedCommand}" Filter="{Binding Request.Filter}">
                         <explorer:ExplorerControl.Style>
                             <Style TargetType="explorer:ExplorerControl" BasedOn="{StaticResource {x:Type explorer:ExplorerControl}}">
                                 <Setter Property="EnableFileSelection" Value="True"></Setter>
-                                <Setter Property="EnableMultiSelect" Value="False"></Setter>
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding Request.Intent}" Value="SaveFile">
                                         <Setter Property="EnableFileSelection" Value="False"></Setter>
                                     </DataTrigger>
-                                    <DataTrigger Binding="{Binding Request.Intent}" Value="LoadFiles">
-                                        <Setter Property="EnableFileSelection" Value="True"></Setter>
-                                        <Setter Property="EnableMultiSelect" Value="True"></Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding Request.Intent}" Value="LoadFile">
-                                        <Setter Property="EnableFileSelection" Value="True"></Setter>
-                                        <Setter Property="EnableMultiSelect" Value="False"></Setter>
-                                    </DataTrigger>
                                 </Style.Triggers>
                             </Style>
                         </explorer:ExplorerControl.Style>
-- 
cgit v1.3.1