From 754f8d5adb4cb32e14b5dd9a70facc803620d93c Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 14 Apr 2020 19:58:23 +0100 Subject: [PATCH] Migrate partition panel from Eto.Forms to Avalonia. --- .idea/.idea.Aaru/.idea/contentModel.xml | 5 +- Aaru.Gui/Models/PartitionModel.cs | 2 + Aaru.Gui/Panels/PartitionPanel.xaml | 15 ++ Aaru.Gui/Panels/PartitionPanel.xaml.cs | 12 + Aaru.Gui/Panels/pnlPartition.xeto | 44 ---- Aaru.Gui/Panels/pnlPartition.xeto.cs | 67 ----- Aaru.Gui/ViewModels/MainWindowViewModel.cs | 290 +++++++++++---------- Aaru.Gui/ViewModels/PartitionViewModel.cs | 24 ++ 8 files changed, 206 insertions(+), 253 deletions(-) create mode 100644 Aaru.Gui/Panels/PartitionPanel.xaml create mode 100644 Aaru.Gui/Panels/PartitionPanel.xaml.cs delete mode 100644 Aaru.Gui/Panels/pnlPartition.xeto delete mode 100644 Aaru.Gui/Panels/pnlPartition.xeto.cs create mode 100644 Aaru.Gui/ViewModels/PartitionViewModel.cs diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml index 91b140237..3de275a97 100644 --- a/.idea/.idea.Aaru/.idea/contentModel.xml +++ b/.idea/.idea.Aaru/.idea/contentModel.xml @@ -1254,14 +1254,14 @@ + + - - @@ -1305,6 +1305,7 @@ + diff --git a/Aaru.Gui/Models/PartitionModel.cs b/Aaru.Gui/Models/PartitionModel.cs index 0b6e6feb7..d849b9c20 100644 --- a/Aaru.Gui/Models/PartitionModel.cs +++ b/Aaru.Gui/Models/PartitionModel.cs @@ -1,5 +1,6 @@ using System.Collections.ObjectModel; using Aaru.CommonTypes; +using Aaru.Gui.ViewModels; using Avalonia.Media.Imaging; namespace Aaru.Gui.Models @@ -12,5 +13,6 @@ namespace Aaru.Gui.Models public Bitmap Icon { get; set; } public ObservableCollection FileSystems { get; } public Partition Partition { get; set; } + public PartitionViewModel ViewModel { get; set; } } } \ No newline at end of file diff --git a/Aaru.Gui/Panels/PartitionPanel.xaml b/Aaru.Gui/Panels/PartitionPanel.xaml new file mode 100644 index 000000000..95e6e83e2 --- /dev/null +++ b/Aaru.Gui/Panels/PartitionPanel.xaml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Aaru.Gui/Panels/PartitionPanel.xaml.cs b/Aaru.Gui/Panels/PartitionPanel.xaml.cs new file mode 100644 index 000000000..f6ebb82d1 --- /dev/null +++ b/Aaru.Gui/Panels/PartitionPanel.xaml.cs @@ -0,0 +1,12 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Aaru.Gui.Panels +{ + public class PartitionPanel : UserControl + { + public PartitionPanel() => InitializeComponent(); + + void InitializeComponent() => AvaloniaXamlLoader.Load(this); + } +} \ No newline at end of file diff --git a/Aaru.Gui/Panels/pnlPartition.xeto b/Aaru.Gui/Panels/pnlPartition.xeto deleted file mode 100644 index 0d94f52d5..000000000 --- a/Aaru.Gui/Panels/pnlPartition.xeto +++ /dev/null @@ -1,44 +0,0 @@ - - - -