Move whole theme ini file to evaluator. Next step is caching. Also now it is

possible to use per-resolution gfx and colors, i.e. complete customization.

svn-id: r22964

1 files changed, 95 insertions, 82 deletions

diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index fc0b8a72d6..aa25e0f0e5 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -1,72 +1,72 @@
 # $URL$
 # $Id$
 [theme]
-version=14
+version=15
 
 [pixmaps]
-dialog_corner=dialog_bkgd_corner.bmp
-dialog_top=dialog_bkgd_top.bmp
-dialog_left=dialog_bkgd_left.bmp
-dialog_bkgd=dialog_bkgd.bmp
-
-widget_corner=widget_bkgd_corner.bmp
-widget_top=widget_bkgd_top.bmp
-widget_left=widget_bkgd_left.bmp
-widget_bkgd=widget_bkgd.bmp
-
-widget_small_corner=widget_small_bkgd_corner.bmp
-widget_small_top=widget_small_bkgd_top.bmp
-widget_small_left=widget_small_bkgd_left.bmp
-widget_small_bkgd=widget_small_bkgd.bmp
-
-checkbox_empty=checkbox_empty.bmp
-checkbox_checked=checkbox_checked.bmp
-
-widget_arrow=widget_arrow.bmp
-
-tab_corner=widget_small_bkgd_corner.bmp
-tab_top=widget_small_bkgd_top.bmp
-tab_left=widget_small_bkgd_left.bmp
-tab_bkgd=widget_small_bkgd.bmp
-
-slider_bkgd_corner=button_bkgd_corner.bmp
-slider_bkgd_top=button_bkgd_top.bmp
-slider_bkgd_left=button_bkgd_left.bmp
-slider_bkgd_bkgd=button_bkgd.bmp
-
-slider_corner=button_bkgd_corner.bmp
-slider_top=button_bkgd_top.bmp
-slider_left=button_bkgd_left.bmp
-slider_bkgd=button_bkgd.bmp
-
-scrollbar_bkgd_corner=widget_small_bkgd_corner.bmp
-scrollbar_bkgd_top=widget_small_bkgd_top.bmp
-scrollbar_bkgd_left=widget_small_bkgd_left.bmp
-scrollbar_bkgd_bkgd=widget_small_bkgd.bmp
-
-scrollbar_corner=widget_bkgd_corner.bmp
-scrollbar_top=widget_bkgd_top.bmp
-scrollbar_left=widget_bkgd_left.bmp
-scrollbar_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
-
-popupwidget_corner=button_bkgd_corner.bmp
-popupwidget_top=button_bkgd_top.bmp
-popupwidget_left=button_bkgd_left.bmp
-popupwidget_bkgd=button_bkgd.bmp
-
-edittext_bkgd_corner=button_bkgd_corner.bmp
-edittext_bkgd_top=button_bkgd_top.bmp
-edittext_bkgd_left=button_bkgd_left.bmp
-edittext_bkgd=button_bkgd.bmp
-
-theme_logo=logo.bmp
-
-cursor_image=cursor.bmp
+pix_dialog_corner="dialog_bkgd_corner.bmp"
+pix_dialog_top="dialog_bkgd_top.bmp"
+pix_dialog_left="dialog_bkgd_left.bmp"
+pix_dialog_bkgd="dialog_bkgd.bmp"
+
+pix_widget_corner="widget_bkgd_corner.bmp"
+pix_widget_top="widget_bkgd_top.bmp"
+pix_widget_left="widget_bkgd_left.bmp"
+pix_widget_bkgd="widget_bkgd.bmp"
+
+pix_widget_small_corner="widget_small_bkgd_corner.bmp"
+pix_widget_small_top="widget_small_bkgd_top.bmp"
+pix_widget_small_left="widget_small_bkgd_left.bmp"
+pix_widget_small_bkgd="widget_small_bkgd.bmp"
+
+pix_checkbox_empty="checkbox_empty.bmp"
+pix_checkbox_checked="checkbox_checked.bmp"
+
+pix_widget_arrow="widget_arrow.bmp"
+
+pix_tab_corner="widget_small_bkgd_corner.bmp"
+pix_tab_top="widget_small_bkgd_top.bmp"
+pix_tab_left="widget_small_bkgd_left.bmp"
+pix_tab_bkgd="widget_small_bkgd.bmp"
+
+pix_slider_bkgd_corner="button_bkgd_corner.bmp"
+pix_slider_bkgd_top="button_bkgd_top.bmp"
+pix_slider_bkgd_left="button_bkgd_left.bmp"
+pix_slider_bkgd_bkgd="button_bkgd.bmp"
+
+pix_slider_corner="button_bkgd_corner.bmp"
+pix_slider_top="button_bkgd_top.bmp"
+pix_slider_left="button_bkgd_left.bmp"
+pix_slider_bkgd="button_bkgd.bmp"
+
+pix_scrollbar_bkgd_corner="widget_small_bkgd_corner.bmp"
+pix_scrollbar_bkgd_top="widget_small_bkgd_top.bmp"
+pix_scrollbar_bkgd_left="widget_small_bkgd_left.bmp"
+pix_scrollbar_bkgd_bkgd="widget_small_bkgd.bmp"
+
+pix_scrollbar_corner="widget_bkgd_corner.bmp"
+pix_scrollbar_top="widget_bkgd_top.bmp"
+pix_scrollbar_left="widget_bkgd_left.bmp"
+pix_scrollbar_bkgd="widget_bkgd.bmp"
+
+pix_button_corner="button_bkgd_corner.bmp"
+pix_button_top="button_bkgd_top.bmp"
+pix_button_left="button_bkgd_left.bmp"
+pix_button_bkgd="button_bkgd.bmp"
+
+pix_popupwidget_corner="button_bkgd_corner.bmp"
+pix_popupwidget_top="button_bkgd_top.bmp"
+pix_popupwidget_left="button_bkgd_left.bmp"
+pix_popupwidget_bkgd="button_bkgd.bmp"
+
+pix_edittext_bkgd_corner="button_bkgd_corner.bmp"
+pix_edittext_bkgd_top="button_bkgd_top.bmp"
+pix_edittext_bkgd_left="button_bkgd_left.bmp"
+pix_edittext_bkgd="button_bkgd.bmp"
+
+pix_theme_logo="logo.bmp"
+
+pix_cursor_image="cursor.bmp"
 
 [colors]
 main_dialog_start=210 114 10
