Revised icons and logo and used the old unused SuperDisk icon for the generic removable disk drive.

src/qt/qt_machinestatus.cpp

@@ -106,7 +106,9 @@ struct Pixmaps {
     PixmapSetEmptyActive floppy_525;
     PixmapSetEmptyActive floppy_35;
     PixmapSetEmptyActive cdrom;
+    PixmapSetEmptyActive rdisk_disabled;
     PixmapSetEmptyActive rdisk;
+    PixmapSetEmptyActive zip;
     PixmapSetEmptyActive mo;
     PixmapSetActive      hd;
     PixmapSetEmptyActive net;
@@ -327,7 +329,15 @@ struct MachineStatus::States {
         pixmaps.floppy_525.load(QIcon(":/settings/qt/icons/floppy_525.ico"));
         pixmaps.floppy_35.load(QIcon(":/settings/qt/icons/floppy_35.ico"));
         pixmaps.cdrom.load(QIcon(":/settings/qt/icons/cdrom.ico"));
+        pixmaps.rdisk_disabled.normal                  = QIcon(":/settings/qt/icons/rdisk_disabled.ico").pixmap(pixmap_size);
+        pixmaps.rdisk_disabled.active                  = pixmaps.rdisk_disabled.normal;
+        pixmaps.rdisk_disabled.read_write_active       = pixmaps.rdisk_disabled.normal;
+        pixmaps.rdisk_disabled.empty                   = pixmaps.rdisk_disabled.normal;
+        pixmaps.rdisk_disabled.empty_active            = pixmaps.rdisk_disabled.normal;
+        pixmaps.rdisk_disabled.empty_write_active      = pixmaps.rdisk_disabled.normal;
+        pixmaps.rdisk_disabled.empty_read_write_active = pixmaps.rdisk_disabled.normal;
         pixmaps.rdisk.load(QIcon(":/settings/qt/icons/rdisk.ico"));
+        pixmaps.zip.load(QIcon(":/settings/qt/icons/zip.ico"));
         pixmaps.mo.load(QIcon(":/settings/qt/icons/mo.ico"));
         pixmaps.hd.load(QIcon(":/settings/qt/icons/hard_disk.ico"));
         pixmaps.net.load(QIcon(":/settings/qt/icons/network.ico"));
@@ -758,6 +768,14 @@ MachineStatus::refresh(QStatusBar *sbar)
     });
 
     iterateRDisk([this, sbar](int i) {
+        int t = rdisk_drives[i].type;
+        if (rdisk_drives[i].bus_type == RDISK_BUS_DISABLED) {
+            d->rdisk[i].pixmaps = &d->pixmaps.rdisk_disabled;
+        } else if ((t == RDISK_TYPE_ZIP_100) || (t == RDISK_TYPE_ZIP_250)) {
+            d->fdd[i].pixmaps = &d->pixmaps.zip;
+        } else {
+            d->fdd[i].pixmaps = &d->pixmaps.rdisk;
+        }
         d->rdisk[i].label = std::make_unique<ClickableLabel>();
         d->rdisk[i].setEmpty(QString(rdisk_drives[i].image_path).isEmpty());
         if (QString(rdisk_drives[i].image_path).isEmpty())

src/qt/qt_mediamenu.cpp

@@ -195,7 +195,8 @@ MediaMenu::refresh(QMenu *parentMenu)
     rdiskMenus.clear();
     MachineStatus::iterateRDisk([this, parentMenu](int i) {
         auto *menu     = parentMenu->addMenu("");
-        QIcon img_icon = QIcon(":/settings/qt/icons/rdisk_image.ico");
+        int   t        = rdisk_drives[i].type;
+        QIcon img_icon = ((t == RDISK_TYPE_ZIP_100) || (t == RDISK_TYPE_ZIP_250)) ? QIcon(":/settings/qt/icons/zip_image.ico") : QIcon(":/settings/qt/icons/rdisk_image.ico");
         menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, New), tr("&New image…"), [this, i]() { rdiskNewImage(i); });
         menu->addSeparator();
         menu->addAction(getIconWithIndicator(img_icon, pixmap_size, QIcon::Normal, Browse), tr("&Existing image…"), [this, i]() { rdiskSelectImage(i, false); });

src/qt/qt_settingsotherremovable.cpp

@@ -67,7 +67,7 @@ SettingsOtherRemovable::setMOBus(QAbstractItemModel *model, const QModelIndex &i
 }
 
 void
-SettingsOtherRemovable::setRDiskBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t channel)
+SettingsOtherRemovable::setRDiskBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint32_t type, uint8_t channel)
 {
     QIcon icon;
     switch (bus) {
@@ -76,7 +76,7 @@ SettingsOtherRemovable::setRDiskBus(QAbstractItemModel *model, const QModelIndex
             break;
         case RDISK_BUS_ATAPI:
         case RDISK_BUS_SCSI:
-            icon = rdisk_icon;
+            icon = ((type == RDISK_TYPE_ZIP_100) || (type == RDISK_TYPE_ZIP_250)) ? zip_icon : rdisk_icon;
             break;
 
         default:
@@ -101,15 +101,30 @@ setMOType(QAbstractItemModel *model, const QModelIndex &idx, uint32_t type)
     model->setData(i, type, Qt::UserRole);
 }
 
-static void
-setRDiskType(QAbstractItemModel *model, const QModelIndex &idx, uint32_t type)
+void
+SettingsOtherRemovable::setRDiskType(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint32_t type)
 {
+    QIcon icon;
+    switch (bus) {
+        case RDISK_BUS_DISABLED:
+            icon = rdisk_disabled_icon;
+            break;
+        case RDISK_BUS_ATAPI:
+        case RDISK_BUS_SCSI:
+            icon = ((type == RDISK_TYPE_ZIP_100) || (type == RDISK_TYPE_ZIP_250)) ? zip_icon : rdisk_icon;
+            break;
+
+        default:
+            break;
+    }
+
     auto i = idx.siblingAtColumn(1);
     if (idx.siblingAtColumn(0).data(Qt::UserRole).toUInt() == RDISK_BUS_DISABLED)
         model->setData(i, QCoreApplication::translate("", "None"));
     else
         model->setData(i, rdiskDriveTypeName(type));
     model->setData(i, type, Qt::UserRole);
+    model->setData(i, icon, Qt::DecorationRole);
 }
 
 SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent)
@@ -147,6 +162,7 @@ SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent)
 
     rdisk_disabled_icon = QIcon(":/settings/qt/icons/rdisk_disabled.ico");
     rdisk_icon          = QIcon(":/settings/qt/icons/rdisk.ico");
