claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Make filename/path display consistent across media menus

Browse Source 
- All media history entries now display the full path
- All "Eject" menu items now display the file name
This commit is contained in:
Alexander Babikov
2025-04-11 05:16:39 +05:00
parent 5ff206e493
commit 1819539c97
26 changed files with 73 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/qt/qt_mediamenu.cpp
View File

@@ -174,8 +174,7 @@ MediaMenu::refresh(QMenu *parentMenu)
}
menu->addSeparator();
#endif // Q_OS_WINDOWS
cdromImagePos = menu->children().count();
cdromDirPos = menu->children().count();
cdromEjectPos = menu->children().count();
menu->addAction(tr("E&ject"), [this, i]() { cdromEject(i); })->setCheckable(false);
cdromMenus[i] = menu;
cdromUpdateMenu(i);
@@ -304,7 +303,8 @@ MediaMenu::cassetteEject()
void
MediaMenu::cassetteUpdateMenu()
{
QString name = cassette_fname;
QString name = cassette_fname;
QFileInfo fi(cassette_fname);
const QString mode = cassette_mode;
auto childs = cassetteMenu->children();
auto *recordMenu = dynamic_cast<QAction *>(childs[cassetteRecordPos]);
@@ -318,6 +318,7 @@ MediaMenu::cassetteUpdateMenu()
rewindMenu->setEnabled(!name.isEmpty());
fastFwdMenu->setEnabled(!name.isEmpty());
ejectMenu->setEnabled(!name.isEmpty());
ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
const bool isSaving = (mode == QStringLiteral("save"));
recordMenu->setChecked(isSaving);
@@ -384,10 +385,12 @@ void
MediaMenu::cartridgeUpdateMenu(int i)
{
const QString name = cart_fns[i];
auto *menu = cartridgeMenus[i];
QFileInfo fi(cart_fns[i]);
auto *menu = cartridgeMenus[i];
auto childs = menu->children();
auto *ejectMenu = dynamic_cast<QAction *>(childs[cartridgeEjectPos]);
ejectMenu->setEnabled(!name.isEmpty());
ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
menu->setTitle(tr("Cartridge %1: %2").arg(QString::number(i + 1), name.isEmpty() ? tr("(empty)") : name));
for (int slot = 0; slot < MAX_PREV_IMAGES; slot++) {
@@ -628,7 +631,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
switch (type) {
default:
menu_item_name = fi.fileName().isEmpty() ? tr("previous image") : fi.fileName();
menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
return;
case ui::MediaType::Cassette:
if (!MachineStatus::hasCassette())
@@ -637,7 +640,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
children = menu->children();
imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cassetteImageHistoryPos[slot]]);
fi.setFile(fn);
menu_item_name = fi.fileName().isEmpty() ? tr("previous image") : fi.fileName();
menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
break;
case ui::MediaType::Cartridge:
if (!machine_has_cartridge(machine))
@@ -646,7 +649,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
children = menu->children();
imageHistoryUpdatePos = dynamic_cast<QAction *>(children[cartridgeImageHistoryPos[slot]]);
fi.setFile(fn);
menu_item_name = fi.fileName().isEmpty() ? tr("previous image") : fi.fileName();
menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
break;
case ui::MediaType::Floppy:
if (!floppyMenus.contains(index))
@@ -655,7 +658,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
children = menu->children();
imageHistoryUpdatePos = dynamic_cast<QAction *>(children[floppyImageHistoryPos[slot]]);
fi.setFile(fn);
menu_item_name = fi.fileName().isEmpty() ? tr("previous image") : fi.fileName();
menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
break;
case ui::MediaType::Optical:
if (!cdromMenus.contains(index))
@@ -673,7 +676,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
} else {
fi.setFile(fn);
menu_icon = fi.isDir() ? QIcon(":/settings/qt/icons/cdrom_folder.ico") : QIcon(":/settings/qt/icons/cdrom_image.ico");
menu_item_name = fn.isEmpty() ? tr("previous image") : fn;
menu_item_name = fn.isEmpty() ? tr("Reload previous image") : fn;
}
imageHistoryUpdatePos->setIcon(menu_icon);
break;
@@ -684,7 +687,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
children = menu->children();
imageHistoryUpdatePos = dynamic_cast<QAction *>(children[zipImageHistoryPos[slot]]);
fi.setFile(fn);
menu_item_name = fi.fileName().isEmpty() ? tr("previous image") : fi.fileName();
menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
break;
case ui::MediaType::Mo:
if (!moMenus.contains(index))
@@ -693,7 +696,7 @@ MediaMenu::updateImageHistory(int index, int slot, ui::MediaType type)
children = menu->children();
imageHistoryUpdatePos = dynamic_cast<QAction *>(children[moImageHistoryPos[slot]]);
fi.setFile(fn);
menu_item_name = fi.fileName().isEmpty() ? tr("previous image") : fi.fileName();
menu_item_name = fi.fileName().isEmpty() ? tr("Reload previous image") : fn;
break;
}
@@ -728,8 +731,8 @@ MediaMenu::cdromUpdateMenu(int i)
muteMenu->setIcon(QIcon((cdrom[i].sound_on == 0) ? ":/settings/qt/icons/cdrom_unmute.ico" : ":/settings/qt/icons/cdrom_mute.ico"));
muteMenu->setText((cdrom[i].sound_on == 0) ? tr("&Unmute") : tr("&Mute"));
auto *imageMenu = dynamic_cast<QAction *>(childs[cdromImagePos]);
imageMenu->setEnabled(!name.isEmpty());
auto *ejectMenu = dynamic_cast<QAction *>(childs[cdromEjectPos]);
ejectMenu->setEnabled(!name.isEmpty());
QString menu_item_name;
if (name.left(8) == "ioctl://") {
#ifdef Q_OS_WINDOWS
@@ -742,12 +745,12 @@ MediaMenu::cdromUpdateMenu(int i)
} else {
QFileInfo fi(cdrom[i].image_path);
menu_item_name = name.isEmpty() ? QString() : name;
menu_item_name = name.isEmpty() ? QString() : fi.fileName();
name2 = name;
menu_icon = fi.isDir() ? QIcon(":/settings/qt/icons/cdrom_folder.ico") : QIcon(":/settings/qt/icons/cdrom_image.ico");
}
imageMenu->setIcon(menu_icon);
imageMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(menu_item_name));
ejectMenu->setIcon(menu_icon);
ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(menu_item_name));
for (int slot = 0; slot < MAX_PREV_IMAGES; slot++)
updateImageHistory(i, slot, ui::MediaType::Optical);
@@ -876,6 +879,7 @@ MediaMenu::zipUpdateMenu(int i)
{
const QString name = zip_drives[i].image_path;
const QString prev_name = zip_drives[i].prev_image_path;
QFileInfo fi(zip_drives[i].image_path);
if (!zipMenus.contains(i))
return;
auto *menu = zipMenus[i];
@@ -883,6 +887,7 @@ MediaMenu::zipUpdateMenu(int i)
auto *ejectMenu = dynamic_cast<QAction *>(childs[zipEjectPos]);
ejectMenu->setEnabled(!name.isEmpty());
ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
QString busName = tr("Unknown Bus");
switch (zip_drives[i].bus_type) {
@@ -1009,8 +1014,9 @@ MediaMenu::moReload(int index, int slot)
void
MediaMenu::moUpdateMenu(int i)
{
QString name = mo_drives[i].image_path;
QString prev_name = mo_drives[i].prev_image_path;
QString name = mo_drives[i].image_path;
QString prev_name = mo_drives[i].prev_image_path;
QFileInfo fi(mo_drives[i].image_path);
if (!moMenus.contains(i))
return;
auto *menu = moMenus[i];
@@ -1018,6 +1024,7 @@ MediaMenu::moUpdateMenu(int i)
auto *ejectMenu = dynamic_cast<QAction *>(childs[moEjectPos]);
ejectMenu->setEnabled(!name.isEmpty());
ejectMenu->setText(name.isEmpty() ? tr("E&ject") : tr("E&ject %1").arg(fi.fileName()));
QString busName = tr("Unknown Bus");
switch (mo_drives[i].bus_type) {