fix #1499 - rename working

2 files changed, 5 insertions, 36 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 8cc5d7b..56e3282 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -104,560 +104,528 @@ void AdvancedFm::populateView() {
                 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) {
                                                                         //  odebug << " overlay link image" << oendl;
                                                                 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);
 //        odebug << mydirent->d_name << oendl;
                                                                 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);
                 }
 
                 thisView->setSorting( 3,FALSE);
                 fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
         //      qDebug("repopulate views");
                 populateView();
                 setOtherTabCurrent();
                 populateView();
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
                 if(selectedItem) {
                                 QString strItem=selectedItem->text(0);
 //      owarn << strItem << oendl;
                                 QString strSize=selectedItem->text(1);
                                 strSize=strSize.stripWhiteSpace();
                                 bool isDirectory = false;
                                 QString strItem2;
 
                                 if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink
                                                 strItem2 = dealWithSymName((const QString&)strItem);
                                                 if(QDir(strItem2).exists() )
                                                                 strItem = strItem2;
                                 }
 
                                 if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
 
                                                 if(QDir(strItem).exists())
                                                                 isDirectory = true;
                                 }
 
                                 if( isDirectory ) {
                                                 CurrentDir()->cd( strItem, TRUE);
                                                 populateView();
                                                 CurrentView()->ensureItemVisible( CurrentView()->firstChild());
                                 }
                                 chdir( strItem.latin1());
                 }
 }
 
 void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , int ) {
                 Q_UNUSED(item);
    switch (mouse) {
    case 1:
    {
       if(renameBox != 0 ) {
          cancelRename();
       }
    }
    break;
 //    case 2:
 //       menuTimer.start( 50, TRUE );
 //       break;
    };
 }
 
 
 void AdvancedFm::refreshCurrentTab() {
      populateView();
         // if ( TabWidget->currentWidget() == tab) {
 }
 
 void AdvancedFm::switchToLocalTab() {
                 TabWidget->setCurrentWidget(tab);
                 Local_View->setFocus();
         //      whichTab = 1;
 }
 
 void AdvancedFm::switchToRemoteTab() {
                 TabWidget->setCurrentWidget(tab_2);
                 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) {
    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());
 }
 
 void AdvancedFm::CFButtonPushed() {
                 Opie::Core::OStorageInfo info;
                 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()) {
+
+        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 )
-                                rn();
-                else if( e->key() ==  Key_U )
-                                upDir();
-                else if( e->key() ==  Key_1)
-                                switchToLocalTab();
-                else if( e->key() == Key_2)
-                                switchToRemoteTab();
-                else if( e->key() ==  Key_3)
-                                CFButtonPushed();
-                else if( e->key() == Key_4)
-                                SDButtonPushed();
-                else if( e->key() == Key_5 )
-                                homeButtonPushed();
-                else if( e->key() ==  Key_6 )
-                                docButtonPushed();
                 else
                                 e->accept();
