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

GUI: Make the ThemeParser less dumb

Browse Source 
Instead of running into assert()s due to dumb parser decisions, use
'less than' and 'greater than' width/height conditions on the
'resolution' tags.
Seems better than listing >9000 different android resolutions.
This commit is contained in:
dhewg 2011-02-23 18:58:59 +01:00
parent 0e9b4f3c50
commit 50a682e7e1
10 changed files with 488 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gui/ThemeParser.cpp
View File

@ -861,30 +861,50 @@ bool ThemeParser::resolutionCheck(const Common::String &resolution) {
return true;
Common::StringTokenizer globTokenizer(resolution, ", ");
Common::String cur, w, h;
bool definedRes = false;
Common::String cur;
while (!globTokenizer.empty()) {
bool ignore = false;
cur = globTokenizer.nextToken();
if (cur[0] == '-') {
ignore = true;
cur.deleteChar(0);
} else {
definedRes = true;
bool lt;
int val;
if (cur.size() < 5) {
warning("Invalid theme 'resolution' token '%s'", resolution.c_str());
return false;
}
Common::StringTokenizer resTokenizer(cur, "x");
w = resTokenizer.nextToken();
h = resTokenizer.nextToken();
if (cur[0] == 'x') {
val = g_system->getOverlayWidth();
} else if (cur[0] == 'y') {
val = g_system->getOverlayHeight();
} else {
warning("Error parsing theme 'resolution' token '%s'", resolution.c_str());
return false;
}
if ((w == "X" || atoi(w.c_str()) == g_system->getOverlayWidth()) &&
(h == "Y" || atoi(h.c_str()) == g_system->getOverlayHeight()))
return !ignore;
if (cur[1] == '<') {
lt = true;
} else if (cur[1] == '>') {
lt = false;
} else {
warning("Error parsing theme 'resolution' token '%s'", resolution.c_str());
return false;
}
int token = atoi(cur.c_str() + 2);
// check inverse for unfulfilled requirements
if (lt) {
if (val >= token)
return false;
} else {
if (val <= token)
return false;
}
}
return !definedRes;
return true;
}
} // End of namespace GUI

884
gui/themes/default.inc
View File

