Ticket #8704: clean_modern.patch

File clean_modern.patch, 17.7 KB (added by jvprat, 13 years ago)
  • gui/themes/modern.ini

     
    185185def_insetW=(w - buttonWidth - 17 * 2 - insetX)
    186186def_insetH=(h - 23 - insetY)
    187187def_optionsVPad=20
    188 def_gameOptionsLabelWidth=90
     188def_optionsLabelWidth=110
    189189def_gameOptionsOverrideVPad=20
    190 def_tabPopupsLabelW=110
     190def_tabPopupsLabelW=optionsLabelWidth
    191191def_aboutXOff=8
    192192def_aboutYOff=5
    193193def_aboutOuterBorder=80
     
    196196def_scummmainVAddOff=5
    197197def_scummhelpW=370
    198198def_scummhelpX=((w - scummhelpW) / 2)
    199 def_midiControlsSpacing=4
    200199def_launcherVersionX=(w / 2 - 283 / 2 - 90)
    201200def_launcherVersionY=21
    202201
     202def_xSeparation=10
     203def_ySeparation=10
     204def_xBorder=15
     205
    203206use=pixmaps
    204207use=colors
    205208use=gradients
     
    214217ListWidget.hlRightPadding=0
    215218PopUpWidget.leftPadding=7
    216219PopUpWidget.rightPadding=5
    217 PopUpWidget.labelSpacing=3
     220PopUpWidget.labelSpacing=xSeparation
    218221EditTextWidget.font=kFontStyleNormal
    219222EditTextWidget.leftPadding=7
    220223EditTextWidget.rightPadding=5
     
    245248launcher_logo.visible=true
    246249space1=20
    247250space2=5
    248 launcher_list=insetX insetY (w - buttonWidth - 17 * 2 - self.x) (h - 23 - self.y)
     251launcher_list=insetX insetY insetW insetH
    249252launcher_start_button=(prev.x2 + 17) prev.y buttonWidth buttonHeight
    250253launcher_addGame_button=prev.x (prev.y2 + space1) prev.w prev.h
    251254launcher_editGame_button=prev.x (prev.y2 + space2) prev.w prev.h
     
    260263globaloptions=insetX insetY insetW insetH
    261264set_parent=globaloptions
    262265vBorder=optionsVPad
    263 globaloptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 16)
     266globaloptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 8 - ySeparation)
    264267
    265268# graphics tab
    266269opYoffset=vBorder
     
    283286# paths tab
    284287yoffset=vBorder
    285288glOff=((buttonHeight - kLineHeight) / 2 + 2)
    286 globaloptions_savebutton=10 yoffset buttonWidth buttonHeight
    287 globaloptions_savepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
    288 yoffset=(yoffset + buttonHeight + 8)
    289 globaloptions_extrabutton=10 yoffset buttonWidth buttonHeight
    290 globaloptions_extrapath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
    291 yoffset=(yoffset + buttonHeight + 8)
    292 globaloptions_themebutton=10 yoffset buttonWidth buttonHeight
    293 globaloptions_themepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
    294 yoffset=(yoffset + buttonHeight + 12)
    295 globaloptions_keysbutton=5 yoffset buttonWidth buttonHeight
     289globaloptions_savebutton=xBorder yoffset buttonWidth buttonHeight
     290globaloptions_savepath=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
     291yoffset=(yoffset + buttonHeight + ySeparation)
     292globaloptions_extrabutton=xBorder yoffset buttonWidth buttonHeight
     293globaloptions_extrapath=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
     294yoffset=(yoffset + buttonHeight + ySeparation)
     295globaloptions_themebutton=xBorder yoffset buttonWidth buttonHeight
     296globaloptions_themepath=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
     297yoffset=(yoffset + buttonHeight + ySeparation)
     298globaloptions_keysbutton=xBorder yoffset buttonWidth buttonHeight
    296299
    297300# Misc options
    298301yoffset=vBorder
    299302glOff=((buttonHeight - kLineHeight) / 2 + 2)
    300 globaloptions_themebutton2=10 yoffset buttonWidth buttonHeight
    301 globaloptions_curtheme=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
    302 yoffset=(yoffset + buttonHeight + 12)
    303 globaloptions_autosaveperiod=10 yoffset (parent.w - 10 - 25) kPopUpHeight
     303globaloptions_themebutton2=xBorder yoffset buttonWidth buttonHeight
     304globaloptions_curtheme=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
     305yoffset=(yoffset + buttonHeight + ySeparation)
     306globaloptions_autosaveperiod=xBorder yoffset (parent.w - self.x - xBorder) kPopUpHeight
    304307
    305 globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
    306 globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
     308globaloptions_cancel=(parent.w - 2 * buttonWidth - xSeparation - xBorder) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
     309globaloptions_ok=(prev.x2 + xSeparation) prev.y prev.w prev.h
    307310
    308311### game options
    309312gameoptions=insetX insetY insetW insetH
    310313set_parent=gameoptions
    311314vBorder=gameOptionsOverrideVPad
    312 gox=10
    313 gow=(parent.w - gox - 25)
     315gox=xBorder
     316gow=(parent.w - gox - xBorder)
    314317
    315 gameoptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 16)
     318gameoptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 8 - ySeparation)
    316319
    317320# game tab
    318321opYoffset=optionsVPad
    319 gameoptions_id=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
     322glOff=((kPopUpHeight - kLineHeight) / 2 + 2)
     323gameoptions_id=gox (opYoffset + glOff) optionsLabelWidth kLineHeight
    320324gameoptions_id.align=kTextAlignRight
    321 gameoptions_domain=prev.x2 (prev.y - 1) (gow - prev.w) kPopUpHeight
    322 opYoffset=(opYoffset + kLineHeight + 12)
    323 gameoptions_name=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
     325gameoptions_domain=(prev.x2 + xSeparation) opYoffset (parent.w - self.x - xBorder) kPopUpHeight
     326opYoffset=(opYoffset + prev.h + ySeparation)
     327gameoptions_name=gox (opYoffset + glOff) optionsLabelWidth kLineHeight
    324328gameoptions_name.align=kTextAlignRight
    325 gameoptions_desc=prev.x2 (prev.y - 1) (gow - prev.w) kPopUpHeight
    326 opYoffset=(opYoffset + kLineHeight + 15)
    327 gameoptions_lang=gox (opYoffset - 1) gow kPopUpHeight
    328 opYoffset=(opYoffset + kLineHeight + 12)
     329gameoptions_desc=(prev.x2 + xSeparation) opYoffset (parent.w - self.x - xBorder) kPopUpHeight
     330opYoffset=(opYoffset + prev.h + ySeparation)
     331gameoptions_lang=gox opYoffset (parent.w - self.x - xBorder) kPopUpHeight
     332opYoffset=(opYoffset + prev.h + ySeparation)
    329333gameoptions_platform=prev.x opYoffset prev.w prev.h
    330 opYoffset=(opYoffset + kLineHeight + 8)
     334opYoffset=(opYoffset + prev.h + ySeparation)
    331335
    332336# paths tab
    333337opYoffset=optionsVPad
    334338goOff=((buttonHeight - kLineHeight) / 2 + 2)
    335339gameoptions_savepath=gox opYoffset buttonWidth buttonHeight
    336 gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
    337 opYoffset=(opYoffset + buttonHeight + 8)
     340gameoptions_savepathText=(prev.x2 + xSeparation) (opYoffset + goOff) (parent.w - self.x - xBorder) kLineHeight
     341opYoffset=(opYoffset + buttonHeight + ySeparation)
    338342gameoptions_extrapath=gox opYoffset buttonWidth buttonHeight
    339 gameoptions_extrapathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
    340 opYoffset=(opYoffset + buttonHeight + 8)
     343gameoptions_extrapathText=(prev.x2 + xSeparation) (opYoffset + goOff) (parent.w - self.x - xBorder) kLineHeight
     344opYoffset=(opYoffset + buttonHeight + ySeparation)
    341345gameoptions_gamepath=gox opYoffset buttonWidth buttonHeight
    342 gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
    343 opYoffset=(opYoffset + buttonHeight + 8)
     346gameoptions_gamepathText=(prev.x2 + xSeparation) (opYoffset + goOff) (parent.w - self.x - xBorder) kLineHeight
     347opYoffset=(opYoffset + buttonHeight + ySeparation)
    344348
    345349# graphics tab
    346350opYoffset=vBorder
    347351opXoffset=gox
    348 gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
    349 opYoffset=(opYoffset + buttonHeight + 6)
     352gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
     353opYoffset=(prev.y2 + ySeparation)
    350354useWithPrefix=graphicsControls gameoptions_
    351355
    352356# audio tab
    353357opYoffset=vBorder
    354 gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
    355 opYoffset=(opYoffset + buttonHeight + 6)
     358gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
     359opYoffset=(prev.y2 + ySeparation)
    356360useWithPrefix=audioControls gameoptions_
    357361useWithPrefix=subtitleControls gameoptions_
    358362
    359363# volume tab
    360364opYoffset=vBorder
    361 gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
    362 opYoffset=(opYoffset + buttonHeight + 6)
     365gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
     366opYoffset=(prev.y2 + ySeparation)
    363367useWithPrefix=volumeControls gameoptions_
    364368
    365369# midi tab
    366370opYoffset=vBorder
    367 gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
    368 opYoffset=(opYoffset + buttonHeight + 6)
     371gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
     372opYoffset=(prev.y2 + ySeparation)
    369373useWithPrefix=midiControls gameoptions_
    370374
    371 gameoptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
    372 gameoptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
     375gameoptions_cancel=(parent.w - 2 * buttonWidth - xSeparation - xBorder) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
     376gameoptions_ok=(prev.x2 + xSeparation) prev.y prev.w prev.h
    373377
    374378### keys dialog
    375379keysdialog=(w / 20) (h / 10) (w - w / 10) (h - h / 5)
     
    386390### mass add dialog
    387391massadddialog=10 20 300 174
    388392set_parent=massadddialog
    389 massadddialog_caption=10 (10 + 1 * kLineHeight) (parent.w - 2*10) kLineHeight
     393massadddialog_caption=xBorder (10 + 1 * kLineHeight) (parent.w - 2 * xBorder) kLineHeight
    390394massadddialog_caption.align=kTextAlignCenter
    391 massadddialog_dirprogress=10 (10 + 3 * kLineHeight) prev.w prev.h
     395massadddialog_dirprogress=xBorder (10 + 3 * kLineHeight) prev.w prev.h
    392396massadddialog_dirprogress.align=kTextAlignCenter
    393 massadddialog_gameprogress=10 (10 + 4 * kLineHeight) prev.w prev.h
     397massadddialog_gameprogress=xBorder (10 + 4 * kLineHeight) prev.w prev.h
    394398massadddialog_gameprogress.align=kTextAlignCenter
    395 massadddialog_ok=((parent.w - (buttonWidth * 2)) / 2) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
    396 massadddialog_cancel=(prev.x2 + 10) prev.y prev.w prev.h
     399massadddialog_ok=((parent.w - (buttonWidth * 2) - xSeparation) / 2) (parent.h - buttonHeight - ySeparation) buttonWidth buttonHeight
     400massadddialog_cancel=(prev.x2 + xSeparation) prev.y prev.w prev.h
    397401
    398402
    399403##### SCUMM dialogs
     
    455459[chooser]
    456460chooserW=insetW
    457461chooser=insetX insetY chooserW opHeight
    458 chooser_headline=10 6 (chooserW - 2 * 10) (kLineHeight)
    459 chooser_list=10 (6 + kLineHeight + 2) prev.w (opHeight - self.y - buttonHeight - 12)
    460 chooser_cancel=(chooserW - 2 * (buttonWidth + 10)) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
    461 chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
     462chooser_headline=xBorder 6 (chooserW - 2 * xBorder) kLineHeight
     463chooser_list=prev.x (prev.y2 + 2) prev.w (opHeight - self.y - buttonHeight - 12)
     464#JVPRAT: next Y doesn't seem right
     465chooser_cancel=(chooserW - 2 * buttonWidth - xSeparation - xBorder) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
     466chooser_ok=(prev.x2 + xSeparation) prev.y prev.w prev.h
    462467
    463468[browser]
    464469browser=insetX insetY insetW insetH
    465470set_parent=browser
    466 browser_headline=10 5 (parent.w - 2 * 10) kLineHeight
     471browser_headline=xBorder 5 (parent.w - 2 * xBorder) kLineHeight
    467472browser_headline.align=kTextAlignCenter
    468 browser_path=10 (prev.y2 + 5) prev.w prev.h
    469 browser_list=10 prev.y2 prev.w (parent.h - 3 * kLineHeight - buttonHeight - 14)
    470 browser_up=10 (parent.h - buttonHeight - 8) buttonWidth buttonHeight
    471 browser_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
    472 browser_choose=(prev.x2 + 10) prev.y prev.w prev.h
     473browser_path=prev.x (prev.y2 + 5) prev.w prev.h
     474browser_list=prev.x prev.y2 prev.w (parent.h - 3 * kLineHeight - buttonHeight - 14)
     475browser_up=prev.x (parent.h - buttonHeight - 8) buttonWidth buttonHeight
     476#JVPRAT: doesn't it lack insetx?:
     477browser_cancel=(parent.w - 2 * buttonWidth - xSeparation - xBorder) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
     478browser_choose=(prev.x2 + xSeparation) prev.y prev.w prev.h
    473479
    474480[graphicsControls]
    475 gcx=(opXoffset + 10)
    476 gcw=(parent.w - gcx - 25)
    477 grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) kPopUpHeight
    478 opYoffset=(opYoffset + kLineHeight + 12)
     481gcx=(opXoffset + xBorder)
     482grModePopup=gcx opYoffset (parent.w - self.x - xBorder) kPopUpHeight
     483opYoffset=(prev.y2 + ySeparation)
    479484grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
    480 opYoffset=(opYoffset + kLineHeight + 16)
    481 grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - 5) buttonHeight
    482 opYoffset=(opYoffset + buttonHeight + 4)
     485opYoffset=(prev.y2 + ySeparation)
     486grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - xBorder) kLineHeight
     487opYoffset=(prev.y2 + ySeparation)
    483488grAspectCheckbox=prev.x opYoffset prev.w prev.h
    484 opYoffset=(opYoffset + buttonHeight + 4)
     489opYoffset=(prev.y2 + ySeparation)
    485490
    486491[audioControls]
    487 aux=(opXoffset + 10)
    488 auw=(parent.w - aux - 30)
    489 auMidiPopup=(aux) (opYoffset - 1) (auw + 5) kPopUpHeight
    490 opYoffset=(opYoffset + buttonHeight + 4)
    491 auSampleRatePopup=(aux) (opYoffset - 1) (auw + 5) kPopUpHeight
    492 opYoffset=(opYoffset + buttonHeight + 4)
     492aux=(opXoffset + xBorder)
     493auMidiPopup=aux opYoffset (parent.w - self.x - xBorder) kPopUpHeight
     494opYoffset=(opYoffset + prev.h + ySeparation)
     495auSampleRatePopup=aux (opYoffset - 1) prev.w kPopUpHeight
     496opYoffset=(opYoffset + prev.h + ySeparation)
    493497
    494498[volumeControls]
    495 vctextw=110
    496 vcxoff=(opXoffset + vctextw + 10)
    497 vcx=(opXoffset + 10)
    498 vcMusicText=vcx (opYoffset + 2) vctextw kLineHeight
     499vcx=(opXoffset + xBorder)
     500vcOff=((sliderHeight - kLineHeight) / 2 + 2)
     501vcMusicText=vcx (opYoffset + vcOff) optionsLabelWidth kLineHeight
    499502vcMusicText.align=kTextAlignRight
    500 vcMusicSlider=vcxoff opYoffset sliderWidth sliderHeight
    501 vcMusicLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
    502 opYoffset=(opYoffset + sliderHeight + 8)
    503 vcSfxText=vcx (opYoffset + 2) vctextw kLineHeight
     503vcMusicSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
     504vcMusicLabel=(prev.x2 + xSeparation) (opYoffset + vcOff) 24 kLineHeight
     505opYoffset=(opYoffset + sliderHeight + ySeparation)
     506vcSfxText=vcx (opYoffset + vcOff) optionsLabelWidth kLineHeight
    504507vcSfxText.align=kTextAlignRight
    505 vcSfxSlider=vcxoff opYoffset sliderWidth sliderHeight
    506 vcSfxLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
    507 opYoffset=(opYoffset + sliderHeight + 8)
    508 vcSpeechText=vcx (opYoffset + 2) vctextw kLineHeight
     508vcSfxSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
     509vcSfxLabel=(prev.x2 + xSeparation) (opYoffset + vcOff) 24 kLineHeight
     510opYoffset=(opYoffset + sliderHeight + ySeparation)
     511vcSpeechText=vcx (opYoffset + vcOff) optionsLabelWidth kLineHeight
    509512vcSpeechText.align=kTextAlignRight
    510 vcSpeechSlider=vcxoff opYoffset sliderWidth sliderHeight
    511 vcSpeechLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
    512 opYoffset=(opYoffset + sliderHeight + 12)
     513vcSpeechSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
     514vcSpeechLabel=(prev.x2 + xSeparation) (opYoffset + vcOff) 24 kLineHeight
     515opYoffset=(opYoffset + sliderHeight + ySeparation)
    513516
    514517[midiControls]
    515 mcx=(opXoffset + 10)
     518mcx=(opXoffset + xBorder)
    516519mcOff=((buttonHeight - kLineHeight) / 2 + 2)
    517520mcFontButton=mcx opYoffset buttonWidth buttonHeight
    518 mcFontPath=(prev.x2 + 20) (opYoffset + mcOff) (parent.w - (buttonWidth + 20) - mcx - kLineHeight - 20) kLineHeight
    519 mcFontClearButton=(prev.x2 + 10) (opYoffset + mcOff) kLineHeight kLineHeight
    520 opYoffset=(opYoffset + buttonHeight + 6 * midiControlsSpacing)
    521 mcMixedCheckbox=mcx opYoffset (parent.w - mcx - 5) buttonHeight
    522 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
    523 mcMt32Checkbox=mcx opYoffset prev.w buttonHeight
    524 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
    525 mcGSCheckbox=mcx opYoffset prev.w buttonHeight
    526 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
    527 mcMidiGainText=mcx (opYoffset + 2) 80 kLineHeight
     521mcFontPath=(prev.x2 + xSeparation) (opYoffset + mcOff) (parent.w - self.x - xSeparation - kLineHeight - xBorder) kLineHeight
     522mcFontClearButton=(prev.x2 + xSeparation) prev.y kLineHeight kLineHeight
     523opYoffset=(opYoffset + buttonHeight + ySeparation)
     524mcMixedCheckbox=mcx opYoffset (parent.w - self.x - xBorder) kLineHeight
     525opYoffset=(opYoffset + prev.h + ySeparation)
     526mcMt32Checkbox=mcx opYoffset prev.w kLineHeight
     527opYoffset=(opYoffset + prev.h + ySeparation)
     528mcGSCheckbox=mcx opYoffset prev.w kLineHeight
     529opYoffset=(opYoffset + prev.h + ySeparation)
     530mcOff=((sliderHeight - kLineHeight) / 2 + 2)
     531mcMidiGainText=mcx (opYoffset + mcOff) optionsLabelWidth kLineHeight
    528532mcMidiGainText.align=kTextAlignRight
    529 mcMidiGainSlider=(prev.x2 + 10) opYoffset sliderWidth sliderHeight
    530 mcMidiGainLabel=(prev.x2 + 10) (opYoffset + 2) 40 kLineHeight
    531 opYoffset=(opYoffset + sliderHeight + midiControlsSpacing)
     533mcMidiGainSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
     534mcMidiGainLabel=(prev.x2 + xSeparation) (opYoffset + mcOff) 40 kLineHeight
     535opYoffset=(opYoffset + sliderHeight + ySeparation)
    532536
    533537[subtitleControls]
    534 sbx=(opXoffset + 10)
    535 sbtextw=110
    536 sbYoff=(buttonHeight / 8)
    537 sbOff=((sliderHeight - kLineHeight) / 2)
    538 opYoffset=(opYoffset + sbYoff)
    539 subToggleDesc=sbx (opYoffset + sbYoff) sbtextw buttonHeight
     538sbx=(opXoffset + xBorder)
     539sbOff=((sliderHeight - kLineHeight) / 2 + 2)
     540subToggleDesc=sbx (opYoffset + sbOff) optionsLabelWidth kLineHeight
    540541subToggleDesc.align=kTextAlignRight
    541 subToggleButton=prev.x2 opYoffset (buttonWidth + 34) sliderHeight
    542 opYoffset=(opYoffset + buttonHeight + 6)
    543 subSubtitleSpeedDesc=sbx (opYoffset + sbOff) sbtextw kLineHeight
     542subToggleButton=(prev.x2 + xSeparation) opYoffset (buttonWidth + 34) sliderHeight
     543opYoffset=(prev.y2 + ySeparation)
     544subSubtitleSpeedDesc=sbx (opYoffset + sbOff) optionsLabelWidth kLineHeight
    544545subSubtitleSpeedDesc.align=kTextAlignRight
    545 subSubtitleSpeedSlider=prev.x2 opYoffset sliderWidth sliderHeight
    546 subSubtitleSpeedLabel=(prev.x2 + 10) (opYoffset + sbOff) 24 kLineHeight
    547 opYoffset=(opYoffset + sliderHeight + 8)
     546subSubtitleSpeedSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
     547subSubtitleSpeedLabel=(prev.x2 + xSeparation) (opYoffset + sbOff) 24 kLineHeight
     548opYoffset=(opYoffset + sliderHeight + ySeparation)
    548549
    549550[scummmain]
    550551## Main dialog
     
    593594def_insetH=(h - 13 - insetY)
    594595def_launcherVersionX=50
    595596def_launcherVersionY=5
    596 def_midiControlsSpacing=2
    597597def_gameOptionsOverrideVPad=10
    598598def_aboutXOff=3
    599599def_aboutYOff=2