diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml index 316dd605a..1a286f122 100644 --- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml +++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml @@ -1311,6 +1311,23 @@ + + + + + + + + + + + + + + + + + diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/computer.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/computer.png new file mode 100644 index 000000000..a5ee19561 Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/computer.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-harddisk.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-harddisk.png new file mode 100644 index 000000000..0ae47f104 Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-harddisk.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-optical.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-optical.png new file mode 100644 index 000000000..74ff49d3c Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-optical.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-removable-media-usb.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-removable-media-usb.png new file mode 100644 index 000000000..5a2927fb5 Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-removable-media-usb.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-removable-media.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-removable-media.png new file mode 100644 index 000000000..1400e98a2 Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/drive-removable-media.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/inode-directory.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/inode-directory.png new file mode 100644 index 000000000..df05cf1d6 Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/inode-directory.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-eject.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-eject.png new file mode 100644 index 000000000..96f7ea9bb Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-eject.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-flash-sd-mmc.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-flash-sd-mmc.png new file mode 100644 index 000000000..031240d7a Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-flash-sd-mmc.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-tape.png b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-tape.png new file mode 100644 index 000000000..0dc1034d4 Binary files /dev/null and b/DiscImageChef.Gui/Assets/Icons/oxygen/32x32/media-tape.png differ diff --git a/DiscImageChef.Gui/Assets/Icons/oxygen/COPYING b/DiscImageChef.Gui/Assets/Icons/oxygen/COPYING new file mode 100644 index 000000000..045b62e8b --- /dev/null +++ b/DiscImageChef.Gui/Assets/Icons/oxygen/COPYING @@ -0,0 +1,216 @@ +The Oxygen Icon Theme + Copyright (C) 2007 Nuno Pinheiro + Copyright (C) 2007 David Vignoni + Copyright (C) 2007 David Miller + Copyright (C) 2007 Johann Ollivier Lapeyre + Copyright (C) 2007 Kenneth Wimer + Copyright (C) 2007 Riccardo Iaconelli + + +and others + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . + +Clarification: + + The GNU Lesser General Public License or LGPL is written for + software libraries in the first place. We expressly want the LGPL to + be valid for this artwork library too. + + KDE Oxygen theme icons is a special kind of software library, it is an + artwork library, it's elements can be used in a Graphical User Interface, or + GUI. + + Source code, for this library means: + - where they exist, SVG; + - otherwise, if applicable, the multi-layered formats xcf or psd, or + otherwise png. + + The LGPL in some sections obliges you to make the files carry + notices. With images this is in some cases impossible or hardly useful. + + With this library a notice is placed at a prominent place in the directory + containing the elements. You may follow this practice. + + The exception in section 5 of the GNU Lesser General Public License covers + the use of elements of this art library in a GUI. + + kde-artists [at] kde.org + +----- + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/DiscImageChef.Gui/DiscImageChef.Gui.csproj b/DiscImageChef.Gui/DiscImageChef.Gui.csproj index 132ad9b84..02887a424 100644 --- a/DiscImageChef.Gui/DiscImageChef.Gui.csproj +++ b/DiscImageChef.Gui/DiscImageChef.Gui.csproj @@ -293,5 +293,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/DiscImageChef.Gui/Forms/frmMain.xeto.cs b/DiscImageChef.Gui/Forms/frmMain.xeto.cs index 7156369d9..d6a06b5ce 100644 --- a/DiscImageChef.Gui/Forms/frmMain.xeto.cs +++ b/DiscImageChef.Gui/Forms/frmMain.xeto.cs @@ -39,6 +39,7 @@ using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; using DiscImageChef.Core.Media.Info; +using DiscImageChef.Decoders.SCSI; using DiscImageChef.Devices; using DiscImageChef.Gui.Dialogs; using DiscImageChef.Gui.Panels; @@ -52,15 +53,24 @@ namespace DiscImageChef.Gui.Forms public class frmMain : Form { bool closing; + Bitmap devicesIcon; + Bitmap ejectIcon; GridView grdFiles; + Bitmap hardDiskIcon; + Bitmap imagesIcon; Label lblError; /// /// This is to remember that column is an image to be set in future /// Image nullImage; + Bitmap opticalIcon; TreeGridItem placeholderItem; + Bitmap removableIcon; + Bitmap sdIcon; + Bitmap tapeIcon; TreeGridView treeImages; TreeGridItemCollection treeImagesItems; + Bitmap usbIcon; public frmMain(bool debug, bool verbose) { @@ -82,8 +92,37 @@ namespace DiscImageChef.Gui.Forms treeImages.ShowHeader = false; treeImages.DataStore = treeImagesItems; - imagesRoot = new TreeGridItem {Values = new object[] {nullImage, "Images"}}; - devicesRoot = new TreeGridItem {Values = new object[] {nullImage, "Devices"}}; + // TODO: SVG + imagesIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.inode-directory.png")); + devicesIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.computer.png")); + hardDiskIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.drive-harddisk.png")); + opticalIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.drive-optical.png")); + usbIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.drive-removable-media-usb.png")); + removableIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.drive-removable-media.png")); + sdIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.media-flash-sd-mmc.png")); + tapeIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.media-tape.png")); + ejectIcon = + new Bitmap(ResourceHandler + .GetResourceStream("DiscImageChef.Gui.Assets.Icons.oxygen._32x32.media-eject.png")); + + imagesRoot = new TreeGridItem {Values = new object[] {imagesIcon, "Images"}}; + devicesRoot = new TreeGridItem {Values = new object[] {devicesIcon, "Devices"}}; treeImagesItems.Add(imagesRoot); treeImagesItems.Add(devicesRoot); @@ -240,9 +279,59 @@ namespace DiscImageChef.Gui.Forms { Values = new object[] { - nullImage, $"{device.Vendor} {device.Model} ({device.Bus})", device.Path, null + hardDiskIcon, $"{device.Vendor} {device.Model} ({device.Bus})", device.Path, null } }; + + try + { + Device dev = new Device(device.Path); + + switch(dev.Type) + { + case DeviceType.ATAPI: + case DeviceType.SCSI: + switch(dev.ScsiType) + { + case PeripheralDeviceTypes.DirectAccess: + case PeripheralDeviceTypes.SCSIZonedBlockDevice: + case PeripheralDeviceTypes.SimplifiedDevice: + devItem.Values[0] = dev.IsRemovable + ? dev.IsUsb + ? usbIcon + : removableIcon + : hardDiskIcon; + break; + case PeripheralDeviceTypes.SequentialAccess: + devItem.Values[0] = tapeIcon; + break; + case PeripheralDeviceTypes.OpticalDevice: + case PeripheralDeviceTypes.WriteOnceDevice: + case PeripheralDeviceTypes.OCRWDevice: + devItem.Values[0] = removableIcon; + break; + case PeripheralDeviceTypes.MultiMediaDevice: + devItem.Values[0] = opticalIcon; + break; + } + + break; + case DeviceType.SecureDigital: + case DeviceType.MMC: + devItem.Values[0] = sdIcon; + break; + case DeviceType.NVMe: + devItem.Values[0] = nullImage; + break; + } + + dev.Close(); + } + catch + { + // ignored + } + devItem.Children.Add(placeholderItem); devicesRoot.Children.Add(devItem); } @@ -368,7 +457,7 @@ namespace DiscImageChef.Gui.Forms if(!scsiInfo.MediaInserted) deviceItem.Children.Add(new TreeGridItem { - Values = new object[] {nullImage, "No media inserted"} + Values = new object[] {ejectIcon, "No media inserted"} }); else {