@ -1,5 +1,445 @@
"<?xml version = '1.0'?>"
"<layout_info resolution='-320xY,-256x240,-Xx272,-544x332,-Xx350'> "
"<render_info> "
"<palette> "
"<color name='black' "
"rgb='0,0,0' "
"/> "
"<color name='lightgrey' "
"rgb='104,104,104' "
"/> "
"<color name='darkgrey' "
"rgb='64,64,64' "
"/> "
"<color name='green' "
"rgb='32,160,32' "
"/> "
"<color name='green2' "
"rgb='0,255,0' "
"/> "
"</palette> "
"<fonts> "
"<font id='text_default' "
"file='helvb12.bdf' "
"/> "
"<font resolution='y<400' "
"id='text_default' "
"file='clR6x12.bdf' "
"/> "
"<font id='text_button' "
"file='helvb12.bdf' "
"/> "
"<font resolution='y<400' "
"id='text_button' "
"file='clR6x12.bdf' "
"/> "
"<font id='text_normal' "
"file='helvb12.bdf' "
"/> "
"<font resolution='y<400' "
"id='text_normal' "
"file='clR6x12.bdf' "
"/> "
"<font id='tooltip_normal' "
"file='fixed5x8.bdf' "
"/> "
"<text_color id='color_normal' "
"color='green' "
"/> "
"<text_color id='color_normal_inverted' "
"color='black' "
"/> "
"<text_color id='color_normal_hover' "
"color='green2' "
"/> "
"<text_color id='color_normal_disabled' "
"color='lightgrey' "
"/> "
"<text_color id='color_alternative' "
"color='lightgrey' "
"/> "
"<text_color id='color_alternative_inverted' "
"color='255,255,255' "
"/> "
"<text_color id='color_alternative_hover' "
"color='176,176,176' "
"/> "
"<text_color id='color_alternative_disabled' "
"color='darkgrey' "
"/> "
"<text_color id='color_button' "
"color='green' "
"/> "
"<text_color id='color_button_hover' "
"color='green2' "
"/> "
"<text_color id='color_button_disabled' "
"color='lightgrey' "
"/> "
"</fonts> "
"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> "
"<drawdata id='text_selection' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='text_selection_focus' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='mainmenu_bg' cache='false'> "
"<drawstep func='fill' "
"fill='foreground' "
"fg_color='black' "
"/> "
"</drawdata> "
"<drawdata id='special_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='tooltip_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='foreground' "
"fg_color='black' "
"/> "
"</drawdata> "
"<drawdata id='separator' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"height='2' "
"ypos='center' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_base' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_handle_hover' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green2' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_handle_idle' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_button_idle' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green' "
"fill='foreground' "
"width='auto' "
"height='auto' "
"xpos='center' "
"ypos='center' "
"orientation='top' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_button_hover' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green2' "
"fill='foreground' "
"width='auto' "
"height='auto' "
"xpos='center' "
"ypos='center' "
"orientation='top' "
"/> "
"</drawdata> "
"<drawdata id='tab_active' cache='false'> "
"<text font='text_default' "
"text_color='color_normal_hover' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='tab' "
"bevel='2' "
"radius='0' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='tab_inactive' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='tab' "
"bevel='2' "
"radius='0' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='tab_background' cache='false'> "
"</drawdata> "
"<drawdata id='widget_slider' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='slider_disabled' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='slider_full' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='slider_hover' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green2' "
"/> "
"</drawdata> "
"<drawdata id='widget_small' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='popup_idle' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green' "
"fill='foreground' "
"width='height' "
"height='auto' "
"xpos='right' "
"ypos='center' "
"orientation='bottom' "
"/> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='popup_disabled' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='lightgrey' "
"fill='foreground' "
"width='height' "
"height='auto' "
"xpos='right' "
"ypos='center' "
"orientation='bottom' "
"/> "
"<text font='text_default' "
"text_color='color_normal_disabled' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='popup_hover' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green2' "
"fill='foreground' "
"width='height' "
"height='auto' "
"xpos='right' "
"ypos='center' "
"orientation='bottom' "
"/> "
"<text font='text_default' "
"text_color='color_normal_hover' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='widget_textedit' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='plain_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='caret' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='default_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='button_idle' cache='false'> "
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='button_hover' cache='false'> "
"<text font='text_button' "
"text_color='color_button_hover' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='button_disabled' cache='false'> "
"<text font='text_button' "
"text_color='color_button_disabled' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='checkbox_disabled' cache='false'> "
"<text font='text_default' "
"text_color='color_normal_disabled' "
"vertical_align='top' "
"horizontal_align='left' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='checkbox_selected' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='top' "
"horizontal_align='left' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='cross' "
"fill='foreground' "
"stroke='2' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='checkbox_default' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='top' "
"horizontal_align='left' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='radiobutton_default' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='7' "
"fill='background' "
"bg_color='darkgrey' "
"xpos='0' "
"ypos='0' "
"/> "
"</drawdata> "
"<drawdata id='radiobutton_selected' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='7' "
"fg_color='darkgrey' "
"fill='none' "
"xpos='0' "
"ypos='0' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='5' "
"fg_color='green' "
"fill='foreground' "
"xpos='2' "
"ypos='2' "
"/> "
"</drawdata> "
"<drawdata id='radiobutton_disabled' cache='false'> "
"<text font='text_default' "
"text_color='color_normal_disabled' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='7' "
"bg_color='lightgrey' "
"fill='background' "
"xpos='0' "
"ypos='0' "
"/> "
"</drawdata> "
"<drawdata id='widget_default' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='widget_small' cache='false'> "
"<drawstep func='square' "
"stroke='0' "
"/> "
"</drawdata> "
"</render_info> "
"<layout_info resolution='y>399'> "
"<globals> "
"<def var='Line.Height' value='16' /> "
"<def var='Font.Height' value='16' /> "
@ -789,7 +1229,7 @@
"</layout> "
"</dialog> "
"</layout_info> "
"<layout_info resolution='320xY,256x240,Xx272,544x332,Xx350'> "
"<layout_info resolution='y<400'> "
"<globals> "
"<def var='Line.Height' value='12' /> "
"<def var='Font.Height' value='10' /> "
@ -1580,443 +2020,3 @@
"</layout> "
"</dialog> "
"</layout_info> "
"<render_info> "
"<palette> "
"<color name='black' "
"rgb='0,0,0' "
"/> "
"<color name='lightgrey' "
"rgb='104,104,104' "
"/> "
"<color name='darkgrey' "
"rgb='64,64,64' "
"/> "
"<color name='green' "
"rgb='32,160,32' "
"/> "
"<color name='green2' "
"rgb='0,255,0' "
"/> "
"</palette> "
"<fonts> "
"<font id='text_default' "
"file='helvb12.bdf' "
"/> "
"<font resolution='320xY,256x240' "
"id='text_default' "
"file='clR6x12.bdf' "
"/> "
"<font id='text_button' "
"file='helvb12.bdf' "
"/> "
"<font resolution='320xY,256x240' "
"id='text_button' "
"file='clR6x12.bdf' "
"/> "
"<font id='text_normal' "
"file='helvb12.bdf' "
"/> "
"<font resolution='320xY,256x240' "
"id='text_normal' "
"file='clR6x12.bdf' "
"/> "
"<font id='tooltip_normal' "
"file='fixed5x8.bdf' "
"/> "
"<text_color id='color_normal' "
"color='green' "
"/> "
"<text_color id='color_normal_inverted' "
"color='black' "
"/> "
"<text_color id='color_normal_hover' "
"color='green2' "
"/> "
"<text_color id='color_normal_disabled' "
"color='lightgrey' "
"/> "
"<text_color id='color_alternative' "
"color='lightgrey' "
"/> "
"<text_color id='color_alternative_inverted' "
"color='255,255,255' "
"/> "
"<text_color id='color_alternative_hover' "
"color='176,176,176' "
"/> "
"<text_color id='color_alternative_disabled' "
"color='darkgrey' "
"/> "
"<text_color id='color_button' "
"color='green' "
"/> "
"<text_color id='color_button_hover' "
"color='green2' "
"/> "
"<text_color id='color_button_disabled' "
"color='lightgrey' "
"/> "
"</fonts> "
"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/> "
"<drawdata id='text_selection' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='text_selection_focus' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='mainmenu_bg' cache='false'> "
"<drawstep func='fill' "
"fill='foreground' "
"fg_color='black' "
"/> "
"</drawdata> "
"<drawdata id='special_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='tooltip_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='foreground' "
"fg_color='black' "
"/> "
"</drawdata> "
"<drawdata id='separator' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"height='2' "
"ypos='center' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_base' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_handle_hover' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green2' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_handle_idle' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_button_idle' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green' "
"fill='foreground' "
"width='auto' "
"height='auto' "
"xpos='center' "
"ypos='center' "
"orientation='top' "
"/> "
"</drawdata> "
"<drawdata id='scrollbar_button_hover' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green2' "
"fill='foreground' "
"width='auto' "
"height='auto' "
"xpos='center' "
"ypos='center' "
"orientation='top' "
"/> "
"</drawdata> "
"<drawdata id='tab_active' cache='false'> "
"<text font='text_default' "
"text_color='color_normal_hover' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='tab' "
"bevel='2' "
"radius='0' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='tab_inactive' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='tab' "
"bevel='2' "
"radius='0' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='tab_background' cache='false'> "
"</drawdata> "
"<drawdata id='widget_slider' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='slider_disabled' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='slider_full' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='slider_hover' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='green2' "
"/> "
"</drawdata> "
"<drawdata id='widget_small' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='popup_idle' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green' "
"fill='foreground' "
"width='height' "
"height='auto' "
"xpos='right' "
"ypos='center' "
"orientation='bottom' "
"/> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='popup_disabled' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='lightgrey' "
"fill='foreground' "
"width='height' "
"height='auto' "
"xpos='right' "
"ypos='center' "
"orientation='bottom' "
"/> "
"<text font='text_default' "
"text_color='color_normal_disabled' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='popup_hover' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='green2' "
"fill='foreground' "
"width='height' "
"height='auto' "
"xpos='right' "
"ypos='center' "
"orientation='bottom' "
"/> "
"<text font='text_default' "
"text_color='color_normal_hover' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='widget_textedit' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='plain_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='caret' cache='false'> "
"<drawstep func='square' "
"fill='foreground' "
"fg_color='lightgrey' "
"/> "
"</drawdata> "
"<drawdata id='default_bg' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='button_idle' cache='false'> "
"<text font='text_button' "
"text_color='color_button' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='button_hover' cache='false'> "
"<text font='text_button' "
"text_color='color_button_hover' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='button_disabled' cache='false'> "
"<text font='text_button' "
"text_color='color_button_disabled' "
"vertical_align='center' "
"horizontal_align='center' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='checkbox_disabled' cache='false'> "
"<text font='text_default' "
"text_color='color_normal_disabled' "
"vertical_align='top' "
"horizontal_align='left' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='checkbox_selected' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='top' "
"horizontal_align='left' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='cross' "
"fill='foreground' "
"stroke='2' "
"fg_color='green' "
"/> "
"</drawdata> "
"<drawdata id='checkbox_default' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='top' "
"horizontal_align='left' "
"/> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"</drawdata> "
"<drawdata id='radiobutton_default' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='7' "
"fill='background' "
"bg_color='darkgrey' "
"xpos='0' "
"ypos='0' "
"/> "
"</drawdata> "
"<drawdata id='radiobutton_selected' cache='false'> "
"<text font='text_default' "
"text_color='color_normal' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='7' "
"fg_color='darkgrey' "
"fill='none' "
"xpos='0' "
"ypos='0' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='5' "
"fg_color='green' "
"fill='foreground' "
"xpos='2' "
"ypos='2' "
"/> "
"</drawdata> "
"<drawdata id='radiobutton_disabled' cache='false'> "
"<text font='text_default' "
"text_color='color_normal_disabled' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"<drawstep func='circle' "
"width='7' "
"height='7' "
"radius='7' "
"bg_color='lightgrey' "
"fill='background' "
"xpos='0' "
"ypos='0' "
"/> "
"</drawdata> "
"<drawdata id='widget_default' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"/> "
"</drawdata> "
"<drawdata id='widget_small' cache='false'> "
"<drawstep func='square' "
"stroke='0' "
"/> "
"</drawdata> "
"</render_info> "

