From 0647852f65598ef9cb9ebff6dfb508e8b1a98c1c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 3 Aug 2012 02:11:25 +0300 Subject: Add support for default theme file names. --- src/gui/theme.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/gui/theme.h') diff --git a/src/gui/theme.h b/src/gui/theme.h index 216b19802..2a3a4aa2d 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -161,6 +161,7 @@ class Theme : public Palette, public ConfigListener int w, int h); ImageSet *getImageSetFromThemeXml(const std::string &name, + const std::string &name2, int w, int h); enum ThemePalette { @@ -261,11 +262,12 @@ class Theme : public Palette, public ConfigListener /** * Loads a skin. */ - Skin *load(const std::string &filename, bool full = true, - const std::string &defaultPath = getThemePath()); + Skin *load(const std::string &filename, const std::string &filename2, + bool full = true, const std::string + &defaultPath = getThemePath()); Skin *loadSkinRect(ImageRect &image, std::string name, - int start = 0, int end = 8); + std::string name2, int start = 0, int end = 8); void unload(Skin *skin); @@ -288,12 +290,13 @@ class Theme : public Palette, public ConfigListener void optionChanged(const std::string &); - void loadRect(ImageRect &image, std::string name, + void loadRect(ImageRect &image, std::string name, std::string name2, int start = 0, int end = 8); void unloadRect(ImageRect &rect, int start = 0, int end = 8); - static Image *getImageFromThemeXml(const std::string &name); + static Image *getImageFromThemeXml(const std::string &name, + const std::string &name2); private: Theme(); -- cgit v1.2.3-60-g2f50