Converted last dialogs to new scheme. Now it seems to be everything. Please,

test throghoutly.

svn-id: r21157

1 files changed, 100 insertions, 18 deletions

diff --git a/gui/themes/default-theme.ini b/gui/themes/default-theme.ini
index fb3b20c67e..71685d1f46 100644
--- a/gui/themes/default-theme.ini
+++ b/gui/themes/default-theme.ini
@@ -140,7 +140,12 @@ def_kLineHeight=12
 def_kFontHeight=10
 def_globOptionsW=(w - 2 * 10)
 def_globOptionsH=(h - 1 * 40)
+def_gameOptionsH=(h - 2 * 30)
+def_gameOptionsLabelWidth=60
 def_tabPopupsLabelW=100
+def_aboutXOff=3
+def_aboutYOff=2
+def_aboutOuterBorder=10
 def_scummmainHOffset=8
 def_scummmainVSpace=5
 def_scummmainVAddOff=2
@@ -161,7 +166,12 @@ def_kLineHeight=16
 def_kFontHeight=14
 def_globOptionsW=(w - 2 * 10)
 def_globOptionsH=(h - 2 * 40)
+def_gameOptionsH=(h - 2 * 40)
+def_gameOptionsLabelWidth=90
 def_tabPopupsLabelW=150
+def_aboutXOff=8
+def_aboutYOff=5
+def_aboutOuterBorder=80
 def_scummmainHOffset=12
 def_scummmainVSpace=7
 def_scummmainVAddOff=3
@@ -170,8 +180,22 @@ def_scummmainButtonHeight=28
 def_scummhelpW=370
 def_scummhelpX=((w - scummhelpW) / 2)
 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)
+
+###### chooser
+opHeight=(h * 7 / 10)
+useWithPrefix=chooser defaultChooser_
+
+##### browser
+brW=((w * 7) / 8)
+brH=((h * 9) / 10)
+browser=((w - brW) / 2) ((h - brH) / 2) brW brH
+set_parent=browser
+browser_headline=10 kLineHeight (parent.w - 2 * 10) kLineHeight
+browser_path=10 prev.y2 prev.w prev.h
+browser_list=10 prev.y2 prev.w (parent.h - 3 * kLineHeight - buttonHeight - 14)
+browser_up=10 (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+browser_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+browser_choose=(prev.x2 + 10) prev.y prev.w prev.h
 
 ##### launcher
 hBorder=10
@@ -197,22 +221,19 @@ launcher_list=hBorder (kLineHeight + 16) (w - 2 * hBorder) (top - kLineHeight -
 globaloptions=10 40 globOptionsW globOptionsH
 set_parent=globaloptions
 vBorder=5
-globaloptions_tabwidget=0, vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)
+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
@@ -229,18 +250,66 @@ globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeigh
 globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
 
 ### game options
-opYoffset=(vBorder + buttonHeight)
-opWidth=globOptionsW
+gameoptions=10 40 (w - 2 * 10) gameOptionsH
+set_parent=gameoptions
+vBorder=5
+gox=5
+gow=(parent.w - 15)
+
+gameoptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)
+
+# game tab
+opYoffset=vBorder
+gameoptions_id=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
+gameoptions_domain=prev.x2 (prev.y - 1) (parent.w - gameOptionsLabelWidth - 10 - gox) (prev.h + 2)
+opYoffset=(opYoffset + prev.h + 3)
+gameoptions_name=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
+gameoptions_desc=prev.x2 (prev.y - 1) (parent.w - gameOptionsLabelWidth - 10 - gox) (prev.h + 2)
+opYoffset=(opYoffset + prev.h + 3)
+gameoptions_lang=gox (opYoffset - 1) gow (kLineHeight + 2)
+opYoffset=(opYoffset + prev.h + 4)
+gameoptions_platform=prev.x opYoffset prev.w prev.h
+opYoffset=(opYoffset + prev.h + 4)
+
+# paths tab
+opYoffset=vBorder
+goOff=((buttonHeight - kLineHeight) / 2 + 2)
+gameoptions_gamepath=gox opYoffset (buttonWidth + 5) buttonHeight
+gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
+opYoffset=(opYoffset + buttonHeight + 4)
+gameoptions_extrapath=gox opYoffset (buttonWidth + 5) buttonHeight
+gameoptions_extrapathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
+opYoffset=(opYoffset + buttonHeight + 4)
+gameoptions_savepath=gox opYoffset (buttonWidth + 5) buttonHeight
+gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
+opYoffset=(opYoffset + buttonHeight + 4)
+
+# graphics tab
+opYoffset=vBorder
+gameoptions_graphicsCheckbox=gox opYoffset (kFontHeight + 10 + 192) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=graphicsControls gameoptions_
 
