From 864b3942e5eb977fe4249bfd2b25d3da4e3b438e Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 12 Apr 2020 18:59:16 +0100 Subject: [PATCH] Migrate xbox info from Eto.Forms to Avalonia. --- .idea/.idea.Aaru/.idea/contentModel.xml | 5 +- Aaru.Gui/Panels/ImageInfoPanel.xaml | 6 + Aaru.Gui/Panels/pnlScsiInfo.xeto.cs | 2 + Aaru.Gui/Tabs/XboxInfoTab.xaml | 44 +++++++ Aaru.Gui/Tabs/XboxInfoTab.xaml.cs | 12 ++ Aaru.Gui/Tabs/tabXboxInfo.xeto | 87 -------------- Aaru.Gui/Tabs/tabXboxInfo.xeto.cs | 140 ---------------------- Aaru.Gui/ViewModels/ImageInfoViewModel.cs | 12 +- Aaru.Gui/ViewModels/XboxInfoViewModel.cs | 85 +++++++++++++ 9 files changed, 158 insertions(+), 235 deletions(-) create mode 100644 Aaru.Gui/Tabs/XboxInfoTab.xaml create mode 100644 Aaru.Gui/Tabs/XboxInfoTab.xaml.cs delete mode 100644 Aaru.Gui/Tabs/tabXboxInfo.xeto delete mode 100644 Aaru.Gui/Tabs/tabXboxInfo.xeto.cs create mode 100644 Aaru.Gui/ViewModels/XboxInfoViewModel.cs diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml index 6ea161e72..926ea8547 100644 --- a/.idea/.idea.Aaru/.idea/contentModel.xml +++ b/.idea/.idea.Aaru/.idea/contentModel.xml @@ -1292,8 +1292,8 @@ - - + + @@ -1316,6 +1316,7 @@ + diff --git a/Aaru.Gui/Panels/ImageInfoPanel.xaml b/Aaru.Gui/Panels/ImageInfoPanel.xaml index 15bf957e7..cf3f1b593 100644 --- a/Aaru.Gui/Panels/ImageInfoPanel.xaml +++ b/Aaru.Gui/Panels/ImageInfoPanel.xaml @@ -162,6 +162,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/Aaru.Gui/Tabs/XboxInfoTab.xaml.cs b/Aaru.Gui/Tabs/XboxInfoTab.xaml.cs new file mode 100644 index 000000000..262a9cf8e --- /dev/null +++ b/Aaru.Gui/Tabs/XboxInfoTab.xaml.cs @@ -0,0 +1,12 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Aaru.Gui.Tabs +{ + public class XboxInfoTab : UserControl + { + public XboxInfoTab() => InitializeComponent(); + + void InitializeComponent() => AvaloniaXamlLoader.Load(this); + } +} \ No newline at end of file diff --git a/Aaru.Gui/Tabs/tabXboxInfo.xeto b/Aaru.Gui/Tabs/tabXboxInfo.xeto deleted file mode 100644 index 17f01f22e..000000000 --- a/Aaru.Gui/Tabs/tabXboxInfo.xeto +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -