X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fconfigdialog.cpp;h=8ee3ce175fb95a1a3ec2c2204d4abe636fa7128e;hb=a0f9dd93d237ed4d73e92fffc0f877f55ad14fdf;hp=23b2008adbfa0ed8cd34d592f0707723efa21dfd;hpb=b74298f2a4540168f8e4a2bbc9fc6fdc7f4afa57;p=virtualjaguar

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 23b2008..8ee3ce1 100644
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -14,9 +14,10 @@
 
 #include "configdialog.h"
 
-#include "generaltab.h"
-#include "controllertab.h"
 #include "alpinetab.h"
+#include "controllertab.h"
+#include "controllerwidget.h"
+#include "generaltab.h"
 #include "settings.h"
 
 
@@ -24,13 +25,15 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
 {
 	tabWidget = new QTabWidget;
 	generalTab = new GeneralTab(this);
-	controllerTab = new ControllerTab(this);
+	controllerTab1 = new ControllerTab(this);
+	controllerTab2 = new ControllerTab(this);
 
 	if (vjs.hardwareTypeAlpine)
 		alpineTab = new AlpineTab(this);
 
 	tabWidget->addTab(generalTab, tr("General"));
-	tabWidget->addTab(controllerTab, tr("Controller"));
+	tabWidget->addTab(controllerTab1, tr("Controller #1"));
+	tabWidget->addTab(controllerTab2, tr("Controller #2"));
 
 	if (vjs.hardwareTypeAlpine)
 		tabWidget->addTab(alpineTab, tr("Alpine"));
@@ -48,7 +51,8 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
 	setWindowTitle(tr("Virtual Jaguar Settings"));
 
 	LoadDialogFromSettings();
-	controllerTab->UpdateLabel();				// Now it's safe to do this... ;-)
+//	controllerTab1->UpdateLabel();				// Now it's safe to do this... ;-)
+//	controllerTab2->UpdateLabel();				// Now it's safe to do this... ;-)
 }
 
 ConfigDialog::~ConfigDialog()
@@ -63,6 +67,7 @@ void ConfigDialog::LoadDialogFromSettings(void)
 	generalTab->edit4->setText(vjs.ROMPath);
 
 	generalTab->useBIOS->setChecked(vjs.useJaguarBIOS);
+	generalTab->useGPU->setChecked(vjs.GPUEnabled);
 	generalTab->useDSP->setChecked(vjs.DSPEnabled);
 	generalTab->useHostAudio->setChecked(vjs.audioEnabled);
 
@@ -74,7 +79,12 @@ void ConfigDialog::LoadDialogFromSettings(void)
 	}
 
 	for(int i=0; i<21; i++)
-		controllerTab->p1Keys[i] = vjs.p1KeyBindings[i];
+	{
+//		controllerTab1->p1Keys[i] = vjs.p1KeyBindings[i];
+//		controllerTab2->p1Keys[i] = vjs.p2KeyBindings[i];
+		controllerTab1->controllerWidget->keys[i] = vjs.p1KeyBindings[i];
+		controllerTab2->controllerWidget->keys[i] = vjs.p2KeyBindings[i];
+	}
 }
 
 void ConfigDialog::UpdateVJSettings(void)
@@ -85,6 +95,7 @@ void ConfigDialog::UpdateVJSettings(void)
 	strcpy(vjs.ROMPath,     generalTab->edit4->text().toAscii().data());
 
 	vjs.useJaguarBIOS = generalTab->useBIOS->isChecked();
+	vjs.GPUEnabled    = generalTab->useGPU->isChecked();
 	vjs.DSPEnabled    = generalTab->useDSP->isChecked();
 	vjs.audioEnabled  = generalTab->useHostAudio->isChecked();
 
@@ -96,5 +107,10 @@ void ConfigDialog::UpdateVJSettings(void)
 	}
 
 	for(int i=0; i<21; i++)
-		vjs.p1KeyBindings[i] = controllerTab->p1Keys[i];
+	{
+//		vjs.p1KeyBindings[i] = controllerTab1->p1Keys[i];
+//		vjs.p2KeyBindings[i] = controllerTab2->p1Keys[i];
+		vjs.p1KeyBindings[i] = controllerTab1->controllerWidget->keys[i];
+		vjs.p2KeyBindings[i] = controllerTab2->controllerWidget->keys[i];
+	}
 }