libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix bugs mentioned in #1730147 "GUI: Classic themes need to be updated"

Browse Source 
svn-id: r27061
This commit is contained in:
Eugene Sandulenko 2007-06-03 08:11:19 +00:00
parent 3ba184b21f
commit 09ae91b118
2 changed files with 68 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui/newgui.cpp
View File

@ -139,7 +139,8 @@ bool NewGui::loadNewTheme(const Common::String &style) {
delete _theme;
_theme = 0;
if (style.compareToIgnoreCase("classic (builtin)") == 0) {
if (style.compareToIgnoreCase("classic (builtin)") == 0 ||
style.compareToIgnoreCase("classic") == 0) {
_theme = new ThemeClassic(_system, style);
} else {
if (Theme::themeConfigUseable(style, "", &styleType, &cfg)) {

115
gui/themes/classic080.ini
View File

@ -1,7 +1,7 @@
# $URL$
# $Id$
[theme]
version=19
version=21
type=classic
name=Classic (ScummVM 0.8.0)
@ -16,53 +16,6 @@ textcolorhi=0 255 0
font="builtin"
blending=true
# Define our classic greenish theme here
[320xY]
def_widgetSize=kNormalWidgetSize
def_buttonWidth=kButtonWidth
def_buttonHeight=kButtonHeight
def_sliderWidth=kSliderWidth
def_sliderHeight=kSliderHeight
def_kLineHeight=12
def_kFontHeight=10
def_insetX=10
def_insetY=10
def_insetW=(w - 2 * 10)
def_insetH=(h - 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
def_scummmainButtonWidth=90
def_scummmainButtonHeight=16
def_scummhelpX=5
def_scummhelpW=(w - 2 * 5)
def_midiControlsSpacing=1
def_vcAudioTabIndent=0
def_vcAudioTabSpacing=2
use=XxY
TabWidget.tabWidth=0
TabWidget.tabHeight=16
TabWidget.titleVPad=2
# Scumm Saveload dialog
scummsaveload=8 8 (w - 2 * 8) (h - 16)
set_parent=scummsaveload
scummsaveload_title=10 2 (parent.w - 2 * 10) kLineHeight
scummsaveload_list=10 18 prev.w (parent.h - 17 - buttonHeight - 8 - self.y)
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
scummsaveload_extinfo.visible=false
# MM NES resolution
[256x240]
useAsIs=320xY
[XxY]
def_widgetSize=kBigWidgetSize
def_buttonWidth=kBigButtonWidth
@ -185,6 +138,8 @@ yoffset=vBorder
glOff=((buttonHeight - kLineHeight) / 2 + 2)
globaloptions_themebutton2=10 yoffset buttonWidth buttonHeight
globaloptions_curtheme=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
yoffset=(yoffset + buttonHeight + 12)
globaloptions_autosaveperiod=10 yoffset (parent.w - 10 - 25) (kLineHeight + 2)
globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
@ -260,6 +215,17 @@ 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
### mass add dialog
massadddialog=10 20 300 174
set_parent=massadddialog
massadddialog_caption=10 (10 + 1 * kLineHeight) (parent.w - 2*10) kLineHeight
massadddialog_caption.align=kTextAlignCenter
massadddialog_dirprogress=10 (10 + 3 * kLineHeight) prev.w prev.h
massadddialog_dirprogress.align=kTextAlignCenter
massadddialog_gameprogress=10 (10 + 4 * kLineHeight) prev.w prev.h
massadddialog_gameprogress.align=kTextAlignCenter
massadddialog_ok=((parent.w - (buttonWidth * 2)) / 2) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
massadddialog_cancel=(prev.x2 + 10) prev.y prev.w prev.h
##### SCUMM dialogs
@ -341,6 +307,8 @@ aux=10
auw=(parent.w - 2 * 10)
auMidiPopup=(aux - 5) (opYoffset - 1) (auw + 5) (kLineHeight + 2)
opYoffset=(opYoffset + buttonHeight + 4)
auSampleRatePopup=(aux - 5) (opYoffset - 1) (auw + 5) (kLineHeight + 2)
opYoffset=(opYoffset + buttonHeight + 4)
[volumeControls]
vctextw=(95 + vcAudioTabIndent)
@ -365,7 +333,8 @@ opYoffset=(opYoffset + sliderHeight + vcAudioTabSpacing)
[midiControls]
mcx=10
mcFontButton=mcx opYoffset buttonWidth buttonHeight
mcFontPath=(prev.x2 + 20) (opYoffset + 3) (parent.w - (buttonWidth + 20) - 15) kLineHeight
mcFontPath=(prev.x2 + 20) (opYoffset + 3) (parent.w - (buttonWidth + 20) - mcx - kLineHeight - 20) kLineHeight
mcFontClearButton=(prev.x2 + 10) (opYoffset + 3) kLineHeight kLineHeight
opYoffset=(opYoffset + buttonHeight + 2 * midiControlsSpacing)
mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight
opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
@ -419,6 +388,54 @@ smW=(scummmainButtonWidth + 2 * scummmainHOffset)
smH=(smY + scummmainVSpace)
scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH
# Define our classic greenish theme here
[320xY]
def_widgetSize=kNormalWidgetSize
def_buttonWidth=kButtonWidth
def_buttonHeight=kButtonHeight
def_sliderWidth=kSliderWidth
def_sliderHeight=kSliderHeight
def_kLineHeight=12
def_kFontHeight=10
def_insetX=10
def_insetY=10
def_insetW=(w - 2 * 10)
def_insetH=(h - 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
def_scummmainButtonWidth=90
def_scummmainButtonHeight=16
def_scummhelpX=5
def_scummhelpW=(w - 2 * 5)
def_midiControlsSpacing=1
def_vcAudioTabIndent=0
def_vcAudioTabSpacing=2
use=XxY
TabWidget.tabWidth=0
TabWidget.tabHeight=16
TabWidget.titleVPad=2
# Scumm Saveload dialog
scummsaveload=8 8 (w - 2 * 8) (h - 16)
set_parent=scummsaveload
scummsaveload_title=10 2 (parent.w - 2 * 10) kLineHeight
scummsaveload_list=10 18 prev.w (parent.h - 17 - buttonHeight - 8 - self.y)
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
scummsaveload_extinfo.visible=false
def_volumeControlsInAudio=false
# MM NES resolution
[256x240]
useAsIs=320xY
# PSP GUI
[480x272]
def_buttonWidth=100