Fixed updated joystick handling, first major stab at gamepad profiles.

[virtualjaguar] / src / gui / configdialog.cpp

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 1c8936796b0cd9b82eb2bbb35aed7406e0841786..752713bde6998e163e5597350d97d4e96e634eec 100644 (file)
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -22,22 +22,28 @@
 #include "settings.h"
 
 
-ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
+ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent),
+       tabWidget(new QTabWidget),
+       generalTab(new GeneralTab(this)),
+       controllerTab1(new ControllerTab(this))
 {
-       tabWidget = new QTabWidget;
-       generalTab = new GeneralTab(this);
-       controllerTab1 = new ControllerTab(this);
-       controllerTab2 = new ControllerTab(this);
+//     tabWidget = new QTabWidget;
+//     generalTab = new GeneralTab(this);
+//     controllerTab1 = new ControllerTab(this);
+////   controllerTab2 = new ControllerTab(this);
 
-       if (vjs.hardwareTypeAlpine)
-               alpineTab = new AlpineTab(this);
+//     if (vjs.hardwareTypeAlpine)
+//             alpineTab = new AlpineTab(this);
 
        tabWidget->addTab(generalTab, tr("General"));
-       tabWidget->addTab(controllerTab1, tr("Controller #1"));
-       tabWidget->addTab(controllerTab2, tr("Controller #2"));
+       tabWidget->addTab(controllerTab1, tr("Controllers"));
+//     tabWidget->addTab(controllerTab2, tr("Controller #2"));
 
        if (vjs.hardwareTypeAlpine)
+       {
+               alpineTab = new AlpineTab(this);
                tabWidget->addTab(alpineTab, tr("Alpine"));
+       }
 
        buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
@@ -50,10 +56,7 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
        setLayout(mainLayout);
 
        setWindowTitle(tr("Virtual Jaguar Settings"));
-
        LoadDialogFromSettings();
-//     controllerTab1->UpdateLabel();                          // Now it's safe to do this... ;-)
-//     controllerTab2->UpdateLabel();                          // Now it's safe to do this... ;-)
 }
 
 
@@ -82,11 +85,15 @@ void ConfigDialog::LoadDialogFromSettings(void)
                alpineTab->writeROM->setChecked(vjs.allowWritesToROM);
        }
 
+#warning "!!! Need to load settings from controller profile !!!"
+#if 0
        for(int i=0; i<21; i++)
        {
+// We need to find the right profile and load it up here...
                controllerTab1->controllerWidget->keys[i] = vjs.p1KeyBindings[i];
-               controllerTab2->controllerWidget->keys[i] = vjs.p2KeyBindings[i];
+//             controllerTab2->controllerWidget->keys[i] = vjs.p2KeyBindings[i];
        }
+#endif
 }
 
 
@@ -112,10 +119,12 @@ void ConfigDialog::UpdateVJSettings(void)
                vjs.allowWritesToROM = alpineTab->writeROM->isChecked();
        }
 
+#warning "!!! Need to save settings to controller profile !!!"
        for(int i=0; i<21; i++)
        {
+// We need to find the right profile and load it up here...
                vjs.p1KeyBindings[i] = controllerTab1->controllerWidget->keys[i];
-               vjs.p2KeyBindings[i] = controllerTab2->controllerWidget->keys[i];
+//             vjs.p2KeyBindings[i] = controllerTab2->controllerWidget->keys[i];
        }
 }