Added memory browser, fixed documentation, M68000 exception explanations.

[virtualjaguar] / src / gui / help.cpp

diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index cb4f2ebc0901fe8592a0ae7b22f8153929acab7a..3194f904b29022f0ae8859d40741bfae05863e60 100644 (file)
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -1,14 +1,15 @@
 //
 // help.cpp - Help file
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2011 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
 // JLH  08/01/2011  Created this file
+// JLH  10/08/2011  Added Esc & Return as exit keys
 //
 
 // STILL TO DO:
@@ -16,58 +17,25 @@
 
 #include "help.h"
 
+
 HelpWindow::HelpWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 {
        setWindowTitle(tr("Virtual Jaguar Help"));
 
        // Need to set the size as well...
-//  resize(560, 480);
        resize(560, 480);
 
        layout = new QVBoxLayout();
-       layout->setSizeConstraint(QLayout::SetFixedSize);
+//     layout->setSizeConstraint(QLayout::SetFixedSize);
        setLayout(layout);
 
-//     image = new QLabel();
-//     image->setAlignment(Qt::AlignRight);
-//     image->setPixmap(QPixmap(":/res/vj_title_small.png"));
-//     layout->addWidget(image);
-
-//     QString s = QString(tr("SVN %1<br>")).arg(__DATE__);
-       QString s;// = QString("");
-       s.append(tr(
-               "<h1>Virtual Jaguar Documentation</h1>"
-               "<br><br>"
-               "<b><i>Coming soon!</i></b>"
-       ));
        text = new QTextBrowser;
-       text->setHtml(s);
+       text->setSource(QUrl("qrc:/res/help.html"));
        layout->addWidget(text);
 }
 
-
-#if 0
-#include "htmlviewer.moc"
-HtmlViewerWindow *htmlViewerWindow;
-
-HtmlViewerWindow::HtmlViewerWindow() {
-  setObjectName("html-window");
-  resize(560, 480);
-  setGeometryString(&config().geometry.htmlViewerWindow);
-  application.windowList.add(this);
-
-  layout = new QVBoxLayout;
-  layout->setMargin(Style::WindowMargin);
-  layout->setSpacing(0);
-  setLayout(layout);
-
-  document = new QTextBrowser;
-  layout->addWidget(document);
-}
-
-void HtmlViewerWindow::show(const char *title, const char *htmlData) {
-  document->setHtml(string() << htmlData);
-  setWindowTitle(title);
-  Window::show();
+void HelpWindow::keyPressEvent(QKeyEvent * e)
+{
+       if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Return)
+               hide();
 }
-#endif