1 files changed, 100 insertions, 106 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 9c13e53..5148172 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -3,30 +3,24 @@
   -------------------
   ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
     email                : ljp@llornkcor.com
     *   This program is free software; you can redistribute it and/or modify  *
     *   it under the terms of the GNU General Public License as published by  *
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 
-
-//  #include <opie/ofileselector.h>
-//  #include <opie/ofiledialog.h>
-
-#include <opie/osplitter.h>
-
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 #include <qdatetime.h>
 #include <qfile.h>
@@ -99,131 +93,131 @@ void AdvancedFm::tabChanged(QWidget *) {
 
    QString fs= getFileSystemType( (const QString &)  path);
 
    setCaption(tr("AdvancedFm :: ")+fs+" :: "
               +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
    chdir( path.latin1());
 }
 
 
 void AdvancedFm::populateView() {
 
 // qWarning("PopulateView");
-                QPixmap pm;
-                QListView *thisView = CurrentView();
-                QDir *thisDir = CurrentDir();
-                QString path = thisDir->canonicalPath();
+        QPixmap pm;
+        QListView *thisView = CurrentView();
+        QDir *thisDir = CurrentDir();
+        QString path = thisDir->canonicalPath();
 
 //qWarning("path is "+path);
-                thisView->clear();
-                thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
-                thisDir->setMatchAllDirs(TRUE);
-                thisDir->setNameFilter(filterStr);
-                QString fileL, fileS, fileDate;
-                QString fs= getFileSystemType((const QString &) path);
-                setCaption(tr("AdvancedFm :: ")+fs+" :: "
-                                                         +checkDiskSpace((const QString &) path)+ tr(" kB free") );
-                bool isDir=FALSE;
-                const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
-                QFileInfoListIterator it(*list);
-                QFileInfo *fi;
-                while ( (fi=it.current()) ) {
-                                if (fi->isSymLink() )  {
-                                                QString symLink=fi->readLink();
-                                                QFileInfo sym( symLink);
-                                                fileS.sprintf( "%10i", sym.size() );
-                                                fileL =  fi->fileName() +" ->  " + sym.filePath().data();
-                                                fileDate = sym.lastModified().toString();
-                                }  else  {
-                                                fileS.sprintf( "%10i", fi->size() );
-                                                fileL = fi->fileName();
-                                                fileDate= fi->lastModified().toString();
-                                                if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
+        thisView->clear();
+        thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
+        thisDir->setMatchAllDirs(TRUE);
+        thisDir->setNameFilter(filterStr);
+        QString fileL, fileS, fileDate;
+        QString fs= getFileSystemType((const QString &) path);
+        setCaption(tr("AdvancedFm :: ")+fs+" :: "
+                             +checkDiskSpace((const QString &) path)+ tr(" kB free") );
+        bool isDir=FALSE;
+        const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
+        QFileInfoListIterator it(*list);
+        QFileInfo *fi;
+        while ( (fi=it.current()) ) {
+                if (fi->isSymLink() )  {
+                        QString symLink=fi->readLink();
+                        QFileInfo sym( symLink);
+                        fileS.sprintf( "%10i", sym.size() );
+                        fileL =  fi->fileName() +" ->  " + sym.filePath().data();
+                        fileDate = sym.lastModified().toString();
+                }  else  {
+                        fileS.sprintf( "%10i", fi->size() );
+                        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" );
-                                                                else
-                                                                                pm= Resource::loadPixmap( "folder" );
-                                                }
-                                                else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-                                                                pm = Resource::loadPixmap( "exec");
-                                                }
-                                                else if( (fileInfo.permission( QFileInfo::ExeUser)
-                                                                                        | fileInfo.permission( QFileInfo::ExeGroup)
-                                                                                        | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
-                                                                pm = Resource::loadPixmap( "exec");
-                                                }
-                                                else if( !fi->isReadable() )  {
-                                                                pm = Resource::loadPixmap( "locked" );
-                                                }
-                                                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) {
-                                                                        //  qDebug(" overlay link image");
-                                                                pm= Resource::loadPixmap( "advancedfm/symlink" );
-                                                                        //              pm= Resource::loadPixmap( "folder" );
+                                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" );
+                                else
+                                        pm= Resource::loadPixmap( "folder" );
+                        }
+                        else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                                pm = Resource::loadPixmap( "exec");
+                        }
+                        else if( (fileInfo.permission( QFileInfo::ExeUser)
+                                            | fileInfo.permission( QFileInfo::ExeGroup)
+                                            | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+                                pm = Resource::loadPixmap( "exec");
+                        }
+                        else if( !fi->isReadable() )  {
+                                pm = Resource::loadPixmap( "locked" );
+                        }
+                        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) {
+                                    //  qDebug(" overlay link image");
+                                pm= Resource::loadPixmap( "advancedfm/symlink" );
+                                    //              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);
-
-                                }
-                                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);
+                        }
+                        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);
 //        qDebug(mydirent->d_name);
