diff --git a/Changes.txt b/Changes.txt index fd0887312..672992d67 100644 --- a/Changes.txt +++ b/Changes.txt @@ -14,7 +14,7 @@ 6.5.2 to 6.5.3 (XXX, 2021) - * Added context-sensitive help (TODO: doc) + * Added context-sensitive help * Improved support of multiple monitors with different resolutions. diff --git a/docs/graphics/cheat.png b/docs/graphics/cheat.png index 10601e627..d2a35ea4b 100644 Binary files a/docs/graphics/cheat.png and b/docs/graphics/cheat.png differ diff --git a/docs/graphics/commandmenu.png b/docs/graphics/commandmenu.png index 9d9d8f9f6..d69e826c9 100644 Binary files a/docs/graphics/commandmenu.png and b/docs/graphics/commandmenu.png differ diff --git a/docs/graphics/eventmapping.png b/docs/graphics/eventmapping.png index f1cef67ac..5ae1268bc 100644 Binary files a/docs/graphics/eventmapping.png and b/docs/graphics/eventmapping.png differ diff --git a/docs/graphics/eventmapping_combo.png b/docs/graphics/eventmapping_combo.png index a8bc4d8cd..d7a2396cf 100644 Binary files a/docs/graphics/eventmapping_combo.png and b/docs/graphics/eventmapping_combo.png differ diff --git a/docs/graphics/eventmapping_devsports.png b/docs/graphics/eventmapping_devsports.png index 536caf4f4..a77937203 100644 Binary files a/docs/graphics/eventmapping_devsports.png and b/docs/graphics/eventmapping_devsports.png differ diff --git a/docs/graphics/eventmapping_mouse.png b/docs/graphics/eventmapping_mouse.png index 760b4eac3..0e8383c20 100644 Binary files a/docs/graphics/eventmapping_mouse.png and b/docs/graphics/eventmapping_mouse.png differ diff --git a/docs/graphics/eventmapping_remap.png b/docs/graphics/eventmapping_remap.png index 442dfead6..9382691b3 100644 Binary files a/docs/graphics/eventmapping_remap.png and b/docs/graphics/eventmapping_remap.png differ diff --git a/docs/graphics/highscores.png b/docs/graphics/highscores.png index edeb5512a..49d93f86c 100644 Binary files a/docs/graphics/highscores.png and b/docs/graphics/highscores.png differ diff --git a/docs/graphics/launcher_options_snapshots.png b/docs/graphics/launcher_options_snapshots.png index a833f8bb3..314dc0bf7 100644 Binary files a/docs/graphics/launcher_options_snapshots.png and b/docs/graphics/launcher_options_snapshots.png differ diff --git a/docs/graphics/launcher_override.png b/docs/graphics/launcher_override.png index a4b3b4221..4cb62ce66 100644 Binary files a/docs/graphics/launcher_override.png and b/docs/graphics/launcher_override.png differ diff --git a/docs/graphics/logs.png b/docs/graphics/logs.png index 195eeed28..343321f1c 100644 Binary files a/docs/graphics/logs.png and b/docs/graphics/logs.png differ diff --git a/docs/graphics/options.png b/docs/graphics/options.png index 9f8a95430..3c1431ada 100644 Binary files a/docs/graphics/options.png and b/docs/graphics/options.png differ diff --git a/docs/graphics/options_audio.png b/docs/graphics/options_audio.png index 174bc3701..b84e87e5c 100644 Binary files a/docs/graphics/options_audio.png and b/docs/graphics/options_audio.png differ diff --git a/docs/graphics/options_developer.png b/docs/graphics/options_developer.png index f39e894b8..108893d6e 100644 Binary files a/docs/graphics/options_developer.png and b/docs/graphics/options_developer.png differ diff --git a/docs/graphics/options_developer_debugger.png b/docs/graphics/options_developer_debugger.png index 4ad4d42d7..b2fdbae99 100644 Binary files a/docs/graphics/options_developer_debugger.png and b/docs/graphics/options_developer_debugger.png differ diff --git a/docs/graphics/options_developer_emulation.png b/docs/graphics/options_developer_emulation.png index 0b2f32d65..82e5aa2a8 100644 Binary files a/docs/graphics/options_developer_emulation.png and b/docs/graphics/options_developer_emulation.png differ diff --git a/docs/graphics/options_developer_tia.png b/docs/graphics/options_developer_tia.png index dbacdc877..0e4f73764 100644 Binary files a/docs/graphics/options_developer_tia.png and b/docs/graphics/options_developer_tia.png differ diff --git a/docs/graphics/options_developer_timemachine.png b/docs/graphics/options_developer_timemachine.png index d912666bc..508d19103 100644 Binary files a/docs/graphics/options_developer_timemachine.png and b/docs/graphics/options_developer_timemachine.png differ diff --git a/docs/graphics/options_developer_video.png b/docs/graphics/options_developer_video.png index 42b55dff8..02b2549ed 100644 Binary files a/docs/graphics/options_developer_video.png and b/docs/graphics/options_developer_video.png differ diff --git a/docs/graphics/options_emulation.png b/docs/graphics/options_emulation.png index 99a1dfa4d..b924a7bbc 100644 Binary files a/docs/graphics/options_emulation.png and b/docs/graphics/options_emulation.png differ diff --git a/docs/graphics/options_gameinfo_cartridge.png b/docs/graphics/options_gameinfo_cartridge.png index 772f1334b..65fd9acfe 100644 Binary files a/docs/graphics/options_gameinfo_cartridge.png and b/docs/graphics/options_gameinfo_cartridge.png differ diff --git a/docs/graphics/options_gameinfo_console.png b/docs/graphics/options_gameinfo_console.png index f7233672b..76f4e8267 100644 Binary files a/docs/graphics/options_gameinfo_console.png and b/docs/graphics/options_gameinfo_console.png differ diff --git a/docs/graphics/options_gameinfo_controller.png b/docs/graphics/options_gameinfo_controller.png index 63b5548a3..84881d9bd 100644 Binary files a/docs/graphics/options_gameinfo_controller.png and b/docs/graphics/options_gameinfo_controller.png differ diff --git a/docs/graphics/options_gameinfo_emulation.png b/docs/graphics/options_gameinfo_emulation.png index b67ca95f7..05f9b3626 100644 Binary files a/docs/graphics/options_gameinfo_emulation.png and b/docs/graphics/options_gameinfo_emulation.png differ diff --git a/docs/graphics/options_gameinfo_highscores.png b/docs/graphics/options_gameinfo_highscores.png index 572aa252b..0249c5104 100644 Binary files a/docs/graphics/options_gameinfo_highscores.png and b/docs/graphics/options_gameinfo_highscores.png differ diff --git a/docs/graphics/options_gameinfo_quadtari.png b/docs/graphics/options_gameinfo_quadtari.png index 04fba7f06..be68d7e35 100644 Binary files a/docs/graphics/options_gameinfo_quadtari.png and b/docs/graphics/options_gameinfo_quadtari.png differ diff --git a/docs/graphics/options_misc.png b/docs/graphics/options_misc.png index 704b7b5de..f4ebf7ca4 100644 Binary files a/docs/graphics/options_misc.png and b/docs/graphics/options_misc.png differ diff --git a/docs/graphics/options_misc_classic.png b/docs/graphics/options_misc_classic.png index 1eab6039e..bd4cccb7a 100644 Binary files a/docs/graphics/options_misc_classic.png and b/docs/graphics/options_misc_classic.png differ diff --git a/docs/graphics/options_misc_dark.png b/docs/graphics/options_misc_dark.png index 79fad1166..6623faa4d 100644 Binary files a/docs/graphics/options_misc_dark.png and b/docs/graphics/options_misc_dark.png differ diff --git a/docs/graphics/options_misc_light.png b/docs/graphics/options_misc_light.png index c0cebe477..a1a2c9450 100644 Binary files a/docs/graphics/options_misc_light.png and b/docs/graphics/options_misc_light.png differ diff --git a/docs/graphics/options_ui.png b/docs/graphics/options_ui.png index 70712d2b6..2b3f37d9c 100644 Binary files a/docs/graphics/options_ui.png and b/docs/graphics/options_ui.png differ diff --git a/docs/graphics/options_video.png b/docs/graphics/options_video.png index 193bc4804..232583505 100644 Binary files a/docs/graphics/options_video.png and b/docs/graphics/options_video.png differ diff --git a/docs/graphics/options_video_dbgcolors.png b/docs/graphics/options_video_dbgcolors.png deleted file mode 100644 index aa7ba44dc..000000000 Binary files a/docs/graphics/options_video_dbgcolors.png and /dev/null differ diff --git a/docs/graphics/options_video_palettes.png b/docs/graphics/options_video_palettes.png index d965b45b3..938bdc6a9 100644 Binary files a/docs/graphics/options_video_palettes.png and b/docs/graphics/options_video_palettes.png differ diff --git a/docs/graphics/options_video_tv.png b/docs/graphics/options_video_tv.png index 01b460842..91e361c64 100644 Binary files a/docs/graphics/options_video_tv.png and b/docs/graphics/options_video_tv.png differ diff --git a/docs/graphics/romaudit.png b/docs/graphics/romaudit.png index 4c85b628c..be67e7dde 100644 Binary files a/docs/graphics/romaudit.png and b/docs/graphics/romaudit.png differ diff --git a/docs/index.html b/docs/index.html index 012a02464..647754e3f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -613,6 +613,10 @@ as the function keys and display the current state. You may find this useful if you cannot remember all the function key events, or you wish to use Stella without a keyboard (ie, in a standalone gaming system).

