some crazy characters fixing

2 files changed, 150 insertions, 188 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 60558e7..77dca49 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1,935 +1,920 @@
 /***************************************************************************
    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 <opie/ofileselector.h>
 //  #include <opie/ofiledialog.h>
 
 #include <opie/otabwidget.h>
 
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qlabel.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.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>
 
 AdvancedFm::AdvancedFm( )
     : QMainWindow( ) {
    init();
    renameBox = 0;
 
    unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
 
    initConnections();
    whichTab=1;
    rePopulate();
    currentPathCombo->setFocus();
     channel = new QCopChannel( "QPE/Application/advancedfm", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
         this, SLOT( qcopReceive(const QCString&, const QByteArray&)) );
 }
 
 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 *w)
 {
   if( w == tab)
     whichTab = 1;
   else
     whichTab = 2;
 
 //  qDebug("tab changed %d", whichTab );
 
    QString path = CurrentDir()->canonicalPath();
   currentPathCombo->lineEdit()->setText( path );
 
   viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
   viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
 
   QString fs= getFileSystemType( (const QString &)  path);
 
   setCaption("AdvancedFm :: "+fs+" :: "
              +checkDiskSpace( (const QString &) path )+ " kB free" );
   chdir( path.latin1());
 }
 
 
 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);
   setCaption("AdvancedFm :: "+fs+" :: "
              +checkDiskSpace((const QString &) path)+" 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() )
-        {
+  while ( (fi=it.current()) ) {
+      if (fi->isSymLink() )  {
           QString symLink=fi->readLink();
           QFileInfo sym( symLink);
           fileS.sprintf( "%10i", sym.size() );
-          fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.filePath().data() );
+          fileL =  fi->fileName() +" ->  " + sym.filePath().data();
           fileDate = sym.lastModified().toString();
-        }
-      else
-        {
+        }  else  {
           fileS.sprintf( "%10i", fi->size() );
-          fileL.sprintf( "%s",fi->fileName().data() );
+          fileL = fi->fileName();
           fileDate= fi->lastModified().toString();
-          if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() )
-            {
+          if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
               fileL+="/";
               isDir=TRUE;
             }
         }
-
       QFileInfo fileInfo(  path + "/" + fileL);
 
-      if(fileL !="./" && fi->exists())
-        {
-          item= new QListViewItem( thisView, fileL, fileS , fileDate);
+      if(fileL !="./" && fi->exists())  {
+          item = new QListViewItem( thisView, fileL, fileS , fileDate);
 
-          if(isDir || fileL.find("/",0,TRUE) != -1)
-            {
+          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 ( 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" )
-            {
+                    | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
               pm = Resource::loadPixmap( "exec");
             }
-          else if( !fi->isReadable() )
-            {
+          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)
-            {
-                // overlay link image
-              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 ) );
+          if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
+               //  qDebug(" overlay link image");
+              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)
-    {
+  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)
-          {
+        while ((mydirent = readdir(dir)) != NULL) {
             lstat( mydirent->d_name, &buf);
 //        qDebug(mydirent->d_name);
             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 )
-              {
+            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()
 {
   int tmpTab = whichTab;
   qDebug("%d", tmpTab);
 
   for(int i =1; i < 3; i++)
     {
       TabWidget->setCurrentTab(i - 1);
       populateView();
     }
   TabWidget->setCurrentTab( tmpTab - 1);
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem)
 {
   if(selectedItem)
     {
       QString strItem=selectedItem->text(0);
       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 *, const QPoint& , int ) {
   switch (mouse) {
   case 1:
   {
     if(renameBox != 0 )
       {
         cancelRename();
       }
   }
   break;
   case 2:
     menuTimer.start( 500, TRUE );
     break;
   };
 }
 
 void AdvancedFm::switchToLocalTab()
 {
   TabWidget->setCurrentTab(0);
   Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab()
 {
   TabWidget->setCurrentTab(1);
   Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig()
 {
   Config cfg("AdvancedFm");
 }
 
 void AdvancedFm::writeConfig()
 {
   Config cfg("AdvancedFm");
 }
 
 void  AdvancedFm::currentPathComboChanged()
 {
   if(QDir( currentPathCombo->lineEdit()->text()).exists())
     {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
       populateView();
     }
   else
     {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath)
 {
 //    qDebug("%d",TabWidget->currentTab());
   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);
         }
     }
 }
 
 void AdvancedFm::currentPathComboActivated(const QString & currentPath)
 {
     chdir( currentPath.latin1() );
     CurrentDir()->cd( currentPath, TRUE);
     populateView();
     update();
 }
 
 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);
 //        qDebug(it.current()->text(0));
         }
     }
   return strList;
 }
 
 void AdvancedFm::homeButtonPushed()
 {
   QString current = QDir::homeDirPath();
   chdir( current.latin1() );
   CurrentDir()->cd(  current, TRUE);
   populateView();
   update();
 }
 
 void AdvancedFm::docButtonPushed()
 {
   QString current = QPEApplication::documentDir();
   chdir( current.latin1() );
   CurrentDir()->cd( current, TRUE);
   populateView();
   update();
 }
 
 void AdvancedFm::SDButtonPushed()
 {
   QString current = "/mnt/card";// this can change so fix
   chdir( current.latin1() );
   CurrentDir()->cd( current, TRUE);
   populateView();
   update();
 }
 
 void AdvancedFm::CFButtonPushed()
 {
   QString current;
   if(zaurusDevice)
     current= "/mnt/cf"; //zaurus
   else
     current = "/mnt/hda"; //ipaq
   chdir( current.latin1() );
   CurrentDir()->cd( current, TRUE);
   populateView();
   update();
 }
 
 
 void AdvancedFm::doAbout()
 {
   QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                                        "is copyright 2002-2003 by\n"
                                        "L.J.Potter<llornkcor@handhelds.org>\n"
                                        "and is licensed by the GPL"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e)
 {
 //    e->accept();
   if( CurrentView()->hasFocus()  )
     {
       switch ( e->key() ) {
       case Key_Delete:
         del();
         break;
       case Key_A:
         copyAs();
         break;
       case Key_C:
         copy();
         break;
       case Key_E:
         runThis();
         break;
       case Key_G:
       {
         currentPathCombo->lineEdit()->setFocus();
       }
       break;
 
       case Key_H:
         showHidden();
         break;
       case Key_I:
         fileStatus();
         break;
       case Key_M:
         move();
         break;
       case Key_N:
         mkDir();
         break;
       case Key_P:
         filePerms();
         break;
       case Key_R:
         rn();
         break;
       case Key_U:
         upDir();
         break;
       case Key_1:
         switchToLocalTab();
         break;
       case Key_2:
         switchToRemoteTab();
         break;
       case Key_3:
         CFButtonPushed();
         break;
       case Key_4:
         SDButtonPushed();
         break;
       case Key_5:
         homeButtonPushed();
         break;
       case Key_6:
         docButtonPushed();
         break;
       case Key_7:
         break;
       case Key_8:
         break;
       case Key_9:
         break;
       case Key_0:
         break;
       };
       e->accept();
     }
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
 {
   if( CurrentView()->hasFocus() )
     e->ignore();
 }
 
 
 void AdvancedFm::QPEButtonPushed()
 {
   QString current = QPEApplication::qpeDir();
   chdir( current.latin1() );
     CurrentDir()->cd( current, TRUE);
     populateView();
   update();
 }
 
 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( copy() ));
   n->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
   n->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
   n->insertItem( tr( "Move" ), this, SLOT( move() ));
 
   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( 4,QCursor::pos().y()) );
 
   if(m) delete m;
 }
 
 
 void AdvancedFm::cancelMenuTimer()
 {
 //  qDebug("selectionChanged: cancel menu timer");
   if( menuTimer.isActive() )
     menuTimer.stop();
 }
 
 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)
-    {
+  if( strListPaths.count() > 0) {
     QString curFile;
-      for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it )
-        {
+      for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
         curFile = thisDir->canonicalPath()+"/"+(*it);
 //                qDebug(curFile);
+        QFileInfo fi(curFile);
         DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
-        f.setName((*it));
+        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)
 {
   qDebug("menu item %d", 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()
 {
 //  qDebug("remove custom dir");
   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("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!"));
     }
   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();
     }
 //    customDirsToMenu();
 
 }
 
 void AdvancedFm::gotoCustomDir(const QString &dir)
 {
 //     qDebug("gotoCustomDir(const QString &dir) " +dir );
 //  QString curDir = dir;
 //  QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
   if( dir == s_addBookmark)
     {
       addCustomDir();
     }
   if( dir == s_removeBookmark)
     {
       removeCustomDir( );
     }
   else
     {
        gotoDirectory( dir);
 //       if(QDir( curDir).exists() )
 //         {
 //           thisDir->setPath( curDir );
 //           chdir( curDir.latin1() );
 //           thisDir->cd( curDir, TRUE);
 //           populateView();
 //         }
     }
 }
 
 QDir *AdvancedFm::CurrentDir()
 {
   if ( whichTab == 1)
     {
     return &currentDir;
     }
   else
     {
     return &currentRemoteDir;
     }
 }
 
 QDir *AdvancedFm::OtherDir()
 {
   if ( whichTab == 1)
     {
     return &currentRemoteDir;
     }
   else
     {
     return &currentDir;
     }
 }
 
 QListView * AdvancedFm::CurrentView()
 {
   if ( whichTab == 1)
     return Local_View;
   else
     return Remote_View;
 }
 
 QListView * AdvancedFm::OtherView()
 {
   if ( whichTab == 1)
     return Remote_View;
   else
     return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent()
 {
   if ( whichTab == 1)
     TabWidget->setCurrentTab(1);
   else
     TabWidget->setCurrentTab(0);
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
    qDebug("qcop message "+msg );
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
       qDebug("received");
       QString file;
       stream >> file;
       gotoDirectory( (const QString &) file);
    }
 }
 
  void AdvancedFm::setDocument(const QString &file) {
       gotoDirectory( file);
 
  }
 
 void AdvancedFm::gotoDirectory(const QString &file) {
 
   QString curDir = file;
   QDir *thisDir = CurrentDir();
  if(QDir( curDir).exists() )  {
       thisDir->setPath( curDir );
       chdir( curDir.latin1() );
       thisDir->cd( curDir, TRUE);
       populateView();
    }
  else if(QFileInfo(curDir).exists()) {
     QFileInfo fileInfo(curDir);
     curDir=fileInfo.dirPath();
     if(QDir( curDir).exists() )  {
        thisDir->setPath( curDir );
        chdir( curDir.latin1() );
        thisDir->cd( curDir, TRUE);
        populateView();
     }
     findFile(file);
  }
   
 }
 
 void AdvancedFm::findFile(const QString &fileName) {
    QFileInfo fi(fileName);
    QListView *thisView = CurrentView();
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if(it.current()->text(0) == fi.fileName()) {
          it.current()->setSelected(true);
          thisView->ensureItemVisible(it.current());
       }
    }
 }
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 9f21245..00d0e07 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,905 +1,882 @@
 /***************************************************************************
    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.                                   *
     ***************************************************************************/
 #include "advancedfm.h"
 #include "output.h"
 #include "filePermissions.h"
 
 #include <opie/otabwidget.h>
 #include <opie/oprocess.h>
 
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 
 #include <qmessagebox.h>
 #include <qmultilineedit.h>
 
 #include <qstring.h>
 
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/sendfile.h>
 #include <fcntl.h>
 
