From 5ca6d8c49da6792f93fa59131dfa93a3489aa373 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 3 May 2010 12:01:43 +0000
Subject: [PATCH] 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                   |  24 +++++++++---------
 Changes.txt                    |  23 +++++++++++++++--
 Readme.txt                     |   4 +--
 debian/changelog               |   7 +++++
 docs/graphics/options_misc.png | Bin 3691 -> 12384 bytes
 docs/index.html                |   3 ++-
 src/common/Version.hxx         |   2 +-
 src/common/mainSDL.cxx         |   2 +-
 src/emucore/Settings.cxx       |  13 +++++++++-
 src/gui/UIDialog.cxx           |  45 +++++++++++++++++++++++----------
 src/gui/UIDialog.hxx           |   6 +++--
 src/macosx/Info-Stella.plist   |   2 +-
 src/unix/stella.SlackBuild     |   2 +-
 src/unix/stella.spec           |   5 +++-
 src/win32/stella.rc            |  10 ++++----
 15 files changed, 104 insertions(+), 44 deletions(-)

diff --git a/Announce.txt b/Announce.txt
index d0e02c295..5db5316de 100644
--- a/Announce.txt
+++ b/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.1-x64.exe
+      Stella-3.1.2-win32.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.1_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only)
+      Stella-3.1.2-macosx.dmg (32-bit Universal Binary)
+      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.1-1_amd64.deb
+      stella_3.1.2-1_i386.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.1-2.x86_64.rpm
+      stella-3.1.2-2.i386.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!
diff --git a/Changes.txt b/Changes.txt
index bc2330384..ddc374388 100644
--- a/Changes.txt
+++ b/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)
 
diff --git a/Readme.txt b/Readme.txt
index bcd330981..410bf9ef9 100644
--- a/Readme.txt
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index 9ae7e65f4..4f14564bf 100644
--- a/debian/changelog
+++ b/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
diff --git a/docs/graphics/options_misc.png b/docs/graphics/options_misc.png
index e2a1ac98cac9a9541e9ab1bf2831baa6204e3618..e82b59d5885a5fc1d80a6bde2c36c050cb757138 100644
GIT binary patch
literal 12384
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

literal 3691
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
Shq1qXfTgLe3DMa5!9M|*i}DKq

diff --git a/docs/index.html b/docs/index.html
index ce00e01f3..868499b6f 100644
--- a/docs/index.html
+++ b/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>
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 0e2525a1b..d9bca5c55 100644
--- a/src/common/Version.hxx
+++ b/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
diff --git a/src/common/mainSDL.cxx b/src/common/mainSDL.cxx
index cece02c27..d69ff1cd6 100644
--- a/src/common/mainSDL.cxx
+++ b/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);
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 6cfc1b9df..89f2077a3 100644
--- a/src/emucore/Settings.cxx
+++ b/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;
diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx
index 33f127d96..af2973fd8 100644
--- a/src/gui/UIDialog.cxx
+++ b/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();
diff --git a/src/gui/UIDialog.hxx b/src/gui/UIDialog.hxx
index 5c34e9ff7..cb6ecf36a 100644
--- a/src/gui/UIDialog.hxx
+++ b/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'
     };
 };
 
diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist
index 7a60078e0..4c83eb176 100644
--- a/src/macosx/Info-Stella.plist
+++ b/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>
diff --git a/src/unix/stella.SlackBuild b/src/unix/stella.SlackBuild
index dd5da883d..8eea29137 100644
--- a/src/unix/stella.SlackBuild
+++ b/src/unix/stella.SlackBuild
@@ -13,7 +13,7 @@ die() {
 	exit 1
 }
 
-VERSION=3.1.1
+VERSION=3.1.2
 ARCH=${ARCH-i486}
 BUILD=1
 
diff --git a/src/unix/stella.spec b/src/unix/stella.spec
index e0c00eb55..609bceb97 100644
--- a/src/unix/stella.spec
+++ b/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
 
diff --git a/src/win32/stella.rc b/src/win32/stella.rc
index fa1f421c4..2cd1e5f65 100755
--- a/src/win32/stella.rc
+++ b/src/win32/stella.rc
@@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,0
- PRODUCTVERSION 3,1,1,0
+ FILEVERSION 3,1,2,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"