X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fabout.cpp;h=1e11561479f8a686703283f83682b8b2341cd49c;hb=ec46f1b3c40cf464d833e360346b4f6f8379b9ae;hp=dc8a93a1d5b28c645c5c4038317ec1d2daad22f6;hpb=0231914da63ed8c44751d7c7ef07f8e311ae0db1;p=virtualjaguar

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index dc8a93a..1e11561 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -11,12 +11,14 @@
 // 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:
 //
 
 #include "about.h"
+#include "version.h"
 
 AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 {
@@ -31,13 +33,15 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 	image->setPixmap(QPixmap(":/res/vj_title_small.png"));
 	layout->addWidget(image);
 
-//	QString s = QString(tr("(Last full build was on %1 %2)<br>")).arg(__DATE__).arg(__TIME__);
-	QString s = QString(tr("SVN %1<br>")).arg(__DATE__);
+	QString s;
 	s.append(tr(
 		"<table>"
-		"<tr><td align='right'><b>Version: </b></td><td>2.0.0</td></tr>"
+		"<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>Testers: </b></td><td>Cyrano Jones, Robert R, TheUMan, Dissection,<br>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>"
@@ -45,7 +49,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>"
@@ -57,3 +61,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();
+}