From adabe4e1b99bc57f0381fb0a5bb3192ac0fdff18 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 16 Mar 2020 14:32:39 +0200
Subject: Working on FSE/PPC FileSystem Provider/Service.

---
 .../Tango.FileSystem/FileSystemDataGrid.cs         | 30 ++++++++++++++++
 .../Tango.FileSystem/FileSystemDataGridRow.cs      | 40 ++++++++++++++++++++++
 .../Tango.FileSystem/FileSystemItem.cs             |  5 +--
 .../Tango.FileSystem/FileSystemManager.cs          | 23 ++++++++-----
 .../Network/AbortOperationRequest.cs               | 13 +++++++
 .../Network/AbortOperationResponse.cs              | 12 +++++++
 .../Network/ChunkDownloadRequest.cs                | 15 ++++++++
 .../Network/ChunkDownloadResponse.cs               | 13 +++++++
 .../Tango.FileSystem/Network/ChunkUploadRequest.cs | 14 ++++++++
 .../Network/ChunkUploadResponse.cs                 | 13 +++++++
 .../Network/FileDownloadRequest.cs                 | 13 +++++++
 .../Network/FileDownloadResponse.cs                | 14 ++++++++
 .../Tango.FileSystem/Network/FileUploadRequest.cs  |  1 -
 .../Tango.FileSystem/Network/FileUploadResponse.cs |  2 +-
 .../Network/FolderDownloadRequest.cs               | 13 +++++++
 .../Network/FolderDownloadResponse.cs              | 14 ++++++++
 .../Network/GetFileSystemItemRequest.cs            |  2 ++
 .../Network/StartFileDownloadRequest.cs            | 13 -------
 .../Network/StartFileDownloadResponse.cs           | 15 --------
 .../Network/StartFolderDownloadRequest.cs          | 13 -------
 .../Network/StartFolderDownloadResponse.cs         | 15 --------
 .../Tango.FileSystem/Tango.FileSystem.csproj       | 16 ++++++---
 .../Tango.FileSystem/Themes/Generic.xaml           | 32 ++++++-----------
 23 files changed, 246 insertions(+), 95 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/FileSystemDataGrid.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/FileSystemDataGridRow.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationRequest.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationResponse.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadRequest.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadResponse.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadRequest.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadResponse.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadRequest.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadResponse.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadRequest.cs
 create mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadResponse.cs
 delete mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadRequest.cs
 delete mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadResponse.cs
 delete mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadRequest.cs
 delete mode 100644 Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadResponse.cs

(limited to 'Software/Visual_Studio/Tango.FileSystem')