+
 }
 
 
 void AdvancedFm::parsetab(const QString &fileName) {
 
    fileSystemTypeList.clear();
    fsList.clear();
    struct mntent *me;
    FILE *mntfp = setmntent( fileName.latin1(), "r" );
    if ( mntfp ) {
       while ( (me = getmntent( mntfp )) != 0 ) {
          QString deviceName = me->mnt_fsname;
          QString filesystemType = me->mnt_type;
          QString mountDir = me->mnt_dir;
          if(deviceName != "none") {
             if( fsList.contains(filesystemType) == 0
                 & filesystemType.find("proc",0,TRUE) == -1
                 & filesystemType.find("cramfs",0,TRUE) == -1
                 & filesystemType.find("auto",0,TRUE) == -1)
                fsList << filesystemType;
             fileSystemTypeList << mountDir+"::"+filesystemType;
          }
       }
    }
    endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
    parsetab("/etc/mtab"); //why did TT forget filesystem type?
    QString current = currentText;//.right( currentText.length()-1);
    QString baseFs;
    for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
       QString temp = (*it);
       QString path = temp.left(temp.find("::",0,TRUE) );
       path = path.right( path.length()-1);
       if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
          return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       }
    }
    return baseFs;
 }
 
 QString  AdvancedFm::getDiskSpace( const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
       int blkSize = fss.f_bsize;
       //    int totalBlks = fs.f_blocks;
       int availBlks = fss.f_bavail;
 
       long mult = blkSize / 1024;
       long div = 1024 / blkSize;
       if ( !mult ) mult = 1;
       if ( !div ) div = 1;
 
       return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 
 void AdvancedFm::showFileMenu() {
    QString curApp;
    curApp = CurrentView()->currentItem()->text(0);
 
    MimeType mt(curApp);
    const AppLnk* app = mt.application();
    QFile fi(curApp);
    QPopupMenu *m = new QPopupMenu(0);
    QPopupMenu *n = new QPopupMenu(0);
    //    QPopupMenu *o = new QPopupMenu(0);
    m->insertItem(tr("Show Hidden Files"),this,SLOT(showHidden()));
 
    if ( QFileInfo(fi).isDir()) {
       m->insertSeparator();
       m->insertItem(tr("Change Directory"),this,SLOT(doDirChange()));
    } else {
 
       if (app)
          m->insertItem(app->pixmap(),tr("Open in " + app->name()),this,SLOT(runThis()));
       else if(QFileInfo(fi).isExecutable() ) //damn opie doesnt like this
          m->insertItem(tr("Execute"),this,SLOT(runThis()));
       m->insertItem(Resource::loadPixmap("txt"),tr("Open as text"),this,SLOT(runText()));
    }
 
    m->insertItem(tr("Actions"),n);
    n->insertItem(tr("Make Directory"),this,SLOT(makeDir()));
 
    n->insertItem(tr("Make Symlink"),this,SLOT(mkSym()));
 
    n->insertSeparator();
    n->insertItem(tr("Rename"),this,SLOT(renameIt()));
 
    n->insertItem(tr("Copy"),this,SLOT(copyTimer()));
    n->insertItem(tr("Copy As"),this,SLOT(copyAsTimer()));
    n->insertItem(tr("Copy Same Dir"),this,SLOT(copySameDirTimer()));
    n->insertItem(tr("Move"),this,SLOT(moveTimer()));
 
    n->insertSeparator();
    n->insertItem(tr("Delete"),this,SLOT(doDelete()));
    m->insertItem(tr("Add To Documents"),this,SLOT(addToDocs()));
 
    m->insertItem(tr("Run Command"),this,SLOT(runCommand()));
    m->insertItem(tr("File Info"),this,SLOT(fileStatus()));
 
    m->insertSeparator();
    m->insertItem(tr("Set Permissions"),this,SLOT(filePerms()));
 
 #if defined(QT_QWS_OPIE)
    m->insertItem(tr("Properties"),this,SLOT(doProperties()));
 #endif
    m->setCheckable(TRUE);
    if (!b)
       m->setItemChecked(m->idAt(0),TRUE);
    else
       m->setItemChecked(m->idAt(0),FALSE);
 
    if(Ir::supported())
       m->insertItem(tr("Beam File"),this,SLOT(doBeam()));
    m->setFocus();
 
    m->exec(QPoint(QCursor::pos().x(),QCursor::pos().y()));
 
    if(m) delete m;
 }
 
 
 QString AdvancedFm::checkDiskSpace(const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
       int blkSize = fss.f_bsize;
 //    int totalBlks = fs.f_blocks;
       int availBlks = fss.f_bavail;
 
       long mult = blkSize / 1024;
       long div = 1024 / blkSize;
       if ( !mult ) mult = 1;
       if ( !div ) div = 1;
 
 
       return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 void AdvancedFm::addToDocs() {
    QStringList strListPaths = getPath();
    QDir *thisDir = CurrentDir();
 
    if( strListPaths.count() > 0) {
       QString curFile;
       for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
          curFile = thisDir->canonicalPath()+"/"+(*it);
 //                odebug << curFile << oendl;
          QFileInfo fi(curFile);
          DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
          f.setName(fi.baseName() );
          f.setFile( curFile);
          f.writeLink();
       }
    }
 }
 
 
 void AdvancedFm::customDirsToMenu() {
 
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
 
    QStringList list = cfg.readListEntry( "CustomDir", ',');
    menuButton->insertItems(list );
 
 //      for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
 //        {
 //            customDirMenu->insertItem(*it );
 //        }
 }
 
 void AdvancedFm::dirMenuSelected(int item) {
    switch(item)
    {
 
    case -21:
    case 0:
       addCustomDir();
       break;
    case -22:
    case 1:
       removeCustomDir();
       break;
    default:
    {
 //            gotoCustomDir( menuButton->text(item));
 //            gotoCustomDir( customDirMenu->text(item));
    }
    break;
 
    };
 }
 
 void AdvancedFm::addCustomDir() {
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
    QString dir;
    QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
 
    dir =  CurrentDir()->canonicalPath();
 
    bool addIt=true;
    for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
       if( dir == (*it)) {
          addIt=false;
       }
    }
    if(addIt) {
       menuButton->insertItem(dir);
 //          customDirMenu->insertItem(dir);
       list <<  dir;
    }
 
    cfg.writeEntry("CustomDir", list, ',');
    cfg.write();
 }
 
 void AdvancedFm::removeCustomDir() {
 //  odebug << "remove custom dir" << oendl;
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
    QString dir;
    QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
    QStringList list2;
    dir =  CurrentDir()->canonicalPath();
    int ramble=2;
 //  int ramble=-24;
 //first remove list
    if(list.grep(dir,true).isEmpty()) {
       QMessageBox::message(tr( "AdvancedFm" ),
                            tr("<p>Cannot remove current directory from bookmarks. It is not bookmarked!</p>"));
    } else {
       for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
          if((*it) != dir) {
 //current item is not our current dir, so add it to temp list
             list2 <<(*it);
          } else {
 //              customDirMenu->removeItem( ramble);
             menuButton->remove( ramble);
 
          }
          ramble++;
 //        ramble--;
       }
 
       cfg.writeEntry("CustomDir", list2, ',');
       cfg.write();
    }
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 6abdc85..80324eb 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -612,262 +612,263 @@ void AdvancedFm::runCommand() {
    QString curFile;
    curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);
 
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
    fileDlg->setInputText(curFile);
    fileDlg->exec();
    //QString command;
 
    if( fileDlg->result() == 1 ) {
 //      odebug << fileDlg->LineEdit1->text() << oendl;
       QStringList command;
 
       command << "/bin/sh";
       command << "-c";
       command <<  fileDlg->LineEdit1->text();
       Output *outDlg;
       outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
       QPEApplication::execDialog( outDlg );
       qApp->processEvents();
 
    }
 }
 
 void AdvancedFm::runCommandStd() {
    if( !CurrentView()->currentItem()) return;
    QString curFile;
    QDir *thisDir = CurrentDir();
    QListView *thisView = CurrentView();
    if( thisView->currentItem())
       curFile = thisDir->canonicalPath() +"/"+  thisView->currentItem()->text(0);
 
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
    fileDlg->setInputText(curFile);
    fileDlg->exec();
 
    if( fileDlg->result() == 1 ) {
       qApp->processEvents();
       startProcess( (const QString)fileDlg->LineEdit1->text().latin1());
    }
 }
 
 void AdvancedFm::fileStatus() {
    if( !CurrentView()->currentItem()) return;
    QString curFile;
    curFile = CurrentView()->currentItem()->text(0);
 
    QStringList command;
    command << "/bin/sh";
    command << "-c";
    command << "stat -l "+ curFile;
 
    Output *outDlg;
    outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
    QPEApplication::execDialog( outDlg );
    qApp->processEvents();
 }
 
 
 void AdvancedFm::mkDir() {
     makeDir();
 }
 
 void AdvancedFm::rn() {
   renameIt();
 }
 
 void AdvancedFm::del() {
     doDelete();
 }
 
 void AdvancedFm::mkSym() {
   QString cmd;
   QStringList curFileList = getPath();
   if( curFileList.count() > 0) {
       QDir *thisDir = CurrentDir();
       QDir * thatDir = OtherDir();
 
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
           QString destName = thatDir->canonicalPath()+"/"+(*it);
           if(destName.right(1) == "/") {
               destName = destName.left( destName.length() -1);
             }
 
           QString curFile =  thisDir->canonicalPath()+"/"+(*it);
 
           if( curFile.right(1) == "/") {
               curFile = curFile.left( curFile.length() -1);
             }
 
           cmd = "ln -s "+curFile+" "+destName;
 //          odebug << cmd << oendl;
           startProcess( (const QString)cmd );
         }
             rePopulate();
             setOtherTabCurrent();
     }
 }
 
 void AdvancedFm::doBeam() {
    Ir ir;
    if(!ir.supported())  {
    } else {
       QStringList curFileList = getPath();
       if( curFileList.count() > 0)  {
          for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
             QString curFile = (*it);
             QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;
             if( curFilePath.right(1) == "/") {
                curFilePath = curFilePath.left( curFilePath.length() -1);
             }
             Ir *file = new Ir(this, "IR");
             connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*)));
             file->send( curFilePath, curFile );
          }
       }
    }
 }
 
 void AdvancedFm::fileBeamFinished( Ir *) {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 }
 
 void AdvancedFm::selectAll() {
   QListView *thisView = CurrentView();
   thisView->selectAll(true);
   thisView->setSelected( thisView->firstChild(),false);
 }
 
 void AdvancedFm::startProcess(const QString & cmd) {
   QStringList command;
   OProcess *process;
   process = new OProcess();
   connect(process,SIGNAL(processExited(Opie::Core::OProcess*)),this,SLOT(processEnded(Opie::Core::OProcess*)));
   connect(process,SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),this,SLOT(oprocessStderr(Opie::Core::OProcess*,char*,int)));
 
   command << "/bin/sh";
   command << "-c";
   command << cmd.latin1();
   *process << command;
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
     odebug << "could not start process" << oendl;
 }
 
 void AdvancedFm::processEnded(OProcess *) {
             rePopulate();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
 //    owarn << "received stderrt " << buflen << " bytes" << oendl;
 
     QString lineStr = buffer;
     QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
 }
 
 bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
                 if ( o->inherits( "QLineEdit" ) )  {
                                 if ( e->type() == QEvent::KeyPress ) {
                                                 QKeyEvent *ke = (QKeyEvent*)e;
                                                 if ( ke->key() == Key_Return ||
                                                                  ke->key() == Key_Enter )  {
                                                                 okRename();
                                                                 return true;
             }
                                                 else if ( ke->key() == Key_Escape ) {
                 cancelRename();
                 return true;
                                                 }
         }
                                 else if ( e->type() == QEvent::FocusOut ) {
             cancelRename();
             return true;
                                 }
     }
    if ( o->inherits( "QListView" ) ) {
        if ( e->type() == QEvent::FocusIn ) {
             if( o == Local_View) { //keep track of which view
                whichTab = 1;
                                        viewMenu->setItemChecked(viewMenu->idAt(0), true);
                                        viewMenu->setItemChecked(viewMenu->idAt(1), false);
             } else {
                whichTab = 2;
                                        viewMenu->setItemChecked(viewMenu->idAt(0), false);
                                        viewMenu->setItemChecked(viewMenu->idAt(1), true);
             }
        }
        OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
      }
 
   return QWidget::eventFilter( o, e );
 }
 
 
 void AdvancedFm::cancelRename() {
 //  odebug << "cancel rename" << oendl;
   QListView * view;
   view = CurrentView();
 
   bool resetFocus = view->viewport()->focusProxy() == renameBox;
   delete renameBox;
   renameBox = 0;
   if ( resetFocus ) {
       view->viewport()->setFocusProxy( view);
       view->setFocus();
     }
 }
 
 void AdvancedFm::doRename(QListView * view) {
    if( !CurrentView()->currentItem()) return;
 
     QRect r = view->itemRect( view->currentItem( ));
     r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
     r.setX( view->contentsX() );
                 if ( r.width() > view->visibleWidth() )
         r.setWidth( view->visibleWidth() );
 
     renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );
     renameBox->setFrame(true);
     renameBox->setText(  view->currentItem()->text(0) );
     renameBox->selectAll();
     renameBox->installEventFilter( this );
     view->addChild( renameBox, r.x(), r.y() );
                 renameBox->resize( r.size() );
                 view->viewport()->setFocusProxy( renameBox );
                 renameBox->setFocus();
     renameBox->show();
 }
 
 
 void AdvancedFm::renameIt() {
                 if( !CurrentView()->currentItem()) return;
 
                 QListView *thisView = CurrentView();
     oldName = thisView->currentItem()->text(0);
     doRename( thisView );
 }
 
 void AdvancedFm::okRename() {
                 qDebug("okrename");
                 if( !renameBox) return;
 
                 QString newName = renameBox->text();
                 cancelRename();
                 QListView * view = CurrentView();
                 QString path =  CurrentDir()->canonicalPath() + "/";
                 oldName = path + oldName;
                 newName = path + newName;
                 if( rename( oldName.latin1(), newName.latin1())== -1)
                                 QMessageBox::message(tr("Note"),tr("Could not rename"));
                 else
                                 oldName = "";
                 QListViewItem *item = view->currentItem();
                 view->takeItem( item );
                 delete item;
-                rePopulate();
+                populateView();
+                
 }
 
 void AdvancedFm::openSearch() {
     QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
 }