summaryrefslogtreecommitdiff
Unidiff
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()
311 if(fileL !="./" && fi->exists()) { 311 if(fileL !="./" && fi->exists()) {
312 item= new QListViewItem( Local_View, fileL, fileS , fileDate); 312 item= new QListViewItem( Local_View, fileL, fileS , fileDate);
313 313
314 if(isDir || fileL.find("/",0,TRUE) != -1) { 314 if(isDir || fileL.find("/",0,TRUE) != -1) {
315 315
316 if( !QDir( fi->filePath() ).isReadable()) //is directory 316 if( !QDir( fi->filePath() ).isReadable()) //is directory
317 pm = Resource::loadPixmap( "lockedfolder" ); 317 pm = Resource::loadPixmap( "lockedfolder" );
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.permission( QFileInfo::ExeUser) 321 } else if( (fileInfo.permission( QFileInfo::ExeUser)
322 | fileInfo.permission( QFileInfo::ExeGroup) 322 | fileInfo.permission( QFileInfo::ExeGroup)
323 | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) { 323 | fileInfo.permission( QFileInfo::ExeOther))
324 | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
324 pm = Resource::loadPixmap( "exec"); 325 pm = Resource::loadPixmap( "exec");
325// else { //is exec 326// else { //is exec
326// pm = Resource::loadPixmap( "exec"); 327// pm = Resource::loadPixmap( "exec");
327// } 328// }
328// // item->setPixmap( 0,pm); 329// // item->setPixmap( 0,pm);
329 } else if( !fi->isReadable() ) { 330 } else if( !fi->isReadable() ) {
330 pm = Resource::loadPixmap( "locked" ); 331 pm = Resource::loadPixmap( "locked" );
331// item->setPixmap( 0,pm); 332// item->setPixmap( 0,pm);
332 } else { //everything else goes by mimetype 333 } else { //everything else goes by mimetype
333 MimeType mt(fi->filePath()); 334 MimeType mt(fi->filePath());
334 pm=mt.pixmap(); //sets the correct pixmap for mimetype 335 pm=mt.pixmap(); //sets the correct pixmap for mimetype
335 if(pm.isNull()) 336 if(pm.isNull())
@@ -433,25 +434,26 @@ void AdvancedFm::populateRemoteView()
433 if(fileL !="./" && fi->exists()) { 434 if(fileL !="./" && fi->exists()) {
434 item= new QListViewItem( Remote_View, fileL, fileS, fileDate); 435 item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
435 QPixmap pm; 436 QPixmap pm;
436 437
437 if(isDir || fileL.find("/",0,TRUE) != -1) { 438 if(isDir || fileL.find("/",0,TRUE) != -1) {
438 if( !QDir( fi->filePath() ).isReadable()) 439 if( !QDir( fi->filePath() ).isReadable())
439 pm = Resource::loadPixmap( "lockedfolder" ); 440 pm = Resource::loadPixmap( "lockedfolder" );
440 else 441 else
441 pm= Resource::loadPixmap( "folder" ); 442 pm= Resource::loadPixmap( "folder" );
442// item->setPixmap( 0,pm ); 443// item->setPixmap( 0,pm );
443 } else if( (fileInfo.permission( QFileInfo::ExeUser) 444 } else if( (fileInfo.permission( QFileInfo::ExeUser)
444 | fileInfo.permission( QFileInfo::ExeGroup) 445 | fileInfo.permission( QFileInfo::ExeGroup)
445 | fileInfo.permission( QFileInfo::ExeOther)) & fs.find("vfat",0,TRUE) == -1) { 446 | fileInfo.permission( QFileInfo::ExeOther))
447 | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
446///// } else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!! 448///// } else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!!
447 pm = Resource::loadPixmap( "exec"); 449 pm = Resource::loadPixmap( "exec");
448// item->setPixmap( 0,pm); 450// item->setPixmap( 0,pm);
449 } else if( !fi->isReadable() ) { 451 } else if( !fi->isReadable() ) {
450 pm = Resource::loadPixmap( "locked" ); 452 pm = Resource::loadPixmap( "locked" );
451// item->setPixmap( 0,pm); 453// item->setPixmap( 0,pm);
452 } else { 454 } else {
453 MimeType mt(fi->filePath()); 455 MimeType mt(fi->filePath());
454 pm=mt.pixmap(); //sets the correct pixmap for mimetype 456 pm=mt.pixmap(); //sets the correct pixmap for mimetype
455 if(pm.isNull()) 457 if(pm.isNull())
456 pm = Resource::loadPixmap( "UnknownDocument-14" ); 458 pm = Resource::loadPixmap( "UnknownDocument-14" );
457// item->setPixmap( 0,pm); 459// item->setPixmap( 0,pm);