Ticket #8238: helpDialog.diff

scumm/dialogs.h

@@ -23 +23 @@
 
 #include "common/str.h"
 #include "gui/dialog.h"
+#include "help.h"
 
 class ListWidget;
 class Scumm;
@@ -37 +38 @@
 
         Scumm *_scumm;
 
+        Dialog *_helpDialog;
+
         void addResText(int x, int y, int w, int h, int resID);
 
         // Query a string from the resources
@@ -50 +53 @@
 class SaveLoadDialog : public ScummDialog {
 public:
         SaveLoadDialog(NewGui *gui, Scumm *scumm);
+        ~SaveLoadDialog();
         virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
         virtual void open();    
         virtual void close();
 
 protected:
-        ListWidget       *_savegameList;
+        ListWidget       *_savegameList;
 
         PushButtonWidget *_saveButton;
         PushButtonWidget *_loadButton;
@@ -72 +76 @@
 class AboutDialog : public ScummDialog {
 public:
         AboutDialog(NewGui *gui, Scumm *scumm);
+};
+
+class HelpDialog : public ScummDialog {
+public:
+        HelpDialog(NewGui *gui, Scumm *scumm);
+        virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+
+protected:
+        typedef ScummVM::String String;
+
+        PushButtonWidget *_nextButton;
+        PushButtonWidget *_prevButton;
+
+        StaticTextWidget *_title;
+        StaticTextWidget *_key[HELP_NUM_LINES];
+        StaticTextWidget *_dsc[HELP_NUM_LINES];
+
+        int _page;
+        int _numPages;
+
+        byte _gameId;
+
+        void displayKeyBindings();
 };
 
 class OptionsDialog : public ScummDialog {

scumm/dialogs.cpp

@@ -25 +25 @@
 #include "scumm.h"
 #include "imuse.h"
 #include "verbs.h"
+#include "help.h"
 
 #include "gui/newgui.h"
 #include "gui/ListWidget.h"
@@ -78 +79 @@
         "Map",                                                                                          //24
         "Choose an action to map",                                                      //25
         "Press the key to associate",                                           //26
-        "Please select an action"                                                       //27
+        "Please select an action",                                                      //27
+        "Help"                                                                          //28
 };
 
 #ifdef __PALM_OS__
@@ -219 +221 @@
         kLoadCmd = 'LOAD',
         kPlayCmd = 'PLAY',
         kOptionsCmd = 'OPTN',
-        kQuitCmd = 'QUIT'
+        kQuitCmd = 'QUIT',
+        kHelpCmd = 'HELP',
 };
 
 SaveLoadDialog::SaveLoadDialog(NewGui *gui, Scumm *scumm)
@@ -234 +237 @@
         _loadButton = addPushButton(x, 40, queryResString(5), kLoadCmd, 'L');
         addButton(x, 60, queryResString(6), kPlayCmd, 'P');     // Play
         addButton(x, 80, queryCustomString(17), kOptionsCmd, 'O');      // Options
-        addButton(x, 100, queryResString(8), kQuitCmd, 'Q');    // Quit
+        addButton(x, 100, queryCustomString(28), kHelpCmd, 'H');        // Help
+        addButton(x, 120, queryResString(8), kQuitCmd, 'Q');    // Quit
 
         // The save game list
         _savegameList = new ListWidget(this, 8, 20, x - 14, 134);
+
+        _helpDialog = new HelpDialog(gui, scumm);
+}
+
+SaveLoadDialog::~SaveLoadDialog() {
+        delete _helpDialog;
 }
 
 void SaveLoadDialog::open() {
@@ -296 +306 @@
         case kOptionsCmd:
                 _scumm->optionsDialog();
                 break;
+        case kHelpCmd:
+                _helpDialog->runModal();
+                break;
         case kQuitCmd:
 #ifdef __PALM_OS__
                 close();
@@ -553 +566 @@
         new StaticTextWidget(this, 10, 50, 240, 16, "All games (c) LucasArts", kTextAlignCenter);
         new StaticTextWidget(this, 10, 64, 240, 16, "Except", kTextAlignCenter);
         new StaticTextWidget(this, 10, 78, 240, 16, "Simon the Sorcerer (c) Adventuresoft", kTextAlignCenter);
+}
+
+#pragma mark -
+
+enum {
+        kNextCmd = 'NEXT',
+        kPrevCmd = 'PREV'
+};
+
+HelpDialog::HelpDialog(NewGui *gui, Scumm *scumm)
+        : ScummDialog(gui, scumm, 20, 10, 280, 184) {
+
+        _page = 1;
+        _gameId = scumm->_gameId;
+        _numPages = ScummHelp::numPages(_gameId);
+
+        _prevButton = addPushButton(10, 160, "Previous", kPrevCmd, 'P');
+        _nextButton = addPushButton(90, 160, "Next", kNextCmd, 'N');
+        addButton(200, 160, "Close", kCloseCmd, 'C');
+        _prevButton->clearFlags(WIDGET_ENABLED);
+
+        _title = new StaticTextWidget(this, 10, 5, 260, 16, "", kTextAlignCenter);
+        for (int i = 0; i < HELP_NUM_LINES; i++) {
+                _key[i] = new StaticTextWidget(this, 10, 20 + (10 * i), 70, 16, "", kTextAlignLeft);
+                _dsc[i] = new StaticTextWidget(this, 80, 20 + (10 * i), 190, 16, "", kTextAlignLeft);
+        }
+
+        displayKeyBindings();
+}
+
+void HelpDialog::displayKeyBindings() {
+        String titleStr, *keyStr, *dscStr;
+
+        ScummHelp::updateStrings(_gameId, _page, titleStr, keyStr, dscStr);
+
+        _title->setLabel(titleStr);
+        for (int i = 0; i < HELP_NUM_LINES; i++) {
+                _key[i]->setLabel(keyStr[i]);
+                _dsc[i]->setLabel(dscStr[i]);
+        }
+
+        delete [] keyStr;
+        delete [] dscStr;
+}
+
+void HelpDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+        switch (cmd) {
+        case kNextCmd:
+                _page++;
+                if (_page >= _numPages) {
+                        _nextButton->clearFlags(WIDGET_ENABLED);
+                }
+                if (_page >= 2) {
+                        _prevButton->setFlags(WIDGET_ENABLED);
+                }
+                displayKeyBindings();
+                draw();
+                break;
+        case kPrevCmd:
+                _page--;
+                if (_page <= _numPages) {
+                        _nextButton->setFlags(WIDGET_ENABLED);
+                }
+                if (_page <= 1) {
+                        _prevButton->clearFlags(WIDGET_ENABLED);
+                }
+                displayKeyBindings();
+                draw();
+                break;
+        default:
+                ScummDialog::handleCommand(sender, cmd, data);
+        }
 }
 
 #pragma mark -