[paragui-cvs] CVS: paragui/src/themes theme_priv.cpp,1.3,1.4 theme_priv.h,1.4,1.5 themeloader.cpp,1.3,1.4

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/themes
In directory subversions:/tmp/cvs-serv12482/src/themes

Modified Files:
        theme_priv.cpp theme_priv.h themeloader.cpp 
Log Message:
synced with the devel-1-0-x tree.



Index: theme_priv.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** theme_priv.cpp      15 Apr 2002 13:35:36 -0000      1.3
--- theme_priv.cpp      18 Aug 2002 08:12:53 -0000      1.4
***************
*** 220,223 ****
--- 220,225 ----
        }
        strings.clear();
+       
+       delete font;
  }
  

Index: theme_priv.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/theme_priv.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5

Index: themeloader.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/themeloader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** themeloader.cpp     15 Apr 2002 13:35:36 -0000      1.3
--- themeloader.cpp     18 Aug 2002 08:12:53 -0000      1.4
***************
*** 28,33 ****
--- 28,36 ----
  
  #include "paragui.h"
+ 
+ 
  #include "theme_priv.h"
  #include "pglog.h"
+ #include "pgfilearchive.h"
  
  #include <string>
***************
*** 58,65 ****
        THEME_WIDGET* p_currentWidget;
        THEME_OBJECT* p_currentObject;
-       const char* path;
        std::string themename;
-       int xml_file_size;
-       PG_FileArchive archive;
  }
  PARSE_INFO;
--- 61,65 ----
***************
*** 192,196 ****
  
                // load the image file
!               filename->surface = 
info->archive.LoadSurface(filename->value.c_str());
  
                if(filename->surface == NULL) {
--- 192,196 ----
  
                // load the image file
!               filename->surface = 
PG_FileArchive::LoadSurface(filename->value.c_str());
  
                if(filename->surface == NULL) {
***************
*** 415,428 ****
  
        // and add it to the searchpath
!       if(info.archive.Exists(filename.c_str())) {
!               const char* path = info.archive.GetRealDir(filename.c_str());
!               std::string fullpath = (std::string)path + (std::string)"/" + 
filename;
  
!               bool rc = info.archive.AddArchive(fullpath.c_str());
                if(rc) {
                        PG_LogMSG("added '%s' to the searchpath", 
fullpath.c_str());
                } else {
                        PG_LogWRN("failed to add '%s'", fullpath.c_str());
!                       PG_LogWRN("%s", info.archive.GetLastError());
                }
        }
--- 415,434 ----
  
        // and add it to the searchpath
!       if(PG_FileArchive::Exists(filename.c_str())) {
!               const char* path = PG_FileArchive::GetRealDir(filename.c_str());
!               char sep = PG_FileArchive::GetDirSeparator()[0];
!               
!               std::string fullpath = (std::string)path;
!               if(fullpath[fullpath.size()-1] != sep) {
!                       fullpath += sep;
!               }
!               fullpath += filename;
  
!               bool rc = PG_FileArchive::AddArchive(fullpath.c_str());
                if(rc) {
                        PG_LogMSG("added '%s' to the searchpath", 
fullpath.c_str());
                } else {
                        PG_LogWRN("failed to add '%s'", fullpath.c_str());
!                       PG_LogWRN("%s", PG_FileArchive::GetLastError());
                }
        }
***************
*** 431,435 ****
  
        filename = (std::string)xmltheme + (std::string)THEME_SUFFIX;
!       if(!info.archive.Exists(filename.c_str())) {
                PG_LogERR("theme '%s' not found !", filename.c_str());
                return NULL;
--- 437,441 ----
  
        filename = (std::string)xmltheme + (std::string)THEME_SUFFIX;
!       if(!PG_FileArchive::Exists(filename.c_str())) {
                PG_LogERR("theme '%s' not found !", filename.c_str());
                return NULL;
***************
*** 447,451 ****
        // create an input-stream
  
!       PG_File* file = info.archive.OpenFile(filename.c_str());
  
        if(!file) {
--- 453,457 ----
        // create an input-stream
  
!       PG_File* file = PG_FileArchive::OpenFile(filename.c_str());
  
        if(!file) {
***************
*** 480,486 ****
  
        PG_LogMSG("theme '%s' loaded sucessfully", filename.c_str());
- 
-       //PG_Theme *theme = info.theme;
-       //return theme;
  
        return info.theme;
--- 486,489 ----