[Scummvm-cvs-logs] scummvm master -> 5580072fe3ff0315713dd914ea201a13c557758a

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
40a663d589 GUI: Remove dummy FluidSynth Settings button from Edit Game.
5580072fe3 Merge pull request #715 from dudola/patch-1


Commit: 40a663d58990e309d7673fa64ab8b194aaac473b
    https://github.com/scummvm/scummvm/commit/40a663d58990e309d7673fa64ab8b194aaac473b
Author: dudola (kbdudola at gmail.com)
Date: 2016-04-01T11:22:09+05:30

Commit Message:
GUI: Remove dummy FluidSynth Settings button from Edit Game.

The FluidSynth Settings button actually works only from the Options dialog.
https://sourceforge.net/p/scummvm/bugs/6821/

Changed paths:
    gui/options.cpp



diff --git a/gui/options.cpp b/gui/options.cpp
index ba247e5..917c905 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -868,10 +868,6 @@ void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefi
 	_midiGainSlider->setMaxValue(1000);
 	_midiGainLabel = new StaticTextWidget(boss, prefix + "mcMidiGainLabel", "1.00");
 
-#ifdef USE_FLUIDSYNTH
-	new ButtonWidget(boss, prefix + "mcFluidSynthSettings", _("FluidSynth Settings"), 0, kFluidSynthSettingsCmd);
-#endif
-
 	_enableMIDISettings = true;
 }
 
@@ -1109,6 +1105,10 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 	_midiTabId = tab->addTab(_("MIDI"));
 	addMIDIControls(tab, "GlobalOptions_MIDI.");
 
+#ifdef USE_FLUIDSYNTH
+	new ButtonWidget(tab, "GlobalOptions_MIDI.mcFluidSynthSettings", _("FluidSynth Settings"), 0, kFluidSynthSettingsCmd);
+#endif
+
 	//
 	// 4) The MT-32 tab
 	//


Commit: 5580072fe3ff0315713dd914ea201a13c557758a
    https://github.com/scummvm/scummvm/commit/5580072fe3ff0315713dd914ea201a13c557758a
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2016-04-12T00:14:40+02:00

Commit Message:
Merge pull request #715 from dudola/patch-1

GUI: Remove dummy FluidSynth Settings button from Edit Game

Changed paths:
    gui/options.cpp