1 files changed, 16 insertions, 12 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 90c887f..26bc36d 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -547,304 +547,308 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
       fstat (read_fd, &stat_buf);
       if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
 //       qWarning("destfile open failed");
        return success = false;
       }
       write_fd = destFile.handle(); 
       if(write_fd != -1) {
          err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
            if( err == -1) {
               QString msg;
               switch(err) {
               case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
               case EINVAL: msg = "Descriptor is not valid or locked. ";
               case ENOMEM: msg = "Insufficient memory to read from in_fd.";
               case EIO: msg = "Unspecified error while reading from in_fd.";
               };
               success = false;
 //              qWarning(msg);
          }
       } else {
          success = false;
       }
    } else {
       success = false;
    }
    srcFile.close();
    destFile.close();
     // Set file permissions
   if( stat( (const char *) src, &status ) == 0 )  {
       chmod( (const char *) dest, status.st_mode );
     }
 
   return success;
 }
 
 void AdvancedFm::runCommand() {
    if( !CurrentView()->currentItem()) return;
    QDir *thisDir = CurrentDir();
 
    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 ) {
 //      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() {
    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);
    outDlg->showMaximized();
    outDlg->exec();
    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;
 //          qDebug(cmd);
           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(OProcess *)),
           this, SLOT( processEnded(OProcess *)));
 
   connect(process, SIGNAL( receivedStderr(OProcess *, char *, int)),
             this, SLOT( oprocessStderr(OProcess *, char *, int)));
 
   command << "/bin/sh";
   command << "-c";
   command << cmd.latin1();
   *process << command;
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
     qDebug("could not start process");
 }
 
 void AdvancedFm::processEnded(OProcess *) {
                         rePopulate();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
 //    qWarning("received stderrt %d bytes", buflen);
 
     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;
           }
           else {
              whichTab=2;
           }
        }
        OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
      }
 
   return QWidget::eventFilter( o, e );
 }
 
 
 void AdvancedFm::cancelRename() {
 //  qDebug("cancel rename");
   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() )
+
+                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->resize( r.size() );
+
+                view->viewport()->setFocusProxy( renameBox );
+
+                renameBox->setFocus();
     renameBox->show();
 }
 
 
 void AdvancedFm::renameIt() {
-   if( !CurrentView()->currentItem()) return;
-   QListView *thisView = CurrentView();
+                if( !CurrentView()->currentItem()) return;
+
+                QListView *thisView = CurrentView();
     oldName = thisView->currentItem()->text(0);
     doRename( thisView );
-                        rePopulate();
 }
 
 void AdvancedFm::okRename() {
    if( !CurrentView()->currentItem()) return;
+
    QString newName = renameBox->text();
-   cancelRename();
-   QListView * view = CurrentView();
+         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 = "";
-
    view->takeItem( view->currentItem() );
    delete view->currentItem();
-                        rePopulate();
+         rePopulate();
 }
 
 void AdvancedFm::openSearch() {
     QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
 }