summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-05-02 02:42:45 (UTC)
committer llornkcor <llornkcor>2002-05-02 02:42:45 (UTC)
commitdd8d5784a9ef93b0d4ed7b6d1751942a904ab7cb (patch) (side-by-side diff)
tree2f40da1aec6e66dd9c67eb73297561c9e5a64e2b
parent6dfc6f34420b8c9222d1c785efc950fc5031a7f0 (diff)
downloadopie-dd8d5784a9ef93b0d4ed7b6d1751942a904ab7cb.zip
opie-dd8d5784a9ef93b0d4ed7b6d1751942a904ab7cb.tar.gz
opie-dd8d5784a9ef93b0d4ed7b6d1751942a904ab7cb.tar.bz2
bug on vfat workaround... sorta
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 7cd8644..b224deb 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -311,25 +311,26 @@ void AdvancedFm::populateLocalView()
if(fileL !="./" && fi->exists()) {
item= new QListViewItem( Local_View, fileL, fileS , fileDate);
if(isDir || fileL.find("/",0,TRUE) != -1) {
if( !QDir( fi->filePath() ).isReadable()) //is directory
pm = Resource::loadPixmap( "lockedfolder" );
else
pm= Resource::loadPixmap( "folder" );
// item->setPixmap( 0,pm );
} else if( (fileInfo.permission( QFileInfo::ExeUser)
| fileInfo.permission( QFileInfo::ExeGroup)
- | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) {
+ | fileInfo.permission( QFileInfo::ExeOther))
+ | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
pm = Resource::loadPixmap( "exec");
// else { //is exec
// pm = Resource::loadPixmap( "exec");
// }
// // item->setPixmap( 0,pm);
} else if( !fi->isReadable() ) {
pm = Resource::loadPixmap( "locked" );
// item->setPixmap( 0,pm);
} else { //everything else goes by mimetype
MimeType mt(fi->filePath());
pm=mt.pixmap(); //sets the correct pixmap for mimetype
if(pm.isNull())
@@ -433,25 +434,26 @@ void AdvancedFm::populateRemoteView()
if(fileL !="./" && fi->exists()) {
item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
QPixmap pm;
if(isDir || fileL.find("/",0,TRUE) != -1) {
if( !QDir( fi->filePath() ).isReadable())
pm = Resource::loadPixmap( "lockedfolder" );
else
pm= Resource::loadPixmap( "folder" );
// item->setPixmap( 0,pm );
} else if( (fileInfo.permission( QFileInfo::ExeUser)
| fileInfo.permission( QFileInfo::ExeGroup)
- | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) {
+ | fileInfo.permission( QFileInfo::ExeOther))
+ | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
///// } else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!!
pm = Resource::loadPixmap( "exec");
// item->setPixmap( 0,pm);
} else if( !fi->isReadable() ) {
pm = Resource::loadPixmap( "locked" );
// item->setPixmap( 0,pm);
} else {
MimeType mt(fi->filePath());
pm=mt.pixmap(); //sets the correct pixmap for mimetype
if(pm.isNull())
pm = Resource::loadPixmap( "UnknownDocument-14" );
// item->setPixmap( 0,pm);