From 38593206b08c85af2aa223a2b020c82d5908f2ce Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 12 Apr 2020 17:32:57 +0100
Subject: [PATCH] Migrate pcmcia info from Eto.Forms to Avalonia.

---
 .idea/.idea.Aaru/.idea/contentModel.xml       |   6 +-
 Aaru.Gui/Models/PcmciaCisModel.cs             |   8 ++
 Aaru.Gui/Panels/ImageInfoPanel.xaml           |   6 +
 Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs         |  37 +++--
 Aaru.Gui/Tabs/PcmciaInfoTab.xaml              |  22 +++
 Aaru.Gui/Tabs/PcmciaInfoTab.xaml.cs           |  12 ++
 Aaru.Gui/Tabs/tabPcmciaInfo.xeto              |  53 -------
 Aaru.Gui/ViewModels/ImageInfoViewModel.cs     | 136 +++++++++---------
 .../PcmciaInfoViewModel.cs}                   | 127 ++++++----------
 9 files changed, 187 insertions(+), 220 deletions(-)
 create mode 100644 Aaru.Gui/Models/PcmciaCisModel.cs
 create mode 100644 Aaru.Gui/Tabs/PcmciaInfoTab.xaml
 create mode 100644 Aaru.Gui/Tabs/PcmciaInfoTab.xaml.cs
 delete mode 100644 Aaru.Gui/Tabs/tabPcmciaInfo.xeto
 rename Aaru.Gui/{Tabs/tabPcmciaInfo.xeto.cs => ViewModels/PcmciaInfoViewModel.cs} (57%)

diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 0e52e1ae2..e7ab58b63 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1255,6 +1255,7 @@
           <e p="NameCountModel.cs" t="Include" />
           <e p="PartitionModel.cs" t="Include" />
           <e p="PartitionSchemeModel.cs" t="Include" />
+          <e p="PcmciaCisModel.cs" t="Include" />
           <e p="PluginModel.cs" t="Include" />
           <e p="RootModel.cs" t="Include" />
           <e p="ScsiPageModel.cs" t="Include" />
@@ -1285,10 +1286,10 @@
           <e p="DvdInfoTab.xaml.cs" t="Include" />
           <e p="DvdWritableInfoTab.xaml" t="Include" />
           <e p="DvdWritableInfoTab.xaml.cs" t="Include" />
+          <e p="PcmciaInfoTab.xaml" t="Include" />
+          <e p="PcmciaInfoTab.xaml.cs" t="Include" />
           <e p="ScsiInfoTab.xaml" t="Include" />
           <e p="ScsiInfoTab.xaml.cs" t="Include" />
-          <e p="tabPcmciaInfo.xeto" t="Include" />
-          <e p="tabPcmciaInfo.xeto.cs" t="Include" />
           <e p="tabSdMmcInfo.xeto" t="Include" />
           <e p="tabSdMmcInfo.xeto.cs" t="Include" />
           <e p="tabXboxInfo.xeto" t="Include" />
@@ -1307,6 +1308,7 @@
           <e p="ImageInfoViewModel.cs" t="Include" />
           <e p="LicenseDialogViewModel.cs" t="Include" />
           <e p="MainWindowViewModel.cs" t="Include" />
+          <e p="PcmciaInfoViewModel.cs" t="Include" />
           <e p="PluginsDialogViewModel.cs" t="Include" />
           <e p="ScsiInfoViewModel.cs" t="Include" />
           <e p="SettingsDialogViewModel.cs" t="Include" />
