thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- cleanup

Browse source 
- consistency fix in modern.ini
- increased THEME_VERSION

svn-id: r29396
This commit is contained in:
Johannes Schickel 2007-11-04 01:07:47 +00:00
parent dcc71a36eb
commit 034eb920d2
4 changed files with 22 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

71
gui/ThemeModern.cpp
View file

@ -1313,68 +1313,33 @@ void ThemeModern::processExtraValues() {
// loading new ones if needed when this is processed?
// load the pixmap filenames from the config file
_imageHandles[kDialogBkgdCorner] = _evaluator->getStringVar("pix_dialog_corner");
_imageHandles[kDialogBkgdTop] = _evaluator->getStringVar("pix_dialog_top");
_imageHandles[kDialogBkgdLeft] = _evaluator->getStringVar("pix_dialog_left");
_imageHandles[kDialogBkgd] = _evaluator->getStringVar("pix_dialog_bkgd");
#define loadRectData(type, str) \
_imageHandles[k##type##Corner] = _evaluator->getStringVar("pix_"str"_corner"); \
_imageHandles[k##type##Top] = _evaluator->getStringVar("pix_"str"_top"); \
_imageHandles[k##type##Left] = _evaluator->getStringVar("pix_"str"_left"); \
_imageHandles[k##type] = _evaluator->getStringVar("pix_"str"_bkgd")
loadRectData(DialogBkgd, "dialog");
loadRectData(WidgetBkgd, "widget");
loadRectData(WidgetSmallBkgd, "widget_small");
loadRectData(TabBkgd, "tab");
loadRectData(SliderBkgd, "slider_bkgd");
loadRectData(Slider, "slider");
loadRectData(ScrollbarBkgd, "scrollbar_bkgd");
loadRectData(Scrollbar, "scrollbar");
loadRectData(ButtonBkgd, "button");
loadRectData(PopUpWidgetBkgd, "popupwidget");
loadRectData(EditTextBkgd, "edittext_bkgd");
_imageHandles[kWidgetBkgdCorner] = _evaluator->getStringVar("pix_widget_corner");
_imageHandles[kWidgetBkgdTop] = _evaluator->getStringVar("pix_widget_top");
_imageHandles[kWidgetBkgdLeft] = _evaluator->getStringVar("pix_widget_left");
_imageHandles[kWidgetBkgd] = _evaluator->getStringVar("pix_widget_bkgd");
_imageHandles[kWidgetSmallBkgdCorner] = _evaluator->getStringVar("pix_widget_small_corner");
_imageHandles[kWidgetSmallBkgdTop] = _evaluator->getStringVar("pix_widget_small_top");
_imageHandles[kWidgetSmallBkgdLeft] = _evaluator->getStringVar("pix_widget_small_left");
_imageHandles[kWidgetSmallBkgd] = _evaluator->getStringVar("pix_widget_small_bkgd");
#undef loadRectData
_imageHandles[kCheckboxEmpty] = _evaluator->getStringVar("pix_checkbox_empty");
_imageHandles[kCheckboxChecked] = _evaluator->getStringVar("pix_checkbox_checked");
_imageHandles[kWidgetArrow] = _evaluator->getStringVar("pix_widget_arrow");
_imageHandles[kTabBkgdCorner] = _evaluator->getStringVar("pix_tab_corner");
_imageHandles[kTabBkgdTop] = _evaluator->getStringVar("pix_tab_top");
_imageHandles[kTabBkgdLeft] = _evaluator->getStringVar("pix_tab_left");
_imageHandles[kTabBkgd] = _evaluator->getStringVar("pix_tab_bkgd");
_imageHandles[kSliderBkgdCorner] = _evaluator->getStringVar("pix_slider_bkgd_corner");
_imageHandles[kSliderBkgdTop] = _evaluator->getStringVar("pix_slider_bkgd_top");
_imageHandles[kSliderBkgdLeft] = _evaluator->getStringVar("pix_slider_bkgd_left");
_imageHandles[kSliderBkgd] = _evaluator->getStringVar("pix_slider_bkgd_bkgd");
_imageHandles[kSliderCorner] = _evaluator->getStringVar("pix_slider_corner");
_imageHandles[kSliderTop] = _evaluator->getStringVar("pix_slider_top");
_imageHandles[kSliderLeft] = _evaluator->getStringVar("pix_slider_left");
_imageHandles[kSlider] = _evaluator->getStringVar("pix_slider_bkgd");
_imageHandles[kScrollbarBkgdCorner] = _evaluator->getStringVar("pix_scrollbar_bkgd_corner");
_imageHandles[kScrollbarBkgdTop] = _evaluator->getStringVar("pix_scrollbar_bkgd_top");
_imageHandles[kScrollbarBkgdLeft] = _evaluator->getStringVar("pix_scrollbar_bkgd_left");
_imageHandles[kScrollbarBkgd] = _evaluator->getStringVar("pix_scrollbar_bkgd_bkgd");
_imageHandles[kScrollbarCorner] = _evaluator->getStringVar("pix_scrollbar_corner");
_imageHandles[kScrollbarTop] = _evaluator->getStringVar("pix_scrollbar_top");
_imageHandles[kScrollbarLeft] = _evaluator->getStringVar("pix_scrollbar_left");
_imageHandles[kScrollbar] = _evaluator->getStringVar("pix_scrollbar_bkgd");
_imageHandles[kButtonBkgdCorner] = _evaluator->getStringVar("pix_button_corner");
_imageHandles[kButtonBkgdTop] = _evaluator->getStringVar("pix_button_top");
_imageHandles[kButtonBkgdLeft] = _evaluator->getStringVar("pix_button_left");
_imageHandles[kButtonBkgd] = _evaluator->getStringVar("pix_button_bkgd");
_imageHandles[kThemeLogo] = _evaluator->getStringVar("pix_theme_logo");
_imageHandles[kPopUpWidgetBkgdCorner] = _evaluator->getStringVar("pix_popupwidget_corner");
_imageHandles[kPopUpWidgetBkgdTop] = _evaluator->getStringVar("pix_popupwidget_top");
_imageHandles[kPopUpWidgetBkgdLeft] = _evaluator->getStringVar("pix_popupwidget_left");
_imageHandles[kPopUpWidgetBkgd] = _evaluator->getStringVar("pix_popupwidget_bkgd");
_imageHandles[kEditTextBkgdCorner] = _evaluator->getStringVar("pix_edittext_bkgd_corner");
_imageHandles[kEditTextBkgdTop] = _evaluator->getStringVar("pix_edittext_bkgd_top");
_imageHandles[kEditTextBkgdLeft] = _evaluator->getStringVar("pix_edittext_bkgd_left");
_imageHandles[kEditTextBkgd] = _evaluator->getStringVar("pix_edittext_bkgd");
_imageHandles[kGUICursor] = _evaluator->getStringVar("pix_cursor_image");
for (int i = 0; i < kImageHandlesMax; ++i) {

2
gui/theme.h
View file

@ -34,7 +34,7 @@
#include "graphics/surface.h"
#include "graphics/fontman.h"
#define THEME_VERSION 22
#define THEME_VERSION 23
namespace GUI {

2
gui/themes/classic080.ini
View file

@ -1,7 +1,7 @@
# $URL$
# $Id$
[theme]
version=22
version=23
type=classic
name=Classic (ScummVM 0.8.0)

4
gui/themes/modern.ini
View file

@ -1,7 +1,7 @@
# $URL$
# $Id$
[theme]
version=22
version=23
type=modern
name=Modern Style
@ -64,7 +64,7 @@ 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_edittext_bkgd_bkgd="button_bkgd.bmp"
pix_theme_logo="logo.bmp"