Ticket #3172: gui-volume-tab.patch
File gui-volume-tab.patch, 5.5 KB (added by , 17 years ago) |
---|
-
gui/themes/modern.ini
223 223 Console.rightPadding=5 224 224 Console.topPadding=5 225 225 Console.bottomPadding=5 226 TabWidget.tabWidth= 85226 TabWidget.tabWidth=75 227 227 TabWidget.tabHeight=27 228 228 TabWidget.titleVPad=8 229 229 TabWidget.navButtonRightPad=3 … … 359 359 gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight 360 360 opYoffset=(opYoffset + buttonHeight + 6) 361 361 useWithPrefix=audioControls gameoptions_ 362 useWithPrefix=volumeControls gameoptions_363 362 useWithPrefix=subtitleControls gameoptions_ 364 363 364 # volume tab 365 opYoffset=vBorder 366 gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight 367 opYoffset=(opYoffset + buttonHeight + 6) 368 useWithPrefix=volumeControls gameoptions_ 369 365 370 # midi tab 366 371 opYoffset=vBorder 367 372 gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight … … 566 571 pix_checkbox_empty="checkbox_empty320.bmp" 567 572 pix_checkbox_checked="checkbox_checked320.bmp" 568 573 pix_cursor_image="cursor320.bmp" 569 def_volumeControlsInAudio=false570 574 571 575 # NES resoltuion 572 576 [256x240] … … 582 586 def_insetH=(h - 13 - insetY) 583 587 def_launcherVersionX=50 584 588 def_launcherVersionY=5 585 def_volumeControlsInAudio=false586 589 def_midiControlsSpacing=2 587 590 def_gameOptionsOverrideVPad=10 588 591 def_aboutXOff=3 -
gui/themes/classic080.ini
193 193 gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight 194 194 opYoffset=(opYoffset + buttonHeight) 195 195 useWithPrefix=audioControls gameoptions_ 196 useWithPrefix=volumeControls gameoptions_197 196 useWithPrefix=subtitleControls gameoptions_ 198 197 198 # volume tab 199 opYoffset=vBorder 200 gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight 201 opYoffset=(opYoffset + buttonHeight) 202 useWithPrefix=volumeControls gameoptions_ 203 199 204 # midi tab 200 205 opYoffset=vBorder 201 206 gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight … … 430 435 scummsaveload_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight 431 436 scummsaveload_choose=(prev.x2 + 10) prev.y prev.w prev.h 432 437 scummsaveload_extinfo.visible=false 433 def_volumeControlsInAudio=false434 438 435 439 # MM NES resolution 436 440 [256x240] … … 446 450 def_insetH=(h - 13 - insetY) 447 451 def_launcherVersionX=50 448 452 def_launcherVersionY=5 449 def_volumeControlsInAudio=false450 453 def_midiControlsSpacing=2 451 454 def_gameOptionsOverrideVPad=10 452 455 def_aboutXOff=3 -
gui/launcher.cpp
228 228 // 229 229 // 5) The volume tab 230 230 // 231 int volControlPos = g_gui.evaluator()->getVar("volumeControlsInAudio", true);231 tab->addTab("Volume"); 232 232 233 if (!volControlPos) { 234 tab->addTab("Volume"); 233 _globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0); 235 234 236 _globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);237 } else {238 // FIXME/TODO: It's unfortunate that you get a more fine grained control over which settings239 // are overriden and which are not when using the *smaller* resolution than with the bigger!240 // I guess we should simply offer the "volume override" checkbox in the big resolution, too.241 _globalVolumeOverride = NULL;242 }243 244 235 addVolumeControls(tab, "gameoptions_"); 245 236 246 237 // … … 317 308 318 309 void EditGameDialog::loadConfigToWidgets() { 319 310 int sel, i; 320 bool e , f;311 bool e; 321 312 322 313 OptionsDialog::loadConfigToWidgets(); 323 314 … … 333 324 ConfMan.hasKey("output_rate", _domain) || 334 325 ConfMan.hasKey("subtitles", _domain) || 335 326 ConfMan.hasKey("talkspeed", _domain); 327 _globalAudioOverride->setState(e); 336 328 337 f= ConfMan.hasKey("music_volume", _domain) ||329 e = ConfMan.hasKey("music_volume", _domain) || 338 330 ConfMan.hasKey("sfx_volume", _domain) || 339 331 ConfMan.hasKey("speech_volume", _domain); 332 _globalVolumeOverride->setState(e); 340 333 341 if (_globalVolumeOverride) {342 _globalAudioOverride->setState(e);343 _globalVolumeOverride->setState(f);344 } else {345 _globalAudioOverride->setState(e || f);346 }347 348 334 e = ConfMan.hasKey("soundfont", _domain) || 349 335 ConfMan.hasKey("multi_midi", _domain) || 350 336 ConfMan.hasKey("native_mt32", _domain) || -
gui/theme-config.cpp
274 274 "gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n" 275 275 "opYoffset=(opYoffset + buttonHeight)\n" 276 276 "useWithPrefix=audioControls gameoptions_\n" 277 "useWithPrefix=volumeControls gameoptions_\n"278 277 "useWithPrefix=subtitleControls gameoptions_\n" 279 278 "\n" 279 "# volume tab\n" 280 "opYoffset=vBorder\n" 281 "gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n" 282 "opYoffset=(opYoffset + buttonHeight)\n" 283 "useWithPrefix=volumeControls gameoptions_\n" 284 "\n" 280 285 "# midi tab\n" 281 286 "opYoffset=vBorder\n" 282 287 "gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight\n" … … 480 485 "def_insetH=(h - 13 - insetY)\n" 481 486 "def_launcherVersionX=50\n" 482 487 "def_launcherVersionY=5\n" 483 "def_volumeControlsInAudio=false\n"484 488 "def_midiControlsSpacing=2\n" 485 489 "def_gameOptionsOverrideVPad=10\n" 486 490 "def_aboutXOff=3\n"