Added preliminary M68K disassembly browser.

[virtualjaguar] / src / gui / about.cpp

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index d964ed5ece2eb18fce8d34fe0d0c922cbfc8bef9..14ccfd801395f6a0a388c19374e494cdaa90b6fd 100644 (file)
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -1,16 +1,17 @@
 //
 // about.cpp - Credits
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2010 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
 // JLH  01/21/2010  Created this file
 // JLH  01/22/2010  Fleshed out the credits a bit more
 // JLH  01/22/2010  Fixed centering and decorating of window
+// JLH  10/08/2011  Updated credits, added Esc & Return as exit keys
 //
 
 // STILL TO DO:
@@ -27,20 +28,16 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
        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("");
+       QString s;
        s.append(tr(
+               "<img src=':/res/vj_title_small.png' style='float: right'>"
                "<table>"
                "<tr><td align='right'><b>Version: </b></td><td>"
                VJ_RELEASE_VERSION " (" VJ_RELEASE_SUBVERSION ")"
                "</td></tr>"
-               "<tr><td align='right'><b>Coders: </b></td><td>James L. Hammons (shamus)<br>Niels Wagenaar (nwagenaar)<br>Carwin Jones (Caz)<br>Adam Green</td></tr>"
-               "<tr><td align='right'><b>Testers: </b></td><td>Guruma</td></tr>"
+               "<tr><td align='right'><b>Coders: </b></td><td>James Hammons (shamus)<br>Niels Wagenaar (nwagenaar)<br>Carwin Jones (Caz)<br>Adam Green</td></tr>"
+               "<tr><td align='right'><b>Testers: </b></td><td>Cyrano Jones, LinkoVitch, neo-rg, Robert R,<br>TheUMan, Dissection, overridex, geormetal</td></tr>"
+               "<tr><td align='right'><b>Build Team: </b></td><td>ggn (win32)<br>LinkoVitch, goldenegg (MacOS)</td></tr>"
                "<tr><td align='right'><b>Homepage: </b></td><td>http://icculus.org/virtualjaguar/</td></tr>"
                "</table>"
                "<br><br>"
@@ -48,7 +45,7 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
                "<br><br>"
                "<b>Aaron Giles</b> for the original CoJag sources<br>"
                "<b>David Raingeard</b> for the original Virtual Jaguar sources<br>"
-               "<b>Karl Stenerud</b> for his Musashi 68K emulator<br>"
+               "<b>Bernd Schmidt</b> for his UAE 68K emulator<br>"
                "<b>Sam Lantinga</b> for his amazing SDL libraries<br>"
                "<b>Ryan C. Gordon</b> for Virtual Jaguar's web presence<br>"
                "<b>Curt Vendel</b> for various Jaguar & other goodies (you <i>rock!</i>)<br>"
@@ -60,3 +57,9 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
        text = new QLabel(s);
        layout->addWidget(text);
 }
+
+void AboutWindow::keyPressEvent(QKeyEvent * e)
+{
+       if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Return)
+               hide();
+}