[Scummvm-cvs-logs] SF.net SVN: scummvm: [25568] scummvm/trunk/gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Feb 13 22:41:50 CET 2007
Revision: 25568
http://scummvm.svn.sourceforge.net/scummvm/?rev=25568&view=rev
Author: sev
Date: 2007-02-13 13:41:49 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
Disable clear soundfont path button when path is not selected.
Modified Paths:
--------------
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/options.cpp
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2007-02-13 21:41:43 UTC (rev 25567)
+++ scummvm/trunk/gui/launcher.cpp 2007-02-13 21:41:49 UTC (rev 25568)
@@ -392,6 +392,12 @@
// User made this choice...
FilesystemNode file(browser.getResult());
_soundFont->setLabel(file.path());
+
+ if (!file.path().empty() && (file.path() != "None"))
+ _soundFontClearButton->setEnabled(true);
+ else
+ _soundFontClearButton->setEnabled(false);
+
draw();
}
break;
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2007-02-13 21:41:43 UTC (rev 25567)
+++ scummvm/trunk/gui/options.cpp 2007-02-13 21:41:49 UTC (rev 25568)
@@ -205,10 +205,13 @@
_enableGSCheckbox->setState(ConfMan.getBool("enable_gs", _domain));
String soundFont(ConfMan.get("soundfont", _domain));
- if (soundFont.empty() || !ConfMan.hasKey("soundfont", _domain))
+ if (soundFont.empty() || !ConfMan.hasKey("soundfont", _domain)) {
_soundFont->setLabel("None");
- else
+ _soundFontClearButton->setEnabled(false);
+ } else {
_soundFont->setLabel(soundFont);
+ _soundFontClearButton->setEnabled(true);
+ }
// MIDI gain setting
char buf[10];
@@ -448,7 +451,12 @@
_soundFontButton->setEnabled(enabled);
_soundFont->setEnabled(enabled);
- _soundFontClearButton->setEnabled(enabled);
+
+ if (enabled && !_soundFont->getLabel().empty() && (_soundFont->getLabel() != "None"))
+ _soundFontClearButton->setEnabled(enabled);
+ else
+ _soundFontClearButton->setEnabled(false);
+
_multiMidiCheckbox->setEnabled(enabled);
_mt32Checkbox->setEnabled(enabled);
_enableGSCheckbox->setEnabled(enabled);
@@ -827,12 +835,19 @@
// User made his choice...
FilesystemNode file(browser.getResult());
_soundFont->setLabel(file.path());
+
+ if (!file.path().empty() && (file.path() != "None"))
+ _soundFontClearButton->setEnabled(true);
+ else
+ _soundFontClearButton->setEnabled(false);
+
draw();
}
break;
}
case kClearSoundFontCmd: {
_soundFont->setLabel("None");
+ _soundFontClearButton->setEnabled(false);
draw();
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list