- Resize chooser dialog

- Swap About and Help buttons in main SCUMM menu for consistency with launcher

svn-id: r22150
This commit is contained in:
Eugene Sandulenko 2006-04-25 14:27:41 +00:00
parent 6b76f83ea1
commit 869622cf00
2 changed files with 15 additions and 41 deletions

View File

@ -365,10 +365,10 @@ const char *Theme::_defaultConfigINI =
"smY=(smY + scummmainVSpace)\n"
"scummmain_options=prev.x smY prev.w prev.h\n"
"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
"scummmain_help=prev.x smY prev.w prev.h\n"
"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
"scummmain_about=prev.x smY prev.w prev.h\n"
"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
"scummmain_help=prev.x smY prev.w prev.h\n"
"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"
"smY=(smY + scummmainVSpace)\n"
"scummmain_quit=prev.x smY prev.w prev.h\n"
"smY=(smY + scummmainButtonHeight + scummmainVAddOff)\n"

View File

@ -151,7 +151,7 @@ fontfile_normal=helvr12-l1.bdf
cursor_hotspot_x=0
cursor_hotspot_y=0
[640xY]
[XxY]
def_launcherX=23
def_widgetSize=kBigWidgetSize
def_buttonWidth=120
@ -160,8 +160,10 @@ def_sliderWidth=kBigSliderWidth
def_sliderHeight=kBigSliderHeight
def_kLineHeight=16
def_kFontHeight=14
def_globOptionsW=(w - buttonWidth - 17 * 2 - launcherX)
def_gameOptionsH=(h - 2 * 40)
def_insetX=23
def_insetY=94
def_insetW=(w - buttonWidth - 17 * 2 - launcherX)
def_insetH=(h - 23 - insetY)
def_gameOptionsLabelWidth=90
def_tabPopupsLabelW=110
def_aboutXOff=8
@ -185,13 +187,11 @@ PopUpWidget.leftPadding=7
PopUpWidget.rightPadding=7
###### chooser
opHeight=(h * 7 / 10)
opHeight=insetH
useWithPrefix=chooser defaultChooser_
##### browser
brW=((w * 7) / 8)
brH=((h * 9) / 10)
browser=((w - brW) / 2) ((h - brH) / 2) brW brH
browser=insetX insetY insetW insetH
set_parent=browser
browser_headline=10 kLineHeight (parent.w - 2 * 10) kLineHeight
browser_headline.align=kTextAlignCenter
@ -220,7 +220,7 @@ launcher_quit_button=prev.x (prev.y2 + space1) prev.w prev.h
use=scummmain
### global options
globaloptions=23 94 globOptionsW (h - 23 - self.y)
globaloptions=insetX insetY insetW insetH
set_parent=globaloptions
vBorder=20
globaloptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)
@ -254,7 +254,7 @@ globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeigh
globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
### game options
gameoptions=23 94 globOptionsW (h - 23 - self.y)
gameoptions=insetX insetY insetW insetH
set_parent=gameoptions
vBorder=20
gox=10
@ -382,8 +382,8 @@ scummsaveload_extinfo.visible=true
############################################
[chooser]
chooserW=(w - 2 * 8)
chooser=((w - chooserW) / 2) ((h - opHeight) / 2) chooserW opHeight
chooserW=insetW
chooser=insetX insetY chooserW opHeight
chooser_headline=10 6 (chooserW - 2 * 10) (kLineHeight)
chooser_list=10 (6 + kLineHeight + 2) prev.w (opHeight - self.y - buttonHeight - 12)
chooser_cancel=(chooserW - 2 * (buttonWidth + 10)) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
@ -456,38 +456,12 @@ smY=(smY + buttonHeight + scummmainVAddOff)
smY=(smY + scummmainVSpace)
scummmain_options=prev.x smY prev.w prev.h
smY=(smY + buttonHeight + scummmainVAddOff)
scummmain_help=prev.x smY prev.w prev.h
smY=(smY + buttonHeight + scummmainVAddOff)
scummmain_about=prev.x smY prev.w prev.h
smY=(smY + buttonHeight + scummmainVAddOff)
scummmain_help=prev.x smY prev.w prev.h
smY=(smY + buttonHeight + scummmainVAddOff)
smY=(smY + scummmainVSpace)
scummmain_quit=prev.x smY prev.w prev.h
smH=(smY + buttonHeight + scummmainHOffset)
smW=(buttonWidth + 2 * scummmainHOffset)
scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH
## 960xY modes
[960xY]
def_launcherX=23
def_widgetSize=kBigWidgetSize
def_buttonWidth=120
def_buttonHeight=25
def_sliderWidth=kBigSliderWidth
def_sliderHeight=kBigSliderHeight
def_kLineHeight=16
def_kFontHeight=14
def_globOptionsW=(w - buttonWidth - 17 * 2 - launcherX)
def_gameOptionsH=(h - 2 * 40)
def_gameOptionsLabelWidth=90
def_tabPopupsLabelW=110
def_aboutXOff=8
def_aboutYOff=5
def_aboutOuterBorder=80
def_scummmainHOffset=12
def_scummmainVSpace=15
def_scummmainVAddOff=5
def_scummhelpW=370
def_scummhelpX=((w - scummhelpW) / 2)
def_midiControlsSpacing=4
use=640xY