+    zip_icon            = QIcon(":/settings/qt/icons/zip.ico");
 
     Harddrives::populateRemovableBuses(ui->comboBoxRDiskBus->model());
     if ((ui->comboBoxRDiskBus->model()->rowCount() - 3) > 0)
@@ -163,8 +179,8 @@ SettingsOtherRemovable::SettingsOtherRemovable(QWidget *parent)
     model->insertRows(0, RDISK_NUM);
     for (int i = 0; i < RDISK_NUM; i++) {
         auto idx = model->index(i, 0);
-        setRDiskBus(model, idx, rdisk_drives[i].bus_type, rdisk_drives[i].res);
-        setRDiskType(model, idx.siblingAtColumn(1), rdisk_drives[i].type);
+        setRDiskBus(model, idx, rdisk_drives[i].bus_type, rdisk_drives[i].type, rdisk_drives[i].res);
+        setRDiskType(model, idx.siblingAtColumn(1), rdisk_drives[i].bus_type, rdisk_drives[i].type);
         Harddrives::busTrackClass->device_track(1, DEV_MO, rdisk_drives[i].bus_type, rdisk_drives[i].bus_type == RDISK_BUS_ATAPI ? rdisk_drives[i].ide_channel : rdisk_drives[i].scsi_device_id);
     }
     ui->tableViewRDisk->resizeColumnsToContents();
@@ -317,9 +333,11 @@ SettingsOtherRemovable::on_comboBoxRDiskBus_activated(int)
     setRDiskBus(ui->tableViewRDisk->model(),
                 ui->tableViewRDisk->selectionModel()->currentIndex(),
                 ui->comboBoxRDiskBus->currentData().toUInt(),
+                ui->comboBoxRDiskType->currentData().toUInt(),
                 ui->comboBoxRDiskChannel->currentData().toUInt());
     setRDiskType(ui->tableViewRDisk->model(),
                  ui->tableViewRDisk->selectionModel()->currentIndex(),
+                 ui->comboBoxRDiskBus->currentData().toUInt(),
                  ui->comboBoxRDiskType->currentData().toUInt());
     ui->tableViewRDisk->resizeColumnsToContents();
     ui->tableViewRDisk->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
@@ -367,6 +385,7 @@ SettingsOtherRemovable::on_comboBoxRDiskChannel_activated(int)
     setRDiskBus(ui->tableViewRDisk->model(),
                 ui->tableViewRDisk->selectionModel()->currentIndex(),
                 ui->comboBoxRDiskBus->currentData().toUInt(),
+                ui->comboBoxRDiskType->currentData().toUInt(),
                 ui->comboBoxRDiskChannel->currentData().toUInt());
     Harddrives::busTrackClass->device_track(1, DEV_RDISK, ui->tableViewRDisk->model()->data(i, Qt::UserRole).toInt(),
                                             ui->tableViewRDisk->model()->data(i, Qt::UserRole + 1).toInt());
@@ -388,6 +407,7 @@ SettingsOtherRemovable::on_comboBoxRDiskType_activated(int)
 {
     setRDiskType(ui->tableViewRDisk->model(),
                  ui->tableViewRDisk->selectionModel()->currentIndex(),
+                 ui->comboBoxRDiskBus->currentData().toUInt(),
                  ui->comboBoxRDiskType->currentData().toUInt());
     ui->tableViewRDisk->resizeColumnsToContents();
     ui->tableViewRDisk->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);

src/qt/qt_settingsotherremovable.hpp

@@ -40,7 +40,8 @@ private:
     Ui::SettingsOtherRemovable *ui;
 
     void setMOBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t channel);
-    void setRDiskBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint8_t channel);
+    void setRDiskBus(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint32_t type, uint8_t channel);
+    void setRDiskType(QAbstractItemModel *model, const QModelIndex &idx, uint8_t bus, uint32_t type);
     void enableCurrentlySelectedChannel_MO();
     void enableCurrentlySelectedChannel_RDisk();
 
@@ -48,6 +49,7 @@ private:
     QIcon mo_icon;
     QIcon rdisk_disabled_icon;
     QIcon rdisk_icon;
+    QIcon zip_icon;
 };
 
 #endif // QT_SETTINGSOTHERREMOVABLE_HPP

src/qt_resources.qrc

@@ -36,9 +36,8 @@
         <file>qt/icons/rewind.ico</file>
         <file>qt/icons/sound.ico</file>
         <file>qt/icons/storage_controllers.ico</file>
-        <file>qt/icons/superdisk.ico</file>
-        <file>qt/icons/superdisk_image.ico</file>
-        <file>qt/icons/superdisk_disabled.ico</file>
+        <file>qt/icons/zip.ico</file>
+        <file>qt/icons/zip_image.ico</file>
         <file>qt/icons/active.ico</file>
         <file>qt/icons/browse.ico</file>
         <file>qt/icons/eject.ico</file>