o Converted most (all?) widgets to new scheme.

o Converted global options dialog to new scheme.

svn-id: r21137

1 files changed, 130 insertions, 9 deletions

diff --git a/gui/themes/default-theme.ini b/gui/themes/default-theme.ini
index 72c66d866f..3b6e0a034b 100644
--- a/gui/themes/default-theme.ini
+++ b/gui/themes/default-theme.ini
@@ -131,30 +131,151 @@ shadow_top_height=2
 pshadow_bottom_height=4
 
 [320xY]
+def_widgetSize=kNormalWidgetSize
+def_buttonWidth=kButtonWidth
 def_buttonHeight=kButtonHeight
+def_sliderWidth=kSliderWidth
+def_sliderHeight=kSliderHeight
 def_kLineHeight=12
+def_kFontHeight=10
+def_globOptionsW=(w - 2 * 10)
+def_globOptionsH=(h - 1 * 40)
+def_tabPopupsLabelW=100
+def_midiControlsSpacing=1
 use=XxY
 
 [XxY]
+def_widgetSize=kBigWidgetSize
+def_buttonWidth=kBigButtonWidth
 def_buttonHeight=kBigButtonHeight
+def_sliderWidth=kBigSliderWidth
+def_sliderHeight=kBigSliderHeight
 def_kLineHeight=16
+def_kFontHeight=14
+def_globOptionsW=(w - 2 * 10)
+def_globOptionsH=(h - 2 * 40)
+def_tabPopupsLabelW=150
+def_midiControlsSpacing=2
 chooser_headline=10 6 (w - 2 * 16) (kLineHeight)
 chooser_list=10 (6 + kLineHeight + 2) (w - 2 * 16) (h - self.y - buttonHeight - 12)
+
+## launcher
 hBorder=10
 launcher_version=hBorder 8 (w - 2 * hBorder) kLineHeight
 top=(h - 8 - buttonHeight)
 numButtons=4
 space=8
-buttonWidth=((w - 2 * hBorder - space * (numButtons - 1)) / numButtons)
-launcher_quit_button=hBorder top buttonWidth buttonHeight
-launcher_about_button=(prev.x2 + space) top buttonWidth buttonHeight
-launcher_options_button=(prev.x2 + space) top buttonWidth buttonHeight
-launcher_start_button=(prev.x2 + space) top buttonWidth buttonHeight
+butWidth=((w - 2 * hBorder - space * (numButtons - 1)) / numButtons)
+launcher_quit_button=hBorder top butWidth buttonHeight
+launcher_about_button=(prev.x2 + space) top butWidth buttonHeight
+launcher_options_button=(prev.x2 + space) top butWidth buttonHeight
+launcher_start_button=(prev.x2 + space) top butWidth buttonHeight
 top=(top - buttonHeight * 2)
 numButtons=3
 space=10
-buttonWidth=((w - 2 * hBorder - space * (numButtons - 1)) / numButtons)
-launcher_addGame_button=hBorder top buttonWidth buttonHeight
-launcher_editGame_button=(prev.x2 + space) top buttonWidth buttonHeight
-launcher_removeGame_button=(prev.x2 + space) top buttonWidth buttonHeight
+butWidth=((w - 2 * hBorder - space * (numButtons - 1)) / numButtons)
+launcher_addGame_button=hBorder top butWidth buttonHeight
+launcher_editGame_button=(prev.x2 + space) top butWidth buttonHeight
+launcher_removeGame_button=(prev.x2 + space) top butWidth buttonHeight
 launcher_list=hBorder (kLineHeight + 16) (w - 2 * hBorder) (top - kLineHeight - 20)
