diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml index aebc33b89..74435f4d0 100644 --- a/.idea/.idea.Aaru/.idea/contentModel.xml +++ b/.idea/.idea.Aaru/.idea/contentModel.xml @@ -1263,14 +1263,14 @@ + + - - @@ -1305,6 +1305,7 @@ + diff --git a/Aaru.Gui/Forms/frmMain.xeto.cs b/Aaru.Gui/Forms/frmMain.xeto.cs index 9983dd423..d6fcd24e8 100644 --- a/Aaru.Gui/Forms/frmMain.xeto.cs +++ b/Aaru.Gui/Forms/frmMain.xeto.cs @@ -41,7 +41,6 @@ using Aaru.Gui.Panels; using Eto.Drawing; using Eto.Forms; using Eto.Serialization.Xaml; -using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo; namespace Aaru.Gui.Forms { @@ -220,38 +219,6 @@ namespace Aaru.Gui.Forms switch(selectedItem.Values[3]) { - case null when selectedItem.Parent == devicesRoot: - try - { - var dev = new Device((string)selectedItem.Values[2]); - - if(dev.IsRemote) - Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem, - dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture); - - if(dev.Error) - { - selectedItem.Values[3] = $"Error {dev.LastError} opening device"; - - return; - } - - var devInfo = new DeviceInfo(dev); - - selectedItem.Values[3] = new pnlDeviceInfo(devInfo); - splMain.Panel2 = (Panel)selectedItem.Values[3]; - - dev.Close(); - } - catch(SystemException ex) - { - selectedItem.Values[3] = ex.Message; - lblError.Text = ex.Message; - splMain.Panel2 = lblError; - AaruConsole.ErrorWriteLine(ex.Message); - } - - break; case string devErrorMessage when selectedItem.Parent == devicesRoot: lblError.Text = devErrorMessage; splMain.Panel2 = lblError; diff --git a/Aaru.Gui/Models/DeviceModel.cs b/Aaru.Gui/Models/DeviceModel.cs index 30ca4be01..677dda815 100644 --- a/Aaru.Gui/Models/DeviceModel.cs +++ b/Aaru.Gui/Models/DeviceModel.cs @@ -1,4 +1,5 @@ using System.Collections.ObjectModel; +using Aaru.Gui.ViewModels; using Avalonia.Media.Imaging; namespace Aaru.Gui.Models @@ -7,9 +8,10 @@ namespace Aaru.Gui.Models { public DeviceModel() => Media = new ObservableCollection(); - public Bitmap Icon { get; set; } - public string Name { get; set; } - public string Path { get; set; } + public Bitmap Icon { get; set; } + public string Name { get; set; } + public string Path { get; set; } + public DeviceInfoViewModel ViewModel { get; set; } public ObservableCollection Media { get; } } diff --git a/Aaru.Gui/Panels/DeviceInfoPanel.xaml b/Aaru.Gui/Panels/DeviceInfoPanel.xaml new file mode 100644 index 000000000..2fb6d1c9f --- /dev/null +++ b/Aaru.Gui/Panels/DeviceInfoPanel.xaml @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Aaru.Gui/Panels/DeviceInfoPanel.xaml.cs b/Aaru.Gui/Panels/DeviceInfoPanel.xaml.cs new file mode 100644 index 000000000..13a15ff9a --- /dev/null +++ b/Aaru.Gui/Panels/DeviceInfoPanel.xaml.cs @@ -0,0 +1,12 @@ +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Aaru.Gui.Panels +{ + public class DeviceInfoPanel : UserControl + { + public DeviceInfoPanel() => InitializeComponent(); + + void InitializeComponent() => AvaloniaXamlLoader.Load(this); + } +} \ No newline at end of file diff --git a/Aaru.Gui/Panels/pnlDeviceInfo.xeto b/Aaru.Gui/Panels/pnlDeviceInfo.xeto deleted file mode 100644 index 458f688f8..000000000 --- a/Aaru.Gui/Panels/pnlDeviceInfo.xeto +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -