screen based theme loading

2 files changed, 12 insertions, 7 deletions

diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index ca39620..ddc68ec 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.cc,v 1.22 2003/12/03 00:18:58 fluxgen Exp $
+// $Id: Theme.cc,v 1.23 2003/12/29 11:04:09 fluxgen Exp $
 
 #include "Theme.hh"
 
@@ -73,7 +73,8 @@ bool ThemeManager::unregisterTheme(Theme &tm) {
     return true;
 }
 
-bool ThemeManager::load(const std::string &filename) {
+bool ThemeManager::load(const std::string &filename, int screen_num) {
+    cerr<<"Load Theme: "<<filename<<endl;
     std::string location = FbTk::StringUtil::expandFilename(filename);
     std::string prefix = "";
 
@@ -107,11 +108,15 @@ bool ThemeManager::load(const std::string &filename) {
     location.append("/pixmaps");
     Image::addSearchPath(location);
 
-    //get list and go throu all the resources and load them
+    // get list and go throu all the resources and load them
     ThemeList::iterator theme_it = m_themelist.begin();
     const ThemeList::iterator theme_it_end = m_themelist.end();
     for (; theme_it != theme_it_end; ++theme_it) {
-        loadTheme(**theme_it);
+        if (screen_num < 0)
+            loadTheme(**theme_it);
+        else if (screen_num == (*theme_it)->screenNum()) // specified screen
+            loadTheme(**theme_it);
+            
     }
     // notify all themes that we reconfigured
     theme_it = m_themelist.begin();
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index b0f422a..c9262f5 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.hh,v 1.13 2003/12/17 00:43:22 fluxgen Exp $
+// $Id: Theme.hh,v 1.14 2003/12/29 11:04:09 fluxgen Exp $
 
 /**
  @file holds ThemeItem<T>, Theme and ThemeManager which is the base for any theme
@@ -124,8 +124,8 @@ private:
 class ThemeManager {
 public:
     static ThemeManager &instance();
-
-    bool load(const std::string &filename);
+    /// load style file "filename" to screen 
+    bool load(const std::string &filename, int screen_num = -1);
     std::string resourceValue(const std::string &name, const std::string &altname);
     void loadTheme(Theme &tm);
     bool loadItem(ThemeItem_base &resource);