80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

* Implement settings-only mode

Browse Source 
* Show correct directory to place ROMs in on macOS
This commit is contained in:
Cacodemon345
2021-12-24 15:02:16 +06:00
parent 0402048629
commit 9671469778
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/qt_main.cpp
View File

@@ -101,9 +101,16 @@ int main(int argc, char* argv[]) {
#endif #endif
elapsed_timer.start(); elapsed_timer.start();
pc_init(argc, argv); if (!pc_init(argc, argv))
{
return 0;
}
if (! pc_init_modules()) { if (! pc_init_modules()) {
#ifdef Q_OS_MACOS
ui_msgbox_header(MBX_FATAL, VC(L"No ROMs found."), VC(L"86Box could not find any usable ROM images.\n\nPlease <a href='https://github.com/86Box/roms/releases/latest'>download</a> a ROM set and extract it into the \"~/Library/Application Support/net.86box.86box/roms\" directory."));
#else
ui_msgbox_header(MBX_FATAL, VC(L"No ROMs found."), VC(L"86Box could not find any usable ROM images.\n\nPlease <a href='https://github.com/86Box/roms/releases/latest'>download</a> a ROM set and extract it into the \"roms\" directory.")); ui_msgbox_header(MBX_FATAL, VC(L"No ROMs found."), VC(L"86Box could not find any usable ROM images.\n\nPlease <a href='https://github.com/86Box/roms/releases/latest'>download</a> a ROM set and extract it into the \"roms\" directory."));
#endif
return 6; return 6;
} }
@@ -134,6 +141,7 @@ int main(int argc, char* argv[]) {
/* Set the PAUSE mode depending on the renderer. */ /* Set the PAUSE mode depending on the renderer. */
// plat_pause(0); // plat_pause(0);
if (settings_only) dopause = 1;
QTimer onesec; QTimer onesec;
QObject::connect(&onesec, &QTimer::timeout, &app, [] { QObject::connect(&onesec, &QTimer::timeout, &app, [] {
pc_onesec(); pc_onesec();

7
src/qt/qt_mainwindow.cpp
View File

@@ -374,6 +374,10 @@ void MainWindow::on_actionSettings_triggered() {
break; break;
} }
plat_pause(currentPause); plat_pause(currentPause);
if (settings_only) {
cpu_thread_run = 0;
close();
}
} }
std::array<uint32_t, 256> x11_to_xt_base std::array<uint32_t, 256> x11_to_xt_base
@@ -1027,7 +1031,8 @@ void MainWindow::on_actionHardware_Renderer_OpenGL_ES_triggered() {
void MainWindow::focusInEvent(QFocusEvent* event) void MainWindow::focusInEvent(QFocusEvent* event)
{ {
this->grabKeyboard(); if (settings_only) ui->actionSettings->trigger();
else this->grabKeyboard();
} }
void MainWindow::focusOutEvent(QFocusEvent* event) void MainWindow::focusOutEvent(QFocusEvent* event)