From fcaf7d8148e1122e233f1c3da4731f1a4d660e49 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 14 Apr 2020 20:20:43 +0100 Subject: [PATCH] Migrate filesystem panel from Eto.Forms to Avalonia. --- .idea/.idea.Aaru/.idea/contentModel.xml | 5 +- Aaru.Gui/Models/FileSystemModel.cs | 2 + Aaru.Gui/Panels/FileSystemPanel.xaml | 35 +++++++ Aaru.Gui/Panels/FileSystemPanel.xaml.cs | 12 +++ Aaru.Gui/Panels/pnlFilesystem.xeto | 58 ----------- Aaru.Gui/Panels/pnlFilesystem.xeto.cs | 114 --------------------- Aaru.Gui/ViewModels/FileSystemViewModel.cs | 70 +++++++++++++ Aaru.Gui/ViewModels/MainWindowViewModel.cs | 12 ++- 8 files changed, 132 insertions(+), 176 deletions(-) create mode 100644 Aaru.Gui/Panels/FileSystemPanel.xaml create mode 100644 Aaru.Gui/Panels/FileSystemPanel.xaml.cs delete mode 100644 Aaru.Gui/Panels/pnlFilesystem.xeto delete mode 100644 Aaru.Gui/Panels/pnlFilesystem.xeto.cs create mode 100644 Aaru.Gui/ViewModels/FileSystemViewModel.cs diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml index 3de275a97..7ec2970e5 100644 --- a/.idea/.idea.Aaru/.idea/contentModel.xml +++ b/.idea/.idea.Aaru/.idea/contentModel.xml @@ -1252,14 +1252,14 @@ + + - - @@ -1297,6 +1297,7 @@ + diff --git a/Aaru.Gui/Models/FileSystemModel.cs b/Aaru.Gui/Models/FileSystemModel.cs index a1652bc28..e15362c61 100644 --- a/Aaru.Gui/Models/FileSystemModel.cs +++ b/Aaru.Gui/Models/FileSystemModel.cs @@ -1,4 +1,5 @@ using Aaru.CommonTypes.Interfaces; +using Aaru.Gui.ViewModels; namespace Aaru.Gui.Models { @@ -7,5 +8,6 @@ namespace Aaru.Gui.Models public string VolumeName { get; set; } public IFilesystem Filesystem { get; set; } public IReadOnlyFilesystem ReadOnlyFilesystem { get; set; } + public FileSystemViewModel ViewModel { get; set; } } } \ No newline at end of file diff --git a/Aaru.Gui/Panels/FileSystemPanel.xaml b/Aaru.Gui/Panels/FileSystemPanel.xaml new file mode 100644 index 000000000..3d5a6631d --- /dev/null +++ b/Aaru.Gui/Panels/FileSystemPanel.xaml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Aaru.Gui/Panels/FileSystemPanel.xaml.cs b/Aaru.Gui/Panels/FileSystemPanel.xaml.cs new file mode 100644 index 000000000..a760eb8dc --- /dev/null +++ b/Aaru.Gui/Panels/FileSystemPanel.xaml.cs @@ -0,0 +1,12 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Aaru.Gui.Panels +{ + public class FileSystemPanel : UserControl + { + public FileSystemPanel() => InitializeComponent(); + + void InitializeComponent() => AvaloniaXamlLoader.Load(this); + } +} \ No newline at end of file diff --git a/Aaru.Gui/Panels/pnlFilesystem.xeto b/Aaru.Gui/Panels/pnlFilesystem.xeto deleted file mode 100644 index 8f31e3aae..000000000 --- a/Aaru.Gui/Panels/pnlFilesystem.xeto +++ /dev/null @@ -1,58 +0,0 @@ - - - -