X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fconfigdialog.cpp;h=42942f0eb7fb4022de7ea6744ef75811f94ec875;hb=240a6df48aebb5e17f82452c32e770cdfe9b5d5e;hp=752713bde6998e163e5597350d97d4e96e634eec;hpb=69effddb777c2009d32f70e3315d5570973446ef;p=virtualjaguar

diff --git a/src/gui/configdialog.cpp b/src/gui/configdialog.cpp
index 752713b..42942f0 100644
--- a/src/gui/configdialog.cpp
+++ b/src/gui/configdialog.cpp
@@ -7,7 +7,7 @@
 // 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
@@ -77,6 +77,7 @@ void ConfigDialog::LoadDialogFromSettings(void)
 	generalTab->useDSP->setChecked(vjs.DSPEnabled);
 	generalTab->useFullScreen->setChecked(vjs.fullscreen);
 //	generalTab->useHostAudio->setChecked(vjs.audioEnabled);
+	generalTab->useFastBlitter->setChecked(vjs.useFastBlitter);
 
 	if (vjs.hardwareTypeAlpine)
 	{
@@ -86,6 +87,7 @@ void ConfigDialog::LoadDialogFromSettings(void)
 	}
 
 #warning "!!! Need to load settings from controller profile !!!"
+// We do this now, but not here. Need to fix this...
 #if 0
 	for(int i=0; i<21; i++)
 	{
@@ -102,30 +104,34 @@ void ConfigDialog::UpdateVJSettings(void)
 //	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());
+		generalTab->edit3->text()).toUtf8().data());
 	strcpy(vjs.ROMPath,     CheckForTrailingSlash(
-		generalTab->edit4->text()).toAscii().data());
+		generalTab->edit4->text()).toUtf8().data());
 
-	vjs.useJaguarBIOS = generalTab->useBIOS->isChecked();
-	vjs.GPUEnabled    = generalTab->useGPU->isChecked();
-	vjs.DSPEnabled    = generalTab->useDSP->isChecked();
-	vjs.fullscreen    = generalTab->useFullScreen->isChecked();
-//	vjs.audioEnabled  = generalTab->useHostAudio->isChecked();
+	vjs.useJaguarBIOS  = generalTab->useBIOS->isChecked();
+	vjs.GPUEnabled     = generalTab->useGPU->isChecked();
+	vjs.DSPEnabled     = generalTab->useDSP->isChecked();
+	vjs.fullscreen     = generalTab->useFullScreen->isChecked();
+//	vjs.audioEnabled   = generalTab->useHostAudio->isChecked();
+	vjs.useFastBlitter = generalTab->useFastBlitter->isChecked();
 
 	if (vjs.hardwareTypeAlpine)
 	{
-		strcpy(vjs.alpineROMPath, alpineTab->edit1->text().toAscii().data());
-		strcpy(vjs.absROMPath,    alpineTab->edit2->text().toAscii().data());
+		strcpy(vjs.alpineROMPath, alpineTab->edit1->text().toUtf8().data());
+		strcpy(vjs.absROMPath,    alpineTab->edit2->text().toUtf8().data());
 		vjs.allowWritesToROM = alpineTab->writeROM->isChecked();
 	}
 
 #warning "!!! Need to save settings to controller profile !!!"
+// We do this now, but not here. Need to fix this...
+#if 0
 	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];
 	}
+#endif
 }