[Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.45,1.46 options.h,1.14,1.15

[James Brown]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv4361/gui

Modified Files:
	options.cpp options.h 
Log Message:
Launcher subtitles checkbox (is Sound the right place for this? I dunno..)


Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- options.cpp	16 Jan 2004 16:28:56 -0000	1.45
+++ options.cpp	17 Jan 2004 13:21:15 -0000	1.46
@@ -58,7 +58,7 @@
 	_enableGraphicSettings(false),
 	_gfxPopUp(0), _fullscreenCheckbox(0), _aspectCheckbox(0),
 	_enableAudioSettings(false),
-	_multiMidiCheckbox(0), _mt32Checkbox(0),
+	_multiMidiCheckbox(0), _mt32Checkbox(0), _subCheckbox(0),
 	_enableVolumeSettings(false),
 	_masterVolumeSlider(0), _masterVolumeLabel(0),
 	_musicVolumeSlider(0), _musicVolumeLabel(0),
@@ -120,6 +120,9 @@
 
 		// Native mt32 setting
 		_mt32Checkbox->setState(ConfMan.getBool("native_mt32", _domain));
+
+		// Subtitles setting
+		_subCheckbox->setState(ConfMan.getBool("subtitles", _domain));
 	}
 
 	if (_masterVolumeSlider) {
@@ -171,7 +174,7 @@
 			if (_enableAudioSettings) {
 				ConfMan.set("multi_midi", _multiMidiCheckbox->getState(), _domain);
 				ConfMan.set("native_mt32", _mt32Checkbox->getState(), _domain);
-
+				ConfMan.set("subtitles", _subCheckbox->getState(), _domain); 
 				const MidiDriverDescription *md = getAvailableMidiDrivers();
 				while (md->name && md->id != (int)_midiPopUp->getSelectedTag())
 					md++;
@@ -183,6 +186,7 @@
 				ConfMan.removeKey("multi_midi", _domain);
 				ConfMan.removeKey("native_mt32", _domain);
 				ConfMan.removeKey("music_driver", _domain);
+				ConfMan.removeKey("subtitles", _domain); 
 			}
 		}
 
@@ -230,6 +234,7 @@
 	_midiPopUp->setEnabled(enabled);
 	_multiMidiCheckbox->setEnabled(enabled);
 	_mt32Checkbox->setEnabled(enabled);
+	_subCheckbox->setEnabled(enabled);
 }
 
 void OptionsDialog::setVolumeSettingsState(bool enabled) {
@@ -301,6 +306,10 @@
 	// Native mt32 setting
 	_mt32Checkbox = new CheckboxWidget(boss, x, yoffset, w, 16, "True Roland MT-32 (disable GM emulation)");
 	yoffset += 16;
+
+	// Subtitles on/off
+	_subCheckbox = new CheckboxWidget(boss, x, yoffset, w, 16, "Display subtitles");
+	yoffset += 16;
 	
 	_enableAudioSettings = true;
 

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- options.h	6 Jan 2004 12:45:29 -0000	1.14
+++ options.h	17 Jan 2004 13:21:15 -0000	1.15
@@ -70,12 +70,13 @@
 	CheckboxWidget *_aspectCheckbox;
 
 	//
-	// MIDI controls
+	// Audio controls
 	//
 	bool _enableAudioSettings;
 	PopUpWidget *_midiPopUp;
 	CheckboxWidget *_multiMidiCheckbox;
 	CheckboxWidget *_mt32Checkbox;
+	CheckboxWidget *_subCheckbox;
 
 	//
 	// Volume controls