BIN
gui/themes/scummclassic.zip
View File

Binary file not shown.

6
gui/themes/scummclassic/classic_gfx.stx
View File

@ -46,21 +46,21 @@
<font id = 'text_default'
file = 'helvb12.bdf'
/>
<font resolution = '320xY, 256x240'
<font resolution = 'y<400'
id = 'text_default'
file = 'clR6x12.bdf'
/>
<font id = 'text_button'
file = 'helvb12.bdf'
/>
<font resolution = '320xY, 256x240'
<font resolution = 'y<400'
id = 'text_button'
file = 'clR6x12.bdf'
/>
<font id = 'text_normal'
file = 'helvb12.bdf'
/>
<font resolution = '320xY, 256x240'
<font resolution = 'y<400'
id = 'text_normal'
file = 'clR6x12.bdf'
/>

2
gui/themes/scummclassic/classic_layout.stx
View File

@ -23,7 +23,7 @@
- $Id$
-
-->
<layout_info resolution = '-320xY, -256x240, -Xx272, -544x332, -Xx350'>
<layout_info resolution = 'y>399'>
<globals>
<def var = 'Line.Height' value = '16' />
<def var = 'Font.Height' value = '16' />

2
gui/themes/scummclassic/classic_layout_lowres.stx
View File

@ -23,7 +23,7 @@
- $Id$
-
-->
<layout_info resolution = "320xY, 256x240, Xx272, 544x332, Xx350">
<layout_info resolution = 'y<400'>
<globals>
<def var = 'Line.Height' value = '12' />
<def var = 'Font.Height' value = '10' />