-                                                                fileL.sprintf("%s", mydirent->d_name);
-                                                                devT = buf.st_dev;
-                                                                fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
-                                                                fileDate.sprintf("%s", ctime( &buf.st_mtime));
-                                                                if( fileL.find(".") == -1 ) {
-                                                                                item= new QListViewItem( thisView, fileL, fileS, fileDate);
-                                                                                pm = unknownXpm;
-                                                                                item->setPixmap( 0,pm);
-                                                                }
-                                                }
+                                fileL.sprintf("%s", mydirent->d_name);
+                                devT = buf.st_dev;
+                                fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
+                                fileDate.sprintf("%s", ctime( &buf.st_mtime));
+                                if( fileL.find(".") == -1 ) {
+                                        item= new QListViewItem( thisView, fileL, fileS, fileDate);
+                                        pm = unknownXpm;
+                                        item->setPixmap( 0,pm);
+                                }
+                        }
 
-                                closedir(dir);
-                }
+                closedir(dir);
+        }
 
-                thisView->setSorting( 3,FALSE);
-                fillCombo( (const QString &) path );
+        thisView->setSorting( 3,FALSE);
+        fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
      populateView();
      setOtherTabCurrent();
      populateView();
 
 //      int tmpTab = whichTab;
 // //  qDebug("%d", tmpTab);
 
 //    for(int i =1; i < 3; i++) {
 //       TabWidget->setCurrentWidget(i - 1);
@@ -774,25 +768,25 @@ void AdvancedFm::gotoCustomDir(const QString &dir) {
       gotoDirectory( dir);
 //       if(QDir( curDir).exists() )
 //         {
 //           thisDir->setPath( curDir );
 //           chdir( curDir.latin1() );
 //           thisDir->cd( curDir, TRUE);
 //           populateView();
 //         }
    }
 }
 
 QDir *AdvancedFm::CurrentDir() {
-   
+
    if ( whichTab == 1) {
       return &currentDir;
    } else {
       return &currentRemoteDir;
    }
 }
 
 QDir *AdvancedFm::OtherDir() {
    if ( whichTab == 1) {
       return &currentRemoteDir;
    } else {
       return &currentDir;
@@ -815,25 +809,25 @@ QListView * AdvancedFm::OtherView() {
    else
       return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent() {
 //   qWarning("setOtherTabCurrent() %d", whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
    OtherView()->setFocus();
-   OtherView()->setSelected( CurrentView()->firstChild(), true);      
+   OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
 //   qDebug("qcop message "+msg );
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
 //      qDebug("received");
       QString file;
       stream >> file;
       gotoDirectory( (const QString &) file);
    }
 }
@@ -855,25 +849,25 @@ void AdvancedFm::gotoDirectory(const QString &file) {
    }
    else if(QFileInfo(curDir).exists()) {
       QFileInfo fileInfo(curDir);
       curDir=fileInfo.dirPath();
       if(QDir( curDir).exists() )  {
          thisDir->setPath( curDir );
          chdir( curDir.latin1() );
          thisDir->cd( curDir, TRUE);
          populateView();
       }
       findFile(file);
    }
-  
+
 }
 
 void AdvancedFm::findFile(const QString &fileName) {
    QFileInfo fi(fileName);
    QListView *thisView = CurrentView();
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if(it.current()->text(0) == fi.fileName()) {
          it.current()->setSelected(true);
          thisView->ensureItemVisible(it.current());
       }
    }