Added 'Display.Phosphor' toggleswitch to GameInfoDialog.

Cleaned up stella.pro wrt to 'Keypad' vs. 'Keyboard'.  The manual says
Keyboard, so that's what we use.

Added 'Display.Phosphor' property for many ROMs which require it (thanks
to the z26 database).  This means it will be automatically used for those
ROMs.


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

stella/src/cheat/CheatManager.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: CheatManager.cxx,v 1.6 2006-01-08 13:55:03 stephena Exp $
+// $Id: CheatManager.cxx,v 1.7 2006-01-11 01:17:08 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -265,7 +265,6 @@ void CheatManager::loadCheatDatabase()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CheatManager::saveCheatDatabase()
 {
-cerr << "CheatManager::saveCheatDatabase(): " << myCheatMap.size() << endl;
   string cheatfile = myOSystem->baseDir() + BSPF_PATH_SEPARATOR + "stella.cht";
   ofstream out(cheatfile.c_str(), ios::out);
   if(!out)
@@ -320,8 +319,6 @@ void CheatManager::saveCheats(const string& md5sum)
   // Add new entry only if there are any cheats defined
   if(cheats.str() != "")
     myCheatMap.insert(make_pair(md5sum, cheats.str()));
-
-cerr << "added " << myCheatList.size() << " cheats, map is " << myCheatMap.size() << endl;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

stella/src/emucore/PropsSet.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: PropsSet.cxx,v 1.16 2006-01-10 20:37:00 stephena Exp $
+// $Id: PropsSet.cxx,v 1.17 2006-01-11 01:17:11 stephena Exp $
 //============================================================================
 
 #include <assert.h>
@@ -217,7 +217,7 @@ const Properties& PropertiesSet::defaultProperties()
   ourDefaultProperties.set("Cartridge.Note", "");
   ourDefaultProperties.set("Cartridge.Rarity", "");
   ourDefaultProperties.set("Cartridge.Sound", "Mono");
-  ourDefaultProperties.set("Cartridge.Type", "Auto-detect");
+  ourDefaultProperties.set("Cartridge.Type", "AUTO-DETECT");
 
   ourDefaultProperties.set("Console.LeftDifficulty", "B");
   ourDefaultProperties.set("Console.RightDifficulty", "B");

stella/src/gui/GameInfoDialog.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: GameInfoDialog.cxx,v 1.20 2006-01-08 02:28:03 stephena Exp $
+// $Id: GameInfoDialog.cxx,v 1.21 2006-01-11 01:17:11 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -242,6 +242,16 @@ GameInfoDialog::GameInfoDialog(
                                 25, fontHeight, "");
   wid.push_back(myHeight);
 
+  ypos += lineHeight + 3;
+  new StaticTextWidget(myTab, xpos, ypos+1, lwidth, fontHeight,
+                       "Use Phosphor:", kTextAlignLeft);
+  myPhosphor = new PopUpWidget(myTab, xpos+lwidth, ypos,
+                               font.getStringWidth("Yes") + 15, lineHeight,
+                               "", 0, 0);
+  myPhosphor->appendEntry("Yes", 1);
+  myPhosphor->appendEntry("No", 2);
+  wid.push_back(myPhosphor);
+
   ypos += lineHeight + 3;
   new StaticTextWidget(myTab, xpos, ypos+1, lwidth, fontHeight,
                        "Use HMBlanks:", kTextAlignLeft);
@@ -393,6 +403,14 @@ void GameInfoDialog::loadConfig()
   s = myGameProperties->get("Display.Height");
   myHeight->setEditString(s);
 
+  s = myGameProperties->get("Display.Phosphor", true);
+  if(s == "YES")
+    myPhosphor->setSelectedTag(1);
+  else if(s == "NO")
+    myPhosphor->setSelectedTag(2);
+  else
+    myPhosphor->setSelectedTag(0);
+
   s = myGameProperties->get("Emulation.HmoveBlanks", true);
   if(s == "YES")
     myHmoveBlanks->setSelectedTag(1);
@@ -495,6 +513,10 @@ void GameInfoDialog::saveConfig()
   s = myHeight->getEditString();
   myGameProperties->set("Display.Height", s);
 
+  tag = myPhosphor->getSelectedTag();
+  s = (tag == 1) ? "Yes" : "No";
+  myGameProperties->set("Display.Phosphor", s);
+
   tag = myHmoveBlanks->getSelectedTag();
   s = (tag == 1) ? "Yes" : "No";
   myGameProperties->set("Emulation.HmoveBlanks", s);

stella/src/gui/GameInfoDialog.hxx

@@ -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: GameInfoDialog.hxx,v 1.13 2006-01-08 02:28:03 stephena Exp $
+// $Id: GameInfoDialog.hxx,v 1.14 2006-01-11 01:17:11 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -82,6 +82,7 @@ class GameInfoDialog : public Dialog, public CommandSender
     EditTextWidget* myWidth;
     EditTextWidget* myYStart;
     EditTextWidget* myHeight;
+    PopUpWidget*    myPhosphor;
     PopUpWidget*    myHmoveBlanks;
 
     /** Game properties for currently loaded ROM */