diff --git a/Software/Visual_Studio/Tango.FileSystem/FileSystemDataGrid.cs b/Software/Visual_Studio/Tango.FileSystem/FileSystemDataGrid.cs
new file mode 100644
index 000000000..c1c31cf95
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/FileSystemDataGrid.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.FileSystem
+{
+    public class FileSystemDataGrid : DataGrid
+    {
+        static FileSystemDataGrid()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(FileSystemDataGrid), new FrameworkPropertyMetadata(typeof(FileSystemDataGrid)));
+        }
+
+        protected override DependencyObject GetContainerForItemOverride()
+        {
+            return new FileSystemDataGridRow();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/FileSystemDataGridRow.cs b/Software/Visual_Studio/Tango.FileSystem/FileSystemDataGridRow.cs
new file mode 100644
index 000000000..4cc67f888
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/FileSystemDataGridRow.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.FileSystem
+{
+    public class FileSystemDataGridRow : DataGridRow
+    {
+        public ICommand DoubleClickCommand
+        {
+            get { return (ICommand)GetValue(DoubleClickCommandProperty); }
+            set { SetValue(DoubleClickCommandProperty, value); }
+        }
+        public static readonly DependencyProperty DoubleClickCommandProperty =
+            DependencyProperty.Register("DoubleClickCommand", typeof(ICommand), typeof(FileSystemDataGridRow), new PropertyMetadata(null));
+
+        protected override void OnPreviewMouseDoubleClick(MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseDoubleClick(e);
+
+            DoubleClickCommand?.Execute(DataContext);
+        }
+
+        static FileSystemDataGridRow()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(FileSystemDataGridRow), new FrameworkPropertyMetadata(typeof(FileSystemDataGridRow)));
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs b/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
index 6f8190f6c..536409f63 100644
--- a/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/FileSystemItem.cs
@@ -52,14 +52,15 @@ namespace Tango.FileSystem
                 {
                     DriveType = dto.DriveType,
                     Label = dto.DriveLabel,
-                    Items = dto.Items.Select(x => FromDTO(x)).ToObservableCollection()
+                    Items = dto.Items?.Select(x => FromDTO(x)).ToObservableCollection()
                 };
             }
             else if (dto.Type == FileSystemItemType.Folder)
             {
                 item = new FolderItem()
                 {
-                    Items = dto.Items.Select(x => FromDTO(x)).ToObservableCollection()
+                    Items = dto.Items?.Select(x => FromDTO(x)).ToObservableCollection(),
+                    IsRoot = dto.IsRoot,
                 };
             }
             else if (dto.Type == FileSystemItemType.File)
diff --git a/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs b/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs
index 9a051793d..f0b86becf 100644
--- a/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/FileSystemManager.cs
@@ -16,7 +16,7 @@ namespace Tango.FileSystem
             folder.Path = "This PC";
             folder.IsRoot = true;
             folder.Type = FileSystemItemType.Folder;
-            folder.Items = DriveInfo.GetDrives().Select(x => new FileSystemItemDTO()
+            folder.Items = DriveInfo.GetDrives().Where(x => x.DriveType == DriveType.Fixed || x.DriveType == DriveType.Removable || x.DriveType == DriveType.Network).Select(x => new FileSystemItemDTO()
             {
                 Path = x.RootDirectory.FullName,
                 DriveType = x.DriveType,
@@ -27,21 +27,26 @@ namespace Tango.FileSystem
             return folder;
         }
 
-        public FileSystemItemDTO GetFolder(String path)
+        public FileSystemItemDTO GetFolder(GetFileSystemItemRequest request)
         {
             List<FileSystemItemDTO> items = new List<FileSystemItemDTO>();
 
-            if (String.IsNullOrWhiteSpace(path))
+            if (request.SpecialFolder.HasValue)
+            {
+                request.Path = Environment.GetFolderPath(request.SpecialFolder.Value);
+            }
+
+            if (String.IsNullOrWhiteSpace(request.Path))
             {
                 return GetRoot();
             }
 
-            if (!Directory.Exists(path))
+            if (!Directory.Exists(request.Path))
             {
                 throw new DirectoryNotFoundException("The specified directory could not be located.");
             }
 
-            foreach (var directory in Directory.GetDirectories(path))
+            foreach (var directory in Directory.GetDirectories(request.Path))
             {
                 items.Add(new FileSystemItemDTO()
                 {
@@ -51,7 +56,7 @@ namespace Tango.FileSystem
                 });
             }
 
-            foreach (var file in Directory.GetFiles(path))
+            foreach (var file in Directory.GetFiles(request.Path))
             {
                 items.Add(new FileSystemItemDTO()
                 {
@@ -64,8 +69,8 @@ namespace Tango.FileSystem
 
             return new FileSystemItemDTO()
             {
-                Path = path,
-                Type = path.Length == 3 ? FileSystemItemType.Drive : FileSystemItemType.Folder,
+                Path = request.Path,
+                Type = request.Path.Length == 3 ? FileSystemItemType.Drive : FileSystemItemType.Folder,
                 Items = items
             };
         }
@@ -74,7 +79,7 @@ namespace Tango.FileSystem
         {
             if (Directory.Exists(path))
             {
-                Directory.Delete(path);
+                Directory.Delete(path, true);
             }
             else if (File.Exists(path))
             {
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationRequest.cs
new file mode 100644
index 000000000..3e912b9f0
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationRequest.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class AbortOperationRequest
+    {
+        public String OperationId { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationResponse.cs
new file mode 100644
index 000000000..c5669ad48
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/AbortOperationResponse.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class AbortOperationResponse
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadRequest.cs
new file mode 100644
index 000000000..16951930e
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadRequest.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class ChunkDownloadRequest
+    {
+        public String OperationId { get; set; }
+        public long Position { get; set; }
+        public long MaxChunkSize { get; set; } = 1024 * 1024;
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadResponse.cs
new file mode 100644
index 000000000..df72e193f
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkDownloadResponse.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class ChunkDownloadResponse
+    {
+        public byte[] Data { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadRequest.cs
new file mode 100644
index 000000000..98a27efd2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadRequest.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class ChunkUploadRequest
+    {
+        public String OperationId { get; set; }
+        public byte[] Data { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadResponse.cs
new file mode 100644
index 000000000..5cd6a3f80
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/ChunkUploadResponse.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class ChunkUploadResponse
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadRequest.cs
new file mode 100644
index 000000000..b63937f8b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadRequest.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class FileDownloadRequest
+    {
+        public String Path { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadResponse.cs
new file mode 100644
index 000000000..c57a9bad6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/FileDownloadResponse.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class FileDownloadResponse
+    {
+        public long Length { get; set; }
+        public String OperationId { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadRequest.cs
index 50c35c584..f3cbc2d54 100644
--- a/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadRequest.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadRequest.cs
@@ -9,6 +9,5 @@ namespace Tango.FileSystem.Network
     public class FileUploadRequest
     {
         public String Path { get; set; }
-        public byte[] Data { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadResponse.cs
index 4f4bc0d52..c0af1a797 100644
--- a/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadResponse.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/FileUploadResponse.cs
@@ -8,6 +8,6 @@ namespace Tango.FileSystem.Network
 {
     public class FileUploadResponse
     {
-
+        public String OperationId { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadRequest.cs
new file mode 100644
index 000000000..cb65a8942
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadRequest.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class FolderDownloadRequest
+    {
+        public String Path { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadResponse.cs
new file mode 100644
index 000000000..239ff2e59
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/FolderDownloadResponse.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class FolderDownloadResponse
+    {
+        public long Length { get; set; }
+        public String OperationId { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/GetFileSystemItemRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/GetFileSystemItemRequest.cs
index f69c7bd98..1ed6c19e4 100644
--- a/Software/Visual_Studio/Tango.FileSystem/Network/GetFileSystemItemRequest.cs
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/GetFileSystemItemRequest.cs
@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static System.Environment;
 
 namespace Tango.FileSystem.Network
 {
     public class GetFileSystemItemRequest
     {
         public String Path { get; set; }
+        public SpecialFolder? SpecialFolder { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadRequest.cs
deleted file mode 100644
index aac03af38..000000000
--- a/Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.FileSystem.Network
-{
-    public class StartFileDownloadRequest
-    {
-        public String Path { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadResponse.cs
deleted file mode 100644
index 187d15254..000000000
--- a/Software/Visual_Studio/Tango.FileSystem/Network/StartFileDownloadResponse.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.FileSystem.Network
-{
-    public class StartFileDownloadResponse
-    {
-        public byte[] Data { get; set; }
-        public long Position { get; set; }
-        public long Length { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadRequest.cs
deleted file mode 100644
index e7989bd98..000000000
--- a/Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadRequest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.FileSystem.Network
-{
-    public class StartFolderDownloadRequest
-    {
-        public String Path { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadResponse.cs b/Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadResponse.cs
deleted file mode 100644
index c48d4c04c..000000000
--- a/Software/Visual_Studio/Tango.FileSystem/Network/StartFolderDownloadResponse.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.FileSystem.Network
-{
-    public class StartFolderDownloadResponse
-    {
-        public byte[] ZipData { get; set; }
-        public long Position { get; set; }
-        public long Length { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.FileSystem/Tango.FileSystem.csproj b/Software/Visual_Studio/Tango.FileSystem/Tango.FileSystem.csproj
index 90dfd78d2..733493f02 100644
--- a/Software/Visual_Studio/Tango.FileSystem/Tango.FileSystem.csproj
+++ b/Software/Visual_Studio/Tango.FileSystem/Tango.FileSystem.csproj
@@ -50,6 +50,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DragItem.cs" />
+    <Compile Include="FileSystemDataGrid.cs" />
+    <Compile Include="FileSystemDataGridRow.cs" />
+    <Compile Include="Network\AbortOperationRequest.cs" />
+    <Compile Include="Network\AbortOperationResponse.cs" />
+    <Compile Include="Network\ChunkUploadRequest.cs" />
+    <Compile Include="Network\ChunkUploadResponse.cs" />
+    <Compile Include="Network\ChunkDownloadRequest.cs" />
+    <Compile Include="Network\ChunkDownloadResponse.cs" />
     <Compile Include="VirtualFileDataObject.cs" />
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -73,10 +81,10 @@
     <Compile Include="Network\FileUploadResponse.cs" />
     <Compile Include="Network\GetFileSystemItemRequest.cs" />
     <Compile Include="Network\GetFileSystemItemResponse.cs" />
-    <Compile Include="Network\StartFileDownloadRequest.cs" />
-    <Compile Include="Network\StartFileDownloadResponse.cs" />
-    <Compile Include="Network\StartFolderDownloadRequest.cs" />
-    <Compile Include="Network\StartFolderDownloadResponse.cs" />
+    <Compile Include="Network\FileDownloadRequest.cs" />
+    <Compile Include="Network\FileDownloadResponse.cs" />
+    <Compile Include="Network\FolderDownloadRequest.cs" />
+    <Compile Include="Network\FolderDownloadResponse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Software/Visual_Studio/Tango.FileSystem/Themes/Generic.xaml b/Software/Visual_Studio/Tango.FileSystem/Themes/Generic.xaml
index c9e561e29..f793be947 100644
--- a/Software/Visual_Studio/Tango.FileSystem/Themes/Generic.xaml
+++ b/Software/Visual_Studio/Tango.FileSystem/Themes/Generic.xaml
@@ -7,6 +7,14 @@
     <converters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter" />
     <converters:DateTimeUtcToLocalDateTime x:Key="DateTimeUtcToLocalDateTime" />
 
+    <Style TargetType="{x:Type local:FileSystemDataGridRow}" BasedOn="{StaticResource {x:Type DataGridRow}}">
+        <Setter Property="DoubleClickCommand" Value="{Binding RelativeSource={RelativeSource AncestorType=local:FileExplorerControl},Path=ItemDoubleClickedCommand}"></Setter>
+    </Style>
+
+    <Style TargetType="{x:Type local:FileSystemDataGrid}" BasedOn="{StaticResource {x:Type DataGrid}}">
+
+    </Style>
+
     <Style x:Key="FileSystemCellStyle" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
@@ -92,7 +100,7 @@
                                         </Style.Triggers>
                                     </Style>
                                 </Grid.Style>
-                                <DataGrid x:Name="PART_datagrid" ItemsSource="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=CurrentItem.Items}" CellStyle="{StaticResource FileSystemCellStyle}">
+                                <local:FileSystemDataGrid x:Name="PART_datagrid" ItemsSource="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=CurrentItem.Items}" CellStyle="{StaticResource FileSystemCellStyle}">
                                     <DataGrid.Style>
                                         <Style TargetType="DataGrid" BasedOn="{StaticResource {x:Type DataGrid}}">
                                             <Setter Property="Background" Value="Transparent"></Setter>
@@ -119,11 +127,6 @@
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <DockPanel Background="Transparent">
-                                                        <DockPanel.InputBindings>
-                                                            <MouseBinding MouseAction="LeftDoubleClick"
-                                                              Command="{Binding RelativeSource={RelativeSource AncestorType=local:FileExplorerControl},Path=ItemDoubleClickedCommand}"
-                                                              CommandParameter="{Binding}" />
-                                                        </DockPanel.InputBindings>
                                                         <Image Width="18" Height="18" RenderOptions.BitmapScalingMode="Fant" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
                                                             <Image.Style>
                                                                 <Style TargetType="Image">
@@ -150,11 +153,6 @@
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <DockPanel Background="Transparent">
-                                                        <DockPanel.InputBindings>
-                                                            <MouseBinding MouseAction="LeftDoubleClick"
-                                                              Command="{Binding RelativeSource={RelativeSource AncestorType=local:FileExplorerControl},Path=ItemDoubleClickedCommand}"
-                                                              CommandParameter="{Binding}" />
-                                                        </DockPanel.InputBindings>
                                                         <TextBlock Text="{Binding DateModified,Converter={StaticResource DateTimeUtcToLocalDateTime}}" VerticalAlignment="Center"></TextBlock>
                                                     </DockPanel>
                                                 </DataTemplate>
@@ -164,11 +162,6 @@
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <DockPanel Background="Transparent">
-                                                        <DockPanel.InputBindings>
-                                                            <MouseBinding MouseAction="LeftDoubleClick"
-                                                              Command="{Binding RelativeSource={RelativeSource AncestorType=local:FileExplorerControl},Path=ItemDoubleClickedCommand}"
-                                                              CommandParameter="{Binding}" />
-                                                        </DockPanel.InputBindings>
                                                         <TextBlock Text="{Binding Description}" VerticalAlignment="Center"></TextBlock>
                                                     </DockPanel>
                                                 </DataTemplate>
@@ -178,11 +171,6 @@
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <DockPanel Background="Transparent">
-                                                        <DockPanel.InputBindings>
-                                                            <MouseBinding MouseAction="LeftDoubleClick"
-                                                              Command="{Binding RelativeSource={RelativeSource AncestorType=local:FileExplorerControl},Path=ItemDoubleClickedCommand}"
-                                                              CommandParameter="{Binding}" />
-                                                        </DockPanel.InputBindings>
                                                         <TextBlock Text="{Binding Size,Converter={StaticResource ByteArrayToFileSizeConverter}}" VerticalAlignment="Center">
                                                             <TextBlock.Style>
                                                                 <Style TargetType="TextBlock">
@@ -200,7 +188,7 @@
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
                                     </DataGrid.Columns>
-                                </DataGrid>
+                                </local:FileSystemDataGrid>
                             </Grid>
                         </Grid>
                     </Border>
-- 
cgit v1.3.1