#include "configdialog.h"
-#include "generaltab.h"
-#include "controllertab.h"
#include "alpinetab.h"
+#include "controllertab.h"
+#include "controllerwidget.h"
+#include "generaltab.h"
#include "settings.h"
setWindowTitle(tr("Virtual Jaguar Settings"));
LoadDialogFromSettings();
- controllerTab1->UpdateLabel(); // Now it's safe to do this... ;-)
- controllerTab2->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()
for(int i=0; i<21; i++)
{
- controllerTab1->p1Keys[i] = vjs.p1KeyBindings[i];
- controllerTab2->p1Keys[i] = vjs.p2KeyBindings[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];
}
}
for(int i=0; i<21; i++)
{
- vjs.p1KeyBindings[i] = controllerTab1->p1Keys[i];
- vjs.p2KeyBindings[i] = controllerTab2->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];
}
}