+
 void AdvancedFm::doDirChange()
 {
   ListClicked( CurrentView()->currentItem());
 }
 
 void AdvancedFm::showMenuHidden()
 {
   if (b)
     {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
       fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
 //    b=FALSE;
 
     }
   else
     {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
       fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
 //    b=TRUE;
     }
   rePopulate();
 //    if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true");
     if(b) b = false; else b = true;
 }
 
 void AdvancedFm::showHidden()
 {
   if (b)
     {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
 //     fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
 //    b=FALSE;
 
     }
   else
     {
       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
 //     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
 //    b=TRUE;
     }
   rePopulate();
 }
 
 QString AdvancedFm::dealWithSymName(const QString &fileName)
 {
         QString strItem = fileName;
         return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
 }
 
 void AdvancedFm::runThis()
 {
   QString fs;
   QDir *thisDir = CurrentDir();
 
   QString curFile = CurrentView()->currentItem()->text(0);
   QString path = thisDir->canonicalPath();
 
   if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
 
     curFile = dealWithSymName((const QString&)curFile);
 
   if(curFile != "../")
     {
 
       fs = getFileSystemType((const QString &) path);
       QFileInfo fileInfo( path  + "/" + curFile);
       qDebug( fileInfo.owner());
 
       if( (fileInfo.permission( QFileInfo::ExeUser)
            | fileInfo.permission( QFileInfo::ExeGroup)
            | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
           | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
         QCopEnvelope e("QPE/System", "execute(QString)" );
         e << curFile;
       }
       else
         {
           curFile =  path + "/" + curFile;
           DocLnk nf(curFile);
           QString execStr = nf.exec();
           qDebug( execStr);
           if( execStr.isEmpty() )
             {
             }
           else
             {
               nf.execute();
             }
         }
     }
 }
 
 void AdvancedFm::runText()
 {
   QString curFile = CurrentView()->currentItem()->text(0);
   if(curFile != "../")
     {
       if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
         curFile = dealWithSymName((const QString&)curFile);
       curFile =  CurrentDir()->canonicalPath()+"/"+curFile;
       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
       e << curFile;
     }
 }
 
 void AdvancedFm::makeDir()
 {
   InputDialog *fileDlg;
   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
   fileDlg->exec();
   if( fileDlg->result() == 1 )
     {
       QDir *thisDir = CurrentDir();
       QString  filename = fileDlg->LineEdit1->text();
       thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
   }
   populateView();
 }
 
 void AdvancedFm::doDelete()
 {
-
-  QStringList curFileList = getPath();
-  bool doMsg=true;
-  int count = curFileList.count();
-  if( count > 0)
-    {
-      if(count > 1 )
-        {
-          QString msg;
-          msg=tr("Really delete\n%1 files?").arg(count);
-          switch ( QMessageBox::warning(this,tr("Delete"),msg
-                                        ,tr("Yes"),tr("No"),0,0,1) )
-            {
-            case 0:
-                doMsg=false;
-                break;
-            case 1:
-                return;
-                break;
-          };
+   QStringList curFileList = getPath();
+   bool doMsg=true;
+   int count = curFileList.count();
+   if( count > 0)  {
+      if(count > 1 ) {
+         QString msg;
+         msg=tr("Really delete\n%1 files?").arg(count);
+         switch ( QMessageBox::warning(this,tr("Delete"),msg
+                                       ,tr("Yes"),tr("No"),0,0,1) )
+         {
+         case 0:
+            doMsg=false;
+            break;
+         case 1:
+            return;
+            break;
+         };
       }
 
       QString myFile;
-    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
-      {
-      myFile = (*it);
-      if( myFile.find(" -> ",0,TRUE) != -1)
-        myFile = myFile.left( myFile.find(" -> ",0,TRUE));
-
-      QString f = CurrentDir()->canonicalPath();
-      if(f.right(1).find("/",0,TRUE) == -1)
-        f += "/";
-      f += myFile;
-      if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) //if file is a directory
-        {
-        switch ( QMessageBox::warning( this, tr("Delete Directory?"), 
-                                        tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
-                                        tr("Yes"),
-                                        tr("No"),
-                                        0,
-                                        0,
-                                        1) )
-          {
-        case 0:
-        {
-          f=f.left(f.length()-1);
-          QString cmd="rm -rf "+f;
-          startProcess( (const QString)cmd.latin1() );
-          populateView();
-        }
-          break;
-        case 1:
-          // exit
-          break;
-        };
 
-      } else {
-          if(doMsg) {
-        switch ( QMessageBox::warning(this,tr("Delete"),
-                                        tr("Really delete\n%1?").arg( f ),
-                                 tr("Yes"),
-                                 tr("No"),
-                                 0,
-                                 0,
-                                 1) ) {
-          case 1:
-              return;
-              break;
-        };
-          }
-        QString cmd="rm "+f;
-        QFile file(f);
-        if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) {
-            qDebug("remove link files "+f);
-//             AppLnk lnk(f);
-//             qDebug(lnk.linkFile());
-//             lnk.removeLinkFile();
-           file.remove();
-        }
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+         myFile = (*it);
+         if( myFile.find(" -> ",0,TRUE) != -1)
+            myFile = myFile.left( myFile.find(" -> ",0,TRUE));
+
+         QString f = CurrentDir()->canonicalPath();
+         if(f.right(1).find("/",0,TRUE) == -1)
+            f += "/";
+         f += myFile;
+         if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
+            //if file is a directory
+
+            switch ( QMessageBox::warning( this, tr("Delete Directory?"), 
+                                           tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
+                                           tr("Yes"), tr("No"), 0, 0, 1) ) {
+            case 0:
+            {
+               f=f.left(f.length()-1);
+               QString cmd="rm -rf "+f;
+               startProcess( (const QString)cmd.latin1() );
+               populateView();
+            }
+            break;
+            case 1:
+               // exit
+               break;
+            };
+
+         } else {
+            if(doMsg) {
+               switch ( QMessageBox::warning(this,tr("Delete"),
+                                             tr("Really delete\n%1?").arg( myFile ),
+                                             tr("Yes"), tr("No"), 0, 0, 1) ) {
+               case 1:
+                  return;
+                  break;
+               };
+            }
+      
+            QString cmd="rm "+f;
+            QFile file(f);
+            QFileInfo fi(myFile);
+            if( fi.fileName().find("../",0,TRUE)==-1) {
+               qDebug("remove link files "+myFile);
+               
+//               DocLnk lnk(f);
+                 DocLnk *lnk;
+                 lnk = new DocLnk(f);
+                 qDebug("Deleting doclnk " + lnk->linkFile());
+                 if(lnk->isValid())
+                    lnk->removeLinkFile();
+               // delete lnk;
+               file.remove();
+            }
+         }
       }
-    }
-  }
-  populateView();
+   }
+   populateView();
 }
 
 void AdvancedFm::filePerms()
 {
   QStringList curFileList = getPath();
   QString filePath;
 
   filePath = CurrentDir()->canonicalPath()+"/";
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
     {
       filePermissions *filePerm;
       filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
       filePerm->showMaximized();
       filePerm->exec();
       if( filePerm)
         delete  filePerm;
     }
   populateView();
 }
 
 void AdvancedFm::doProperties()
 {
 #if defined(QT_QWS_OPIE)
 
   QStringList curFileList = getPath();
 
   QString filePath;
     filePath = CurrentDir()->canonicalPath()+"/";
 
     qDebug("%d",curFileList.count());
 
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
      {
     qDebug((filePath+*it));
     DocLnk lnk( (filePath+*it));
     LnkProperties prop( &lnk );
     prop.showMaximized();
     prop.exec();
   }
 #endif
 
 }
 
 void AdvancedFm::upDir()
 {
   QDir *thisDir = CurrentDir();
   QString current = thisDir->canonicalPath();
   QDir dir(current);
   dir.cdUp();
   current = dir.canonicalPath();
   chdir( current.latin1() );
   thisDir->cd(  current, TRUE);
 
   populateView();
   update();
 }
 
 void AdvancedFm::copy()
 {
   qApp->processEvents();
   QStringList curFileList = getPath();
 
   QDir *thisDir = CurrentDir();
   QDir *thatDir = OtherDir();
 
   bool doMsg=true;
   int count=curFileList.count();
   if( count > 0) {
     if(count > 1 ){
       QString msg;
       msg=tr("Really copy\n%1 files?").arg(count);
       switch ( QMessageBox::warning(this,tr("Copy"),msg
                                     ,tr("Yes"),tr("No"),0,0,1) )
         {
         case 0:
           doMsg=false;
           break;
         case 1:
           return;
           break;
         };
     }
 
     QString curFile, item, destFile;
     for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
       {
         item=(*it);
         if(item.find("->",0,TRUE)) //symlink
           item = item.left(item.find("->",0,TRUE));
 
         curFile = thisDir->canonicalPath()+"/"+ item;
         destFile = thatDir->canonicalPath()+"/"+ item;
 
         qDebug("Destination file is "+destFile);
         qDebug("CurrentFile file is " + curFile);
 
         QFile f(destFile);
         if( f.exists())
           {
             if(doMsg)
               {
                 switch ( QMessageBox::warning(this,tr("File Exists!"),
                                               tr("%1 exists. Ok to overwrite?").arg( item ),
                                               tr("Yes"),tr("No"),0,0,1) )
                   {
                   case 1:
                     return;
                     break;
                   };
               }
             f.remove();
           }
 
-        if( !copyFile( curFile, destFile) )
-          {
+        if( !copyFile( curFile, destFile) )  {
             QMessageBox::message("AdvancedFm",
                                  tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
             return;
           }
       }
     setOtherTabCurrent();
     populateView();
    }
 }
 
 void AdvancedFm::copyAs()
 {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
   QString curFile, item;
   InputDialog *fileDlg;
 
   QDir *thisDir = CurrentDir();
   QDir *thatDir = OtherDir();
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
     {
       QString destFile;
       item=(*it);
       curFile = thisDir->canonicalPath()+"/"+(*it);
       fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0);
 
       fileDlg->setInputText((const QString &) destFile );
       fileDlg->exec();
 
       if( fileDlg->result() == 1 )
         {
           QString  filename = fileDlg->LineEdit1->text();
           destFile = thatDir->canonicalPath()+"/"+filename;
 
           QFile f( destFile);
           if( f.exists())
             {
               switch (QMessageBox::warning(this,tr("File Exists!"),
                                            item+tr("\nexists. Ok to overwrite?"),
                                            tr("Yes"),tr("No"),0,0,1) )
                 {
                 case 0:
                   f.remove();
                   break;
                 case 1:
                   return;
                   break;
                 };
             }
-          if( !copyFile( curFile, destFile) )
-            {
+          if( !copyFile( curFile, destFile) ) {
               QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                    +curFile +tr("to\n")+destFile);
               return;
             }
         }
       delete fileDlg;
 
     }
     setOtherTabCurrent();
   populateView();
 }
 
 void AdvancedFm::copySameDir()
 {
   qApp->processEvents();
   QStringList curFileList = getPath();
   QString curFile, item, destFile;
   InputDialog *fileDlg;
 
   QDir *thisDir = CurrentDir();
 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
     {
       item=(*it);
       curFile = thisDir->canonicalPath()+"/"+ item;
 
       fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
       fileDlg->setInputText((const QString &) destFile );
       fileDlg->exec();
 
       if( fileDlg->result() == 1 )
         {
 
           QString filename = fileDlg->LineEdit1->text();
           destFile = thisDir->canonicalPath()+"/"+filename;
 
           QFile f(destFile);
           if( f.exists())
             {
               switch (QMessageBox::warning(this,tr("Delete"),
                                            destFile+tr(" already exists.\nDo you really want to delete it?"),
                                            tr("Yes"),tr("No"),0,0,1) ) {
               case 0:
 
                 f.remove();
                 break;
               case 1:
                 return;
                 break;
               };
             }
-          if(!copyFile( curFile,destFile) )
-            {
+          if(!copyFile( curFile,destFile) )  {
               QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                    +curFile +tr("to\n")+destFile);
               return;
             }
 
           qDebug("copy "+curFile+" as "+destFile);
         }
       delete fileDlg;
     }
   populateView();
 }
 
 void AdvancedFm::move()
 {
   qApp->processEvents();
 
   QStringList curFileList = getPath();
   if( curFileList.count() > 0)
     {
       QString curFile, destFile, item;
 
       QDir *thisDir = CurrentDir();
       QDir *thatDir = OtherDir();
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it )
         {
           item=(*it);
           QString destFile =  thatDir->canonicalPath();
 
           if(destFile.right(1).find("/",0,TRUE) == -1)
             destFile+="/";
           destFile += item;
           qDebug("Destination file is "+destFile);
 
           curFile = thisDir->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) )
-              {
+            if( !copyFile(  curFile, destFile) )  {
                 QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
                 return;
               } else
                 QFile::remove(curFile);
           }
         }
 
     }
     setOtherTabCurrent();
       populateView();
 //      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 );
