Fixed OP scaling bug for sizes of 7.0 and up.

[virtualjaguar] / src / gui / mainwin.cpp

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 88e55f80ee37a30ceed540b82b864988bdcca4a5..75b4bc385ae734ca09a6e89ce7a5c849ddfbceaa 100644 (file)
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -9,10 +9,12 @@
 // ---  ----------  -------------------------------------------------------------
 // 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:
 //
+// - Add dbl click/enter to select in cart list, ESC to dimiss [DONE]
 //
 // STILL TO BE DONE:
 //
@@ -20,7 +22,6 @@
 // - 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
 //
 
 /*
@@ -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);
@@ -478,6 +479,8 @@ void MainWin::TogglePowerState(void)
                pauseAct->setDisabled(true);
                showUntunedTankCircuit = true;
                running = true;
+               // This is just in case the ROM we were playing was in a narrow or wide field mode
+               TOMReset();
        }
        else
        {
@@ -489,6 +492,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);