diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml index 86863765e..c36fca2b8 100644 --- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml +++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml @@ -1,8 +1,6 @@ - - @@ -1328,6 +1326,8 @@ + + diff --git a/.idea/.idea.DiscImageChef/riderModule.iml b/.idea/.idea.DiscImageChef/riderModule.iml index 0ee339f25..4e3934535 100644 --- a/.idea/.idea.DiscImageChef/riderModule.iml +++ b/.idea/.idea.DiscImageChef/riderModule.iml @@ -1,11 +1,6 @@ - - - - - diff --git a/DiscImageChef.Gui/frmMain.xeto.cs b/DiscImageChef.Gui/frmMain.xeto.cs index d383bea4b..997ad29a3 100644 --- a/DiscImageChef.Gui/frmMain.xeto.cs +++ b/DiscImageChef.Gui/frmMain.xeto.cs @@ -34,6 +34,7 @@ using System; using System.ComponentModel; using System.Linq; using DiscImageChef.Console; +using DiscImageChef.Core.Media.Info; using DiscImageChef.Devices; using Eto.Forms; using Eto.Serialization.Xaml; @@ -182,6 +183,12 @@ namespace DiscImageChef.Gui splMain.Panel2 = null; + if(selectedItem.Values.Length >= 3 && selectedItem.Values[2] is Panel infoPanel) + { + splMain.Panel2 = infoPanel; + return; + } + if(selectedItem.Parent != devicesRoot) return; switch(selectedItem.Values[2]) @@ -216,9 +223,6 @@ namespace DiscImageChef.Gui lblError.Text = devErrorMessage; splMain.Panel2 = lblError; break; - case Panel devInfoPanel: - splMain.Panel2 = devInfoPanel; - break; } } @@ -264,13 +268,22 @@ namespace DiscImageChef.Gui } }); else - deviceItem.Children.Add(new TreeGridItem - { - Values = new object[] + { + // TODO: Removable non-SCSI? + ScsiInfo scsiInfo = new ScsiInfo(dev); + + if(!scsiInfo.MediaInserted) + deviceItem.Children.Add(new TreeGridItem {Values = new object[] {"No media inserted"}}); + else + deviceItem.Children.Add(new TreeGridItem { - "Removable device commands not yet implemented" - } - }); + Values = new[] + { + scsiInfo.MediaType, deviceItem.Values[1], + new pnlScsiInfo(scsiInfo) + } + }); + } dev.Close(); } diff --git a/DiscImageChef.Gui/pnlScsiInfo.xeto b/DiscImageChef.Gui/pnlScsiInfo.xeto new file mode 100644 index 000000000..2a05de2cc --- /dev/null +++ b/DiscImageChef.Gui/pnlScsiInfo.xeto @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + +