X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fconfigdialog.cpp;h=23b2008adbfa0ed8cd34d592f0707723efa21dfd;hb=0c9f3744f0129a95e60bb886073b65144ba31a22;hp=3ee9a92108e31649770992c7022f113962a86460;hpb=786e438a8bcaf738b84ab79733015ea2b1f4bbb9;p=virtualjaguar diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp index 3ee9a92..23b2008 100644 --- a/src/gui/configdialog.cpp +++ b/src/gui/configdialog.cpp @@ -48,6 +48,7 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent) setWindowTitle(tr("Virtual Jaguar Settings")); LoadDialogFromSettings(); + controllerTab->UpdateLabel(); // Now it's safe to do this... ;-) } ConfigDialog::~ConfigDialog() @@ -68,8 +69,12 @@ void ConfigDialog::LoadDialogFromSettings(void) if (vjs.hardwareTypeAlpine) { alpineTab->edit1->setText(vjs.alpineROMPath); + alpineTab->edit2->setText(vjs.absROMPath); alpineTab->writeROM->setChecked(vjs.allowWritesToROM); } + + for(int i=0; i<21; i++) + controllerTab->p1Keys[i] = vjs.p1KeyBindings[i]; } void ConfigDialog::UpdateVJSettings(void) @@ -86,6 +91,10 @@ void ConfigDialog::UpdateVJSettings(void) if (vjs.hardwareTypeAlpine) { strcpy(vjs.alpineROMPath, alpineTab->edit1->text().toAscii().data()); + strcpy(vjs.absROMPath, alpineTab->edit2->text().toAscii().data()); vjs.allowWritesToROM = alpineTab->writeROM->isChecked(); } + + for(int i=0; i<21; i++) + vjs.p1KeyBindings[i] = controllerTab->p1Keys[i]; }