First stab at adding translations. Translators needed! :-)

[virtualjaguar] / src / gui / configdialog.cpp

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 8ee3ce175fb95a1a3ec2c2204d4abe636fa7128e..1c8936796b0cd9b82eb2bbb35aed7406e0841786 100644 (file)
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -1,15 +1,16 @@
 //
 // 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"
@@ -55,21 +56,24 @@ ConfigDialog::ConfigDialog(QWidget * parent/*= 0*/): QDialog(parent)
 //     controllerTab2->UpdateLabel();                          // Now it's safe to do this... ;-)
 }
 
+
 ConfigDialog::~ConfigDialog()
 {
 }
 
+
 void ConfigDialog::LoadDialogFromSettings(void)
 {
-       generalTab->edit1->setText(vjs.jagBootPath);
-       generalTab->edit2->setText(vjs.CDBootPath);
+//     generalTab->edit1->setText(vjs.jagBootPath);
+//     generalTab->edit2->setText(vjs.CDBootPath);
        generalTab->edit3->setText(vjs.EEPROMPath);
        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);
+       generalTab->useFullScreen->setChecked(vjs.fullscreen);
+//     generalTab->useHostAudio->setChecked(vjs.audioEnabled);
 
        if (vjs.hardwareTypeAlpine)
        {
@@ -80,24 +84,26 @@ void ConfigDialog::LoadDialogFromSettings(void)
 
        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];
        }
 }
 
+
 void ConfigDialog::UpdateVJSettings(void)
 {
-       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.jagBootPath, generalTab->edit1->text().toAscii().data());
+//     strcpy(vjs.CDBootPath,  generalTab->edit2->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();
+       vjs.fullscreen    = generalTab->useFullScreen->isChecked();
+//     vjs.audioEnabled  = generalTab->useHostAudio->isChecked();
 
        if (vjs.hardwareTypeAlpine)
        {
@@ -108,9 +114,16 @@ void ConfigDialog::UpdateVJSettings(void)
 
        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;
+}