diff options
-rw-r--r-- | gui/theme-config.cpp | 63 | ||||
-rw-r--r-- | gui/themes/modern.ini | 2 |
2 files changed, 56 insertions, 9 deletions
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index f0f7944093..e0d2af458c 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -34,9 +34,10 @@ const char *Theme::_defaultConfigINI = "def_sliderHeight=kSliderHeight\n" "def_kLineHeight=12\n" "def_kFontHeight=10\n" -"def_globOptionsW=(w - 2 * 10)\n" -"def_globOptionsH=(h - 30)\n" -"def_gameOptionsH=(h - 30)\n" +"def_insetX=10\n" +"def_insetY=10\n" +"def_insetW=(w - 2 * 10)\n" +"def_insetH=(h - 30)\n" "def_gameOptionsLabelWidth=60\n" "def_tabPopupsLabelW=100\n" "def_aboutXOff=3\n" @@ -79,9 +80,10 @@ const char *Theme::_defaultConfigINI = "def_sliderHeight=kBigSliderHeight\n" "def_kLineHeight=16\n" "def_kFontHeight=14\n" -"def_globOptionsW=(w - 2 * 10)\n" -"def_globOptionsH=(h - 2 * 40)\n" -"def_gameOptionsH=(h - 2 * 40)\n" +"def_insetX=10\n" +"def_insetY=20\n" +"def_insetW=(w - 2 * 10)\n" +"def_insetH=(h - 2 * 40)\n" "def_gameOptionsLabelWidth=90\n" "def_tabPopupsLabelW=150\n" "def_aboutXOff=8\n" @@ -149,7 +151,7 @@ const char *Theme::_defaultConfigINI = "launcher_list=hBorder (kLineHeight + 16) (w - 2 * hBorder) (top - kLineHeight - 20)\n" "\n" "### global options\n" -"globaloptions=10 20 globOptionsW globOptionsH\n" +"globaloptions=insetX insetY insetW insetH\n" "set_parent=globaloptions\n" "vBorder=5\n" "globaloptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)\n" @@ -187,7 +189,7 @@ const char *Theme::_defaultConfigINI = "globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h\n" "\n" "### game options\n" -"gameoptions=10 20 (w - 2 * 10) gameOptionsH\n" +"gameoptions=insetX insetY insetW insetH\n" "set_parent=gameoptions\n" "vBorder=5\n" "gox=5\n" @@ -415,6 +417,51 @@ const char *Theme::_defaultConfigINI = "smW=(scummmainButtonWidth + 2 * scummmainHOffset)\n" "smH=(smY + scummmainVSpace)\n" "scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH\n" +"\n" +"# PSP GUI\n" +"[480x272]\n" +"def_buttonWidth=100\n" +"def_buttonHeight=23\n" +"def_insetX=20\n" +"def_insetY=10\n" +"def_insetW=(w - 2 * insetX)\n" +"def_insetH=(h - 13 - insetY)\n" +"def_launcherVersionX=50\n" +"def_launcherVersionY=5\n" +"def_volumeControlsInAudio=false\n" +"def_midiControlsSpacing=2\n" +"def_gameOptionsOverrideVPad=10\n" +"def_aboutXOff=3\n" +"def_aboutYOff=2\n" +"def_aboutOuterBorder=10\n" +"\n" +"use=XxY\n" +"\n" +"# Override audio tab\n" +"set_parent=gameoptions\n" +"vBorder=5\n" +"\n" +"# audio tab\n" +"opYoffset=vBorder\n" +"useWithPrefix=audioControls globaloptions_\n" +"useWithPrefix=subtitleControls globaloptions_\n" +"\n" +"# volume tab\n" +"opYoffset=vBorder\n" +"useWithPrefix=volumeControls globaloptions_\n" +"\n" +"# audio tab\n" +"opYoffset=vBorder\n" +"gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n" +"opYoffset=(opYoffset + buttonHeight + 6)\n" +"useWithPrefix=audioControls gameoptions_\n" +"useWithPrefix=subtitleControls gameoptions_\n" +"\n" +"# volume tab\n" +"opYoffset=vBorder\n" +"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n" +"opYoffset=(opYoffset + buttonHeight + 6)\n" +"useWithPrefix=volumeControls gameoptions_\n" ""; using Common::String; diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini index ec4bd2c7fb..75272093b3 100644 --- a/gui/themes/modern.ini +++ b/gui/themes/modern.ini @@ -580,7 +580,7 @@ inactive_dialog_shading=kShadingNone # Override audio tab set_parent=gameoptions -vBorder=20 +vBorder=10 # audio tab opYoffset=vBorder |