Scale icons approprtely

1 files changed, 7 insertions, 7 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 56e3282..fd81313 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -123,64 +123,64 @@ void AdvancedFm::populateView() {
                                                 fileL = fi->fileName();
                                                 fileDate= fi->lastModified().toString();
                                                 if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
 //           if(fileL == "..")
                                                                 fileL += "/";
                                                                 isDir=TRUE;
                                                 }
                                 }
                                 QFileInfo fileInfo(  path + "/" + fileL);
 
                                 if(fileL !="./" && fi->exists())  {
                                                 item = new QListViewItem( thisView, fileL, fileS , fileDate);
 
                                                 if(isDir || fileL.find("/",0,TRUE) != -1) {
 
                                                                 if( !QDir( fi->filePath() ).isReadable()) //is directory
-                                                                                pm = Resource::loadPixmap( "lockedfolder" );
+                                                                                pm.convertFromImage( Resource::loadImage( "lockedfolder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
                                                                 else
-                                                                                pm= Resource::loadPixmap( "folder" );
+                                                                                pm.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
                                                 }
                                                 else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-                                                                pm = Resource::loadPixmap( "exec");
+                                                                pm.convertFromImage( Resource::loadImage( "exec" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
                                                 }
                                                 else if( (fileInfo.permission( QFileInfo::ExeUser)
                                                                                         | fileInfo.permission( QFileInfo::ExeGroup)
                                                                                         | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
-                                                                pm = Resource::loadPixmap( "exec");
+                                                                pm.convertFromImage( Resource::loadImage( "exec" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
                                                 }
                                                 else if( !fi->isReadable() )  {
-                                                                pm = Resource::loadPixmap( "locked" );
+                                                                pm.convertFromImage( Resource::loadImage( "locked" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
                                                 }
                                                 else { //everything else goes by mimetype
                                                                 MimeType mt(fi->filePath());
                                                                 pm=mt.pixmap(); //sets the correct pixmap for mimetype
                                                                 if(pm.isNull()) {
                                                                                 pm = unknownXpm;
                                                                 }
                                                 }
                                                 if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
                                                                         //  odebug << " overlay link image" << oendl;
-                                                                pm= Resource::loadPixmap( "advancedfm/symlink" );
+                                                                pm.convertFromImage( Resource::loadImage( "advancedfm/symlink" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
                                                                         //              pm= Resource::loadPixmap( "folder" );
 //                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
 //                QPainter painter( &pm );
 //                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
 //                pm.setMask( pm.createHeuristicMask( FALSE ) );
                                                 }
-                                                item->setPixmap( 0,pm);
+                                                item->setPixmap( 0, pm );
 
                                 }
                                 isDir=FALSE;
                                 ++it;
                 }
 
                 if( path.find("dev",0,TRUE) != -1) {
                                 struct stat buf;
                                 dev_t devT;
                                 DIR *dir;
                                 struct dirent *mydirent;
 
                                 if((dir = opendir( path.latin1())) != NULL)
                                                 while ((mydirent = readdir(dir)) != NULL) {
                                                                 lstat( mydirent->d_name, &buf);
 //        odebug << mydirent->d_name << oendl;