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
@@ -714,424 +714,424 @@ void AdvancedFm::move() {
 
       TabWidget->setCurrentTab(1);
 
     } else { //view 2
 
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
           item = (*it);
         QString destFile = currentDir.canonicalPath();
 
         if(destFile.right(1).find("/",0,TRUE) == -1)
           destFile+="/";
 
         destFile += item;
 
         qDebug("Destination file is "+destFile);
 
         curFile = currentRemoteDir.canonicalPath();
 
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
         curFile+= item;
         qDebug("CurrentFile file is " + curFile);
 
         QFile f( curFile);
         if( f.exists()) {
           if(!copyFile( curFile, destFile) ) {
             QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile);
             return;
           } else
             QFile::remove( curFile);
         }
         TabWidget->setCurrentTab(0);
       }
     }
     populateRemoteView();
     populateLocalView();
   }
 }
 
 bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
   char bf[ 50000 ];
   int  bytesRead;
   bool success = TRUE;
   struct stat status;
 
   QFile s( src );
   QFile d( dest );
 
   if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
     while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
       if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
         success = FALSE;
         break;
       }
     }
     if( success && (bytesRead > 0) ){
       d.writeBlock( bf, bytesRead );
     }
   } else {
     success = FALSE;
   }
 
   // Set file permissions
   if( stat( (const char *) src, &status ) == 0 ){
     chmod( (const char *) dest, status.st_mode );
   }
 
   return success;
 }
 
 void AdvancedFm::runCommand() {
     QString curFile;
     if (TabWidget->getCurrentTab() == 0) {
         if( Local_View->currentItem())
             curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
     } else {
         if(Remote_View->currentItem())
             curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->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 ) {
         qDebug(fileDlg->LineEdit1->text());
         QStringList command;
 
         command << "/bin/sh";
         command << "-c";
         command <<  fileDlg->LineEdit1->text();
         Output *outDlg;
         outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
         outDlg->showMaximized();
         outDlg->exec();
         qApp->processEvents();
 
     }
 }
 
 void AdvancedFm::runCommandStd() {
   QString curFile;
   if (TabWidget->getCurrentTab() == 0) {
     if( Local_View->currentItem())
       curFile = currentDir.canonicalPath() +"/"+  Local_View->currentItem()->text(0);
   } else {
     if(Remote_View->currentItem())
       curFile = currentRemoteDir.canonicalPath() +"/"
           +  Remote_View->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() {
   QString curFile;
   if (TabWidget->getCurrentTab() == 0) {
     curFile = Local_View->currentItem()->text(0);
   } else {
     curFile = Remote_View->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);
     outDlg->showMaximized();
     outDlg->exec();
     qApp->processEvents();
 
 
 //   Output *outDlg;
 //   outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
 //   outDlg->showMaximized();
 //   outDlg->show();
 //   qApp->processEvents();
 
 //   FILE *fp;
 //   char line[130];
 //   sleep(1);
 //   fp = popen(  (const char *) command, "r");
 //   if ( !fp ) {
 //     qDebug("Could not execute '" + command + "'! err=%d", fp);
 //     QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
 //     pclose(fp);
 //     return;
 //   } else {
 //     while ( fgets( line, sizeof line, fp)) {
 //       outDlg->OutputEdit->append(line);
 //       outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
 //     }
 
 //   }
 //   pclose(fp);
 }
 
 
 void AdvancedFm::mkDir() {
   if (TabWidget->getCurrentTab() == 0)
     localMakDir();
   else
     remoteMakDir();
 
 }
 
 void AdvancedFm::rn() {
   if (TabWidget->getCurrentTab() == 0)
     localRename();
   else
     remoteRename();
 
 }
 
 void AdvancedFm::del() {
   if (TabWidget->getCurrentTab() == 0)
     localDelete();
   else
     remoteDelete();
 }
 
 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();
 }