fix rename

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 2ddcabc..e7c0b6a 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -906,232 +906,232 @@ void AdvancedFm::del() {
 }
 
 void AdvancedFm::mkSym() {
     QString cmd;
     QStringList curFileList = getPath();
     if( curFileList.count() > 0) {
 
         if (TabWidget->getCurrentTab() == 0) {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                 QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
                 if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
                 QString curFile =  currentDir.canonicalPath()+"/"+(*it);
                 if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
                 cmd = "ln -s "+curFile+" "+destName;
                 qDebug(cmd);
                 startProcess( (const QString)cmd );
             }
             populateRemoteView();
             TabWidget->setCurrentTab(1);
         } else {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                 QString destName = currentDir.canonicalPath()+"/"+(*it);
                 if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
                 QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
                 if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
 
                 cmd = "ln -s "+curFile+" "+destName;
                 qDebug(cmd);
                 startProcess( (const QString)cmd );
             }
             populateLocalView();
             TabWidget->setCurrentTab(0);
         }
     }
 }
 
 void AdvancedFm::doBeam() {
   Ir ir;
   if(!ir.supported()){
   } else {
 
     QStringList curFileList = getPath();
     if( curFileList.count() > 0) {
 
       if (TabWidget->getCurrentTab() == 0) {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
           QString curFile =  currentDir.canonicalPath()+"/"+(*it);
           if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
           Ir *file = new Ir(this, "IR");
           connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
           file->send( curFile, curFile );
         }
 
       }  else {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
           QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
           if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
           Ir *file = new Ir(this, "IR");
           connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
           file->send( curFile, curFile );
 
         }
       }
     }
   }
 
 }
 
 void AdvancedFm::fileBeamFinished( Ir *) {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 
 }
 
 void AdvancedFm::selectAll() {
     if (TabWidget->getCurrentTab() == 0) {
         Local_View->selectAll(true);
         Local_View->setSelected( Local_View->firstChild(),false);
     } else {
         Remote_View->selectAll(true);
         Remote_View->setSelected( Remote_View->firstChild(),false);
     }
 }
 
 void AdvancedFm::startProcess(const QString & cmd) {
       QStringList command;
       OProcess *process;
       process = new OProcess();
       connect(process, SIGNAL(processExited(OProcess *)),
               this, SLOT( processEnded()));
 
       command << "/bin/sh";
       command << "-c";
       command << cmd.latin1();
       *process << command;
       if(!process->start(OProcess::NotifyOnExit) )
           qDebug("could not start process");
 }
 
 void AdvancedFm::processEnded() {
   populateLocalView();
   populateRemoteView();
 }
 
 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::FocusOut ) {
             printf("focusIn\n");
             
         }
     }   
 
     return QWidget::eventFilter( o, e );
 }
 
 
 void AdvancedFm::cancelRename()
 {
     qDebug("cancel rename");
     QListView * view;
     if (TabWidget->getCurrentTab() == 0)
       {
           view = Local_View;
       }
     else
       {
           view = Remote_View;
       }
 
     bool resetFocus = view->viewport()->focusProxy() == renameBox;
     delete renameBox;
     renameBox = 0;
     if ( resetFocus ) {
         view->viewport()->setFocusProxy( view);
         view->setFocus();
     }
 }
 
 void AdvancedFm::doRename(QListView * view)
 {
 
     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::localRename()
 {
     oldName = Local_View->currentItem()->text(0);
     doRename(Local_View );
     populateLocalView();
 }
 
 void AdvancedFm::remoteRename()
 {
     oldName = Remote_View->currentItem()->text(0);
-    doRename(Local_View );
+    doRename(Remote_View );
     populateRemoteView();
 }
 
 void AdvancedFm::okRename()
 {
     QString newName = renameBox->text();
     cancelRename();
     int tabs=0;
      QListView * view;
      tabs = TabWidget->getCurrentTab();
      if ( tabs == 0)
        {
            view = Local_View;
            QString path =  currentDir.canonicalPath() + "/";
            oldName = path + oldName;
            newName = path + newName;
         }
      else
        {
            view = Remote_View;
            QString path =  currentRemoteDir.canonicalPath() + "/";
            oldName = path + oldName;
            newName = path + newName;
        }
 
      if(  view->currentItem() == NULL)
          return;
        if( rename(oldName.latin1(), newName.latin1())== -1)
          QMessageBox::message(tr("Note"),tr("Could not rename"));
        else
            oldName = "";
 
     view->takeItem( view->currentItem() );
     delete view->currentItem();
     if ( tabs == 0)
         populateLocalView();
     else
         populateRemoteView();
 }