Hooked up the UI/frontend controller #2 to the Jaguar core, final fixes to the

[virtualjaguar] / src / gui / configdialog.cpp

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 23b2008adbfa0ed8cd34d592f0707723efa21dfd..ab12b13f02631d9f94c311f9be957156b4a4c274 100644 (file)
--- 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()
@@ -74,7 +78,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)
@@ -96,5 +105,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];
+       }
 }