[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.117,1.118 options.cpp,1.79,1.80 options.h,1.29,1.30

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Mon May 16 19:59:44 CEST 2005


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29297

Modified Files:
	launcher.cpp options.cpp options.h 
Log Message:
Fixed the SoundFont button's behaviour in the Edit Game dialog.


Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- launcher.cpp	16 May 2005 00:38:30 -0000	1.117
+++ launcher.cpp	16 May 2005 06:33:33 -0000	1.118
@@ -65,6 +65,8 @@
 	kCmdGlobalMIDIOverride = 'OMID',
 	kCmdGlobalVolumeOverride = 'OVOL',
 
+	kCmdChooseSoundFontCmd = 'chsf',
+
 	kCmdExtraBrowser = 'PEXT',
 	kCmdGameBrowser = 'PGME',
 	kCmdSaveBrowser = 'PSAV'
@@ -375,6 +377,18 @@
 		draw();
 		break;
 
+	case kCmdChooseSoundFontCmd: {
+		BrowserDialog browser("Select SoundFont", false);
+
+		if (browser.runModal() > 0) {
+			// User made this choice...
+			FilesystemNode file(browser.getResult());
+			_soundFont->setLabel(file.path());
+			draw();
+		}
+		break;
+	}
+
 	// Change path for the game
 	case kCmdGameBrowser: {
 		BrowserDialog browser("Select additional game directory", true);

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- options.cpp	16 May 2005 00:38:30 -0000	1.79
+++ options.cpp	16 May 2005 06:33:33 -0000	1.80
@@ -291,6 +291,8 @@
 void OptionsDialog::setMIDISettingsState(bool enabled) {
 	_enableMIDISettings = enabled;
 
+	_soundFontButton->setEnabled(enabled);
+	_soundFont->setEnabled(enabled);
 	_multiMidiCheckbox->setEnabled(enabled);
 	_mt32Checkbox->setEnabled(enabled);
 	_enableGSCheckbox->setEnabled(enabled);
@@ -383,7 +385,7 @@
 	const int w = _w - 20;
 
 	// SoundFont
-	new ButtonWidget(boss, x, yoffset, kButtonWidth + 14, 16, "SoundFont: ", kChooseSoundFontCmd, 0);
+	_soundFontButton = new ButtonWidget(boss, x, yoffset, kButtonWidth + 14, 16, "SoundFont: ", kChooseSoundFontCmd, 0);
 	_soundFont = new StaticTextWidget(boss, x + kButtonWidth + 20, yoffset + 3, _w - (x + kButtonWidth + 20) - 10, kLineHeight, "None", kTextAlignLeft);
 	yoffset += 18;
 

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- options.h	22 Apr 2005 21:20:22 -0000	1.29
+++ options.h	16 May 2005 06:33:33 -0000	1.30
@@ -52,7 +52,8 @@
 protected:
 	/** Config domain this dialog is used to edit. */
 	String _domain;
-	
+
+	ButtonWidget *_soundFontButton;
 	StaticTextWidget *_soundFont;
 
 	int addGraphicControls(GuiObject *boss, int yoffset);





More information about the Scummvm-git-logs mailing list