4 files changed, 47 insertions, 83 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 41e83c7..66353bb 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1,597 +1,572 @@
 /***************************************************************************
    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/otabwidget.h>
+
 //  #include <opie/ofileselector.h>
 //  #include <opie/ofiledialog.h>
 
-#include <qpe/config.h>
+#include <opie/otabwidget.h>
+
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpemenubar.h>
-#include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.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 <qwmatrix.h>
-#include <qregexp.h>
-#include <qtabwidget.h>
-#include <qtextstream.h>
-#include <qpushbutton.h>
 #include <qdatetime.h>
-#include <qdir.h>
 #include <qfile.h>
-#include <qstring.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
-#include <qmainwindow.h>
 #include <qlabel.h>
-#include <qprogressbar.h>
-#include <qspinbox.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.h>
-#include <qpixmap.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
-#include <qregexp.h>
 
-#include <unistd.h>
-#include <stdlib.h>
 #include <sys/stat.h>
-#include <dirent.h>
-#include <stdio.h>
 #include <time.h>
+#include <dirent.h>
 #include <fcntl.h>
-#include <mntent.h>
-#include <string.h>
-#include <errno.h>
 #include <sys/vfs.h>
 #include <mntent.h>
-#include <sys/utsname.h>
 
 AdvancedFm::AdvancedFm( )
     : QMainWindow( ) {
    init();
    renameBox = 0;
 
-   QWMatrix matrix;
-   QPixmap pix(Resource::loadPixmap( "UnknownDocument" ));
-   matrix.scale( .4, .4);
-   unknownXpm =  pix.xForm(matrix);
-   
+   unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
+
    initConnections();
    whichTab=1;
    rePopulate();
    currentPathCombo->setFocus();
 }
 
 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() )
         {
           QString symLink=fi->readLink();
           QFileInfo sym( symLink);
           fileS.sprintf( "%10i", sym.size() );
           fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.filePath().data() );
           fileDate = sym.lastModified().toString();
         }
       else
         {
           fileS.sprintf( "%10i", fi->size() );
           fileL.sprintf( "%s",fi->fileName().data() );
           fileDate= fi->lastModified().toString();
           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(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)
             {
                 // 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 ) );
             }
           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);
 //        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 )
               {
                 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);
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index c30d8e0..4480051 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -1,174 +1,171 @@
 /***************************************************************************
    advancedfm.h
                              -------------------
                              ** 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.                                   *
     ***************************************************************************/
 #ifndef ADVANCEDFM_H
 #define ADVANCEDFM_H
 #define QTOPIA_INTERNAL_FSLP // to get access to fileproperties
 #define QT_QWS_OPIE
 
 //#include <opie/otabwidget.h>
 #include <opie/oprocess.h>
 #include <qpe/ir.h>
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qpoint.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 
 class OTabWidget;
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QComboBox;
 class QListView;
 class QListviewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
-class QPEToolBar;
-class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
 class MenuButton;
 
