diff options
| -rw-r--r-- | gui/ThemeNew.cpp | 2 | ||||
| -rw-r--r-- | gui/themes/default-theme.ini | 248 | ||||
| -rw-r--r-- | gui/themes/default-theme.zip | bin | 28858 -> 31279 bytes |
3 files changed, 243 insertions, 7 deletions
diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index 4a5422a0a2..b4ba5c7e0f 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -36,7 +36,7 @@ #define kShadowTr3 64 #define kShadowTr4 128 -#define THEME_VERSION 5 +#define THEME_VERSION 6 using Graphics::Surface; diff --git a/gui/themes/default-theme.ini b/gui/themes/default-theme.ini index 85ef24b927..40258fb8eb 100644 --- a/gui/themes/default-theme.ini +++ b/gui/themes/default-theme.ini @@ -1,7 +1,7 @@ # $URL$ # $Id$ [theme] -version=5 +version=6 [pixmaps] dialog_corner=dialog_bkgd_corner.bmp @@ -49,10 +49,10 @@ scrollbar_top=widget_bkgd_top.bmp scrollbar_left=widget_bkgd_left.bmp scrollbar_bkgd=widget_bkgd.bmp -button_corner=widget_bkgd_corner.bmp -button_top=widget_bkgd_top.bmp -button_left=widget_bkgd_left.bmp -button_bkgd=widget_bkgd.bmp +button_corner=button_bkgd_corner.bmp +button_top=button_bkgd_top.bmp +button_left=button_bkgd_left.bmp +button_bkgd=button_bkgd.bmp theme_logo=logo.bmp @@ -133,11 +133,43 @@ shadow_top_height=2 pshadow_bottom_height=4 [640xY] +def_widgetSize=kBigWidgetSize def_buttonWidth=120 def_buttonHeight=25 +def_sliderWidth=kBigSliderWidth +def_sliderHeight=kBigSliderHeight +def_kLineHeight=16 +def_kFontHeight=14 +def_globOptionsW=466 +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 + +###### 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_headline.align=kTextAlignCenter +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 launcher_version=85 21 247 kLineHeight @@ -154,7 +186,159 @@ launcher_removeGame_button=prev.x (prev.y2 + space2) prev.w prev.h launcher_options_button=prev.x (prev.y2 + space1) prev.w prev.h launcher_about_button=prev.x (prev.y2 + space2) prev.w prev.h launcher_quit_button=prev.x (prev.y2 + space1) prev.w prev.h + +use=scummmain + +### global options +globaloptions=23 94 globOptionsW (h - 23 - self.y) +set_parent=globaloptions +vBorder=20 +globaloptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder) + +# graphics tab +opYoffset=vBorder +opXoffset=0 +useWithPrefix=graphicsControls globaloptions_ + +# audio tab +opYoffset=vBorder +useWithPrefix=audioControls globaloptions_ +useWithPrefix=volumeControls globaloptions_ + +# MIDI tab +opYoffset=vBorder +useWithPrefix=midiControls globaloptions_ + +# paths tab +yoffset=vBorder +glOff=((buttonHeight - kLineHeight) / 2 + 2) +globaloptions_savebutton=10 yoffset (buttonWidth + 5) buttonHeight +globaloptions_savepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight +yoffset=(yoffset + buttonHeight + 8) +globaloptions_extrabutton=10 yoffset (buttonWidth + 5) buttonHeight +globaloptions_extrapath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight +yoffset=(yoffset + buttonHeight + 12) +globaloptions_keysbutton=5 yoffset (buttonWidth + 5) buttonHeight + +globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight +globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h + +### game options +gameoptions=23 94 globOptionsW (h - 23 - self.y) +set_parent=gameoptions +vBorder=20 +gox=10 +gow=(parent.w - gox - 25) + +gameoptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder) + +# game tab +opYoffset=vBorder +gameoptions_id=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight +gameoptions_id.align=kTextAlignRight +gameoptions_domain=prev.x2 (prev.y - 1) (gow - prev.w) (prev.h + 2) +opYoffset=(opYoffset + kLineHeight + 8) +gameoptions_name=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight +gameoptions_name.align=kTextAlignRight +gameoptions_desc=prev.x2 (prev.y - 1) (gow - prev.w) (prev.h + 2) +opYoffset=(opYoffset + kLineHeight + 12) +gameoptions_lang=gox (opYoffset - 1) gow (kLineHeight + 2) +opYoffset=(opYoffset + kLineHeight + 8) +gameoptions_platform=prev.x opYoffset prev.w prev.h +opYoffset=(opYoffset + kLineHeight + 8) + +# 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 + 8) +gameoptions_extrapath=gox opYoffset (buttonWidth + 5) buttonHeight +gameoptions_extrapathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight +opYoffset=(opYoffset + buttonHeight + 8) +gameoptions_savepath=gox opYoffset (buttonWidth + 5) buttonHeight +gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight +opYoffset=(opYoffset + buttonHeight + 8) + +# graphics tab +opYoffset=vBorder +opXoffset=gox +gameoptions_graphicsCheckbox=gox opYoffset (kFontHeight + 10 + 192) buttonHeight +opYoffset=(opYoffset + buttonHeight + 6) +useWithPrefix=graphicsControls gameoptions_ + +# audio tab +opYoffset=vBorder +gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight +opYoffset=(opYoffset + buttonHeight + 6) +useWithPrefix=audioControls gameoptions_ + +# midi tab +opYoffset=vBorder +gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight +opYoffset=(opYoffset + buttonHeight + 6) +useWithPrefix=midiControls gameoptions_ + +# volume tab +opYoffset=vBorder +gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 189) buttonHeight +opYoffset=(opYoffset + buttonHeight + 6) +useWithPrefix=volumeControls 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) +set_parent=keysdialog +keysdialog_map=(parent.w - buttonWidth - 10) 20 buttonWidth buttonHeight +keysdialog_ok=prev.x (prev.y2 + 4) prev.w prev.h +keysdialog_cancel=prev.x (prev.y2 + 4) prev.w prev.h +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_action.align=kTextAlignCenter +keysdialog_mapping=prev.x (prev.y + kLineHeight) prev.w prev.h +keysdialog_mapping.align=kTextAlignCenter + + + +##### SCUMM dialogs +scummDummyDialog=0 80 0 16 + use=scummmain +## Engine config +# note that scummconfig size depends on overall height +# hence it is on the end of the list +opYoffset=8 +useWithPrefix=volumeControls scummconfig_ +scummconfig_subtitlesCheckbox=15 opYoffset (kFontHeight + 10 + 89) buttonHeight +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 +scummconfig_cancel=(prev.x2 + 4) prev.y (prev.w + 10) prev.h +scummconfig_ok=(prev.x2 + 4) prev.y prev.w prev.h +opYoffset=(opYoffset + buttonHeight) +scummconfig=((w - soWidth) / 2) ((h - opYoffset) / 2) soWidth (opYoffset + 8) + +## Help +scummHelpNumLines=15 +shH=(5 + (2 + scummHelpNumLines) * kFontHeight + buttonHeight + 7) +scummhelp=scummhelpX ((h - shH) / 2) scummhelpW shH +scummhelp_title=10 5 scummhelpW kFontHeight +scummhelp_title.align=kTextAlignCenter +scummhelp_key.x=10 +scummhelp_key.yoffset=5 +scummhelp_key.w=80 +scummhelp_key.h=kFontHeight +scummhelp_dsc.x=90 +scummhelp_dsc.yoffset=5 +scummhelp_dsc.w=(scummhelpW - 10 - 90) +scummhelp_dsc.h=kFontHeight +scummhelp_prev=10 (5 + kFontHeight * (scummHelpNumLines + 2) + 2) buttonWidth buttonHeight +scummhelp_next=(prev.x2 + 8) prev.y prev.w prev.h +scummhelp_close=(scummhelpW - 8 - buttonWidth) prev.y prev.w prev.h # Saveload dialog scummsaveload=8 8 (w - 2 * 8) (h - 16) @@ -167,7 +351,6 @@ scummsaveload_choose=(prev.x2 + 10) prev.y prev.w prev.h opHeight=(h * 9 / 10) useWithPrefix=chooser scummsaveload_ - ############################################ [chooser] chooserW=(w - 2 * 8) @@ -177,6 +360,59 @@ 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) +grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) (kLineHeight + 2) +opYoffset=(opYoffset + kLineHeight + 8) +grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h +opYoffset=(opYoffset + kLineHeight + 12) +grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight +opYoffset=(opYoffset + buttonHeight + 4) +grAspectCheckbox=prev.x opYoffset (kFontHeight + 10 + 136) prev.h +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) + +[volumeControls] +vctextw=95 +vcxoff=(vctextw + 15) +vcMusicText=10 (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.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.align=kTextAlignRight +vcSpeechSlider=vcxoff opYoffset sliderWidth sliderHeight +vcSpeechLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight +opYoffset=(opYoffset + sliderHeight + 8) + +[midiControls] +mcx=(opXoffset + 10) +mcOff=((buttonHeight - kLineHeight) / 2 + 2) +mcFontButton=mcx opYoffset buttonWidth buttonHeight +mcFontPath=(prev.x2 + 20) (opYoffset + mcOff) (parent.w - (buttonWidth + 20) - 10) kLineHeight +opYoffset=(opYoffset + buttonHeight + 6 * 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) + [scummmain] ## Main dialog # note that scummmain size depends on overall height diff --git a/gui/themes/default-theme.zip b/gui/themes/default-theme.zip Binary files differindex ad34ceb7a1..056318a3dd 100644 --- a/gui/themes/default-theme.zip +++ b/gui/themes/default-theme.zip |