[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.88.2.2,1.88.2.3 options.cpp,1.47.2.2,1.47.2.3 options.h,1.16,1.16.2.1
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun May 2 09:37:07 CEST 2004
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13901/gui
Modified Files:
Tag: branch-0-6-0
launcher.cpp options.cpp options.h
Log Message:
backported imuse digital from head cvs except save/load code
Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.88.2.2
retrieving revision 1.88.2.3
diff -u -d -r1.88.2.2 -r1.88.2.3
--- launcher.cpp 25 Mar 2004 23:28:57 -0000 1.88.2.2
+++ launcher.cpp 2 May 2004 16:36:03 -0000 1.88.2.3
@@ -225,7 +225,8 @@
e = ConfMan.hasKey("master_volume", _domain) ||
ConfMan.hasKey("music_volume", _domain) ||
- ConfMan.hasKey("sfx_volume", _domain);
+ ConfMan.hasKey("sfx_volume", _domain) ||
+ ConfMan.hasKey("speech_volume", _domain);
_globalVolumeOverride->setState(e);
// TODO: game path
Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.47.2.2
retrieving revision 1.47.2.3
diff -u -d -r1.47.2.2 -r1.47.2.3
--- options.cpp 17 Mar 2004 00:08:15 -0000 1.47.2.2
+++ options.cpp 2 May 2004 16:36:03 -0000 1.47.2.3
@@ -49,6 +49,7 @@
kMasterVolumeChanged = 'mavc',
kMusicVolumeChanged = 'muvc',
kSfxVolumeChanged = 'sfvc',
+ kSpeechVolumeChanged = 'vcvc',
kChooseSaveDirCmd = 'chos'
};
@@ -62,7 +63,8 @@
_enableVolumeSettings(false),
_masterVolumeSlider(0), _masterVolumeLabel(0),
_musicVolumeSlider(0), _musicVolumeLabel(0),
- _sfxVolumeSlider(0), _sfxVolumeLabel(0) {
+ _sfxVolumeSlider(0), _sfxVolumeLabel(0),
+ _speechVolumeSlider(0), _speechVolumeLabel(0) {
}
@@ -141,6 +143,10 @@
vol = ConfMan.getInt("sfx_volume", _domain);
_sfxVolumeSlider->setValue(vol);
_sfxVolumeLabel->setValue(vol);
+
+ vol = ConfMan.getInt("speech_volume", _domain);
+ _speechVolumeSlider->setValue(vol);
+ _speechVolumeLabel->setValue(vol);
}
}
@@ -165,10 +171,12 @@
ConfMan.set("master_volume", _masterVolumeSlider->getValue(), _domain);
ConfMan.set("music_volume", _musicVolumeSlider->getValue(), _domain);
ConfMan.set("sfx_volume", _sfxVolumeSlider->getValue(), _domain);
+ ConfMan.set("speech_volume", _speechVolumeSlider->getValue(), _domain);
} else {
ConfMan.removeKey("master_volume", _domain);
ConfMan.removeKey("music_volume", _domain);
ConfMan.removeKey("sfx_volume", _domain);
+ ConfMan.removeKey("speech_volume", _domain);
}
}
@@ -213,6 +221,10 @@
_sfxVolumeLabel->setValue(_sfxVolumeSlider->getValue());
_sfxVolumeLabel->draw();
break;
+ case kSpeechVolumeChanged:
+ _speechVolumeLabel->setValue(_speechVolumeSlider->getValue());
+ _speechVolumeLabel->draw();
+ break;
case kOKCmd:
setResult(1);
close();
@@ -250,6 +262,8 @@
_musicVolumeLabel->setEnabled(enabled);
_sfxVolumeSlider->setEnabled(enabled);
_sfxVolumeLabel->setEnabled(enabled);
+ _speechVolumeSlider->setEnabled(enabled);
+ _speechVolumeLabel->setEnabled(enabled);
}
int OptionsDialog::addGraphicControls(GuiObject *boss, int yoffset) {
@@ -346,6 +360,12 @@
_sfxVolumeLabel->setFlags(WIDGET_CLEARBG);
yoffset += 16;
+ _speechVolumeSlider = new SliderWidget(boss, 5, yoffset, 185, 12, "Speech volume: ", 100, kSpeechVolumeChanged);
+ _speechVolumeLabel = new StaticTextWidget(boss, 200, yoffset + 2, 24, kLineHeight, "100%", kTextAlignLeft);
+ _speechVolumeSlider->setMinValue(0); _speechVolumeSlider->setMaxValue(255);
+ _speechVolumeLabel->setFlags(WIDGET_CLEARBG);
+ yoffset += 16;
+
_enableVolumeSettings = true;
return yoffset;
@@ -355,9 +375,9 @@
GlobalOptionsDialog::GlobalOptionsDialog(GameDetector &detector)
- : OptionsDialog(Common::ConfigManager::kApplicationDomain, 10, 20, 320 - 2 * 10, 200 - 2 * 20) {
+ : OptionsDialog(Common::ConfigManager::kApplicationDomain, 10, 20, 320 - 2 * 10, 200 - 1 * 20) {
- const int vBorder = 5;
+ const int vBorder = 4;
int yoffset;
// The tab widget
Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- options.h 5 Feb 2004 11:59:05 -0000 1.16
+++ options.h 2 May 2004 16:36:03 -0000 1.16.2.1
@@ -90,6 +90,9 @@
SliderWidget *_sfxVolumeSlider;
StaticTextWidget *_sfxVolumeLabel;
+
+ SliderWidget *_speechVolumeSlider;
+ StaticTextWidget *_speechVolumeLabel;
};
More information about the Scummvm-git-logs
mailing list