//
// configdialog.cpp - Configuration dialog
//
-// by James L. Hammons
+// by James Hammons
// (C) 2010 Underground Software
//
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
//
// Who When What
// --- ---------- -------------------------------------------------------------
// JLH 01/29/2010 Created this file
// JLH 06/23/2011 Added initial implementation
+// JLH 10/14/2011 Fixed possibly missing final slash in paths
//
#include "configdialog.h"
generalTab->edit4->setText(vjs.ROMPath);
generalTab->useBIOS->setChecked(vjs.useJaguarBIOS);
+ generalTab->useGPU->setChecked(vjs.GPUEnabled);
generalTab->useDSP->setChecked(vjs.DSPEnabled);
generalTab->useHostAudio->setChecked(vjs.audioEnabled);
for(int i=0; i<21; 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];
}
{
strcpy(vjs.jagBootPath, generalTab->edit1->text().toAscii().data());
strcpy(vjs.CDBootPath, generalTab->edit2->text().toAscii().data());
- strcpy(vjs.EEPROMPath, generalTab->edit3->text().toAscii().data());
- strcpy(vjs.ROMPath, generalTab->edit4->text().toAscii().data());
+ strcpy(vjs.EEPROMPath, CheckForTrailingSlash(
+ generalTab->edit3->text()).toAscii().data());
+ strcpy(vjs.ROMPath, CheckForTrailingSlash(
+ generalTab->edit4->text()).toAscii().data());
vjs.useJaguarBIOS = generalTab->useBIOS->isChecked();
+ vjs.GPUEnabled = generalTab->useGPU->isChecked();
vjs.DSPEnabled = generalTab->useDSP->isChecked();
vjs.audioEnabled = generalTab->useHostAudio->isChecked();
for(int i=0; i<21; 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];
}
}
+
+QString ConfigDialog::CheckForTrailingSlash(QString s)
+{
+ if (!s.endsWith('/') && !s.endsWith('\\'))
+ s.append('/');
+
+ return s;
+}