fix

1 files changed, 9 insertions, 11 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index f1be471..0dc822d 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1,170 +1,168 @@
 /***************************************************************************
    AdvancedFm.cpp
   -------------------
   ** 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 <opie2/odebug.h>
 
 #include <opie2/ostorageinfo.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
 using namespace Opie::Ui;
 
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
    : QMainWindow( ) {
    init();
    renameBox = 0;
-
+         whichTab = 1;
    unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() );
 
          initConnections();
          rePopulate();
          channel = new QCopChannel( "QPE/Application/advancedfm", this );
          connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
          switchToLocalTab();
 }
 
 AdvancedFm::~AdvancedFm() {
 }
 
 
 void AdvancedFm::cleanUp() {
    QString sfile=QDir::homeDirPath();
    if(sfile.right(1) != "/")
       sfile+="/._temp";
    else
       sfile+="._temp";
    QFile file( sfile);
    if(file.exists())
       file.remove();
 }
 
 void AdvancedFm::tabChanged(QWidget *wd) {
         //      qDebug("tabChanged");
                 if(wd == tab) {
                                 whichTab = 1;
         //                      qDebug("tabchanged: LOCAL VIEW SHOWN");
                 }
                 else if(wd == tab_2) {
                                 whichTab = 2;
         //                      qDebug("tabchanged: REMOTE VIEW SHOWN");
                 }
                 qApp->processEvents();
                 QString path = CurrentDir()->canonicalPath();
         //      qDebug(path);
                 if ( TabWidget->currentWidget() == tab) {
                                 viewMenu->setItemChecked(viewMenu->idAt(0), true);
                                 viewMenu->setItemChecked(viewMenu->idAt(1), false);
                 } else {
                                 viewMenu->setItemChecked(viewMenu->idAt(0), false);
                                 viewMenu->setItemChecked(viewMenu->idAt(1), true);
                 }
 
-                QString fs= getFileSystemType( (const QString &)  path);
-
-                setCaption(tr("AdvancedFm :: ")+fs+" :: "
-                                                         +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
                 chdir( path.latin1());
                 currentPathCombo->lineEdit()->setText(path);
 }
 
 
 void AdvancedFm::populateView() {
 
                 QPixmap pm;
                 QListView *thisView = CurrentView();
                 QDir *thisDir = CurrentDir();
                 QString path = thisDir->canonicalPath();
 
                 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);
+
+                QString fs = getFileSystemType((const QString &) path);
                 setCaption(tr("AdvancedFm :: ")+fs+" :: "
                                                          +checkDiskSpace((const QString &) path)+ tr(" kB free") );
-                bool isDir=FALSE;
+                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();
+                                                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) {
                                                                         //  odebug << " overlay link image" << oendl;
                                                                 pm= Resource::loadPixmap( "advancedfm/symlink" );
                                                                         //              pm= Resource::loadPixmap( "folder" );
@@ -278,119 +276,119 @@ void AdvancedFm::switchToRemoteTab() {
         //      Remote_View->setFocus();
                 whichTab = 2;
 }
 
 void  AdvancedFm::currentPathComboChanged() {
                 QString pDir = currentPathCombo->lineEdit()->text();
    if(QDir(pDir).exists()) {
       CurrentDir()->setPath(pDir );
       populateView();
    } else {
       QMessageBox::message(tr("Note"),tr("<p>%1 does not exist</p>").arg(pDir));
    }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
 
          if ( TabWidget->currentWidget() == tab) {
 //   if ( whichTab == 1) {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
          currentPathCombo->clear();
          localDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( localDirPathStringList,-1);
       }
    } else {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
          currentPathCombo->clear();
          remoteDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( remoteDirPathStringList,-1);
       }
    }
 }
 
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    QListView *thisView=CurrentView();
    QList<QListViewItem> * getSelectedItems( QListView * thisView );
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
-void AdvancedFm::changeTo(const QString dir) {
+void AdvancedFm::changeTo(const QString &dir) {
    chdir( dir.latin1());
    CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::homeButtonPushed() {
  changeTo(QDir::homeDirPath());
 }
 
 void AdvancedFm::docButtonPushed() {
    changeTo(QPEApplication::documentDir());
 }
 
 void AdvancedFm::SDButtonPushed() {
                 Opie::Core::OStorageInfo info;
-   changeTo(info.sdPath());
+                changeTo(info.sdPath());
 }
 
 void AdvancedFm::CFButtonPushed() {
                 Opie::Core::OStorageInfo info;
-   changeTo(info.cfPath());
+                changeTo(info.cfPath());
 }
 
 void AdvancedFm::QPEButtonPushed() {
                 changeTo(QPEApplication::qpeDir());
 }
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
                 Q_UNUSED(e);
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
 //     if( CurrentView()->hasFocus() )
 //        e->ignore();
                 if( currentPathCombo->lineEdit()->hasFocus()) {
         //                      qDebug("shout!");
                 }
 
                                 else if(  e->key() ==  Key_Left ) 
                                 upDir();
                 else if( e->key() == Key_Return || e->key() == Key_Enter)
                                 navigateToSelected();
                 else if( e->key() == Key_Tab)
                                 setOtherTabCurrent();
                 else if( e->key() == Key_Delete )
                                 del();
                 else if( e->key() ==  Key_A)
                                 copyAs();
                 else if( e->key() ==  Key_C)
                                 copy();
                 else if( e->key() ==  Key_E)
                                 runThis();
                 else if( e->key() ==  Key_G)
                                 currentPathCombo->lineEdit()->setFocus();
                 else if( e->key() == Key_H )
                                 showHidden();
                 else if( e->key() == Key_I)
                                 fileStatus();
                 else if( e->key() == Key_M)
                                 move();
                 else if( e->key() == Key_N )
                                 mkDir();
                 else if( e->key() ==  Key_P)
                                 filePerms();
                 else if( e->key() ==  Key_R )