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

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index dc8a93a..1b3df54 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -1,22 +1,25 @@
 //
 // 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:
 //
 
 #include "about.h"
+#include "version.h"
+
 
 AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 {
@@ -26,18 +29,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("(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(
+		"<img src=':/res/vj_title_small.png' style='float: right'>"
 		"<table>"
-		"<tr><td align='right'><b>Version: </b></td><td>2.0.0</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>Version: </b></td><td>"
+		VJ_RELEASE_VERSION " (" VJ_RELEASE_SUBVERSION ")"
+		"</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, partycle, ggn,<br>neo-rg, Robert R, TheUMan, Dissection,<br>overridex, geormetal</td></tr>"
+		"<tr><td align='right'><b>Build Team: </b></td><td>shamus (win32)<br>goldenegg (MacOS)</td></tr>"
 		"<tr><td align='right'><b>Homepage: </b></td><td>http://icculus.org/virtualjaguar/</td></tr>"
 		"</table>"
 		"<br><br>"
@@ -45,10 +46,10 @@ 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>"
+		"<b>Curt Vendel</b> for various Jaguar & other goodies<br>"
 		"<b>Reboot</b> for reasons too numerous to mention<br>"
 		"<b>The Free Jaguar Project</b> (you know why) ;-)<br>"
 		"The guys over at <b>Atari Age</b> :-)<br>"
@@ -57,3 +58,10 @@ 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();
+}