diff --git a/Aaru.Gui/Models/PcmciaCisModel.cs b/Aaru.Gui/Models/PcmciaCisModel.cs
new file mode 100644
index 000000000..fb427348c
--- /dev/null
+++ b/Aaru.Gui/Models/PcmciaCisModel.cs
@@ -0,0 +1,8 @@
+namespace Aaru.Gui.Models
+{
+    public class PcmciaCisModel
+    {
+        public string Code        { get; set; }
+        public string Description { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Aaru.Gui/Panels/ImageInfoPanel.xaml b/Aaru.Gui/Panels/ImageInfoPanel.xaml
index 8c364125f..ea13d0ad2 100644
--- a/Aaru.Gui/Panels/ImageInfoPanel.xaml
+++ b/Aaru.Gui/Panels/ImageInfoPanel.xaml
@@ -150,6 +150,12 @@
                 </TabItem.Header>
                 <ContentControl Content="{Binding BlurayInfo}" />
             </TabItem>
+            <TabItem IsVisible="{Binding !!PcmciaInfo}">
+                <TabItem.Header>
+                    <TextBlock Text="PCMCIA" />
+                </TabItem.Header>
+                <ContentControl Content="{Binding PcmciaInfo}" />
+            </TabItem>
         </TabControl>
         <StackPanel Orientation="Horizontal" Spacing="5">
             <Button Command="{Binding EntropyCommand}">
diff --git a/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs b/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs
index 4dc535904..c6156f602 100644
--- a/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs
+++ b/Aaru.Gui/Panels/pnlDeviceInfo.xeto.cs
@@ -32,12 +32,10 @@
 
 using System;
 using System.IO;
-using Aaru.Decoders.SCSI.SSC;
-using Aaru.Devices;
+using Aaru.Core.Devices.Info;
 using Aaru.Gui.Tabs;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
-using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 
 namespace Aaru.Gui.Panels
 {
@@ -80,23 +78,24 @@ namespace Aaru.Gui.Panels
                 txtFirewireModel.Text        = devInfo.FireWireModelName;
                 txtFirewireGuid.Text         = $"{devInfo.FireWireGuid:X16}";
             }
+            /*
+                        if(devInfo.IsPcmcia)
+                        {
+                            var tabPcmciaInfo = new tabPcmciaInfo();
+                            tabPcmciaInfo.LoadData(devInfo.Cis);
+                            tabInfos.Pages.Add(tabPcmciaInfo);
+                        }
+            */
+            /*
+                        if(devInfo.AtaIdentify   != null ||
+                           devInfo.AtapiIdentify != null)
+                        {
+                            var tabAtaInfo = new tabAtaInfo();
+                            tabAtaInfo.LoadData(devInfo.AtaIdentify, devInfo.AtapiIdentify, devInfo.AtaMcptError);
 
-            if(devInfo.IsPcmcia)
-            {
-                var tabPcmciaInfo = new tabPcmciaInfo();
-                tabPcmciaInfo.LoadData(devInfo.Cis);
-                tabInfos.Pages.Add(tabPcmciaInfo);
-            }
-/*
-            if(devInfo.AtaIdentify   != null ||
-               devInfo.AtapiIdentify != null)
-            {
-                var tabAtaInfo = new tabAtaInfo();
-                tabAtaInfo.LoadData(devInfo.AtaIdentify, devInfo.AtapiIdentify, devInfo.AtaMcptError);
-
-                tabInfos.Pages.Add(tabAtaInfo);
-            }
-*/
+                            tabInfos.Pages.Add(tabAtaInfo);
+                        }
+            */
             /*
             if(devInfo.ScsiInquiryData != null)
             {
diff --git a/Aaru.Gui/Tabs/PcmciaInfoTab.xaml b/Aaru.Gui/Tabs/PcmciaInfoTab.xaml
new file mode 100644
index 000000000..6ad46f31d
--- /dev/null
+++ b/Aaru.Gui/Tabs/PcmciaInfoTab.xaml
@@ -0,0 +1,22 @@
+<UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Aaru.Gui.Tabs.PcmciaInfoTab">
+    <Design.DataContext>
+        <vm:PcmciaInfoViewModel />
+    </Design.DataContext>
+    <StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <DataGrid Items="{Binding cisList}" SelectedItem="{Binding SelectedCis}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="CIS" Binding="{Binding Code}" />
+                </DataGrid.Columns>
+            </DataGrid>
+            <TextBox IsReadOnly="True" Text="{Binding PcmciaCisText}" />
+        </StackPanel>
+        <Button Command="{Binding SavePcmciaCisCommand}">
+            <TextBlock Text="Save PCMCIA CIS to file" />
+        </Button>
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/Aaru.Gui/Tabs/PcmciaInfoTab.xaml.cs b/Aaru.Gui/Tabs/PcmciaInfoTab.xaml.cs
new file mode 100644
index 000000000..f7716118e
--- /dev/null
+++ b/Aaru.Gui/Tabs/PcmciaInfoTab.xaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Aaru.Gui.Tabs
+{
+    public class PcmciaInfoTab : UserControl
+    {
+        public PcmciaInfoTab() => InitializeComponent();
+
+        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    }
+}
\ No newline at end of file
diff --git a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto b/Aaru.Gui/Tabs/tabPcmciaInfo.xeto
deleted file mode 100644
index c33fa602e..000000000
--- a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-// /***************************************************************************
-// The Disc Image Chef
-// ============================================================================
-//
-// Filename       : tabPcmciaInfo.xeto
-// Author(s)      : Natalia Portillo <claunia@claunia.com>
-//
-// Component      : Device information.
-//
-// ==[ Description ] ==========================================================
-//
-//     Defines the structure for the PCMCIA device information.
-//
-// ==[ License ] ==============================================================
-//
-//     This program is free software: you can redistribute it and/or modify
-//     it under the terms of the GNU General public License as
-//     published by the Free Software Foundation, either version 3 of the
-//     License, or (at your option) any later version.
-//
-//     This program is distributed in the hope that it will be useful,
-//     but WITHOUT ANY WARRANTY; without even the implied warranty of
-//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//     GNU General public License for more details.
-//
-//     You should have received a copy of the GNU General public License
-//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// ============================================================================
-// Copyright © 2011-2020 Natalia Portillo
-// ****************************************************************************/
--->
-<TabPage Text="PCMCIA" Visible="False" xmlns="http://schema.picoe.ca/eto.forms"
-         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StackLayout Orientation="Vertical">
-        <StackLayoutItem HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Expand="True">
-            <StackLayout Orientation="Horizontal">
-                <StackLayoutItem HorizontalAlignment="Left" VerticalAlignment="Stretch" Expand="True">
-                    <TreeGridView ID="treePcmcia" SelectedItemChanged="OnTreePcmciaSelectedItemChanged"/>
-                </StackLayoutItem>
-                <StackLayoutItem HorizontalAlignment="Right" VerticalAlignment="Stretch" Expand="True">
-                    <TextArea ID="txtPcmciaCis" ReadOnly="True"/>
-                </StackLayoutItem>
-            </StackLayout>
-        </StackLayoutItem>
-        <StackLayoutItem HorizontalAlignment="Right" VerticalAlignment="Bottom">
-            <StackLayout Orientation="Horizontal">
-                <Button ID="btnSavePcmciaCis" Text="Save PCMCIA CIS to file" Click="OnBtnSavePcmciaCis"/>
-            </StackLayout>
-        </StackLayoutItem>
-    </StackLayout>
-</TabPage>
diff --git a/Aaru.Gui/ViewModels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/ImageInfoViewModel.cs
index d479ecb8c..b42494b33 100644
--- a/Aaru.Gui/ViewModels/ImageInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/ImageInfoViewModel.cs
@@ -371,6 +371,12 @@ namespace Aaru.Gui.ViewModels
                imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.DVD_BCA))
                 dvdBca = imageFormat.ReadDiskTag(MediaTagType.DVD_BCA);
 
