author | llornkcor <llornkcor> | 2002-05-02 03:35:28 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-02 03:35:28 (UTC) |
commit | a52fd4b1995e34963888397587aa2592ea858da6 (patch) (unidiff) | |
tree | 6f8461a8ff72a96078bac6e3a644d33a8b25873a | |
parent | dd8d5784a9ef93b0d4ed7b6d1751942a904ab7cb (diff) | |
download | opie-a52fd4b1995e34963888397587aa2592ea858da6.zip opie-a52fd4b1995e34963888397587aa2592ea858da6.tar.gz opie-a52fd4b1995e34963888397587aa2592ea858da6.tar.bz2 |
I hate vfat.. I really do, or maybe I hate the way the kernel deals with it
-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 | |||
@@ -318,17 +318,18 @@ 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 ( 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 |
334 | MimeType mt(fi->filePath()); | 335 | MimeType mt(fi->filePath()); |
@@ -430,7 +431,7 @@ void AdvancedFm::populateRemoteView() | |||
430 | // qDebug( fileL); | 431 | // qDebug( fileL); |
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); |
436 | QPixmap pm; | 437 | QPixmap pm; |
@@ -441,12 +442,12 @@ void AdvancedFm::populateRemoteView() | |||
441 | else | 442 | else |
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() ) { |
452 | pm = Resource::loadPixmap( "locked" ); | 453 | pm = Resource::loadPixmap( "locked" ); |