Removed 'uselauncher' from the UI, as it really shouldn't be there

(ie, disabling from the UI kills the UI on future runs, so you can't
enable it again).  This should fix problems where users go
'click-happy' in the UI, turning options on and off just to see what
happens.

Added 'showinfo' to the UI, so you don't have to drop to the
commandline to use it.

Updated all release files and bumped version number for 3.1.2
release.


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

Announce.txt

@@ -9,7 +9,7 @@
      SSSS     ttt  eeeee llll llll  aaaaa
 
 ===========================================================================
-                Release 3.1.1 for Linux, MacOSX and Windows
+                Release 3.1.2 for Linux, MacOSX and Windows
 ===========================================================================
 
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@@ -21,30 +21,30 @@ all of your favourite Atari 2600 games again!  Stella was originally
 developed for Linux by Bradford W. Mott, however, it has been ported to a
 number of other platforms and is currently maintained by Stephen Anthony.
 
-This is the 3.1.1 release of Stella for Linux, Mac OSX and Windows.  The
+This is the 3.1.2 release of Stella for Linux, Mac OSX and Windows.  The
 distributions currently available are:
 
   * Binary installer (exe) for Windows 32-bit & 64-bit :
-      Stella-3.1.1-win32.exe
+      Stella-3.1.2-win32.exe
-      Stella-3.1.1-x64.exe
+      Stella-3.1.2-x64.exe
 
   * Binary zip for Windows, containing 32 and 64-bit versions :
-      Stella-3.1.1-windows.zip
+      Stella-3.1.2-windows.zip
 
   * Binary distribution for MacOSX 32-bit & 64-bit :
-      Stella-3.1.1-macosx.dmg (32-bit Universal Binary)
+      Stella-3.1.2-macosx.dmg (32-bit Universal Binary)
-      Stella-3.1.1_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only)
+      Stella-3.1.2_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only)
 
   * Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
-      stella_3.1.1-1_i386.deb
+      stella_3.1.2-1_i386.deb
-      stella_3.1.1-1_amd64.deb
+      stella_3.1.2-1_amd64.deb
 
   * Binary distribution in 32-bit & 64-bit RPM format :
-      stella-3.1.1-2.i386.rpm
+      stella-3.1.2-2.i386.rpm
-      stella-3.1.1-2.x86_64.rpm
+      stella-3.1.2-2.x86_64.rpm
 
   * Source code distribution for all platforms :
-      stella-3.1.1-src.tar.gz
+      stella-3.1.2-src.tar.gz
 
 PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH
 REQUESTS WILL BE IGNORED!

Changes.txt

@@ -12,6 +12,27 @@
                                Release History
 ===========================================================================
 
+3.1.1 to 3.1.2: (May 3, 2010)
+
+  * Modified 'showinfo' command to accept levels of output, where
+    increasingly larger numbers provide more debug output.  Related to
+    this, added UI item to modify 'showinfo'.
+
+  * Updated DPC+ bankswitch scheme to latest specifications, including
+    support for 32K ROMs with ARM code (the ARM code is ignored for now).
+
+  * Fixed bug in saving patched ROMs using DPC and DPC+ bankswitch
+    schemes; the saved image didn't actually include any changes made by
+    the user.
+
+  * Removed 'uselauncher' from the UI, since disabling it will remove
+    the ROM launcher on all future runs, and not allow one to enable it
+    again.  It's still available from the commandline, for those that
+    have a need for it.
+
+-Have fun!
+
+
 3.1 to 3.1.1: (April 26, 2010)
 
   * Fixed program crash when using RIOT addresses and labels in the
@@ -19,8 +40,6 @@
 
   * Updated DPC+ bankswitch scheme to latest specifications.
 
--Have fun!
-
 
 3.0 to 3.1: (April 22, 2010)
 

Readme.txt

@@ -1,4 +1,4 @@
-This is release 3.1.1 of Stella.  Stella is a multi-platform Atari 2600 VCS
+This is release 3.1.2 of Stella.  Stella is a multi-platform Atari 2600 VCS
 emulator which allows you to play all of your favourite Atari 2600 games
 on your PC.  You'll find the Stella Users Manual in the docs subdirectory.
 If you'd like to verify that you have the latest release of Stella visit
@@ -9,4 +9,4 @@ the Stella Website at:
 Enjoy,
 
 The Stella Team
-April 26, 2010
+May 3, 2010

debian/changelog

@@ -1,3 +1,10 @@
+stella (3.1.2-1) stable; urgency=high
+
+  * Version 3.1.2 release
+
+ -- Stephen Anthony <stephena@users.sf.net>  Mon, 3 May 2010 18:38:25 +0200
+
+
 stella (3.1.1-1) stable; urgency=high
 
   * Version 3.1.1 release

docs/index.html

@@ -10,7 +10,7 @@
 	<br><br>
 	<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
 
-	<center><h4><b>Release 3.1.1</b></h4></center>
+	<center><h4><b>Release 3.1.2</b></h4></center>
 	<br><br>
 
 	<center><h2><b>User's Guide</b></h2></center>
