Deactivated ROM Info viewer for the upcoming release. It really isn't

useful until I get the UI fixed wrt font sizing, and fix the issue where
you need to save snapshots in 1x mode.  All that leads to extra work that
can't be released in pieces, and I want to get this release out *now*.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1436 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/src/emucore/Settings.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Settings.cxx,v 1.135 2008-03-22 17:35:02 stephena Exp $
+// $Id: Settings.cxx,v 1.136 2008-03-22 18:17:59 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -309,7 +309,7 @@ void Settings::usage()
     << "  -pspeed       <number>       Speed of digital emulated paddle movement (1-15)\n"
     << "  -sa1          <left|right>   Stelladaptor 1 emulates specified joystick port\n"
     << "  -sa2          <left|right>   Stelladaptor 2 emulates specified joystick port\n"
-    << "  -romviewer    <1|0>          Show ROM info viewer in ROM launcher\n"
+//    << "  -romviewer    <1|0>          Show ROM info viewer in ROM launcher\n"
     << "  -autoslot     <1|0>          Automatically switch to next save slot when state saving\n"
     << "  -ssdir        <path>         The directory to save snapshot files to\n"
     << "  -sssingle     <1|0>          Generate single snapshot instead of many\n"

stella/src/gui/LauncherDialog.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: LauncherDialog.cxx,v 1.83 2008-03-22 17:35:03 stephena Exp $
+// $Id: LauncherDialog.cxx,v 1.84 2008-03-22 18:17:59 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -64,6 +64,8 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
   int xpos = 0, ypos = 0, lwidth = 0;
   WidgetArray wid;
 
+#if 0
+// FIXME - this isn't really useful until we get a resizable and font-aware UI
   // Check if we want the ROM info viewer
   // Make sure it will fit within the current bounds
   myRomInfoFlag = instance()->settings().getBool("romviewer");
@@ -72,6 +74,7 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
     cerr << "Error: ROM launcher too small, deactivating ROM info viewer" << endl;
     myRomInfoFlag = false;
   }
+#endif
 
   // Show game name
   lwidth = font.getStringWidth("Select an item from the list ...");

stella/src/gui/OptionsDialog.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OptionsDialog.cxx,v 1.67 2008-03-14 23:52:17 stephena Exp $
+// $Id: OptionsDialog.cxx,v 1.68 2008-03-22 18:17:59 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -128,7 +128,7 @@ OptionsDialog::OptionsDialog(OSystem* osystem, DialogContainer* parent,
 #endif
   myInputDialog = new InputDialog(myOSystem, parent, font, x, y, w, h);
 
-  w = 200; h = 175;
+  w = 200; h = 145;
   myUIDialog = new UIDialog(myOSystem, parent, font, x, y, w, h);
 
   w = 280; h = 180;

stella/src/gui/UIDialog.cxx

@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: UIDialog.cxx,v 1.11 2008-03-15 19:11:02 stephena Exp $
+// $Id: UIDialog.cxx,v 1.12 2008-03-22 18:17:59 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -128,6 +128,7 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
   wid.push_back(myPalettePopup);
   ypos += lineHeight + 4;
 
+#if 0
   // ROM info viewer
   xpos += ((_w - 40 - font.getStringWidth("ROM Info viewer (*)")) >> 1);
   myRomViewerCheckbox = new CheckboxWidget(this, font, xpos, ypos,
@@ -138,6 +139,7 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
   new StaticTextWidget(this, font, 10, _h - 38, lwidth, fontHeight,
                        "(*) Requires application restart",
                        kTextAlignLeft);
+#endif
 
   // Add Defaults, OK and Cancel buttons
   ButtonWidget* b;
@@ -218,9 +220,11 @@ void UIDialog::loadConfig()
   if(i < 1 || i > 2) i = 1;
   myPalettePopup->setSelectedTag(i);
 
+#if 0
   // ROM info viewer
   bool b = instance()->settings().getBool("romviewer");
   myRomViewerCheckbox->setState(b);
+#endif
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -243,9 +247,10 @@ void UIDialog::saveConfig()
   instance()->settings().setInt("uipalette",
     myPalettePopup->getSelectedTag());
 
+#if 0
   // ROM info viewer
-  instance()->settings().setBool("romviewer", 
-    myRomViewerCheckbox->getState());
+  instance()->settings().setBool("romviewer", myRomViewerCheckbox->getState());
+#endif
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -