From afcd085bfe8c0b921b5fe93bb99de72db99e8da4 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 12 Apr 2020 22:29:24 +0100 Subject: [PATCH] Migrate image entropy window from Eto.Forms to Avalonia. --- .idea/.idea.Aaru/.idea/contentModel.xml | 6 +- Aaru.Gui/Forms/frmImageEntropy.xeto | 82 ---- Aaru.Gui/Forms/frmImageEntropy.xeto.cs | 244 ------------ Aaru.Gui/Models/TrackEntropyModel.cs | 9 + Aaru.Gui/ViewModels/ImageEntropyViewModel.cs | 385 +++++++++++++++++++ Aaru.Gui/ViewModels/ImageInfoViewModel.cs | 21 +- Aaru.Gui/Views/ImageEntropyWindow.xaml | 58 +++ Aaru.Gui/Views/ImageEntropyWindow.xaml.cs | 27 ++ 8 files changed, 493 insertions(+), 339 deletions(-) delete mode 100644 Aaru.Gui/Forms/frmImageEntropy.xeto delete mode 100644 Aaru.Gui/Forms/frmImageEntropy.xeto.cs create mode 100644 Aaru.Gui/Models/TrackEntropyModel.cs create mode 100644 Aaru.Gui/ViewModels/ImageEntropyViewModel.cs create mode 100644 Aaru.Gui/Views/ImageEntropyWindow.xaml create mode 100644 Aaru.Gui/Views/ImageEntropyWindow.xaml.cs diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml index bd5718eac..3c6b8b14d 100644 --- a/.idea/.idea.Aaru/.idea/contentModel.xml +++ b/.idea/.idea.Aaru/.idea/contentModel.xml @@ -1225,8 +1225,6 @@ - - @@ -1258,6 +1256,7 @@ + @@ -1305,6 +1304,7 @@ + @@ -1327,6 +1327,8 @@ + + diff --git a/Aaru.Gui/Forms/frmImageEntropy.xeto b/Aaru.Gui/Forms/frmImageEntropy.xeto deleted file mode 100644 index 257ba4a95..000000000 --- a/Aaru.Gui/Forms/frmImageEntropy.xeto +++ /dev/null @@ -1,82 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/Aaru.Gui/Views/ImageEntropyWindow.xaml.cs b/Aaru.Gui/Views/ImageEntropyWindow.xaml.cs new file mode 100644 index 000000000..cd5fdb9e0 --- /dev/null +++ b/Aaru.Gui/Views/ImageEntropyWindow.xaml.cs @@ -0,0 +1,27 @@ +using System.ComponentModel; +using Aaru.Gui.ViewModels; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Aaru.Gui.Views +{ + public class ImageEntropyWindow : Window + { + public ImageEntropyWindow() + { + InitializeComponent(); + #if DEBUG + this.AttachDevTools(); + #endif + } + + void InitializeComponent() => AvaloniaXamlLoader.Load(this); + + protected override void OnClosing(CancelEventArgs e) + { + (DataContext as ImageChecksumViewModel)?.ExecuteStopCommand(); + base.OnClosing(e); + } + } +} \ No newline at end of file