@@ -1310,6 +1310,7 @@
 					<tr><td>Interface Palette</td><td>palette to use for UI elements</td><td>-uipalette</td></tr>
 					<tr><td>List quick delay</td><td>time to wait between keypresses in listwidget</td><td>-listdelay</td></tr>
 					<tr><td>Mouse wheel scroll</td><td>number of lines mouse scroll will move in listwidget</td><td>-mscroll</td></tr>
+					<tr><td>Show Info level</td><td>amount of logging information to display</td><td>-showinfo</td></tr>
 				</table>
 			</td>
 		</tr>

src/common/Version.hxx

@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.2_svn"
+#define STELLA_VERSION "3.1.2"
 #define STELLA_BUILD atoi("$Rev$"+6)
 
 #endif

src/common/mainSDL.cxx

@@ -101,8 +101,8 @@ int main(int argc, char* argv[])
   #error Unsupported platform!
 #endif
 
-  theOSystem->logMessage("Loading config options ...\n", 2);
   theOSystem->settings().loadConfig();
+  theOSystem->logMessage("Loading config options ...\n", 2);
 
   // Take care of commandline arguments
   theOSystem->logMessage("Loading commandline arguments ...\n", 2);

src/emucore/Settings.cxx

@@ -210,21 +210,32 @@ string Settings::loadCommandLine(int argc, char** argv)
         continue;
       }
 
+      ostringstream buf;
       if(++i >= argc)
       {
-        ostringstream buf;
         buf << "Missing argument for '" << key << "'" << endl;
         myOSystem->logMessage(buf.str(), 0);
         return "";
       }
       string value = argv[i];
 
+      buf.str("");
+      buf << "  key = '" << key << "', value = '" << value << "'";
+
       // Settings read from the commandline must not be saved to 
       // the rc-file, unless they were previously set
       if(int idx = getInternalPos(key) != -1)
+      {
         setInternal(key, value, idx);   // don't set initialValue here
+        buf << "(I)\n";
+      }
       else
+      {
         setExternal(key, value);
+        buf << "(E)\n";
+      }
+
+      myOSystem->logMessage(buf.str(), 2);
     }
     else
       return key;

src/gui/UIDialog.cxx

@@ -54,7 +54,7 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
 
   // Set real dimensions
   _w = 42 * fontWidth + 10;
-  _h = 10 * (lineHeight + 4) + 10;
+  _h = 9 * (lineHeight + 4) + 10;
 
   // The tab widget
   xpos = ypos = vBorder;
@@ -120,13 +120,8 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
   wid.push_back(myRomViewerPopup);
   ypos += lineHeight + 4;
 
-  // Should we use the built-in ROM launcher
-  myUseLauncherBox = new CheckboxWidget(myTab, font, xpos+20, ypos+10,
-                                        "Use ROM launcher");
-  wid.push_back(myUseLauncherBox);
-
   // Add message concerning usage
-  xpos = vBorder; ypos += 2*(lineHeight + 4);
+  xpos = vBorder; ypos += 1*(lineHeight + 4);
   lwidth = font.getStringWidth("(*) Changes require application restart");
   new StaticTextWidget(myTab, font, xpos, ypos, lwidth, fontHeight,
                        "(*) Changes require application restart",
@@ -228,6 +223,21 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
   myWheelLinesLabel->setFlags(WIDGET_CLEARBG);
   ypos += lineHeight + 4;
 
+  // Amount of output to show with 'showinfo'
+  myShowInfoSlider = new SliderWidget(myTab, font, xpos, ypos, pwidth,
+                                      lineHeight, "Show Info level: ",
+                                      lwidth, kSInfoChanged);
+  myShowInfoSlider->setMinValue(0);
+  myShowInfoSlider->setMaxValue(2);
+  myShowInfoSlider->setStepValue(1);
+  wid.push_back(myShowInfoSlider);
+  myShowInfoLabel =
+      new StaticTextWidget(myTab, font,
+                           xpos + myShowInfoSlider->getWidth() + 4,
+                           ypos + 1, 2*fontWidth, fontHeight, "", kTextAlignLeft);
+  myShowInfoLabel->setFlags(WIDGET_CLEARBG);
+  ypos += lineHeight + 4;
+
   // Add items for tab 2
   addToFocusList(wid, tabID);
 
@@ -285,9 +295,6 @@ void UIDialog::loadConfig()
   const string& viewer = instance().settings().getString("romviewer");
   myRomViewerPopup->setSelected(viewer, "0");
 
-  // Use ROM launcher
-  myUseLauncherBox->setState(instance().settings().getBool("uselauncher"));
-
   // Debugger size
   instance().settings().getSize("debuggerres", w, h);
   w = BSPF_max(w, 1050);
@@ -316,6 +323,11 @@ void UIDialog::loadConfig()
   myWheelLinesSlider->setValue(mw);
   myWheelLinesLabel->setValue(mw);
 
+  // Showinfo
+  int si = instance().settings().getInt("showinfo");
+  myShowInfoSlider->setValue(si);
+  myShowInfoLabel->setValue(si);
+
   myTab->loadConfig();
 }
 