+
+# global options
+globaloptions=10 40 globOptionsW globOptionsH
+set_parent=globaloptions
+vBorder=5
+globaloptions_tabwidget=0, vBorder parent.w (parent.h - buttonHeight -8 - 2 * vBorder)
+
+# graphics tab
+opYoffset=vBorder
+opWidth=globOptionsW
+useWithPrefix=graphicsControls globaloptions_
+
+# audio tab
+opYoffset=vBorder
+opWidth=globOptionsW
+useWithPrefix=audioControls globaloptions_
+useWithPrefix=volumeControls globaloptions_
+
+# MIDI tab
+opYoffset=vBorder
+opWidth=globOptionsW
+useWithPrefix=midiControls globaloptions_
+
+# paths tab
+yoffset=vBorder
+globaloptions_savebutton=5 yoffset (buttonWidth + 5) buttonHeight
+globaloptions_savepath=(prev.x2 + 20) (vBorder + 3) (parent.w - (5 + buttonWidth + 20) - 10) kLineHeight
+yoffset=(yoffset + buttonHeight + 4)
+globaloptions_extrabutton=5 yoffset (buttonWidth + 5) buttonHeight
+globaloptions_extrapath=(prev.x2 + 20) (vBorder + 3) (parent.w - (5 + buttonWidth + 20) - 10) kLineHeight
+yoffset=(yoffset + buttonHeight + 4)
+globaloptions_keysbutton=5 yoffset buttonWidth buttonHeight
+
+globaloptions_ok=(parent.w - (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+
+# game options
+opYoffset=(vBorder + buttonHeight)
+opWidth=globOptionsW
+useWithPrefix=graphicsControls gameoptions_
+
+opYoffset=(vBorder + buttonHeight)
+useWithPrefix=audioControls gameoptions_
+
+opYoffset=(vBorder + buttonHeight)
+useWithPrefix=volumeControls gameoptions_
+
+opYoffset=(vBorder + buttonHeight)
+useWithPrefix=midiControls gameoptions_
+
+### SCUMM game options
+opYoffset=8
+useWithPrefix=volumeControls scummoptions_
+
+[graphicsControls]
+gcx=10
+gcw=(opWidth - 2 * 10)
+grModePopup=(gcx - 5) opYoffset (gcw + 5) kLineHeight
+opYoffset=(opYoffset + kLineHeight + 4)
+grRenderPopup=(gcx - 5) opYoffset (gcw + 5) kLineHeight
+opYoffset=(opYoffset + kLineHeight + 4)
+grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
+grAspectCheckbox=gcx opYoffset (kFontHeight + 10 + 136) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
+
+[audioControls]
+aux=10
+auw=(opWidth - 2 * 10)
+auMidiPopup=(aux - 5) opYoffset (auw + 5) kLineHeight
+opYoffset=(opYoffset + kLineHeight + 4)
+auSubtitlesCheckbox=aux opYoffset (kFontHeight + 10 + 102) buttonHeight
+opYoffset=(opYoffset + buttonHeight + 18)
+
+[volumeControls]
+vctextw=95
+vcxoff=(vctextw + 15)
+vcMusicText=10 (opYoffset + 2) vctextw kLineHeight
+vcMusicSlider=vcxoff opYoffset sliderWidth sliderHeight
+vcMusicLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + 4)
+vcSfxText=10 (opYoffset + 2) vctextw kLineHeight
+vcSfxSlider=vcxoff opYoffset sliderWidth sliderHeight
+vcSfxLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + 4)
+vcSpeechText=10 (opYoffset + 2) vctextw kLineHeight
+vcSpeechSlider=vcxoff opYoffset sliderWidth sliderHeight
+vcSpeechLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + 4)
+
+[midiControls]
+mcx=10
+mcFontButton=mcx opYoffset buttonWidth buttonHeight
+mcFontPath=(prev.x2 + 20) (opYoffset + 3) (opWidth - (buttonWidth + 20) - 10) kLineHeight
+opYoffset=(opYoffset + buttonHeight + 2 * midiControlsSpacing)
+mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight
+opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
+mcMt32Checkbox=mcx opYoffset (kFontHeight + 10 + 256) buttonHeight
+opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
+mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight
+opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)