// --- ---------- -------------------------------------------------------------
// JLH 12/23/2009 Created this file
// JLH 12/20/2010 Added settings, menus & toolbars
+// JLH 07/05/2011 Added CD BIOS functionality to GUI
//
// FIXED:
//
// STILL TO BE DONE:
//
+// - Autoscan/autoload all available BIOS from 'software' folder
+// - Controller configuration
+// - Remove SDL dependencies (sound, mainly) from Jaguar core lib
+// - Add 1 key jumping in cartridge list (press 'R', jumps to carts starting with 'R', etc)
+// - Add dbl click/enter to select in cart list, ESC to dimiss
//
+/*
+For BIOS autoscan, infrastructure is already there in filethread.cpp; just need to figure out
+if we want to scan every time, or stuff filenames found into the config file, or what.
+Should filethread emit signal that's intercepted here? Maybe...
+*/
+
// Uncomment this for debugging...
//#define DEBUG
//#define DEBUGFOO // Various tool debugging...
#include "settings.h"
#include "filepicker.h"
#include "configdialog.h"
+#include "generaltab.h"
#include "version.h"
#include "jaguar.h"
#include "file.h"
#include "joystick.h"
+#ifdef __GCCWIN32__
+// Apparently on win32, usleep() is not pulled in by the usual suspects.
+#include <unistd.h>
+#endif
+
// Uncomment this to use built-in BIOS/CD-ROM BIOS
// You'll need a copy of jagboot.h & jagcd.h for this to work...!
+// Creating those is left as an exercise for the reader. ;-)
//#define USE_BUILT_IN_BIOS
#ifdef USE_BUILT_IN_BIOS
// use, we can drop it in anywhere and use it as-is.
MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit(true),
- cartridgeLoaded(false)
+ cartridgeLoaded(false), CDActive(false)
{
videoWidget = new GLWidget(this);
setCentralWidget(videoWidget);
videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- ReadSettings();
setUnifiedTitleAndToolBarOnMac(true);
// Create actions
configAct->setShortcut(QKeySequence(tr("Ctrl+c")));
connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
+ useCDAct = new QAction(QIcon(":/res/compact-disc.png"), tr("&Use CD Unit"), this);
+ useCDAct->setStatusTip(tr("Use Jaguar Virtual CD unit"));
+// useCDAct->setShortcut(QKeySequence(tr("Ctrl+c")));
+ useCDAct->setCheckable(true);
+ connect(useCDAct, SIGNAL(triggered()), this, SLOT(ToggleCDUsage()));
+
// Misc. connections...
connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
fileMenu = menuBar()->addMenu(tr("&File"));
fileMenu->addAction(filePickAct);
+ fileMenu->addAction(useCDAct);
fileMenu->addAction(powerAct);
fileMenu->addAction(pauseAct);
fileMenu->addAction(configAct);
toolbar->addAction(powerAct);
toolbar->addAction(pauseAct);
toolbar->addAction(filePickAct);
+ toolbar->addAction(useCDAct);
toolbar->addSeparator();
toolbar->addAction(x1Act);
toolbar->addAction(x2Act);
// Create status bar
statusBar()->showMessage(tr("Ready"));
+ ReadSettings();
+
// Set toolbar buttons/menus based on settings read in (sync the UI)...
blurAct->setChecked(vjs.glFilter);
x1Act->setChecked(zoomLevel == 1);
CDBIOSLoaded = (JaguarLoadROM(jaguarCDBootROM, vjs.CDBootPath) == 0x40000 ? true : false);
WriteLog("VJ: CD BIOS is %savailable...\n", (CDBIOSLoaded ? "" : "not "));
#endif
+
+ filePickWin->ScanSoftwareFolder(allowUnknownSoftware);
}
void MainWin::closeEvent(QCloseEvent * event)
{
// Call the configuration dialog and update settings
ConfigDialog dlg(this);
+ //ick.
+ dlg.generalTab->useUnknownSoftware->setChecked(allowUnknownSoftware);
if (dlg.exec() == false)
return;
+ QString before = vjs.ROMPath;
dlg.UpdateVJSettings();
+ QString after = vjs.ROMPath;
+
+ bool allowOld = allowUnknownSoftware;
+ //ick.
+ allowUnknownSoftware = dlg.generalTab->useUnknownSoftware->isChecked();
+
+ // We rescan the "software" folder if the user either changed the path or
+ // checked/unchecked the "Allow unknown files" option in the config dialog.
+ if ((before != after) || (allowOld != allowUnknownSoftware))
+ filePickWin->ScanSoftwareFolder(allowUnknownSoftware);
+
+ // Just in case we crash before a clean exit...
+ WriteSettings();
}
//
}
else
{
- showUntunedTankCircuit = (cartridgeLoaded ? false : true);
- pauseAct->setChecked(false);
- pauseAct->setDisabled(!cartridgeLoaded);
+ if (!CDActive)
+ {
+ showUntunedTankCircuit = (cartridgeLoaded ? false : true);
+ pauseAct->setChecked(false);
+ pauseAct->setDisabled(!cartridgeLoaded);
+ }
+ else
+ {
+// Should check for cartridgeLoaded here as well...!
+// We can clear it when toggling CDActive on, so that when we power cycle it does the
+// expected thing. Otherwise, if we use the file picker to insert a cart, we expect
+// to run the cart! Maybe have a RemoveCart function that only works if the CD unit
+// is active?
+ showUntunedTankCircuit = false;
+ pauseAct->setChecked(false);
+ pauseAct->setDisabled(false);
+ memcpy(jagMemSpace + 0x800000, jaguarCDBootROM, 0x40000);
+ }
//(Err, what's so crappy about this? It seems to do what it's supposed to...)
//This is crappy!!! !!! FIX !!!
setWindowTitle(newTitle);
}
+void MainWin::ToggleCDUsage(void)
+{
+ CDActive = !CDActive;
+
+ if (CDActive)
+ {
+ powerAct->setDisabled(false);
+ }
+ else
+ {
+ powerAct->setDisabled(true);
+ }
+}
+
void MainWin::ResizeMainWindow(void)
{
videoWidget->setFixedSize(zoomLevel * 320, zoomLevel * (vjs.hardwareTypeNTSC ? 240 : 256));
filePickWin->move(pos);
zoomLevel = settings.value("zoom", 1).toInt();
+ allowUnknownSoftware = settings.value("showUnknownSoftware", false).toBool();
vjs.useJoystick = settings.value("useJoystick", false).toBool();
vjs.joyport = settings.value("joyport", 0).toInt();
settings.setValue("cartLoadPos", filePickWin->pos());
settings.setValue("zoom", zoomLevel);
+ settings.setValue("showUnknownSoftware", allowUnknownSoftware);
settings.setValue("useJoystick", vjs.useJoystick);
settings.setValue("joyport", vjs.joyport);