X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=70812d27d6ea607cd93e5b7135c2460e0793e579;hb=a7c352a26c0fbd32d85f3248a12d661c0bec4ac1;hp=88e55f80ee37a30ceed540b82b864988bdcca4a5;hpb=6bbf8a69b977644a55a4abdea71dfa9e3bb6c087;p=virtualjaguar diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp index 88e55f8..70812d2 100644 --- a/src/gui/mainwin.cpp +++ b/src/gui/mainwin.cpp @@ -9,6 +9,7 @@ // --- ---------- ------------------------------------------------------------- // 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: @@ -164,7 +165,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit configAct->setShortcut(QKeySequence(tr("Ctrl+c"))); connect(configAct, SIGNAL(triggered()), this, SLOT(Configure())); - useCDAct = new QAction(QIcon(":/res/generic.png"), tr("&Use CD Unit"), this); + 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); @@ -489,6 +490,11 @@ void MainWin::TogglePowerState(void) } 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);