Merging qt-experimental into trunk.

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 88e55f80ee37a30ceed540b82b864988bdcca4a5..c73d6708a6cbffb87b90685325223847f1e80391 100644 (file)
--- 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:
@@ -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);