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

Cleanup on default theme.

Browse Source 
Added support for Widget Type Declaration (makes XML much cleaner).

svn-id: r33661
This commit is contained in:
Vicent Marti 2008-08-06 14:28:37 +00:00
parent 38f130db34
commit bd0cdd0f74
6 changed files with 62 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui/ThemeEval.cpp
View File

@ -145,11 +145,19 @@ void ThemeLayoutHorizontal::reflowLayout() {
}
void ThemeEval::addWidget(const Common::String &name, int w, int h) {
void ThemeEval::addWidget(const Common::String &name, int w, int h, const Common::String &type) {
ThemeLayoutWidget *widget = new ThemeLayoutWidget(_curLayout.top(), name);
widget->setWidth(w);
widget->setHeight(h);
int typeW = -1;
int typeH = -1;
if (!type.empty()) {
typeW = getVar("Globals." + type + ".Width", -1);
typeH = getVar("Globals." + type + ".Height", -1);
}
widget->setWidth(typeW == -1 ? w : typeW);
widget->setHeight(typeH == -1 ? h : typeH);
_curLayout.top()->addChild(widget);
}

2
gui/ThemeEval.h
View File

@ -260,7 +260,7 @@ public:
void addDialog(const Common::String &name, const Common::String &overlays);
void addLayout(ThemeLayout::LayoutType type, int spacing, bool reverse, bool center = false);
void addWidget(const Common::String &name, int w, int h);
void addWidget(const Common::String &name, int w, int h, const Common::String &type);
void addSpace(int size);
void addPadding(int16 l, int16 r, int16 t, int16 b) {

3
gui/ThemeParser.cpp
View File

@ -475,8 +475,7 @@ bool ThemeParser::parserCallback_widget(ParserNode *node) {
return parserError("Corrupted height value in key for %s", var.c_str());
}
_theme->themeEval()->addWidget(var, width, height);
_theme->themeEval()->addWidget(var, width, height, node->values["type"]);
}
return true;

1
gui/ThemeParser.h
View File

@ -446,6 +446,7 @@ protected:
XML_PROP(name, true)
XML_PROP(width, false)
XML_PROP(height, false)
XML_PROP(type, false)
KEY_END()
XML_KEY(space)

2
gui/themes/default.inc
View File

File diff suppressed because one or more lines are too long

116
gui/themes/modern.stx
View File

@ -437,7 +437,7 @@
<def var = 'ListWidget.hlRightPadding' value = '16'/>
<widget name = 'OptionsLabel'
size = '110, 16'
size = '110, Globals.Line.Height'
/>
<widget name = 'Button'
size = '120, 25'
@ -448,6 +448,9 @@
<widget name = 'PopUp'
size = '-1, 19'
/>
<widget name = 'Checkbox'
size = '-1, Globals.Line.Height'
/>
<widget name = 'ListWidget'
padding = '7, 5, 3, 3'
/>
@ -485,36 +488,29 @@
/>
<layout type = 'horizontal' direction = 'right2left' padding = '0, 0, 0, 0'>
<layout type = 'vertical' padding = '16, 0, 0, 0'>
<widget name = 'StartButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'StartButton'
type = 'Button'
/>
<space size = '16' />
<widget name = 'AddGameButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'AddGameButton'
type = 'Button'
/>
<widget name = 'EditGameButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'EditGameButton'
type = 'Button'
/>
<widget name = 'RemoveGameButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'RemoveGameButton'
type = 'Button'
/>
<space size = '16' />
<widget name = 'OptionsButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'OptionsButton'
type = 'Button'
/>
<widget name = 'AboutButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'AboutButton'
type = 'Button'
/>
<space size = '16' />
<widget name = 'QuitButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'QuitButton'
type = 'Button'
/>
<space/>
</layout>
@ -526,13 +522,11 @@
<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList'>
<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'>
<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
<widget name = 'Ok'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
<widget name = 'Ok'
type = 'Button'
/>
<widget name = 'Cancel'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
type = 'Button'
/>
<space/>
</layout>
@ -543,16 +537,16 @@
<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grModePopup'
height = 'Globals.PopUp.Height'
type = 'PopUp'
/>
<widget name = 'grRenderPopup'
height = 'Globals.PopUp.Height'
type = 'PopUp'
/>
<widget name = 'grAspectCheckbox'
height = 'Globals.Line.Height'
type = 'Checkbox'
/>
<widget name = 'grFullscreenCheckbox'
height = 'Globals.Line.Height'
type = 'Checkbox'
/>
</layout>
</dialog>
@ -560,15 +554,14 @@
<dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'auMidiPopup'
height = 'Globals.Line.Height'
type = 'PopUp'
/>
<widget name = 'auSampleRatePopup'
height = 'Globals.Line.Height'
type = 'PopUp'
/>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subToggleDesc'
width = 'Globals.OptionsLabel.Width'
height = 'Globals.OptionsLabel.Height'
type = 'OptionsLabel'
/>
<widget name = 'subToggleButton'
width = '150'
@ -577,12 +570,10 @@
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subSubtitleSpeedDesc'
width = 'Globals.OptionsLabel.Width'
height = 'Globals.OptionsLabel.Height'
type = 'OptionsLabel'
/>
<widget name = 'subSubtitleSpeedSlider'
width = 'Globals.Slider.Width'
height = 'Globals.Slider.Height'
type = 'Slider'
/>
<widget name = 'subSubtitleSpeedLabel'
width = '32'
@ -596,12 +587,10 @@
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcMusicText'
width = 'Globals.OptionsLabel.Width'
height = 'Globals.OptionsLabel.Height'
type = 'OptionsLabel'
/>
<widget name = 'vcMusicSlider'
width = 'Globals.Slider.Width'
height = 'Globals.Slider.Height'
type = 'Slider'
/>
<widget name = 'vcMusicLabel'
width = '32'
@ -610,12 +599,10 @@
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSfxText'
width = 'Globals.OptionsLabel.Width'
height = 'Globals.OptionsLabel.Height'
type = 'OptionsLabel'
/>
<widget name = 'vcSfxSlider'
width = 'Globals.Slider.Width'
height = 'Globals.Slider.Height'
type = 'Slider'
/>
<widget name = 'vcSfxLabel'
width = '32'
@ -624,12 +611,10 @@
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSpeechText'
width = 'Globals.OptionsLabel.Width'
height = 'Globals.OptionsLabel.Height'
type = 'OptionsLabel'
/>
<widget name = 'vcSpeechSlider'
width = 'Globals.Slider.Width'
height = 'Globals.Slider.Height'
type = 'Slider'
/>
<widget name = 'vcSpeechLabel'
width = '32'
@ -643,8 +628,7 @@
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'mcFontButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
type = 'Button'
/>
<widget name = 'mcFontClearButton'
height = 'Globals.Line.Height'
@ -655,22 +639,20 @@
/>
</layout>
<widget name = 'mcMixedCheckbox'
height = 'Globals.Line.Height'
type = 'Checkbox'
/>
<widget name = 'mcMt32Checkbox'
height = 'Globals.Line.Height'
type = 'Checkbox'
/>
<widget name = 'mcGSCheckbox'
height = 'Globals.Line.Height'
type = 'Checkbox'
/>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'mcMidiGainText'
width = 'Globals.OptionsLabel.Width'
height = 'Globals.OptionsLabel.Height'
type = 'OptionsLabel'
/>
<widget name = 'mcMidiGainSlider'
width = 'Globals.Slider.Width'
height = 'Globals.Slider.Height'
type = 'Slider'
/>
<widget name = 'mcMidiGainLabel'
width = '32'
@ -684,8 +666,7 @@
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'SaveButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
type = 'Button'
/>
<widget name = 'SavePath'
height = 'Globals.Line.Height'
@ -693,8 +674,7 @@
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'ThemeButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
type = 'Button'
/>
<widget name = 'ThemePath'
height = 'Globals.Line.Height'
@ -702,8 +682,7 @@
</layout>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'ExtraButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
type = 'Button'
/>
<widget name = 'ExtraPath'
height = 'Globals.Line.Height'
@ -716,15 +695,14 @@
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'ThemeButton'
width = 'Globals.Button.Width'
height = 'Globals.Button.Height'
type = 'Button'
/>
<widget name = 'CurTheme'
height = 'Globals.Line.Height'
/>
</layout>
<widget name = 'AutosavePeriod'
height = 'Globals.PopUp.Height'
type = 'PopUp'
/>
</layout>
</dialog>