-//class QPushButton;
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
-   Q_OBJECT
+    Q_OBJECT
 public:
    AdvancedFm();
    ~AdvancedFm();
 protected slots:
    void selectAll();
    void addToDocs();
    void doDirChange();
    void mkDir();
    void del();
    void rn();
    void populateView();
    void rePopulate();
    void showHidden();
    void showMenuHidden();
    void writeConfig();
    void readConfig();
    void ListClicked(QListViewItem *);
    void ListPressed( int, QListViewItem *, const QPoint&, int);
    void makeDir();
    void doDelete();
    void tabChanged(QWidget*);
    void cleanUp();
    void renameIt();
    void runThis();
    void runText();
    void filePerms();
    void doProperties();
    void runCommand();
    void runCommandStd();
    QStringList getPath();
    void mkSym();
    void switchToLocalTab();
    void switchToRemoteTab();
 
 protected:
 
    OTabWidget *TabWidget;
    QPixmap unknownXpm;
    int whichTab;
 //    QTabWidget *TabWidget;
    QWidget *tab, *tab_2, *tab_3;
    QListView *Local_View, *Remote_View;
 
    QLineEdit *currentPathEdit;
    QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
    QToolButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
 //    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
    QDir currentDir, currentRemoteDir;
    QComboBox *currentPathCombo;
    QString filterStr, s_addBookmark, s_removeBookmark;
    QListViewItem * item;
    bool b;
    QStringList fileSystemTypeList, fsList;
    int currentServerConfig;
    bool zaurusDevice;
    QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
    QStringList remoteDirPathStringList, localDirPathStringList;
    QLineEdit *renameBox;
 
    void init();
    void initConnections();
    void keyReleaseEvent( QKeyEvent *);
    void keyPressEvent( QKeyEvent *);
    QString getFileSystemType(const QString &);
    QString getDiskSpace(const QString &);
    void parsetab(const QString &fileName);
    QString checkDiskSpace(const QString &);
    QString dealWithSymName(const QString &);
    QDir *CurrentDir();
    QDir *OtherDir();
    QListView *CurrentView();
    QListView *OtherView();
    void setOtherTabCurrent();
 
 protected slots:
    void dirMenuSelected(int);
    void showFileMenu();
    void cancelMenuTimer();
    void homeButtonPushed();
    void docButtonPushed();
    void SDButtonPushed();
    void CFButtonPushed();
    void QPEButtonPushed();
    void upDir();
    void currentPathComboChanged();
    void copy();
    void copyAs();
    void copySameDir();
    void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    bool copyFile( const QString & , const QString & );
    void move();
    void fileStatus();
    void doAbout();
    void doBeam();
    void fileBeamFinished( Ir *);
 
 private:
    MenuButton *menuButton;
    QString oldName;
    QTimer menuTimer;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
 
 private slots:
    void processEnded(OProcess *);
    void oprocessStderr(OProcess *, char *, int);
    void gotoCustomDir(const QString &);
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 1a7a6d7..eb2bcd8 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -1,278 +1,272 @@
 /***************************************************************************
    advancedfmData.cpp
                              -------------------
 ** Created: Mon 09-23-2002 13:24:11
     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 <opie/otabwidget.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qpemenubar.h>
-#include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
-#include <qpe/config.h>
 
 #include <qlayout.h>
-#include <qpixmap.h>
+#include <qhbox.h>
+#include <qmenubar.h>
 #include <qcombobox.h>
-#include <qpopupmenu.h>
-#include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include <sys/utsname.h>
 
 
 void AdvancedFm::init() {
 #if defined(QT_QWS_OPIE)
     qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!");
 #endif
     setCaption( tr( "AdvancedFm" ) );
 
-  QGridLayout *layout = new QGridLayout( this );
-  layout->setSpacing( 2);
-  layout->setMargin( 2);
+    QVBoxLayout *layout = new QVBoxLayout( this );
+    layout->setSpacing( 2);
+    layout->setMargin( 2);
 
 
-  QPEMenuBar *menuBar = new QPEMenuBar(this);
+  QMenuBar *menuBar = new QMenuBar(this);
   fileMenu = new QPopupMenu( this );
   viewMenu  = new QPopupMenu( this );
 //  customDirMenu  = new QPopupMenu( this );
 
-  layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
+  layout->addWidget( menuBar );
 
   menuBar->insertItem( tr( "File" ), fileMenu);
   menuBar->insertItem( tr( "View" ), viewMenu);
-//  menuBar->insertItem( tr( "^" ), customDirMenu);
 
-  cdUpButton = new QToolButton( this,"cdUpButton");
+  cdUpButton = new QToolButton( 0,"cdUpButton");
   cdUpButton->setPixmap(Resource::loadPixmap("up"));
-  cdUpButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( cdUpButton , 0, 0, 2, 2);
+  cdUpButton->setAutoRaise( true );
+  menuBar->insertItem( cdUpButton );
 
-   menuButton = new MenuButton(this);
-   menuButton->setFixedSize( QSize( 20, 20 ) );
-   layout->addMultiCellWidget( menuButton , 0, 0, 3, 3);
 
-  qpeDirButton= new QToolButton(this,"QPEButton");
+  QHBox *lineBox = new QHBox( this );
+
+  qpeDirButton= new QToolButton( 0,"QPEButton");
   qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
-  qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( qpeDirButton , 0, 0, 4, 4);
+  qpeDirButton->setAutoRaise( true );
+  menuBar->insertItem( qpeDirButton );
 
-  cfButton = new QToolButton( this,"CFButton");
+  cfButton = new QToolButton( 0, "CFButton");
   cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
-  cfButton ->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( cfButton , 0, 0, 5, 5);
+  cfButton->setAutoRaise( true );
+  menuBar->insertItem( cfButton );
 
-  sdButton = new QToolButton( this,"SDButton");
+  sdButton = new QToolButton( 0, "SDButton");
   sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
-  sdButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( sdButton , 0, 0, 6, 6);
-
+  sdButton->setAutoRaise( true );
+  menuBar->insertItem( sdButton );
 
-  docButton = new QToolButton( this,"docsButton");
+  docButton = new QToolButton( 0,"docsButton");
   docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
-  docButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( docButton, 0, 0, 7, 7);
+  docButton->setAutoRaise( true );
+  menuBar->insertItem( docButton );
 
-  homeButton = new QToolButton( this,"homeButton");
+  homeButton = new QToolButton( 0, "homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
-  homeButton->setFixedSize( QSize( 20, 20 ) );
-  layout->addMultiCellWidget( homeButton, 0, 0, 8, 8);
+  homeButton->setAutoRaise( true );
+  menuBar->insertItem( homeButton );
 
   fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
   fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
   fileMenu->insertSeparator();
   fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
   fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
   fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
   fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
   fileMenu->insertSeparator();
   fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
   fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
   fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
   fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
   fileMenu->setCheckable(TRUE);
 
   viewMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
   viewMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
 //   viewMenu->insertSeparator();
 //   viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
   viewMenu->setCheckable(TRUE);
 
   s_addBookmark = tr("Bookmark Directory");
   s_removeBookmark = tr("Remove Current Directory from Bookmarks");
 
-  menuButton->setUseLabel(false);
-  menuButton->insertItem( s_addBookmark);
-  menuButton->insertItem( s_removeBookmark);
-  menuButton->insertSeparator();
 //    menuButton->insertItem("");
 
 //     customDirMenu->insertItem(tr("Add This Directory"));
 //     customDirMenu->insertItem(tr("Remove This Directory"));
 //     customDirMenu->insertSeparator();
 
     customDirsToMenu();
 
-  currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
-  currentPathCombo->setEditable(TRUE);
-  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
-  currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+  menuButton = new MenuButton( lineBox );
 
+  menuButton->setUseLabel(false);
+  menuButton->setMaximumWidth( 20 );
+  menuButton->insertItem( s_addBookmark);
+  menuButton->insertItem( s_removeBookmark);
+  menuButton->insertSeparator();
+
+  currentPathCombo = new QComboBox( FALSE, lineBox, "currentPathCombo" );
+  currentPathCombo->setEditable(TRUE);
   currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
-  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 8);
+  layout->addWidget( lineBox );
 
 
   TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab);
 //  TabWidget = new QTabWidget( this, "TabWidget" );
-  layout->addMultiCellWidget( TabWidget, 2, 2, 0, 8);
+  layout->addWidget( TabWidget, 4 );
 
   tab = new QWidget( TabWidget, "tab" );
   tabLayout = new QGridLayout( tab );
   tabLayout->setSpacing( 2);
   tabLayout->setMargin( 2);
 
   Local_View = new QListView( tab, "Local_View" );
   Local_View->addColumn( tr("File"),130);
   Local_View->addColumn( tr("Size"),-1);
   Local_View->setColumnAlignment(1,QListView::AlignRight);
   Local_View->addColumn( tr("Date"),-1);
   Local_View->setColumnAlignment(2,QListView::AlignRight);
   Local_View->setAllColumnsShowFocus(TRUE);
   Local_View->setMultiSelection( TRUE );
   Local_View->setSelectionMode(QListView::Extended);
 
   QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
   tabLayout->addWidget( Local_View, 0, 0 );
 
   TabWidget->addTab( tab,"advancedfm/smFileBrowser.png", tr("1"));
 //  TabWidget->insertTab( tab, tr("1"));
 
   tab_2 = new QWidget( TabWidget, "tab_2" );
   tabLayout_2 = new QGridLayout( tab_2 );
   tabLayout_2->setSpacing( 2);
   tabLayout_2->setMargin( 2);
 
   Remote_View = new QListView( tab_2, "Remote_View" );
   Remote_View->addColumn( tr("File"),130);
   Remote_View->addColumn( tr("Size"),-1);
   Remote_View->setColumnAlignment(1,QListView::AlignRight);
   Remote_View->addColumn( tr("Date"),-1);
   Remote_View->setColumnAlignment(2,QListView::AlignRight);
   Remote_View->setAllColumnsShowFocus(TRUE);
   Remote_View->setMultiSelection( TRUE );
   Remote_View->setSelectionMode(QListView::Extended);
 
 
   QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
   tabLayout_2->addWidget( Remote_View, 0, 0 );
 
   TabWidget->addTab( tab_2, "advancedfm/smFileBrowser.png",tr( "2"));
 //  TabWidget->insertTab( tab_2, tr( "2"));
 
   /*     tab_3 = new QWidget( TabWidget, "tab_3" );
          tabLayout_3 = new QGridLayout( tab_3 );
          tabLayout_3->setSpacing( 2);
          tabLayout_3->setMargin( 2);
 
 
          //     OFileDialog fileDialog;
          // fileDialog;
          //    fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy
          //     fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow");
          //      OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/");
 
          QListView *fileTree;
          fileTree = new QListView( tab_3, "tree" );
 
 
          tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
 
          TabWidget->insertTab( tab_3, tr( "Remote" ) );
   */
 
   ///////////////
 
   struct utsname name; /* check for embedix kernel running on the zaurus*/
   if (uname(&name) != -1) {
       QString release=name.release;
       if(release.find("embedix",0,TRUE) !=-1) {
           zaurusDevice=TRUE;
      } else {
           zaurusDevice=FALSE;
           sdButton->hide();
       }
   }
 
   currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
   currentDir.setPath( QDir::currentDirPath());
 
   currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
   currentRemoteDir.setPath( QDir::currentDirPath());
 
   b = TRUE;
 
   filterStr="*";
   b=FALSE;
   TabWidget->setCurrentTab(0);
 
 }
 
 void AdvancedFm::initConnections()
 {
 
   connect( qApp,SIGNAL( aboutToQuit()),
            this, SLOT( cleanUp()) );
   connect( qpeDirButton ,SIGNAL(released()),
            this,SLOT( QPEButtonPushed()) );
   connect( cfButton ,SIGNAL(released()),
            this,SLOT( CFButtonPushed()) );
   connect( sdButton ,SIGNAL(released()),
            this,SLOT( SDButtonPushed()) );
   connect( cdUpButton ,SIGNAL(released()),
            this,SLOT( upDir()) );
   connect( docButton,SIGNAL(released()),
            this,SLOT( docButtonPushed()) );
   connect( homeButton,SIGNAL(released()),
            this,SLOT( homeButtonPushed()) );
   connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
            this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
   connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
            this,SLOT(currentPathComboChanged()));
 
   connect( Local_View, SIGNAL( clicked( QListViewItem*)),
            this,SLOT( ListClicked(QListViewItem *)) );
   connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
   connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
 
   connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
            this,SLOT( ListClicked(QListViewItem *)) );
   connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
   connect( TabWidget,SIGNAL(currentChanged(QWidget *)),
           this,SLOT(tabChanged(QWidget*)));
 
   connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
 
   connect( menuButton, SIGNAL( selected(const QString &)), SLOT(gotoCustomDir(const QString&)));
 //  connect( menuButton, SIGNAL( selected( int)), SLOT( dirMenuSelected(int)));
 
 //  connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
 
 }
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index eae86a4..575833a 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,889 +1,887 @@
 /***************************************************************************
    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/qpemenubar.h>
-#include <qpe/qpetoolbar.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 <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;
           };
       }
 
       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() )
         {
         switch ( QMessageBox::warning( this, tr("Delete Directory?"), tr("Really delete\n") + f +
                                       "\nand all it's contents ?"
                                       ,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")+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)
             file.remove();
       }
     }
   }
   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) )
           {
             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) )
             {
               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) )
             {
               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) )
               {
                 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 );
 
    int read_fd=0;
    int write_fd=0;
    struct stat stat_buf;
    off_t offset = 0;
    read_fd = ::open(src.latin1(), O_RDONLY);
    if(read_fd != -1) {
       fstat (read_fd, &stat_buf);
       write_fd = ::open(dest.latin1(), O_WRONLY | O_CREAT, stat_buf.st_mode);
       if(write_fd != -1) {
          if(sendfile(write_fd, read_fd, &offset, stat_buf.st_size) == -1) {
             success = false;
          }
       } 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;
 //     }
 
     // Set file permissions
   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
     {
       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 );
             }
         }
     }
 
 }
 
 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();
 }