Patch #1091170: ALL, SCUMM: Subtitle speed control

svn-id: r22456

1 files changed, 27 insertions, 13 deletions

diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index 0bc67b7edb..6c6e5d51b4 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -234,6 +234,7 @@ useWithPrefix=graphicsControls globaloptions_
 opYoffset=vBorder
 useWithPrefix=audioControls globaloptions_
 useWithPrefix=volumeControls globaloptions_
+useWithPrefix=subtitleControls globaloptions_
 
 # MIDI tab
 opYoffset=vBorder
@@ -302,6 +303,7 @@ opYoffset=vBorder
 gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=audioControls gameoptions_
+useWithPrefix=subtitleControls gameoptions_
 
 # midi tab
 opYoffset=vBorder
@@ -341,9 +343,8 @@ use=scummmain
 # hence it is on the end of the list
 opYoffset=8
 useWithPrefix=volumeControls scummconfig_
-scummconfig_subtitlesCheckbox=15 opYoffset (kFontHeight + 10 + 89) buttonHeight
+useWithPrefix=subtitleControls scummconfig_
 opYoffset=(opYoffset + buttonHeight)
-scummconfig_speechCheckbox=prev.x opYoffset (kFontHeight + 10 + 85) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 4)
 soWidth=(8 + 3 * buttonWidth + 4)
 scummconfig_keys=(soWidth - 3 * (buttonWidth + 4) + 6) opYoffset (buttonWidth - 10) buttonHeight
@@ -389,7 +390,6 @@ chooser_list=10 (6 + kLineHeight + 2) prev.w (opHeight - self.y - buttonHeight -
 chooser_cancel=(chooserW - 2 * (buttonWidth + 10)) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
 chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
 
-
 [graphicsControls]
 gcx=(opXoffset + 10)
 gcw=(parent.w - gcx - 25)
@@ -404,26 +404,25 @@ opYoffset=(opYoffset + buttonHeight + 4)
 
 [audioControls]
 aux=(opXoffset + 10)
-auw=(parent.w - aux - 25)
-auMidiPopup=(aux - 5) (opYoffset - 1) (auw + 5) (kLineHeight + 2)
-opYoffset=(opYoffset + kLineHeight + 16)
-auSubtitlesCheckbox=aux opYoffset (kFontHeight + 10 + 102) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 18)
+auw=(parent.w - aux - 30)
+auMidiPopup=(aux) (opYoffset - 1) (auw + 5) (kLineHeight + 2)
+opYoffset=(opYoffset + buttonHeight + 4)
 
 [volumeControls]
-vctextw=95
-vcxoff=(vctextw + 15)
-vcMusicText=10 (opYoffset + 2) vctextw kLineHeight
+vctextw=110
+vcxoff=(opXoffset + vctextw + 10)
+vcx=(opXoffset + 10)
+vcMusicText=vcx (opYoffset + 2) vctextw kLineHeight
 vcMusicText.align=kTextAlignRight
 vcMusicSlider=vcxoff opYoffset sliderWidth sliderHeight
 vcMusicLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
 opYoffset=(opYoffset + sliderHeight + 8)
-vcSfxText=10 (opYoffset + 2) vctextw kLineHeight
+vcSfxText=vcx (opYoffset + 2) vctextw kLineHeight
 vcSfxText.align=kTextAlignRight
 vcSfxSlider=vcxoff opYoffset sliderWidth sliderHeight
 vcSfxLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
 opYoffset=(opYoffset + sliderHeight + 8)
-vcSpeechText=10 (opYoffset + 2) vctextw kLineHeight
+vcSpeechText=vcx (opYoffset + 2) vctextw kLineHeight
 vcSpeechText.align=kTextAlignRight
 vcSpeechSlider=vcxoff opYoffset sliderWidth sliderHeight
 vcSpeechLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
@@ -442,6 +441,21 @@ opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
 mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
 
+[subtitleControls]
+sbx=(opXoffset + 10)
+sbtextw=110
+sbYoff=(buttonHeight / 8)
+sbOff=((sliderHeight - kLineHeight) / 2)
+opYoffset=(opYoffset + sbYoff)
+subToggleDesc=sbx (opYoffset + sbYoff) sbtextw buttonHeight
+subToggleButton=prev.x2 opYoffset (buttonWidth + 34) sliderHeight
+opYoffset=(opYoffset + buttonHeight + 6)
+subSubtitleSpeedDesc=sbx (opYoffset + sbOff) sbtextw kLineHeight
+subSubtitleSpeedDesc.align=kTextAlignRight
+subSubtitleSpeedSlider=prev.x2 opYoffset sliderWidth sliderHeight
+subSubtitleSpeedLabel=(prev.x2 + 10) (opYoffset + sbOff) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + 8)
+
 [scummmain]
 ## Main dialog
 # note that scummmain size depends on overall height