X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fconfigdialog.cpp;fp=src%2Fgui%2Fconfigdialog.cpp;h=4107e6b6748020d9c9cff6f9bc3e199da8346b23;hb=62b541c6c09933ea0daf800ecd86467f6f15b584;hp=23b2008adbfa0ed8cd34d592f0707723efa21dfd;hpb=0c9f3744f0129a95e60bb886073b65144ba31a22;p=virtualjaguar

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 23b2008..4107e6b 100644
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -24,13 +24,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 +50,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()
@@ -74,7 +77,10 @@ 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];
+	}
 }
 
 void ConfigDialog::UpdateVJSettings(void)
@@ -96,5 +102,8 @@ 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];
+	}
 }