diff -Naur kdirstat-2.4.0/kdirstat/kdirtree.cpp kdirstat-new/kdirstat/kdirtree.cpp --- kdirstat-2.4.0/kdirstat/kdirtree.cpp Tue Aug 26 16:47:47 2003 +++ kdirstat-new/kdirstat/kdirtree.cpp Wed May 26 17:50:40 2004 @@ -859,6 +859,9 @@ } else // non-directory child { + struct stat statRsrc; + if ( lstat( fullName + "/rsrc", &statRsrc ) == 0 ) + statInfo.st_size += statRsrc.st_size; KFileInfo *child = new KFileInfo( entryName, &statInfo, _tree, _dir ); _dir->insertChild( child ); childAdded( child ); @@ -922,8 +925,12 @@ return dir; } - else // no directory + else { // no directory + struct stat statRsrc; + if ( lstat( url.path() + "/rsrc", &statRsrc ) == 0 ) + statInfo.st_size += statRsrc.st_size; return new KFileInfo( name, &statInfo, tree, parent ); + } } else // lstat() failed return 0; diff -Naur kdirstat-2.4.0/kdirstat/ktreemapview.cpp kdirstat-new/kdirstat/ktreemapview.cpp --- kdirstat-2.4.0/kdirstat/ktreemapview.cpp Thu May 22 03:47:23 2003 +++ kdirstat-new/kdirstat/ktreemapview.cpp Wed May 26 17:50:40 2004 @@ -677,8 +677,67 @@ if ( lowerExt == "dll" ) return QColor( 0xff, 0xa0, 0x00 ); if ( lowerExt == "zip" ) return Qt::green; if ( lowerExt == "arj" ) return Qt::green; + + + // ---- Mac, Fink and extras ----- + + // Waste + if ( lowerExt == "hqx" ) return Qt::red; + + // Object-ish + if ( lowerExt == "dylib") return QColor( 0xff, 0xa0, 0x00 ); + if ( lowerExt == "rsrc" ) return QColor( 0xff, 0xa0, 0x00 ); + if ( lowerExt == "jar" ) return QColor( 0xff, 0xa0, 0x00 ); + + // Sound + if ( lowerExt == "ogg" ) return Qt::yellow; + if ( lowerExt == "m4a" ) return Qt::yellow; + if ( lowerExt == "m4p" ) return Qt::yellow; + if ( lowerExt == "aiff" ) return Qt::yellow; + if ( lowerExt == "aif" ) return Qt::yellow; + if ( lowerExt == "wma" ) return Qt::yellow; + + // Video + if ( lowerExt == "mp4" ) return QColor( 0xa0, 0xff, 0x00 ); + if ( lowerExt == "wmv" ) return QColor( 0xa0, 0xff, 0x00 ); + + // Compressed + if ( lowerExt == "tbz2" ) return Qt::green; + if ( lowerExt == "sit" ) return Qt::green; + if ( lowerExt == "sitx" ) return Qt::green; + if ( lowerExt == "deb" ) return Qt::green; + if ( lowerExt == "rar" ) return Qt::green; - + // Text-ish + if ( lowerExt == "rtf" ) return Qt::blue; + if ( lowerExt == "plist") return Qt::blue; + if ( lowerExt == "xml" ) return Qt::blue; + if ( lowerExt == "info" ) return Qt::blue; + if ( lowerExt == "patch") return Qt::blue; + + // Code + if ( lowerExt == "m" ) return Qt::blue; + if ( lowerExt == "mm" ) return Qt::blue; + if ( lowerExt == "nib" ) return Qt::blue; + if ( lowerExt == "strings") return Qt::blue; + if ( lowerExt == "py" ) return Qt::blue; + if ( lowerExt == "pl" ) return Qt::blue; + if ( lowerExt == "pm" ) return Qt::blue; + if ( lowerExt == "java" ) return Qt::blue; + if ( lowerExt == "scpt" ) return Qt::blue; + + // Images + if ( lowerExt == "icns" ) return Qt::cyan; + if ( lowerExt == "psd" ) return Qt::cyan; + + // Possibly uncompressed file containers + if ( lowerExt == "dmg" ) return QColor( 0xff, 0xa0, 0xe0 ); + if ( lowerExt == "img" ) return QColor( 0xff, 0xa0, 0xe0 ); + if ( lowerExt == "toast") return QColor( 0xff, 0xa0, 0xe0 ); + if ( lowerExt == "smi" ) return QColor( 0xff, 0xa0, 0xe0 ); + if ( lowerExt == "tar" ) return QColor( 0xff, 0xa0, 0xe0 ); + + // No match so far? Try the next extension. Some files might have // more than one, e.g., "tar.bz2" - if there is no match for // "tar.bz2", there might be one for just "bz2". diff -Naur kdirstat-2.4.0/kdirstat/pics/Makefile.am kdirstat-new/kdirstat/pics/Makefile.am --- kdirstat-2.4.0/kdirstat/pics/Makefile.am Fri Jun 29 12:37:50 2001 +++ kdirstat-new/kdirstat/pics/Makefile.am Wed May 26 17:51:02 2004 @@ -1,2 +1,2 @@ -datadir = $(kde_datadir)/kdirstat/icons -data_ICON = AUTO +kdirstat_icondir = ${kde_datadir}/kdirstat/icons +kdirstat_icon_ICON = AUTO