X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fconfigdialog.cpp;h=ab12b13f02631d9f94c311f9be957156b4a4c274;hb=0c6ed444bbb07e5cc0513a7d3075fb24d06e61eb;hp=26134121f8577e68a7761f79665695cd966185dc;hpb=4333fdb4f2f297db8272d2ebc8323028df8c105f;p=virtualjaguar

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 2613412..ab12b13 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,6 +51,8 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
 	setWindowTitle(tr("Virtual Jaguar Settings"));
 
 	LoadDialogFromSettings();
+//	controllerTab1->UpdateLabel();				// Now it's safe to do this... ;-)
+//	controllerTab2->UpdateLabel();				// Now it's safe to do this... ;-)
 }
 
 ConfigDialog::~ConfigDialog()
@@ -71,6 +76,14 @@ void ConfigDialog::LoadDialogFromSettings(void)
 		alpineTab->edit2->setText(vjs.absROMPath);
 		alpineTab->writeROM->setChecked(vjs.allowWritesToROM);
 	}
+
+	for(int i=0; i<21; 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)
@@ -90,4 +103,12 @@ void ConfigDialog::UpdateVJSettings(void)
 		strcpy(vjs.absROMPath,    alpineTab->edit2->text().toAscii().data());
 		vjs.allowWritesToROM = alpineTab->writeROM->isChecked();
 	}
+
+	for(int i=0; i<21; 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];
+	}
 }