Fix bugs #1709323: "GUI: Button overlapping" and #1677997: "GUI: Switching

options dialog between 1x and 2x" by introducing Volume tab to all resolutions

svn-id: r27345

2 files changed, 21 insertions, 62 deletions

diff --git a/gui/themes/classic080.ini b/gui/themes/classic080.ini
index 3cd0d1ae15..ee08952990 100644
--- a/gui/themes/classic080.ini
+++ b/gui/themes/classic080.ini
@@ -112,9 +112,12 @@ useWithPrefix=graphicsControls globaloptions_
 # audio tab
 opYoffset=vBorder
 useWithPrefix=audioControls globaloptions_
-useWithPrefix=volumeControls globaloptions_
 useWithPrefix=subtitleControls globaloptions_
 
+# volume tab
+opYoffset=vBorder
+useWithPrefix=volumeControls globaloptions_
+
 # MIDI tab
 opYoffset=vBorder
 useWithPrefix=midiControls globaloptions_
@@ -193,9 +196,14 @@ opYoffset=vBorder
 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,7 +438,6 @@ scummsaveload_thumbnail=(parent.w - (kThumbnailWidth + 22)) 18
 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,7 +453,6 @@ def_insetW=(w - 2 * insetX)
 def_insetH=(h - 13 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
-def_volumeControlsInAudio=false
 def_midiControlsSpacing=2
 def_gameOptionsOverrideVPad=10
 def_aboutXOff=3
@@ -454,30 +460,3 @@ def_aboutYOff=2
 def_aboutOuterBorder=10
 
 use=XxY
-
-# Override audio tab
-set_parent=gameoptions
-vBorder=5
-
-# audio tab
-opYoffset=vBorder
-useWithPrefix=audioControls globaloptions_
-useWithPrefix=subtitleControls globaloptions_
-
-# volume tab
-opYoffset=vBorder
-useWithPrefix=volumeControls globaloptions_
-
-# audio tab
-opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=audioControls gameoptions_
-useWithPrefix=subtitleControls gameoptions_
-
-# volume tab
-opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=volumeControls gameoptions_
-
diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index c5c8d8c46c..e40a2035a6 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -223,7 +223,7 @@ Console.leftPadding=7
 Console.rightPadding=5
 Console.topPadding=5
 Console.bottomPadding=5
-TabWidget.tabWidth=85
+TabWidget.tabWidth=75
 TabWidget.tabHeight=27
 TabWidget.titleVPad=8
 TabWidget.navButtonRightPad=3
@@ -278,9 +278,12 @@ useWithPrefix=graphicsControls globaloptions_
 # audio tab
 opYoffset=vBorder
 useWithPrefix=audioControls globaloptions_
-useWithPrefix=volumeControls globaloptions_
 useWithPrefix=subtitleControls globaloptions_
 
+# volume tab
+opYoffset=vBorder
+useWithPrefix=volumeControls globaloptions_
+
 # MIDI tab
 opYoffset=vBorder
 useWithPrefix=midiControls globaloptions_
@@ -359,9 +362,14 @@ opYoffset=vBorder
 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,7 +574,6 @@ use=extra
 pix_checkbox_empty="checkbox_empty320.bmp"
 pix_checkbox_checked="checkbox_checked320.bmp"
 pix_cursor_image="cursor320.bmp"
-def_volumeControlsInAudio=false
 
 # NES resoltuion
 [256x240]
@@ -582,7 +589,6 @@ def_insetW=(w - buttonWidth - 17 * 2 - insetX)
 def_insetH=(h - 13 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
-def_volumeControlsInAudio=false
 def_midiControlsSpacing=2
 def_gameOptionsOverrideVPad=10
 def_aboutXOff=3
@@ -602,29 +608,3 @@ launcher_logo.visible=true
 
 # Override extras
 inactive_dialog_shading=kShadingNone
-
-# Override audio tab
-set_parent=gameoptions
-vBorder=10
-
-# audio tab
-opYoffset=vBorder
-useWithPrefix=audioControls globaloptions_
-useWithPrefix=subtitleControls globaloptions_
-
-# volume tab
-opYoffset=vBorder
-useWithPrefix=volumeControls globaloptions_
-
-# audio tab
-opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=audioControls gameoptions_
-useWithPrefix=subtitleControls gameoptions_
-
-# volume tab
-opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=volumeControls gameoptions_