BIN
gui/themes/scummmodern.zip
View File

Binary file not shown.

8
gui/themes/scummmodern/scummmodern_gfx.stx
View File

@ -108,21 +108,21 @@
<font id = 'text_default'
file = 'helvb12.bdf'
/>
<font resolution = '320xY, 256x240'
<font resolution = 'y<400'
id = 'text_default'
file = 'clR6x12.bdf'
/>
<font id = 'text_button'
file = 'helvb12.bdf'
/>
<font resolution = '320xY, 256x240'
<font resolution = 'y<400'
id = 'text_button'
file = 'clR6x12.bdf'
/>
<font id = 'text_normal'
file = 'helvb12.bdf'
/>
<font resolution = '320xY, 256x240'
<font resolution = 'y<400'
id = 'text_normal'
file = 'clR6x12.bdf'
/>
@ -178,7 +178,7 @@
<!-- <defaults fill = 'gradient' fg_color = 'white'/> -->
<cursor file = 'cursor.bmp' hotspot = '0, 0' scale = '3'/>
<cursor resolution = '320xY, 256x240' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
<cursor resolution = 'y<400' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
<!-- Selection (text or list items) -->
<drawdata id = 'text_selection' cache = 'false'>

2
gui/themes/scummmodern/scummmodern_layout.stx
View File

@ -23,7 +23,7 @@
- $Id$
-
-->
<layout_info resolution = '-320xY, -256x240, -Xx272, -544x332, -Xx350'>
<layout_info resolution = 'y>399'>
<globals>
<def var = 'Line.Height' value = '16' />
<def var = 'Font.Height' value = '16' />

2
gui/themes/scummmodern/scummmodern_layout_lowres.stx
View File

@ -23,7 +23,7 @@
- $Id$
-
-->
<layout_info resolution = "320xY, 256x240, Xx272, 544x332, Xx350">
<layout_info resolution = 'y<400'>
<globals>
<def var = 'Line.Height' value = '12' />
<def var = 'Font.Height' value = '10' />