-opYoffset=(vBorder + buttonHeight)
+# audio tab
+opYoffset=vBorder
+gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=audioControls gameoptions_
 
-opYoffset=(vBorder + buttonHeight)
+# midi tab
+opYoffset=vBorder
+gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
+useWithPrefix=midiControls gameoptions_
+
+# volume tab
+opYoffset=vBorder
+gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 189) buttonHeight
+opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=volumeControls gameoptions_
 
-opYoffset=(vBorder + buttonHeight)
-useWithPrefix=midiControls gameoptions_
+gameoptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+gameoptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
 
 ### keys dialog
 keysdialog=(w / 20) (h / 10) (w - w / 10) (h - h / 5)
@@ -252,6 +321,8 @@ keysdialog_list=10 10 (prev.x - 20) (parent.h - kLineHeight * 4 - self.y)
 keysdialog_action=prev.x (parent.h - kLineHeight * 3) (parent.w - self.x * 2) kLineHeight
 keysdialog_mapping=prev.x (prev.y + kLineHeight) prev.w prev.h
 
+
+
 ##### SCUMM dialogs
 scummDummyDialog=0 80 0 16
 
@@ -320,14 +391,25 @@ scummsaveload_list=10 18 (parent.w - 2 * 10 - 180) (parent.h - 14 - buttonHeight
 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
+opHeight=(h * 9 / 10)
+useWithPrefix=chooser scummsaveload_
 
 ############################################
+[chooser]
+chooserW=(w - 2 * 8)
+chooser=((w - chooserW) / 2) ((h - opHeight) / 2) chooserW opHeight
+chooser_headline=10 6 (chooserW - 2 * 10) (kLineHeight)
+chooser_list=10 (6 + kLineHeight + 2) prev.w (h - self.y - buttonHeight - 12)
+chooser_cancel=(chooserW - 2 * (buttonWidth + 10)) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
+chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
+
+
 [graphicsControls]
 gcx=10
-gcw=(opWidth - 2 * 10)
-grModePopup=(gcx - 5) opYoffset (gcw + 5) kLineHeight
+gcw=(parent.w - 2 * 10)
+grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) (kLineHeight + 2)
 opYoffset=(opYoffset + kLineHeight + 4)
-grRenderPopup=prev.x opYoffset prev.w prev.h
+grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 4)
 grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
@@ -336,8 +418,8 @@ opYoffset=(opYoffset + buttonHeight)
 
 [audioControls]
 aux=10
-auw=(opWidth - 2 * 10)
-auMidiPopup=(aux - 5) opYoffset (auw + 5) kLineHeight
+auw=(parent.w - 2 * 10)
+auMidiPopup=(aux - 5) (opYoffset - 1) (auw + 5) (kLineHeight + 2)
 opYoffset=(opYoffset + kLineHeight + 4)
 auSubtitlesCheckbox=aux opYoffset (kFontHeight + 10 + 102) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 18)
@@ -361,7 +443,7 @@ opYoffset=(opYoffset + sliderHeight + 4)
 [midiControls]
 mcx=10
 mcFontButton=mcx opYoffset buttonWidth buttonHeight
-mcFontPath=(prev.x2 + 20) (opYoffset + 3) (opWidth - (buttonWidth + 20) - 10) kLineHeight
+mcFontPath=(prev.x2 + 20) (opYoffset + 3) (parent.w - (buttonWidth + 20) - 10) kLineHeight
 opYoffset=(opYoffset + buttonHeight + 2 * midiControlsSpacing)
 mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)