X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fabout.cpp;h=71cec73ffad216747b191aa4fcc8b5c835f2d35d;hb=c9d57b57d70ab2ae842144828175820fb207a3b0;hp=bd3df4afc1cccf288e95ec44d03c411d6df9b703;hpb=90217c7d09fe1b0c7c78e911f3b0c90333f8f9c2;p=virtualjaguar

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index bd3df4a..71cec73 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -1,79 +1,66 @@
 //
 // 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()
+AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog)
 {
-	setWindowTitle("About Virtual Jaguar...");
+	setWindowTitle(tr("About Virtual Jaguar..."));
 
 	layout = new QVBoxLayout();
 	layout->setSizeConstraint(QLayout::SetFixedSize);
-//	layout->setMargin(Style::WindowMargin);
-//	layout->setSpacing(Style::WidgetSpacing);
 	setLayout(layout);
 
-//  logo = new Logo;
-//  logo->setFixedSize(600, 106);
-//  layout->addWidget(logo);
-	image = new QLabel();
-	image->setPixmap(QPixmap(":/res/vj_title_small.png"));
-//hrm, this doesn't work
-	layout->addWidget(image);
-
-	text = new QLabel(tr(
+	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>Author: </b></td><td>James L. Hammons & others</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>"
+		"<i>The Virtual Jaguar team would like to express their gratitude to:</i>"
+		"<br><br>"
+		"<b>Aaron Giles</b> for the original CoJag sources<br>"
+		"<b>David Raingeard</b> for the original Virtual Jaguar sources<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<br>"
+		"<b>Reboot</b> for reasons too numerous to mention<br>"
+		"The guys over at <b>Atari Age</b> :-)<br>"
+		"<b>byuu</b> for <s>BSNES</s> Higan and showing us what was possible"
 	));
+	text = new QLabel(s);
 	layout->addWidget(text);
 }
 
 
-// Byuu's version...
-#if 0
-#include "about.moc"
-AboutWindow *aboutWindow;
-
-AboutWindow::AboutWindow() : QbWindow(config().geometry.aboutWindow) {
-  setObjectName("about-window");
-  setWindowTitle("About bsnes ...");
-
-  layout = new QVBoxLayout;
-  layout->setSizeConstraint(QLayout::SetFixedSize);
-  layout->setMargin(Style::WindowMargin);
-  layout->setSpacing(Style::WidgetSpacing);
-  setLayout(layout);
-
-  logo = new Logo;
-  logo->setFixedSize(600, 106);
-  layout->addWidget(logo);
-
-  info = new QLabel(string() <<
-    "<table>"
-    "<tr><td align='right'><b>Version: </b></td><td>" << bsnesVersion << "</td></tr>"
-    "<tr><td align='right'><b>Author: </b></td><td>byuu</td></tr>"
-    "<tr><td align='right'><b>Homepage: </b></td><td>http://byuu.org/</td></tr>"
-    "</table>"
-  );
-  layout->addWidget(info);
-}
-
-void AboutWindow::Logo::paintEvent(QPaintEvent*) {
-  QPainter painter(this);
-  QPixmap pixmap(":/logo.png");
-  painter.drawPixmap(0, 0, pixmap);
+void AboutWindow::keyPressEvent(QKeyEvent * e)
+{
+	if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Return)
+		hide();
 }
-#endif