@@ -334,9 +346,6 @@ void UIDialog::saveConfig()
   instance().settings().setString("romviewer",
     myRomViewerPopup->getSelectedTag());
 
-  // Use ROM launcher
-  instance().settings().setBool("uselauncher", myUseLauncherBox->getState());
-
   // Debugger size
   instance().settings().setSize("debuggerres", 
     myDebuggerWidthSlider->getValue(), myDebuggerHeightSlider->getValue());
@@ -354,6 +363,9 @@ void UIDialog::saveConfig()
   int mw = myWheelLinesSlider->getValue();
   instance().settings().setInt("mwheel", mw);
   ScrollBarWidget::setWheelLines(mw);
+
+  // Show info
+  instance().settings().setInt("showinfo", myShowInfoSlider->getValue());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -371,7 +383,6 @@ void UIDialog::setDefaults()
       myLauncherHeightLabel->setValue(h);
       myLauncherFontPopup->setSelected("medium", "");
       myRomViewerPopup->setSelected("0", "");
-      myUseLauncherBox->setState(true);
       break;
     }
 
@@ -388,6 +399,8 @@ void UIDialog::setDefaults()
       myListDelayLabel->setValue(300);
       myWheelLinesSlider->setValue(4);
       myWheelLinesLabel->setValue(4);
+      myShowInfoSlider->setValue(1);
+      myShowInfoLabel->setValue(1);
       break;
 
     default:
@@ -426,6 +439,10 @@ void UIDialog::handleCommand(CommandSender* sender, int cmd, int data, int id)
       myWheelLinesLabel->setValue(myWheelLinesSlider->getValue());
       break;
 
+    case kSInfoChanged:
+      myShowInfoLabel->setValue(myShowInfoSlider->getValue());
+      break;
+
     case kOKCmd:
       saveConfig();
       close();

src/gui/UIDialog.hxx

@@ -51,7 +51,6 @@ class UIDialog : public Dialog
     StaticTextWidget* myLauncherHeightLabel;
     PopUpWidget*      myLauncherFontPopup;
     PopUpWidget*      myRomViewerPopup;
-    CheckboxWidget*   myUseLauncherBox;
 
     // Debugger options
     SliderWidget*     myDebuggerWidthSlider;
@@ -65,6 +64,8 @@ class UIDialog : public Dialog
     StaticTextWidget* myListDelayLabel;
     SliderWidget*     myWheelLinesSlider;
     StaticTextWidget* myWheelLinesLabel;
+    SliderWidget*     myShowInfoSlider;
+    StaticTextWidget* myShowInfoLabel;
     
   private:
     void loadConfig();
@@ -79,7 +80,8 @@ class UIDialog : public Dialog
       kDWidthChanged  = 'UIdw',
       kDHeightChanged = 'UIdh',
       kLQDelayChanged = 'UIqd',
-      kWLinesChanged  = 'UIsl'
+      kWLinesChanged  = 'UIsl',
+      kSInfoChanged   = 'UIsi'
     };
 };
 

src/macosx/Info-Stella.plist

@@ -53,7 +53,7 @@
 	<key>CFBundleSignature</key>
 	<string>StLa</string>
 	<key>CFBundleVersion</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain.nib</string>
 	<key>NSPrincipalClass</key>

src/unix/stella.SlackBuild

@@ -13,7 +13,7 @@ die() {
 	exit 1
 }
 
-VERSION=3.1.1
+VERSION=3.1.2
 ARCH=${ARCH-i486}
 BUILD=1
 

src/unix/stella.spec

@@ -1,5 +1,5 @@
 %define name    stella
-%define version 3.1.1
+%define version 3.1.2
 %define rel     1
 
 %define enable_gl 1
@@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 
 %changelog
+* Mon May 3 2010 Stephen Anthony <stephena@users.sf.net> 3.1.2-1
+- Version 3.1.2 release
+
 * Mon Apr 26 2010 Stephen Anthony <stephena@users.sf.net> 3.1.1-1
 - Version 3.1.1 release
 

src/win32/stella.rc

@@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,0
+ FILEVERSION 3,1,2,0
- PRODUCTVERSION 3,1,1,0
+ PRODUCTVERSION 3,1,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -55,12 +55,12 @@ BEGIN
             VALUE "Comments", "The multi-platform Atari 2600 emulator.  Stella is released under the GPLv2."
             VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
             VALUE "FileDescription", "Stella"
-            VALUE "FileVersion", "3.1.1"
+            VALUE "FileVersion", "3.1.2"
             VALUE "InternalName", "Stella"
-            VALUE "LegalCopyright", "Copyright (C) 1995-2010 B. Mott & the Stella Team"
+            VALUE "LegalCopyright", "Copyright (C) 1995-2010 The Stella Team"
             VALUE "OriginalFilename", "Stella.exe"
             VALUE "ProductName", "Stella"
-            VALUE "ProductVersion", "3.1.1"
+            VALUE "ProductVersion", "3.1.2"
         END
     END
     BLOCK "VarFileInfo"