+ +

Note: Clicking the `?` at the top right opens this document at the related + paragraph. This works for almost all dialogs. There is also a hotkey defined + for help (see Hotkeys)).


Keyboard Layout

@@ -2172,6 +2176,11 @@ Alt + Return Cmd + Return + + Open context-sensitive help + F1 + F1 + Exit emulator Control + Q @@ -3922,7 +3931,7 @@ -

Finally there is a 'Combo' button in the 'Emulation Events' tab, accessible +

Finally there is a 'Combo' button in the 'Emulation Events' tab, accessible only when a Combo event has been selected from the list of events on the left. Clicking 'Combo' will show a dialog similar to the following:

@@ -4933,7 +4942,7 @@ Ms Pac-Man (Stella extended codes):  Type Description JoystickAtari's famous black joystick that was originally included with the system. Paddles Standard paddle controllers, only (up to 8) fire buttons supported for QuadTari. - DrivingLooks like a paddle, but allows 360� movement. Only one unit per connector, unlike paddles which were sold in pairs. + DrivingLooks like a paddle, but allows 360° movement. Only one unit per connector, unlike paddles which were sold in pairs. AtariVoxA SpeakJet based unlimited-vocabulary speech/sound synthesizer with 32K EEPROM. SaveKeyA 32K EEPROM for saving high scores, etc. (the EEPROM portion of an AtariVox). diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index a10f6ea4b..ad1e9d1d7 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -3306,9 +3306,8 @@ EventHandler::MenuActionList EventHandler::ourMenuActionList = { { { Event::UIPrevDir, "Parent directory", "" }, { Event::ToggleFullScreen, "Toggle fullscreen", "" }, - { Event::Quit, "Quit", "" }, - { Event::UIHelp, "Help" "" } - + { Event::UIHelp, "Help" "" }, + { Event::Quit, "Quit", "" } } }; // Event groups diff --git a/src/gui/ComboDialog.cxx b/src/gui/ComboDialog.cxx index fe9ed3565..f2c1f155c 100644 --- a/src/gui/ComboDialog.cxx +++ b/src/gui/ComboDialog.cxx @@ -73,6 +73,8 @@ ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font, addDefaultsOKCancelBGroup(wid, font); addToFocusList(wid); + + setHelpAnchor("Combo"); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/QuadTariDialog.cxx b/src/gui/QuadTariDialog.cxx index be5821a71..1fc695b53 100644 --- a/src/gui/QuadTariDialog.cxx +++ b/src/gui/QuadTariDialog.cxx @@ -91,6 +91,8 @@ QuadTariDialog::QuadTariDialog(GuiObject* boss, const GUI::Font& font, int max_w addDefaultsOKCancelBGroup(wid, _font); addBGroupToFocusList(wid); + + setHelpAnchor("Quadtari"); } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -