From 01b55e5f6cfb8930d2f68389383e5ad4c5c124d6 Mon Sep 17 00:00:00 2001 From: stephena Date: Sun, 31 Dec 2006 23:42:04 +0000 Subject: [PATCH] Some minor UI fixes and a bump for copyright. Except for some extra testing, I think we're ready for a 2.3.1 release. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1259 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/emucore/EventHandler.cxx | 4 ++-- stella/src/gui/AboutDialog.cxx | 6 +++--- stella/src/gui/CommandDialog.cxx | 14 +++++++------- stella/src/gui/HelpDialog.cxx | 20 +++++++++----------- stella/src/gui/OptionsDialog.hxx | 4 ++-- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx index f483e24c1..1a5a373b8 100644 --- a/stella/src/emucore/EventHandler.cxx +++ b/stella/src/emucore/EventHandler.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: EventHandler.cxx,v 1.192 2006-12-30 22:26:28 stephena Exp $ +// $Id: EventHandler.cxx,v 1.193 2006-12-31 23:42:04 stephena Exp $ //============================================================================ #include @@ -2550,7 +2550,7 @@ EventHandler::ActionList EventHandler::ourEmulActionList[kEmulActionListSize] = { Event::Fry, "Fry cartridge", 0 }, { Event::VolumeDecrease, "Decrease volume", 0 }, { Event::VolumeIncrease, "Increase volume", 0 }, - { Event::MenuMode, "Toggle options menu mode", 0 }, + { Event::MenuMode, "Enter options menu mode", 0 }, { Event::CmdMenuMode, "Toggle command menu mode", 0 }, { Event::DebuggerMode, "Toggle debugger mode", 0 }, { Event::LauncherMode, "Enter ROM launcher", 0 }, diff --git a/stella/src/gui/AboutDialog.cxx b/stella/src/gui/AboutDialog.cxx index 0c765ab8c..544553a0d 100644 --- a/stella/src/gui/AboutDialog.cxx +++ b/stella/src/gui/AboutDialog.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: AboutDialog.cxx,v 1.16 2006-12-08 16:49:31 stephena Exp $ +// $Id: AboutDialog.cxx,v 1.17 2006-12-31 23:42:04 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -92,7 +92,7 @@ void AboutDialog::updateStrings(int page, int lines, string& title, string* &dsc ADD_ATEXT("\\CA multi-platform Atari 2600 VCS emulator"); ADD_ATEXT(string("\\C\\c2") + instance()->features()); ADD_ALINE; - ADD_ATEXT("\\CCopyright (C) 1995-2005 The Stella team"); + ADD_ATEXT("\\CCopyright (C) 1995-2007 The Stella team"); ADD_ATEXT("\\Chttp://stella.sourceforge.net"); ADD_ALINE; ADD_ATEXT("Stella is free software released under the GNU GPL"); @@ -131,7 +131,7 @@ void AboutDialog::updateStrings(int page, int lines, string& title, string* &dsc title = "Retired members / Contributors"; ADD_ATEXT("\\L\\c0""See Stella manual for contribution details"); ADD_ALINE; - ADD_ATEXT("\\L\\c0"" David Aspell, Christopher Bennett, Alexander Bilstein"); + ADD_ATEXT("\\L\\c0"" David Aspell, Chris Bennett, Alexander Bilstein"); ADD_ATEXT("\\L\\c0"" Dan Boris, Piero Cavina, Bob Colbert"); ADD_ATEXT("\\L\\c0"" Renato Ferreira, Ron Fries, Aaron Giles"); ADD_ATEXT("\\L\\c0"" Mark Hahn, Kevin Horton, Thomas Jentzsch"); diff --git a/stella/src/gui/CommandDialog.cxx b/stella/src/gui/CommandDialog.cxx index 3d717a8c8..8c45d680e 100644 --- a/stella/src/gui/CommandDialog.cxx +++ b/stella/src/gui/CommandDialog.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: CommandDialog.cxx,v 1.11 2006-12-30 22:26:28 stephena Exp $ +// $Id: CommandDialog.cxx,v 1.12 2006-12-31 23:42:04 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -33,15 +33,15 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent) { const GUI::Font& font = osystem->font(); int lineHeight = font.getLineHeight(), - buttonWidth = 60, - buttonHeight = lineHeight + 2, + buttonWidth = 65, + buttonHeight = 18,//lineHeight + 2, xoffset = 5, yoffset = 5, lwidth = buttonWidth + 5; // Set real dimensions _w = 4 * (lwidth) + 5; - _h = 4 * (buttonHeight+5) + 5; + _h = 4 * (buttonHeight+3) + 7; WidgetArray wid; ButtonWidget* b; @@ -62,7 +62,7 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent) "B/W TV", kBWCmd); wid.push_back(b); - xoffset = 5; yoffset += buttonHeight + 5; + xoffset = 5; yoffset += buttonHeight + 3; b = new ButtonWidget(this, font, xoffset, yoffset, buttonWidth, buttonHeight, "Left Diff A", kLeftDiffACmd); @@ -80,7 +80,7 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent) "Right Diff B", kRightDiffBCmd); wid.push_back(b); - xoffset = 5; yoffset += buttonHeight + 5; + xoffset = 5; yoffset += buttonHeight + 3; b = new ButtonWidget(this, font, xoffset, yoffset, buttonWidth, buttonHeight, "Save State", kSaveStateCmd); @@ -98,7 +98,7 @@ CommandDialog::CommandDialog(OSystem* osystem, DialogContainer* parent) "Snapshot", kSnapshotCmd); wid.push_back(b); - xoffset = 5; yoffset += buttonHeight + 5; + xoffset = 5; yoffset += buttonHeight + 3; b = new ButtonWidget(this, font, xoffset, yoffset, buttonWidth, buttonHeight, "NTSC/PAL", kFormatCmd); diff --git a/stella/src/gui/HelpDialog.cxx b/stella/src/gui/HelpDialog.cxx index 3e2266573..9562ad1d9 100644 --- a/stella/src/gui/HelpDialog.cxx +++ b/stella/src/gui/HelpDialog.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: HelpDialog.cxx,v 1.19 2006-12-08 16:49:35 stephena Exp $ +// $Id: HelpDialog.cxx,v 1.20 2006-12-31 23:42:04 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -83,8 +83,8 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, title = "Common commands:"; ADD_BIND("Ctrl Q", "Quit emulation"); ADD_BIND("Escape", "Exit current game"); - ADD_BIND("Tab", "Enter/exit configuration menu"); - ADD_BIND("\\", "Enter/exit command menu"); + ADD_BIND("Tab", "Enter options menu"); + ADD_BIND("\\", "Toggle command menu"); ADD_BIND("Alt =", "Increase window size"); ADD_BIND("Alt -", "Decrease window size"); ADD_BIND("Alt Enter", "Toggle fullscreen/windowed mode"); @@ -96,9 +96,8 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, case 2: title = "Special commands:"; ADD_BIND("Ctrl g", "Grab mouse (keep in window)"); - ADD_BIND("Ctrl f", "Switch between NTSC and PAL"); + ADD_BIND("Ctrl f", "Switch between NTSC/PAL/PAL60"); ADD_BIND("Ctrl s", "Save game properties to new file"); - ADD_BIND("Alt s", "Merge game properties"); ADD_LINE; ADD_BIND("Ctrl 0", "Mouse emulates paddle 0"); ADD_BIND("Ctrl 1", "Mouse emulates paddle 1"); @@ -122,8 +121,8 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, title = "Common commands:"; ADD_BIND("Cmd Q", "Quit emulation"); ADD_BIND("Escape", "Exit current game"); - ADD_BIND("Tab", "Enter/exit configuration menu"); - ADD_BIND("\\", "Enter/exit command menu"); + ADD_BIND("Tab", "Enter options menu"); + ADD_BIND("\\", "Toggle command menu"); ADD_BIND("Cmd =", "Increase window size"); ADD_BIND("Cmd -", "Decrease window size"); ADD_BIND("Cmd Enter", "Toggle fullscreen/windowed mode"); @@ -135,9 +134,8 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, case 2: title = "Special commands:"; ADD_BIND("Cmd g", "Grab mouse (keep in window)"); - ADD_BIND("Cmd f", "Switch between NTSC and PAL"); - ADD_BIND("Cmd s", "Save (or merge) game properties"); - ADD_BIND("Shift-Cmd s", "Merge game properties"); + ADD_BIND("Cmd f", "Switch between NTSC/PAL/PAL60"); + ADD_BIND("Cmd s", "Save game properties to new file"); ADD_LINE; ADD_BIND("Cmd 0", "Mouse emulates paddle 0"); ADD_BIND("Cmd 1", "Mouse emulates paddle 1"); @@ -163,7 +161,7 @@ void HelpDialog::updateStrings(uInt8 page, uInt8 lines, ADD_BIND("Remapped Events", ""); ADD_TEXT("Most other commands can be"); ADD_TEXT("remapped. Please consult the"); - ADD_TEXT("'Event Mapping' section for"); + ADD_TEXT("'Input Settings' section for"); ADD_TEXT("more information."); break; } diff --git a/stella/src/gui/OptionsDialog.hxx b/stella/src/gui/OptionsDialog.hxx index c75a60d26..31fe5b551 100644 --- a/stella/src/gui/OptionsDialog.hxx +++ b/stella/src/gui/OptionsDialog.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: OptionsDialog.hxx,v 1.21 2006-12-30 22:26:29 stephena Exp $ +// $Id: OptionsDialog.hxx,v 1.22 2006-12-31 23:42:04 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -84,7 +84,7 @@ class OptionsDialog : public Dialog kRowHeight = 22, kBigButtonWidth = 90, kMainMenuWidth = (2*kBigButtonWidth + 30), - kMainMenuHeight = 5*kRowHeight + 20 + kMainMenuHeight = 5*kRowHeight + 15 }; };