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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source 
# Conflicts:
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
This commit is contained in:
RichardG867
2022-06-07 15:36:12 -03:00
parent 0582c11e90 92c3768a48
commit 50b75c457d
104 changed files with 7259 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/qt/qt_mediamenu.cpp
View File

@@ -232,6 +232,18 @@ void MediaMenu::cassetteUpdateMenu() {
cassetteMenu->setTitle(QString::asprintf(tr("Cassette: %s").toUtf8().constData(), (name.isEmpty() ? tr("(empty)") : name).toUtf8().constData()));
}
void MediaMenu::cartridgeMount(int i, const QString &filename)
{
cart_close(i);
QByteArray filenameBytes = filename.toUtf8();
cart_load(i, filenameBytes.data());
ui_sb_update_icon_state(SB_CARTRIDGE | i, filename.isEmpty() ? 1 : 0);
cartridgeUpdateMenu(i);
ui_sb_update_tip(SB_CARTRIDGE | i);
config_save();
}
void MediaMenu::cartridgeSelectImage(int i) {
auto filename = QFileDialog::getOpenFileName(
parentWidget,
@@ -245,14 +257,7 @@ void MediaMenu::cartridgeSelectImage(int i) {
if (filename.isEmpty()) {
return;
}
cart_close(i);
QByteArray filenameBytes = filename.toUtf8();
cart_load(i, filenameBytes.data());
ui_sb_update_icon_state(SB_CARTRIDGE | i, filename.isEmpty() ? 1 : 0);
cartridgeUpdateMenu(i);
ui_sb_update_tip(SB_CARTRIDGE | i);
config_save();
cartridgeMount(i, filename);
}
void MediaMenu::cartridgeEject(int i) {
@@ -363,27 +368,8 @@ void MediaMenu::cdromMute(int i) {
sound_cd_thread_reset();
}
void MediaMenu::cdromMount(int i, int dir) {
QString filename;
QFileInfo fi(cdrom[i].image_path);
if (dir) {
filename = QFileDialog::getExistingDirectory(
parentWidget);
} else {
filename = QFileDialog::getOpenFileName(
parentWidget,
QString(),
QString(),
tr("CD-ROM images") %
util::DlgFilter({ "iso","cue" }) %
tr("All files") %
util::DlgFilter({ "*" }, true));
}
if (filename.isEmpty()) {
return;
}
void MediaMenu::cdromMount(int i, const QString &filename)
{
QByteArray fn = filename.toUtf8().data();
cdrom[i].prev_host_drive = cdrom[i].host_drive;
@@ -408,6 +394,31 @@ void MediaMenu::cdromMount(int i, int dir) {
config_save();
}
void MediaMenu::cdromMount(int i, int dir) {
QString filename;
QFileInfo fi(cdrom[i].image_path);
if (dir) {
filename = QFileDialog::getExistingDirectory(
parentWidget);
} else {
filename = QFileDialog::getOpenFileName(
parentWidget,
QString(),
QString(),
tr("CD-ROM images") %
util::DlgFilter({ "iso","cue" }) %
tr("All files") %
util::DlgFilter({ "*" }, true));
}
if (filename.isEmpty()) {
return;
}
cdromMount(i, filename);
}
void MediaMenu::cdromEject(int i) {
cdrom_eject(i);
cdromUpdateMenu(i);