X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=48411906dec629ebe3ede9591305b07a8a4c41f5;hb=2e3a9a7467a1740dff9985203f10f7bae01c9d0d;hp=3ff3ded3283fe0dab0fc07f9640773ccac40aee1;hpb=2136446c0d38d00a651d3eb665ee564b18f94b28;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 3ff3ded..4841190 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -35,6 +35,7 @@
 #include "SDL.h"
 #include "glwidget.h"
 #include "about.h"
+#include "help.h"
 #include "settings.h"
 #include "filepicker.h"
 #include "configdialog.h"
@@ -95,6 +96,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 	setWindowTitle(title);
 
 	aboutWin = new AboutWindow(this);
+	helpWin = new HelpWindow(this);
 	filePickWin = new FilePickerWindow(this);
 
     videoWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -161,6 +163,10 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 	aboutAct->setStatusTip(tr("Blatant self-promotion"));
 	connect(aboutAct, SIGNAL(triggered()), this, SLOT(ShowAboutWin()));
 
+	helpAct = new QAction(QIcon(":/res/vj-icon.png"), tr("&Contents..."), this);
+	helpAct->setStatusTip(tr("Help is available, if you should need it"));
+	connect(helpAct, SIGNAL(triggered()), this, SLOT(ShowHelpWin()));
+
 	filePickAct = new QAction(QIcon(":/res/software.png"), tr("&Insert Cartridge..."), this);
 	filePickAct->setStatusTip(tr("Insert a cartridge into Virtual Jaguar"));
 	filePickAct->setShortcut(QKeySequence(tr("Ctrl+i")));
@@ -192,6 +198,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 	fileMenu->addAction(quitAppAct);
 
 	helpMenu = menuBar()->addMenu(tr("&Help"));
+	helpMenu->addAction(helpAct);
 	helpMenu->addAction(aboutAct);
 
 	toolbar = addToolBar(tr("Stuff"));
@@ -548,6 +555,11 @@ void MainWin::ShowAboutWin(void)
 	aboutWin->show();
 }
 
+void MainWin::ShowHelpWin(void)
+{
+	helpWin->show();
+}
+
 void MainWin::InsertCart(void)
 {
 	// If the emulator is running, we pause it here and unpause it later