-
+   QFile srcFile(src);
+   QFile destFile(dest);
+   int err=0;   
    int read_fd=0;
    int write_fd=0;
    struct stat stat_buf;
    off_t offset = 0;
-   read_fd = ::open(src.latin1(), O_RDONLY);
+      if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
+         qWarning("open failed");
+         return success = false;
+   }
+   read_fd = srcFile.handle();
    if(read_fd != -1) {
       fstat (read_fd, &stat_buf);
-      write_fd = ::open(dest.latin1(), O_WRONLY | O_CREAT, stat_buf.st_mode);
+      if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
+       qWarning("destfile open failed");
+       return success = false;
+      }
+      write_fd = destFile.handle(); 
       if(write_fd != -1) {
-         if(sendfile(write_fd, read_fd, &offset, stat_buf.st_size) == -1) {
-            success = false;
+         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;
    }
-
-   ::close (read_fd);
-   ::close (write_fd);
-
-
-//    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;
-//     }
-
+   srcFile.close();
+   destFile.close();
     // Set file permissions
-  if( stat( (const char *) src, &status ) == 0 )
-    {
+  if( stat( (const char *) src, &status ) == 0 )  {
       chmod( (const char *) dest, status.st_mode );
     }
 
   return success;
 }
 
 void AdvancedFm::runCommand()
 {
   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()
 {
   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()
 {
   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 );
         }
       setOtherTabCurrent();
       populateView();
     }
 }
 
 void AdvancedFm::doBeam()
 {
-  Ir ir;
-  if(!ir.supported())
-    {
-    }
-  else
-    {
+   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 =  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 );
+      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()
 {
 //    if (TabWidget->currentTab() == 0) {
   QListView *thisView = CurrentView();
   thisView->selectAll(true);
   thisView->setSelected( thisView->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(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 *)
 {
 //  populateLocalView();
   populateView();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int buflen) {
     qWarning("received stderrt %d bytes", buflen);
 
     QString lineStr = buffer;
 //    lineStr=lineStr.left(lineStr.length()-1);
     QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
 
 //     OutputEdit->append(lineStr);
 //     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 }
 
 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;
   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)
 {
 
     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()
 {
   QListView *thisView = CurrentView();
     oldName = thisView->currentItem()->text(0);
     doRename( thisView );
     populateView();
 }
 
 void AdvancedFm::okRename()
 {
   QString newName = renameBox->text();
   cancelRename();
 //  int tabs=0;
   QListView * view = CurrentView();
   QString path =  CurrentDir()->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();
   populateView();
 }
 
 void AdvancedFm::openSearch() {
 
 }