Diffstat (limited to 'noncore/apps/advancedfm/advancedfm.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index ee3f736..a9ba3c2 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -318,9 +318,14 @@ void AdvancedFm::populateLocalView() | |||
318 | else | 318 | else |
319 | pm= Resource::loadPixmap( "folder" ); | 319 | pm= Resource::loadPixmap( "folder" ); |
320 | // item->setPixmap( 0,pm ); | 320 | // item->setPixmap( 0,pm ); |
321 | } else if( fileInfo.isExecutable() || fs == "vfat" && fi->filePath().contains("/bin") ) { //is exec | 321 | } else if( (fileInfo.permission( QFileInfo::ExeUser) |
322 | pm = Resource::loadPixmap( "exec"); | 322 | | fileInfo.permission( QFileInfo::ExeGroup) |
323 | // item->setPixmap( 0,pm); | 323 | | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) { |
324 | pm = Resource::loadPixmap( "exec"); | ||
325 | // else { //is exec | ||
326 | // pm = Resource::loadPixmap( "exec"); | ||
327 | // } | ||
328 | // // item->setPixmap( 0,pm); | ||
324 | } else if( !fi->isReadable() ) { | 329 | } else if( !fi->isReadable() ) { |
325 | pm = Resource::loadPixmap( "locked" ); | 330 | pm = Resource::loadPixmap( "locked" ); |
326 | // item->setPixmap( 0,pm); | 331 | // item->setPixmap( 0,pm); |
@@ -332,7 +337,7 @@ void AdvancedFm::populateLocalView() | |||
332 | // item->setPixmap( 0,pm); | 337 | // item->setPixmap( 0,pm); |
333 | } | 338 | } |
334 | item->setPixmap( 0,pm); | 339 | item->setPixmap( 0,pm); |
335 | if( fi->isSymLink() &&fileL.find("->",0,TRUE) != -1) { | 340 | if( fi->isSymLink() && fileL.find("->",0,TRUE) != -1) { |
336 | // overlay link image | 341 | // overlay link image |
337 | pm= Resource::loadPixmap( "folder" ); | 342 | pm= Resource::loadPixmap( "folder" ); |
338 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); | 343 | QPixmap lnk = Resource::loadPixmap( "opie/symlink" ); |
@@ -424,6 +429,7 @@ void AdvancedFm::populateRemoteView() | |||
424 | // qDebug( fileL); | 429 | // qDebug( fileL); |
425 | } | 430 | } |
426 | } | 431 | } |
432 | QFileInfo fileInfo( currentDir.canonicalPath()+"/"+fileL); | ||
427 | if(fileL !="./" && fi->exists()) { | 433 | if(fileL !="./" && fi->exists()) { |
428 | item= new QListViewItem( Remote_View, fileL, fileS, fileDate); | 434 | item= new QListViewItem( Remote_View, fileL, fileS, fileDate); |
429 | QPixmap pm; | 435 | QPixmap pm; |
@@ -434,8 +440,12 @@ void AdvancedFm::populateRemoteView() | |||
434 | else | 440 | else |
435 | pm= Resource::loadPixmap( "folder" ); | 441 | pm= Resource::loadPixmap( "folder" ); |
436 | // item->setPixmap( 0,pm ); | 442 | // item->setPixmap( 0,pm ); |
437 | } else if( fi->isExecutable() || fs == "vfat" && fi->filePath().contains("/bin") ) { | 443 | } else if( (fileInfo.permission( QFileInfo::ExeUser) |
438 | pm = Resource::loadPixmap( "exec"); | 444 | | fileInfo.permission( QFileInfo::ExeGroup) |
445 | | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) { | ||
446 | pm = Resource::loadPixmap( "exec"); | ||
447 | ///// } else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!! | ||
448 | pm = Resource::loadPixmap( "exec"); | ||
439 | // item->setPixmap( 0,pm); | 449 | // item->setPixmap( 0,pm); |
440 | } else if( !fi->isReadable() ) { | 450 | } else if( !fi->isReadable() ) { |
441 | pm = Resource::loadPixmap( "locked" ); | 451 | pm = Resource::loadPixmap( "locked" ); |