| -rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index b224deb..f4ca349 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
| @@ -319,15 +319,16 @@ void AdvancedFm::populateLocalView() | |||
| 319 | pm= Resource::loadPixmap( "folder" ); | 319 | pm= Resource::loadPixmap( "folder" ); |
| 320 | // item->setPixmap( 0,pm ); | 320 | // item->setPixmap( 0,pm ); |
| 321 | } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | ||
| 322 | pm = Resource::loadPixmap( "exec"); | ||
| 321 | } else if( (fileInfo.permission( QFileInfo::ExeUser) | 323 | } else if( (fileInfo.permission( QFileInfo::ExeUser) |
| 322 | | fileInfo.permission( QFileInfo::ExeGroup) | 324 | | fileInfo.permission( QFileInfo::ExeGroup) |
| 323 | | fileInfo.permission( QFileInfo::ExeOther)) | 325 | | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) { |
| 324 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | 326 | pm = Resource::loadPixmap( "exec"); |
| 325 | pm = Resource::loadPixmap( "exec"); | ||
| 326 | // else { //is exec | 327 | // else { //is exec |
| 327 | // pm = Resource::loadPixmap( "exec"); | 328 | // pm = Resource::loadPixmap( "exec"); |
| 328 | // } | 329 | // } |
| 329 | // // item->setPixmap( 0,pm); | 330 | // // item->setPixmap( 0,pm); |
| 330 | } else if( !fi->isReadable() ) { | 331 | } else if( !fi->isReadable() ) { |
| 331 | pm = Resource::loadPixmap( "locked" ); | 332 | pm = Resource::loadPixmap( "locked" ); |
| 332 | // item->setPixmap( 0,pm); | 333 | // item->setPixmap( 0,pm); |
| 333 | } else { //everything else goes by mimetype | 334 | } else { //everything else goes by mimetype |
| @@ -431,5 +432,5 @@ void AdvancedFm::populateRemoteView() | |||
| 431 | } | 432 | } |
| 432 | } | 433 | } |
| 433 | QFileInfo fileInfo( currentDir.canonicalPath()+"/"+fileL); | 434 | QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+fileL); |
| 434 | if(fileL !="./" && fi->exists()) { | 435 | if(fileL !="./" && fi->exists()) { |
| 435 | item= new QListViewItem( Remote_View, fileL, fileS, fileDate); | 436 | item= new QListViewItem( Remote_View, fileL, fileS, fileDate); |
| @@ -442,10 +443,10 @@ void AdvancedFm::populateRemoteView() | |||
| 442 | pm= Resource::loadPixmap( "folder" ); | 443 | pm= Resource::loadPixmap( "folder" ); |
| 443 | // item->setPixmap( 0,pm ); | 444 | // item->setPixmap( 0,pm ); |
| 445 | } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | ||
| 446 | pm = Resource::loadPixmap( "exec"); | ||
| 444 | } else if( (fileInfo.permission( QFileInfo::ExeUser) | 447 | } else if( (fileInfo.permission( QFileInfo::ExeUser) |
| 445 | | fileInfo.permission( QFileInfo::ExeGroup) | 448 | | fileInfo.permission( QFileInfo::ExeGroup) |
| 446 | | fileInfo.permission( QFileInfo::ExeOther)) | 449 | | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) { |
| 447 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | 450 | pm = Resource::loadPixmap( "exec"); |
| 448 | ///// } else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!! | ||
| 449 | pm = Resource::loadPixmap( "exec"); | ||
| 450 | // item->setPixmap( 0,pm); | 451 | // item->setPixmap( 0,pm); |
| 451 | } else if( !fi->isReadable() ) { | 452 | } else if( !fi->isReadable() ) { |