libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-06 00:31:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix ThemeBrowser to use FSNodes, not getPath()

Browse Source 
svn-id: r34713
This commit is contained in:
Max Horn 2008-09-30 17:09:41 +00:00
parent d4cb443af7
commit d2c0facc6a
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gui/themebrowser.cpp
View File

@ -101,10 +101,10 @@ void ThemeBrowser::updateListing() {
// files in other places are ignored in this dialog // files in other places are ignored in this dialog
// TODO: let the user browse the complete FS too/only the FS? // TODO: let the user browse the complete FS too/only the FS?
if (ConfMan.hasKey("themepath")) if (ConfMan.hasKey("themepath"))
addDir(_themes, ConfMan.get("themepath"), 0); addDir(_themes, Common::FilesystemNode(ConfMan.get("themepath")), 0);
#ifdef DATA_PATH #ifdef DATA_PATH
addDir(_themes, DATA_PATH); addDir(_themes, Common::FilesystemNode(DATA_PATH));
#endif #endif
#ifdef MACOSX #ifdef MACOSX
@ -112,7 +112,7 @@ void ThemeBrowser::updateListing() {
if (resourceUrl) { if (resourceUrl) {
char buf[256]; char buf[256];
if (CFURLGetFileSystemRepresentation(resourceUrl, true, (UInt8 *)buf, 256)) { if (CFURLGetFileSystemRepresentation(resourceUrl, true, (UInt8 *)buf, 256)) {
Common::String resourcePath = buf; Common::FilesystemNode resourcePath(buf);
addDir(_themes, resourcePath, 0); addDir(_themes, resourcePath, 0);
} }
CFRelease(resourceUrl); CFRelease(resourceUrl);
@ -120,9 +120,9 @@ void ThemeBrowser::updateListing() {
#endif #endif
if (ConfMan.hasKey("extrapath")) if (ConfMan.hasKey("extrapath"))
addDir(_themes, ConfMan.get("extrapath")); addDir(_themes, Common::FilesystemNode(ConfMan.get("extrapath")));
addDir(_themes, ".", 0); addDir(_themes, Common::FilesystemNode("."), 0);
// Populate the ListWidget // Populate the ListWidget
Common::StringList list; Common::StringList list;
@ -137,12 +137,10 @@ void ThemeBrowser::updateListing() {
draw(); draw();
} }
void ThemeBrowser::addDir(ThList &list, const Common::String &dir, int level) { void ThemeBrowser::addDir(ThList &list, const Common::FilesystemNode &node, int level) {
if (level < 0) if (level < 0)
return; return;
Common::FilesystemNode node(dir);
if (!node.exists() || !node.isReadable()) if (!node.exists() || !node.isReadable())
return; return;
@ -152,7 +150,7 @@ void ThemeBrowser::addDir(ThList &list, const Common::String &dir, int level) {
for (Common::FSList::const_iterator i = fslist.begin(); i != fslist.end(); ++i) { for (Common::FSList::const_iterator i = fslist.begin(); i != fslist.end(); ++i) {
if (i->isDirectory()) { if (i->isDirectory()) {
addDir(list, i->getPath(), level-1); addDir(list, *i, level-1);
} else { } else {
Entry th; Entry th;
if (isTheme(*i, th)) { if (isTheme(*i, th)) {
@ -176,7 +174,8 @@ bool ThemeBrowser::isTheme(const Common::FilesystemNode &node, Entry &out) {
Common::String type; Common::String type;
out.file = node.getName(); out.file = node.getName();
for (int i = out.file.size()-1; out.file[i] != '.' && i > 0; --i) { // Remove the filename extension
while (out.file.lastChar() != '.') {
out.file.deleteLastChar(); out.file.deleteLastChar();
} }
out.file.deleteLastChar(); out.file.deleteLastChar();

2
gui/themebrowser.h
View File

@ -57,7 +57,7 @@ private:
void updateListing(); void updateListing();
void addDir(ThList &list, const Common::String &dir, int level = 4); void addDir(ThList &list, const Common::FilesystemNode &node, int level = 4);
bool isTheme(const Common::FilesystemNode &node, Entry &out); bool isTheme(const Common::FilesystemNode &node, Entry &out);
}; };