fixed palette cycling

updated doc for phase shift hotkeys
improved scanlines hotkey messages

docs/index.html

@@ -1396,19 +1396,19 @@
     </tr>
 
     <tr>
-      <td>Toggle 'phosphor' effect</td>
+      <td>Toggle 'phosphor' mode</td>
       <td>Alt + p</td>
       <td>Cmd + p</td>
     </tr>
 
     <tr>
-      <td>Decrease 'phosphor' blend in phosphor mode</td>
+      <td>Decrease 'phosphor' blend</td>
       <td>Shift-Alt + 9</td>
       <td>Shift-Cmd + 9</td>
     </tr>
 
     <tr>
-      <td>Increase 'phosphor' blend in phosphor mode</td>
+      <td>Increase 'phosphor' blend</td>
       <td>Alt + 9</td>
       <td>Cmd + 9</td>
     </tr>
@@ -1426,7 +1426,7 @@
 
     <tr>
       <td colspan="3"><center><font size="-1">
-      Items marked as (*) are only available in 'Custom' preset mode</font></center></td>
+      Items marked as (*) will also switch to 'Custom' preset mode</font></center></td>
     </tr>
   </table>
 
@@ -1578,18 +1578,18 @@
       <td>Cmd + Enter</td>
     </tr>
 
-    <tr>
-      <td>Increase overscan in fullscreen mode</td>
-      <td>Shift + PageUp</td>
-      <td>Shift + PageUp</td>
-    </tr>
-
     <tr>
       <td>Decrease overscan in fullscreen mode</td>
       <td>Shift + PageDown</td>
       <td>Shift + PageDown</td>
     </tr>
 
+    <tr>
+      <td>Increase overscan in fullscreen mode</td>
+      <td>Shift + PageUp</td>
+      <td>Shift + PageUp</td>
+    </tr>
+
     <tr>
       <td>Move display <i>up</i> (uses "Display.VCenter")</td>
       <td>Alt + PageUp</td>
@@ -1602,24 +1602,36 @@
       <td>Cmd + PageDown</td>
     </tr>
 
-    <tr>
-      <td>Switch display format in <i>increasing</i> order (NTSC/PAL/SECAM etc.)</td>
-      <td>Control + f</td>
-      <td>Control + f</td>
-    </tr>
-
     <tr>
       <td>Switch display format in <i>decreasing</i> order (NTSC/PAL/SECAM etc.)</td>
       <td>Shift-Control + f</td>
       <td>Shift-Control + f</td>
     </tr>
 
+    <tr>
+      <td>Switch display format in <i>increasing</i> order (NTSC/PAL/SECAM etc.)</td>
+      <td>Control + f</td>
+      <td>Control + f</td>
+    </tr>
+
     <tr>
       <td>Switch palette (Standard/Z26/User/Custom)</td>
       <td>Control + p</td>
       <td>Control + p</td>
     </tr>
 
+    <tr>
+      <td>Decrease custom palette phase shift (switches to 'Custom' palette)</td>
+      <td>Shift-Control + 9</td>
+      <td>Shift-Control + 9</td>
+    </tr>
+
+    <tr>
+      <td>Increase custom palette phase shift (switches to 'Custom' palette)</td>
+      <td>Control + 9</td>
+      <td>Control + 9</td>
+    </tr>
+
     <tr>
       <td>Toggle display interpolation</td>
       <td>Control + i</td>

src/emucore/Console.cxx

@@ -514,8 +514,8 @@ void Console::togglePalette()
     }
     else
     {
-      palette = "standard";
-      message = "Standard Stella palette";
+      palette = "custom";
+      message = "Custom palette";
     }
   }
   else if(palette == "user")  // switch to custom
@@ -523,11 +523,6 @@ void Console::togglePalette()
     palette = "custom";
     message = "Custom palette";
   }
-  else if(palette == "custom")  // switch to standard
-  {
-    palette = "standard";
-    message = "Standard Stella palette";
-  }
   else  // switch to standard mode if we get this far
   {
     palette = "standard";

src/emucore/TIASurface.cxx

@@ -193,9 +193,21 @@ void TIASurface::setScanlineIntensity(int amount)
 {
   ostringstream buf;
   uInt32 intensity = enableScanlines(amount);
-  buf << "Scanline intensity at " << intensity  << "%";
+
+  if(intensity == 0)
+    buf << "Scanlines disabled";
+  else
+  {
+    buf << "Scanline intensity at ";
+    if(intensity < 100)
+      buf << intensity << "%";
+    else
+      buf << "maximum";
+  }
   myOSystem.settings().setValue("tv.scanlines", intensity);
 
+  enableNTSC(ntscEnabled());
+
   myFB.showMessage(buf.str());
 }