[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/themes themeloader.cpp,1.3.6.2,1.3.6.3
From: |
Alexander Pipelka <address@hidden> |
Subject: |
[paragui-cvs] CVS: paragui/src/themes themeloader.cpp,1.3.6.2,1.3.6.3 |
Date: |
Mon, 17 Jun 2002 04:18:49 -0400 |
Update of /cvsroot/paragui/paragui/src/themes
In directory subversions:/tmp/cvs-serv5142/src/themes
Modified Files:
Tag: devel-1-0
themeloader.cpp
Log Message:
themeloader cleanup
Index: themeloader.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/themes/themeloader.cpp,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -C2 -r1.3.6.2 -r1.3.6.3
*** themeloader.cpp 11 Jun 2002 14:13:47 -0000 1.3.6.2
--- themeloader.cpp 17 Jun 2002 08:18:43 -0000 1.3.6.3
***************
*** 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,420 ****
// and add it to the searchpath
! if(info.archive.Exists(filename.c_str())) {
! const char* path = info.archive.GetRealDir(filename.c_str());
char sep = PG_FileArchive::GetDirSeparator()[0];
--- 415,420 ----
// 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];
***************
*** 425,434 ****
fullpath += 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());
}
}
--- 425,434 ----
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());
}
}
***************
*** 437,441 ****
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;
***************
*** 453,457 ****
// 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) {
***************
*** 486,492 ****
PG_LogMSG("theme '%s' loaded sucessfully", filename.c_str());
-
- //PG_Theme *theme = info.theme;
- //return theme;
return info.theme;
--- 486,489 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/themes themeloader.cpp,1.3.6.2,1.3.6.3,
Alexander Pipelka <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/widgets pgthemewidget.cpp,1.3,1.3.6.1 pgwidget.cpp,1.4.4.6,1.4.4.7
- Next by Date:
[paragui-cvs] CVS: paragui .cvsignore,1.2,1.2.6.1
- Previous by thread:
[paragui-cvs] CVS: paragui/src/widgets pgthemewidget.cpp,1.3,1.3.6.1 pgwidget.cpp,1.4.4.6,1.4.4.7
- Next by thread:
[paragui-cvs] CVS: paragui .cvsignore,1.2,1.2.6.1
- Index(es):