+            DvdInfo = new DvdInfoTab
+            {
+                DataContext = new DvdInfoViewModel(imageFormat.Info.MediaType, dvdPfi, dvdDmi, dvdCmi,
+                                                   hddvdCopyrightInformation, dvdBca, null, decodedPfi, _view)
+            };
+
             byte[] dvdRamDds                     = null;
             byte[] dvdRamCartridgeStatus         = null;
             byte[] dvdRamSpareArea               = null;
@@ -517,7 +523,6 @@ namespace Aaru.Gui.ViewModels
             tabXboxInfo.LoadData(null, xboxDmi, xboxSecuritySector, decodedXboxSecuritySector);
             tabInfos.Pages.Add(tabXboxInfo);
 */
-            /* TODO: tabPcmciaInfo
 
             byte[] pcmciaCis = null;
 
@@ -525,79 +530,79 @@ namespace Aaru.Gui.ViewModels
                imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS))
                 pcmciaCis = imageFormat.ReadDiskTag(MediaTagType.PCMCIA_CIS);
 
-            var tabPcmciaInfo = new tabPcmciaInfo();
-            tabPcmciaInfo.LoadData(pcmciaCis);
-            tabInfos.Pages.Add(tabPcmciaInfo);
-*/
-            /* TODO: tabSdMmcInfo
-
-            DeviceType deviceType  = DeviceType.Unknown;
-            byte[]     cid         = null;
-            byte[]     csd         = null;
-            byte[]     ocr         = null;
-            byte[]     extendedCsd = null;
-            byte[]     scr         = null;
-
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_CID))
+            PcmciaInfo = new PcmciaInfoTab
             {
-                cid        = imageFormat.ReadDiskTag(MediaTagType.SD_CID);
-                deviceType = DeviceType.SecureDigital;
-            }
+                DataContext = new PcmciaInfoViewModel(pcmciaCis, _view)
+            };
 
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_CSD))
-            {
-                csd        = imageFormat.ReadDiskTag(MediaTagType.SD_CSD);
-                deviceType = DeviceType.SecureDigital;
-            }
+            /* TODO: SD/MMC
+                        DeviceType deviceType  = DeviceType.Unknown;
+                        byte[]     cid         = null;
+                        byte[]     csd         = null;
+                        byte[]     ocr         = null;
+                        byte[]     extendedCsd = null;
+                        byte[]     scr         = null;
 
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_OCR))
-            {
-                ocr        = imageFormat.ReadDiskTag(MediaTagType.SD_OCR);
-                deviceType = DeviceType.SecureDigital;
-            }
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_CID))
+                        {
+                            cid        = imageFormat.ReadDiskTag(MediaTagType.SD_CID);
+                            deviceType = DeviceType.SecureDigital;
+                        }
 
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_SCR))
-            {
-                scr        = imageFormat.ReadDiskTag(MediaTagType.SD_SCR);
-                deviceType = DeviceType.SecureDigital;
-            }
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_CSD))
+                        {
+                            csd        = imageFormat.ReadDiskTag(MediaTagType.SD_CSD);
+                            deviceType = DeviceType.SecureDigital;
+                        }
 
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_CID))
-            {
-                cid        = imageFormat.ReadDiskTag(MediaTagType.MMC_CID);
-                deviceType = DeviceType.MMC;
-            }
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_OCR))
+                        {
+                            ocr        = imageFormat.ReadDiskTag(MediaTagType.SD_OCR);
+                            deviceType = DeviceType.SecureDigital;
+                        }
 
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_CSD))
-            {
-                csd        = imageFormat.ReadDiskTag(MediaTagType.MMC_CSD);
-                deviceType = DeviceType.MMC;
-            }
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.SD_SCR))
+                        {
+                            scr        = imageFormat.ReadDiskTag(MediaTagType.SD_SCR);
+                            deviceType = DeviceType.SecureDigital;
+                        }
 
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_OCR))
-            {
-                ocr        = imageFormat.ReadDiskTag(MediaTagType.MMC_OCR);
-                deviceType = DeviceType.MMC;
-            }
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_CID))
+                        {
+                            cid        = imageFormat.ReadDiskTag(MediaTagType.MMC_CID);
+                            deviceType = DeviceType.MMC;
+                        }
 
-            if(imageFormat.Info.ReadableMediaTags != null &&
-               imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_ExtendedCSD))
-            {
-                extendedCsd = imageFormat.ReadDiskTag(MediaTagType.MMC_ExtendedCSD);
-                deviceType  = DeviceType.MMC;
-            }
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_CSD))
+                        {
+                            csd        = imageFormat.ReadDiskTag(MediaTagType.MMC_CSD);
+                            deviceType = DeviceType.MMC;
+                        }
 
-            var tabSdMmcInfo = new tabSdMmcInfo();
-            tabSdMmcInfo.LoadData(deviceType, cid, csd, ocr, extendedCsd, scr);
-            tabInfos.Pages.Add(tabSdMmcInfo);
-*/
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_OCR))
+                        {
+                            ocr        = imageFormat.ReadDiskTag(MediaTagType.MMC_OCR);
+                            deviceType = DeviceType.MMC;
+                        }
+
+                        if(imageFormat.Info.ReadableMediaTags != null &&
+                           imageFormat.Info.ReadableMediaTags.Contains(MediaTagType.MMC_ExtendedCSD))
+                        {
+                            extendedCsd = imageFormat.ReadDiskTag(MediaTagType.MMC_ExtendedCSD);
+                            deviceType  = DeviceType.MMC;
+                        }
+
+                        var tabSdMmcInfo = new tabSdMmcInfo();
+                        tabSdMmcInfo.LoadData(deviceType, cid, csd, ocr, extendedCsd, scr);
+                        tabInfos.Pages.Add(tabSdMmcInfo);
+            */
             if(imageFormat is IOpticalMediaImage opticalMediaImage)
             {
                 try
@@ -646,6 +651,7 @@ namespace Aaru.Gui.ViewModels
         public DvdInfoTab                              DvdInfo                   { get; }
         public DvdWritableInfoTab                      DvdWritableInfo           { get; }
         public BlurayInfoTab                           BlurayInfo                { get; }
+        public PcmciaInfoTab                           PcmciaInfo                { get; }
         public Bitmap                                  MediaLogo                 { get; }
         public string                                  ImagePathText             { get; }
         public string                                  FilterText                { get; }
diff --git a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs b/Aaru.Gui/ViewModels/PcmciaInfoViewModel.cs
similarity index 57%
rename from Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs
rename to Aaru.Gui/ViewModels/PcmciaInfoViewModel.cs
index 22f99f886..9cda13ad9 100644
--- a/Aaru.Gui/Tabs/tabPcmciaInfo.xeto.cs
+++ b/Aaru.Gui/ViewModels/PcmciaInfoViewModel.cs
@@ -1,69 +1,32 @@
-// /***************************************************************************
-// Aaru Data Preservation Suite
-// ----------------------------------------------------------------------------
-//
-// Filename       : tabPcmciaInfo.xeto.cs
-// Author(s)      : Natalia Portillo <claunia@claunia.com>
-//
-// Component      : Device information.
-//
-// --[ Description ] ----------------------------------------------------------
-//
-//     Implements the PCMCIA device information.
-//
-// --[ License ] --------------------------------------------------------------
-//
-//     This program is free software: you can redistribute it and/or modify
-//     it under the terms of the GNU General public License as
-//     published by the Free Software Foundation, either version 3 of the
-//     License, or (at your option) any later version.
-//
-//     This program is distributed in the hope that it will be useful,
-//     but WITHOUT ANY WARRANTY; without even the implied warranty of
-//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//     GNU General public License for more details.
-//
-//     You should have received a copy of the GNU General public License
-//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// ----------------------------------------------------------------------------
-// Copyright © 2011-2020 Natalia Portillo
-// ****************************************************************************/
-
-using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
+using System.Reactive;
 using Aaru.Console;
 using Aaru.Decoders.PCMCIA;
-using Eto.Forms;
-using Eto.Serialization.Xaml;
-using Tuple = Aaru.Decoders.PCMCIA.Tuple;
+using Aaru.Gui.Models;
+using Avalonia.Controls;
+using ReactiveUI;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.ViewModels
 {
-    public class tabPcmciaInfo : TabPage
+    public class PcmciaInfoViewModel : ViewModelBase
     {
-        byte[] cis;
+        string          _pcmciaCisText;
+        PcmciaCisModel  _selectedCis;
+        readonly Window _view;
+        readonly byte[] cis;
 
-        public tabPcmciaInfo() => XamlReader.Load(this);
-
-        internal void LoadData(byte[] pcmciaCis)
+        internal PcmciaInfoViewModel(byte[] pcmciaCis, Window view)
         {
             if(pcmciaCis == null)
                 return;
 
-            cis     = pcmciaCis;
-            Visible = true;
+            cis                  = pcmciaCis;
+            cisList              = new ObservableCollection<PcmciaCisModel>();
+            SavePcmciaCisCommand = ReactiveCommand.Create(ExecuteSavePcmciaCisCommand);
 
-            var cisList = new TreeGridItemCollection();
-
-            treePcmcia.Columns.Add(new GridColumn
-            {
-                HeaderText = "CIS", DataCell = new TextBoxCell(0)
-            });
-
-            treePcmcia.AllowMultipleSelection = false;
-            treePcmcia.ShowHeader             = false;
-            treePcmcia.DataStore              = cisList;
+            _view = view;
 
             Tuple[] tuples = CIS.GetTuples(cis);
 
@@ -138,58 +101,60 @@ namespace Aaru.Gui.Tabs
                             break;
                     }
 
-                    cisList.Add(new TreeGridItem
+                    cisList.Add(new PcmciaCisModel
                     {
-                        Values = new object[]
-                        {
-                            tupleCode, tupleDescription
-                        }
+                        Code = tupleCode, Description = tupleDescription
                     });
                 }
             else
                 AaruConsole.DebugWriteLine("Device-Info command", "PCMCIA CIS returned no tuples");
         }
 
-        protected void OnTreePcmciaSelectedItemChanged(object sender, EventArgs e)
-        {
-            if(!(treePcmcia.SelectedItem is TreeGridItem item))
-                return;
+        public ObservableCollection<PcmciaCisModel> cisList { get; }
 
-            txtPcmciaCis.Text = item.Values[1] as string;
+        public string PcmciaCisText
+        {
+            get => _pcmciaCisText;
+            set => this.RaiseAndSetIfChanged(ref _pcmciaCisText, value);
         }
 
-        protected void OnBtnSavePcmciaCis(object sender, EventArgs e)
+        public PcmciaCisModel SelectedCis
+        {
+            get => _selectedCis;
+            set
+            {
+                if(_selectedCis == value)
+                    return;
+
+                PcmciaCisText = value?.Description;
+                this.RaiseAndSetIfChanged(ref _selectedCis, value);
+            }
+        }
+
+        public ReactiveCommand<Unit, Unit> SavePcmciaCisCommand { get; }
+
+        async void ExecuteSavePcmciaCisCommand()
         {
             var dlgSaveBinary = new SaveFileDialog();
 
-            dlgSaveBinary.Filters.Add(new FileFilter
+            dlgSaveBinary.Filters.Add(new FileDialogFilter
             {
-                Extensions = new[]
+                Extensions = new List<string>(new[]
                 {
                     "*.bin"
-                },
+                }),
                 Name = "Binary"
             });
 
-            DialogResult result = dlgSaveBinary.ShowDialog(this);
+            string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(result != DialogResult.Ok)
+            if(result is null)
                 return;
 
-            var saveFs = new FileStream(dlgSaveBinary.FileName, FileMode.Create);
+            var saveFs = new FileStream(result, FileMode.Create);
             saveFs.Write(cis, 0, cis.Length);
 
             saveFs.Close();
         }
-
-        #region XAML controls
-        #pragma warning disable 169
-        #pragma warning disable 649
-        TreeGridView treePcmcia;
-        TextArea     txtPcmciaCis;
-        Button       btnSavePcmciaCis;
-        #pragma warning restore 169
-        #pragma warning restore 649
-        #endregion
     }
 }
\ No newline at end of file