@@ -79,7 +79,7 @@ color_state_disabled=192 192 192
 color_state_highlight=100 162 8
 color_state_enabled=0 0 0
 
-color_transparency=255 0 255		# transparency for the pixmaps
+color_transparency=255 0 255
 
 text_inverted_background=100 162 8
 text_inverted_color=0 0 0
@@ -126,40 +126,39 @@ popupwidget_highlight_end=251 241 206
 edittext_background_start=247 228 166
 edittext_background_end=247 228 166
 
-
 caret_color=0 0 0
 
 [gradients]
-dialog_main=1
-dialog=1
-dialog_special=2
+gradient_dialog_main=1
+gradient_dialog=1
+gradient_dialog_special=2
 
-widget_small=3
-widget=3
+gradient_widget_small=3
+gradient_widget=3
 
-button=1
+gradient_button=1
 
-slider=1
-slider_bkgd=1
+gradient_slider=1
+gradient_slider_bkgd=1
 
-tab=2
+gradient_tab=2
 
-scrollbar=1
-scrollbar_background=1
+gradient_scrollbar=1
+gradient_scrollbar_background=1
 
-popupwidget=1
+gradient_popupwidget=1
 
-edittext=1
+gradient_edittext=1
 
 [extra]
 shadow_left_width=2
 shadow_right_width=4
 shadow_top_height=2
 shadow_bottom_height=4
-inactive_dialog_shading=dim
+inactive_dialog_shading=kShadingDim
 shading_dim_percent=15
-fontfile_normal=helvr12-l1.bdf
-fontfile_fixed_normal=courr12-l1.bdf
+fontfile_normal="helvr12-l1.bdf"
+fontfile_fixed_normal="courr12-l1.bdf"
 cursor_hotspot_x=0
 cursor_hotspot_y=0
 cursor_targetScale=3
@@ -194,6 +193,10 @@ def_midiControlsSpacing=4
 def_launcherVersionX=(w / 2 - 283 / 2 - 90)
 def_launcherVersionY=21
 
+use=pixmaps
+use=colors
+use=gradients
+use=extra
 
 ##### Widgets config
 ListWidget.leftPadding=7
@@ -516,6 +519,16 @@ smH=(smY + buttonHeight + scummmainHOffset)
 smW=(buttonWidth + 2 * scummmainHOffset)
 scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH
 
+[320xY]
+use=pixmaps
+use=colors
+use=gradients
+use=extra
+
+# NES resoltuion
+[256x240]
+use=320xY
+
 # PSP GUI
 [480x272]
 def_buttonWidth=100