Ticket #3172: gui-volume-tab.patch

gui/themes/modern.ini

@@ -223 +223 @@
 Console.rightPadding=5
 Console.topPadding=5
 Console.bottomPadding=5
-TabWidget.tabWidth=85
+TabWidget.tabWidth=75
 TabWidget.tabHeight=27
 TabWidget.titleVPad=8
 TabWidget.navButtonRightPad=3
@@ -359 +359 @@
 gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=audioControls gameoptions_
-useWithPrefix=volumeControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
+# volume tab
+opYoffset=vBorder
+gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+opYoffset=(opYoffset + buttonHeight + 6)
+useWithPrefix=volumeControls gameoptions_
+
 # midi tab
 opYoffset=vBorder
 gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
@@ -566 +571 @@
 pix_checkbox_empty="checkbox_empty320.bmp"
 pix_checkbox_checked="checkbox_checked320.bmp"
 pix_cursor_image="cursor320.bmp"
-def_volumeControlsInAudio=false
 
 # NES resoltuion
 [256x240]
@@ -582 +586 @@
 def_insetH=(h - 13 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
-def_volumeControlsInAudio=false
 def_midiControlsSpacing=2
 def_gameOptionsOverrideVPad=10
 def_aboutXOff=3

gui/themes/classic080.ini

@@ -193 +193 @@
 gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=audioControls gameoptions_
-useWithPrefix=volumeControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
+# volume tab
+opYoffset=vBorder
+gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
+useWithPrefix=volumeControls gameoptions_
+
 # midi tab
 opYoffset=vBorder
 gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
@@ -430 +435 @@
 scummsaveload_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
 scummsaveload_choose=(prev.x2 + 10) prev.y prev.w prev.h
 scummsaveload_extinfo.visible=false
-def_volumeControlsInAudio=false
 
 # MM NES resolution
 [256x240]
@@ -446 +450 @@
 def_insetH=(h - 13 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
-def_volumeControlsInAudio=false
 def_midiControlsSpacing=2
 def_gameOptionsOverrideVPad=10
 def_aboutXOff=3

gui/launcher.cpp

@@ -228 +228 @@
         //
         // 5) The volume tab
         //
-        int volControlPos = g_gui.evaluator()->getVar("volumeControlsInAudio", true);
+        tab->addTab("Volume");
 
-        if (!volControlPos) {
-                tab->addTab("Volume");
+        _globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
 
-                _globalVolumeOverride = new CheckboxWidget(tab, "gameoptions_volumeCheckbox", "Override global volume settings", kCmdGlobalVolumeOverride, 0);
-        } else {
-                // FIXME/TODO: It's unfortunate that you get a more fine grained control over which settings
-                // are overriden and which are not when using the *smaller* resolution than with the bigger!
-                // I guess we should simply offer the "volume override" checkbox in the big resolution, too.
-                _globalVolumeOverride = NULL;
-        }
-
         addVolumeControls(tab, "gameoptions_");
 
         //
@@ -317 +308 @@
 
 void EditGameDialog::loadConfigToWidgets() {
         int sel, i;
-        bool e, f;
+        bool e;
 
         OptionsDialog::loadConfigToWidgets();
 
@@ -333 +324 @@
                 ConfMan.hasKey("output_rate", _domain) ||
                 ConfMan.hasKey("subtitles", _domain) ||
                 ConfMan.hasKey("talkspeed", _domain);
+        _globalAudioOverride->setState(e);
 
-        f = ConfMan.hasKey("music_volume", _domain) ||
+        e = ConfMan.hasKey("music_volume", _domain) ||
                 ConfMan.hasKey("sfx_volume", _domain) ||
                 ConfMan.hasKey("speech_volume", _domain);
+        _globalVolumeOverride->setState(e);
 
-        if (_globalVolumeOverride) {
-                _globalAudioOverride->setState(e);
-                _globalVolumeOverride->setState(f);
-        } else {
-                _globalAudioOverride->setState(e || f);
-        }
-
         e = ConfMan.hasKey("soundfont", _domain) ||
                 ConfMan.hasKey("multi_midi", _domain) ||
                 ConfMan.hasKey("native_mt32", _domain) ||

gui/theme-config.cpp

@@ -274 +274 @@
 "gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
 "useWithPrefix=audioControls gameoptions_\n"
-"useWithPrefix=volumeControls gameoptions_\n"
 "useWithPrefix=subtitleControls gameoptions_\n"
 "\n"
+"# volume tab\n"
+"opYoffset=vBorder\n"
+"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n"
+"opYoffset=(opYoffset + buttonHeight)\n"
+"useWithPrefix=volumeControls gameoptions_\n"
+"\n"
 "# midi tab\n"
 "opYoffset=vBorder\n"
 "gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight\n"
@@ -480 +485 @@
 "def_insetH=(h - 13 - insetY)\n"
 "def_launcherVersionX=50\n"
 "def_launcherVersionY=5\n"
-"def_volumeControlsInAudio=false\n"
 "def_midiControlsSpacing=2\n"
 "def_gameOptionsOverrideVPad=10\n"
 "def_aboutXOff=3\n"