X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=60e7fbda2f303502ea7141d2ff08d780b333caf1;hb=a837ec444729b2f195506e66a36fe4954741725f;hp=1435d97a56e978e59ec8c8dd4702769346fa34bd;hpb=ea10984eaf09364d9f6e08114caa4bcfcaa72d9e;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 1435d97..60e7fbd 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -26,15 +26,13 @@
 #include "mainwin.h"
 
 #include "SDL.h"
-//#include <QtGui>
-//#include <QtOpenGL>
 #include "glwidget.h"
 #include "about.h"
 #include "settings.h"
 #include "filepicker.h"
+#include "configdialog.h"
 
 #include "jaguar.h"
-#include "video.h"
 #include "tom.h"
 #include "log.h"
 #include "file.h"
@@ -146,6 +144,10 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 	filePickAct->setStatusTip(tr("Insert a cartridge into Virtual Jaguar"));
 	connect(filePickAct, SIGNAL(triggered()), this, SLOT(InsertCart()));
 
+	configAct = new QAction(QIcon(":/res/generic.png"), tr("&Configure"), this);
+	configAct->setStatusTip(tr("Configure options for Virtual Jaguar"));
+	connect(configAct, SIGNAL(triggered()), this, SLOT(Configure()));
+
 	// Misc. connections...
 	connect(filePickWin, SIGNAL(RequestLoad(QString)), this, SLOT(LoadSoftware(QString)));
 
@@ -155,6 +157,7 @@ MainWin::MainWin(): running(false), powerButtonOn(false), showUntunedTankCircuit
 	fileMenu->addAction(filePickAct);
 	fileMenu->addAction(powerAct);
 	fileMenu->addAction(pauseAct);
+	fileMenu->addAction(configAct);
 	fileMenu->addAction(quitAppAct);
 
 	helpMenu = menuBar()->addMenu(tr("&Help"));
@@ -294,6 +297,17 @@ void MainWin::Open(void)
 {
 }
 
+void MainWin::Configure(void)
+{
+	// Call the configuration dialog and update settings
+	ConfigDialog dlg(this);
+
+	if (dlg.exec() == false)
+		return;
+
+	dlg.UpdateVJSettings();
+}
+
 //
 // Here's the main emulator loop
 //