code cleanup

2 files changed, 1319 insertions, 1422 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index d0ccc3f..96a2d0a 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -3,10 +3,10 @@
                              -------------------
-** Created: Sat Mar 9 23:33:09 2002
+                             ** 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.                                   *
- ***************************************************************************/
+    *   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
@@ -74,216 +74,192 @@
 AdvancedFm::AdvancedFm( )
-        : QMainWindow( )
+  : QMainWindow( )
 {
-    setCaption( tr( "AdvancedFm" ) );
-//      menuTimer( this );
+  setCaption( tr( "AdvancedFm" ) );
 
-    QGridLayout *layout = new QGridLayout( this );
-    layout->setSpacing( 2);
-    layout->setMargin( 2);
+  QGridLayout *layout = new QGridLayout( this );
+  layout->setSpacing( 2);
+  layout->setMargin( 2);
 
-    connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
+  connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
-    QPEMenuBar *menuBar = new QPEMenuBar(this);
-//    fileMenu  = new QPopupMenu( this );
-    fileMenu = new QPopupMenu( this );
-    viewMenu  = new QPopupMenu( this );
+  QPEMenuBar *menuBar = new QPEMenuBar(this);
+  fileMenu = new QPopupMenu( this );
+  viewMenu  = new QPopupMenu( this );
 
-    layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
+  layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
 
-    menuBar->insertItem( tr( "File" ), fileMenu);
-    menuBar->insertItem( tr( "View" ), viewMenu);
+  menuBar->insertItem( tr( "File" ), fileMenu);
+  menuBar->insertItem( tr( "View" ), viewMenu);
 
-    qpeDirButton= new QToolButton(this,"QPEButton");
+  qpeDirButton= new QToolButton(this,"QPEButton");
   qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
-//    qpeDirButton= new QPushButton(Resource::loadIconSet("launcher/opielogo16x16"),"",this,"QPEButton");
-    qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
-    connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
-    //qpeDirButton->setFlat(TRUE);
-    layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
+  qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
+  connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
+  layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
 
-    cfButton = new QToolButton( this,"CFButton");
+  cfButton = new QToolButton( this,"CFButton");
   cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
-//    cfButton = new QPushButton(Resource::loadIconSet("cardmon/pcmcia"),"",this,"CFButton");
-    cfButton ->setFixedSize( QSize( 20, 20 ) );
-    connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
-    //cfButton->setFlat(TRUE);
-    layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
+  cfButton ->setFixedSize( QSize( 20, 20 ) );
+  connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
+  layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
 
-    sdButton = new QToolButton( this,"SDButton");
+  sdButton = new QToolButton( this,"SDButton");
   sdButton->setPixmap(Resource::loadPixmap("sdmon/sdcard"));
-//    sdButton = new QPushButton(Resource::loadIconSet("sdmon/sdcard"),"",this,"SDButton");
-    sdButton->setFixedSize( QSize( 20, 20 ) );
-    connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
-//    sdButton->setFlat(TRUE);
-    layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
+  sdButton->setFixedSize( QSize( 20, 20 ) );
+  connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
+  layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
 
-    cdUpButton = new QToolButton( this,"cdUpButton");
+  cdUpButton = new QToolButton( this,"cdUpButton");
   cdUpButton->setPixmap(Resource::loadPixmap("up"));
-//    cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
-    cdUpButton ->setFixedSize( QSize( 20, 20 ) );
-    connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
-    //cdUpButton ->setFlat(TRUE);
-    layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
+  cdUpButton ->setFixedSize( QSize( 20, 20 ) );
+  connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
+  layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
 
-    docButton = new QToolButton( this,"docsButton");
+  docButton = new QToolButton( this,"docsButton");
   docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
-//    docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
-    docButton->setFixedSize( QSize( 20, 20 ) );
-    connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
-//    docButton->setFlat(TRUE);
-    layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
+  docButton->setFixedSize( QSize( 20, 20 ) );
+  connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
+  layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
 
-    homeButton = new QToolButton( this,"homeButton");
+  homeButton = new QToolButton( this,"homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
-//    homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
-    homeButton->setFixedSize( QSize( 20, 20 ) );
-    connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
-//    homeButton->setFlat(TRUE);
-    layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
-//     fileMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
-//     fileMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
-//     fileMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
-
-    fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
-        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( "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);
-
-
-    currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
-    currentPathCombo->setEditable(TRUE);
-    layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
-    currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+  homeButton->setFixedSize( QSize( 20, 20 ) );
+  connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
+  layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
 
-    connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
-              this, SLOT(  currentPathComboActivated( const QString & ) ) );
+  fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
+  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( "Delete" ), this, SLOT( del() ));
+  fileMenu->setCheckable(TRUE);
 
-    connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
-             this,SLOT(currentPathComboChanged()));
+  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);
 
-    currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
-    layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+  currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
+  currentPathCombo->setEditable(TRUE);
+  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
+  currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
+  connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
+           this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
-    TabWidget = new QTabWidget( this, "TabWidget" );
-    layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7);
+  connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
+           this,SLOT(currentPathComboChanged()));
 
-    tab = new QWidget( TabWidget, "tab" );
-    tabLayout = new QGridLayout( tab );
-    tabLayout->setSpacing( 2);
-    tabLayout->setMargin( 2);
+  currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
-    Local_View = new QListView( tab, "Local_View" );
-//    Local_View->setResizePolicy( QListView::AutoOneFit );
-    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);
+  layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
 
-     QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
+  TabWidget = new QTabWidget( this, "TabWidget" );
+  layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7);
 
+  tab = new QWidget( TabWidget, "tab" );
+  tabLayout = new QGridLayout( tab );
+  tabLayout->setSpacing( 2);
+  tabLayout->setMargin( 2);
 
-    tabLayout->addWidget( Local_View, 0, 0 );
+  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);
 
-    connect( Local_View, SIGNAL( clicked( QListViewItem*)),
-             this,SLOT( localListClicked(QListViewItem *)) );
-    connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-             this,SLOT( localListPressed(int, QListViewItem *, const QPoint&, int)) );
+  QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
-    connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
+  tabLayout->addWidget( Local_View, 0, 0 );
 
-    TabWidget->insertTab( tab, tr("1"));
+  connect( Local_View, SIGNAL( clicked( QListViewItem*)),
+           this,SLOT( localListClicked(QListViewItem *)) );
+  connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+           this,SLOT( localListPressed(int, QListViewItem *, const QPoint&, int)) );
 
-    tab_2 = new QWidget( TabWidget, "tab_2" );
-    tabLayout_2 = new QGridLayout( tab_2 );
-    tabLayout_2->setSpacing( 2);
-    tabLayout_2->setMargin( 2);
+  connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
 
-    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);
+  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);
 
-     QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
+  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);
 
-    connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
-             this,SLOT( remoteListClicked(QListViewItem *)) );
-    connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-             this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
-//    connect( Remote_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
 
-    tabLayout_2->addWidget( Remote_View, 0, 0 );
+  QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
+  connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
+           this,SLOT( remoteListClicked(QListViewItem *)) );
+  connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+           this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
 
-    TabWidget->insertTab( tab_2, tr( "2"));
+  tabLayout_2->addWidget( Remote_View, 0, 0 );
 
-     connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
-            this,SLOT(tabChanged(QWidget*)));
 
-     /*     tab_3 = new QWidget( TabWidget, "tab_3" );
-      tabLayout_3 = new QGridLayout( tab_3 );
-      tabLayout_3->setSpacing( 2);
-      tabLayout_3->setMargin( 2);
+  TabWidget->insertTab( tab_2, tr( "2"));
 
+  connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
+          this,SLOT(tabChanged(QWidget*)));
 
-//     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,"/");
+  /*     tab_3 = new QWidget( TabWidget, "tab_3" );
+         tabLayout_3 = new QGridLayout( tab_3 );
+         tabLayout_3->setSpacing( 2);
+         tabLayout_3->setMargin( 2);
 
-QListView *fileTree;
-    fileTree = new QListView( tab_3, "tree" );
 
-      
-     tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
+         //     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,"/");
 
-       TabWidget->insertTab( tab_3, tr( "Remote" ) );
-       */
-         
-///////////////
+         QListView *fileTree;
+         fileTree = new QListView( tab_3, "tree" );
 
-////////////////////     
+      
+         tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
 
+         TabWidget->insertTab( tab_3, tr( "Remote" ) );
+  */
+         
+  ///////////////
      
-    currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-    currentDir.setPath( QDir::currentDirPath());
+  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());
+  currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+  currentRemoteDir.setPath( QDir::currentDirPath());
 
-    b = TRUE;
+  b = TRUE;
 
-    filterStr="*";
-    b=FALSE;
+  filterStr="*";
+  b=FALSE;
 
-    connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
+  connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
     
-    populateLocalView();
-    populateRemoteView();
-    currentPathCombo->setFocus();
+  populateLocalView();
+  populateRemoteView();
+  currentPathCombo->setFocus();
 }
@@ -296,10 +272,10 @@ void AdvancedFm::cleanUp()
 {
-    QString sfile=QDir::homeDirPath();
-    if(sfile.right(1) != "/")
-        sfile+="/._temp";
-    else
-        sfile+="._temp";
-    QFile file( sfile);
-    if(file.exists())
-        file.remove();
+  QString sfile=QDir::homeDirPath();
+  if(sfile.right(1) != "/")
+    sfile+="/._temp";
+  else
+    sfile+="._temp";
+  QFile file( sfile);
+  if(file.exists())
+    file.remove();
 }
@@ -308,12 +284,12 @@ void AdvancedFm::tabChanged(QWidget *w)
 {
-    if (TabWidget->currentPageIndex() == 0) {
-            currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
-            viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
-            viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
-    }
+  if (TabWidget->currentPageIndex() == 0) {
+    currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+    viewMenu->setItemChecked(viewMenu->idAt(0),TRUE);
+    viewMenu->setItemChecked(viewMenu->idAt(1),FALSE);
+  }
   if (TabWidget->currentPageIndex() == 1) {
-            currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
-            viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
-            viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
-    }
+    currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
+    viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
+    viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
+  }
 }
@@ -323,113 +299,94 @@ void AdvancedFm::populateLocalView()
 {
-    QPixmap pm;
-    Local_View->clear();
-    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
-    currentDir.setMatchAllDirs(TRUE);
-    currentDir.setNameFilter(filterStr);
-    QString fileL, fileS, fileDate;
-//    qDebug(currentDir.canonicalPath());
-//     struct stat buf;
-//     mode_t mode;
-    QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
-    setCaption("AdvancedFm :: "+fs);
-    bool isDir=FALSE;
-    const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
-    QFileInfoListIterator it(*list);
-    QFileInfo *fi;
-    while ( (fi=it.current()) ) {
-        if (fi->isSymLink() ) {
-            QString symLink=fi->readLink();
-//         qDebug("Symlink detected "+symLink);
-            QFileInfo sym( symLink);
-            fileS.sprintf( "%10li", sym.size() );
-            fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
-            fileDate = sym.lastModified().toString();
-        } else {
-            fileS.sprintf( "%10li", fi->size() );
-            fileL.sprintf( "%s",fi->fileName().data() );
-            fileDate= fi->lastModified().toString();
-            if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
-                fileL+="/";
-                isDir=TRUE;
-//     qDebug( fileL);
-            }
-        }
-        QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
-        if(fileL !="./" && fi->exists()) {
-            item= new QListViewItem( Local_View, 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" );
-//                 item->setPixmap( 0,pm );
-            } 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 { //is exec
-//                  pm = Resource::loadPixmap( "exec");
-//                 }
-// //                 item->setPixmap( 0,pm);
-        } else if( !fi->isReadable() ) {
-            pm = Resource::loadPixmap( "locked" );
-//                 item->setPixmap( 0,pm);
-            } else { //everything else goes by mimetype
-                MimeType mt(fi->filePath());
-                pm=mt.pixmap(); //sets the correct pixmap for mimetype
-                if(pm.isNull())
-                    pm =  Resource::loadPixmap( "UnknownDocument-14" );
-//                 item->setPixmap( 0,pm);
-            }
-            item->setPixmap( 0,pm);
-            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);
-            }
+  QPixmap pm;
+  Local_View->clear();
+  currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
+  currentDir.setMatchAllDirs(TRUE);
+  currentDir.setNameFilter(filterStr);
+  QString fileL, fileS, fileDate;
+  QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
+  setCaption("AdvancedFm :: "+fs);
+  bool isDir=FALSE;
+  const QFileInfoList *list = currentDir.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( "%10li", sym.size() );
+      fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
+      fileDate = sym.lastModified().toString();
+    } else {
+      fileS.sprintf( "%10li", fi->size() );
+      fileL.sprintf( "%s",fi->fileName().data() );
+      fileDate= fi->lastModified().toString();
+      if( QDir(QDir::cleanDirPath( currentDir.canonicalPath()+"/"+fileL)).exists() ) {
+        fileL+="/";
+        isDir=TRUE;
+      }
+    }
+    QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
+    if(fileL !="./" && fi->exists()) {
+      item= new QListViewItem( Local_View, 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 =  Resource::loadPixmap( "UnknownDocument-14" );
+      }
+      item->setPixmap( 0,pm);
+      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(currentDir.canonicalPath().find("dev",0,TRUE) != -1) {
+    struct stat buf;
+    dev_t devT;
+    DIR *dir;
+    struct dirent *mydirent;
+    if((dir = opendir( currentDir.canonicalPath().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( Local_View, fileL, fileS, fileDate);
+          pm =  Resource::loadPixmap( "UnknownDocument-14" );
+          item->setPixmap( 0,pm);
         }
-        isDir=FALSE;
-        ++it;
-     }
-
-    if(currentDir.canonicalPath().find("dev",0,TRUE) != -1) {
-        struct stat buf;
-//         struct stat st;
-        dev_t devT;
-//         mode_t mode;
-        DIR *dir;
-//         int fd = 0;
-        struct dirent *mydirent;
-//         int i = 1;
-        if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL)
-            while ((mydirent = readdir(dir)) != NULL) {
-                lstat( mydirent->d_name, &buf);
-                qDebug(mydirent->d_name);
-//                 mode = buf.st_mode;
-                fileL.sprintf("%s", mydirent->d_name);
-//                fileS.sprintf("%d, %d",  ); //this isn't correct
-                devT = buf.st_dev;
-                fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
-//                fileS.sprintf("%d,%d", devT,  devT);
-                fileDate.sprintf("%s", ctime( &buf.st_mtime));
-                if( fileL.find(".") == -1 ){
-                    item= new QListViewItem( Local_View, fileL, fileS, fileDate);
-                    pm =  Resource::loadPixmap( "UnknownDocument-14" );
-                    item->setPixmap( 0,pm);
-                }
-            }
+      }
 
-        closedir(dir);
-    }
+    closedir(dir);
+  }
 
-    Local_View->setSorting( 3,FALSE);
-    fillCombo( (const QString &) currentDir.canonicalPath());
+  Local_View->setSorting( 3,FALSE);
+  fillCombo( (const QString &) currentDir.canonicalPath());
 }
@@ -439,115 +396,95 @@ void AdvancedFm::populateRemoteView()
 {
-//     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
-//     QListViewItemIterator it( Remote_View );
-//     for ( ; it.current(); ++it ) {
-//         if ( it.current()->isSelected() ) {
-//             QString strItem = it.current()->text(0);
-//             QString localFile = currentRemoteDir.canonicalPath()+"/"+strItem;
-//             QFileInfo fi(localFile);
-//         }
-//     }
-    QPixmap pm;
-    Remote_View->clear();
-    currentRemoteDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
-    currentRemoteDir.setMatchAllDirs(TRUE);
-    currentRemoteDir.setNameFilter(filterStr);
-    QString fileL, fileS, fileDate;
-
-    QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
-    setCaption("AdvancedFm :: "+fs);
-    bool isDir=FALSE;
-    const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
-    QFileInfoListIterator it(*list);
-    QFileInfo *fi;
-    while ( (fi=it.current()) ) {
-        if (fi->isSymLink() ){
-            QString symLink=fi->readLink();
-//         qDebug("Symlink detected "+symLink);
-            QFileInfo sym( symLink);
-            fileS.sprintf( "%10li", sym.size() );
-            fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
-            fileDate = sym.lastModified().toString();
-        } else {
-//        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
-            fileS.sprintf( "%10li", fi->size() );
-            fileL.sprintf( "%s",fi->fileName().data() );
-            fileDate= fi->lastModified().toString();
-            if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
-                fileL+="/";
-                isDir=TRUE;
-//     qDebug( fileL);
-            }
-        }
-        QFileInfo fileInfo(  currentRemoteDir.canonicalPath()+"/"+fileL);
-        if(fileL !="./" && fi->exists()) {
-            item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
-            QPixmap pm;
-
-            if(isDir || fileL.find("/",0,TRUE) != -1) {
-                if( !QDir( fi->filePath() ).isReadable())
-                    pm = Resource::loadPixmap( "lockedfolder" );
-                else
-                    pm= Resource::loadPixmap( "folder" );
-//                 item->setPixmap( 0,pm );
-            } 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");
-//                     item->setPixmap( 0,pm);
-            } else if( !fi->isReadable() ) {
-                pm = Resource::loadPixmap( "locked" );
-//                     item->setPixmap( 0,pm);
-            } else {
-                MimeType mt(fi->filePath());
-                pm=mt.pixmap(); //sets the correct pixmap for mimetype
-                if(pm.isNull())
-                    pm =  Resource::loadPixmap( "UnknownDocument-14" );
-//                     item->setPixmap( 0,pm);
-            }
-        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);
-        }
-        item->setPixmap( 0, pm);
+  QPixmap pm;
+  Remote_View->clear();
+  currentRemoteDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
+  currentRemoteDir.setMatchAllDirs(TRUE);
+  currentRemoteDir.setNameFilter(filterStr);
+  QString fileL, fileS, fileDate;
+
+  QString fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
+  setCaption("AdvancedFm :: "+fs);
+  bool isDir=FALSE;
+  const QFileInfoList *list = currentRemoteDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
+  QFileInfoListIterator it(*list);
+  QFileInfo *fi;
+  while ( (fi=it.current()) ) {
+    if (fi->isSymLink() ){
+      QString symLink=fi->readLink();
+      //         qDebug("Symlink detected "+symLink);
+      QFileInfo sym( symLink);
+      fileS.sprintf( "%10li", sym.size() );
+      fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
+      fileDate = sym.lastModified().toString();
+    } else {
+      //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+      fileS.sprintf( "%10li", fi->size() );
+      fileL.sprintf( "%s",fi->fileName().data() );
+      fileDate= fi->lastModified().toString();
+      if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
+        fileL+="/";
+        isDir=TRUE;
+        //     qDebug( fileL);
+      }
     }
-    isDir=FALSE;
-        ++it;
+    QFileInfo fileInfo(  currentRemoteDir.canonicalPath()+"/"+fileL);
+    if(fileL !="./" && fi->exists()) {
+      item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
+      QPixmap pm;
+
+      if(isDir || fileL.find("/",0,TRUE) != -1) {
+        if( !QDir( fi->filePath() ).isReadable())
+          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 {
+        MimeType mt(fi->filePath());
+        pm=mt.pixmap(); //sets the correct pixmap for mimetype
+        if(pm.isNull())
+          pm =  Resource::loadPixmap( "UnknownDocument-14" );
+      }
+      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(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1) {
-        struct stat buf;
-//         struct stat st;
-//         mode_t mode;
-        DIR *dir;
-//         int fd = 0;
-        struct dirent *mydirent;
-//         int i = 1;
-        if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
-            while ((mydirent = readdir(dir)) != NULL) {
-                lstat( mydirent->d_name, &buf);
-                qDebug(mydirent->d_name);
-//                 mode = buf.st_mode;
-                fileL.sprintf("%s", mydirent->d_name);
-//                fileS.sprintf("%d, %d",  ); //this isn't correct
-                fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
-                fileDate.sprintf("%s", ctime( &buf.st_mtime));
-                if( fileL.find(".") == -1 ){
-                    item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
-                    pm =  Resource::loadPixmap( "UnknownDocument-14" );
-                    item->setPixmap( 0,pm);
-                }
-            }
+  if(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1) {
+    struct stat buf;
+    DIR *dir;
+    struct dirent *mydirent;
+    if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
+      while ((mydirent = readdir(dir)) != NULL) {
+        lstat( mydirent->d_name, &buf);
+        qDebug(mydirent->d_name);
+        fileL.sprintf("%s", mydirent->d_name);
+        fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
+        fileDate.sprintf("%s", ctime( &buf.st_mtime));
+        if( fileL.find(".") == -1 ){
+          item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
+          pm =  Resource::loadPixmap( "UnknownDocument-14" );
+          item->setPixmap( 0,pm);
+        }
+      }
 
-        closedir(dir);
-    }
+    closedir(dir);
+  }
 
-    Remote_View->setSorting( 3,FALSE);
-    fillCombo( (const QString &) currentRemoteDir.canonicalPath() );
+  Remote_View->setSorting( 3,FALSE);
+  fillCombo( (const QString &) currentRemoteDir.canonicalPath() );
 }
@@ -556,39 +493,39 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem)
 {
-    if(selectedItem) {
-        QString strItem=selectedItem->text(0);
-        QString strSize=selectedItem->text(1);
-        strSize=strSize.stripWhiteSpace();
-        if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
-              // is symlink
-            QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
-            if(QDir(strItem2).exists() ) {
-                currentDir.cd(strItem2, TRUE);
-                populateLocalView();
-            }
-        } else { // not a symlink
-            if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
-                if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
-                    strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
-                    currentDir.cd(strItem,FALSE);
-                    populateLocalView();
-                } else {
-                    currentDir.cdUp();
-                    populateLocalView();
-                }
-                if(QDir(strItem).exists()){
-                    currentDir.cd(strItem, TRUE);
-                    populateLocalView();
-                }
-            } else {
-                strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
-                if( QFile::exists(strItem ) ) {
-//                     qDebug("clicked item "+strItem);
-//                     DocLnk doc( strItem, FALSE );
-//                     doc.execute();
-                      //    Local_View->clearSelection();
-                }
-            } //end not symlink
-            chdir(strItem.latin1());
+  if(selectedItem) {
+    QString strItem=selectedItem->text(0);
+    QString strSize=selectedItem->text(1);
+    strSize=strSize.stripWhiteSpace();
+    if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
+      // is symlink
+      QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
+      if(QDir(strItem2).exists() ) {
+        currentDir.cd(strItem2, TRUE);
+        populateLocalView();
+      }
+    } else { // not a symlink
+      if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
+        if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
+          strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
+          currentDir.cd(strItem,FALSE);
+          populateLocalView();
+        } else {
+          currentDir.cdUp();
+          populateLocalView();
+        }
+        if(QDir(strItem).exists()){
+          currentDir.cd(strItem, TRUE);
+          populateLocalView();
         }
+      } else {
+        strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
+        if( QFile::exists(strItem ) ) {
+          //                     qDebug("clicked item "+strItem);
+          //                     DocLnk doc( strItem, FALSE );
+          //                     doc.execute();
+          //    Local_View->clearSelection();
+        }
+      } //end not symlink
+      chdir(strItem.latin1());
     }
+  }
 }
@@ -597,39 +534,39 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
 {
-    if(selectedItem) {
-        QString strItem=selectedItem->text(0);
-        QString strSize=selectedItem->text(1);
-        strSize=strSize.stripWhiteSpace();
-        if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
-              // is symlink
-            QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
-            if(QDir(strItem2).exists() ) {
-                currentRemoteDir.cd(strItem2, TRUE);
-                populateRemoteView();
-            }
-        } else { // not a symlink
-            if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
-                if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) {
-                    strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
-                    currentRemoteDir.cd(strItem,FALSE);
-                    populateRemoteView();
-                } else {
-                    currentRemoteDir.cdUp();
-                    populateRemoteView();
-                }
-                if(QDir(strItem).exists()){
-                    currentRemoteDir.cd(strItem, TRUE);
-                    populateRemoteView();
-                }
-            } else {
-                strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
-                if( QFile::exists(strItem ) ) {
-//                     qDebug("clicked item "+strItem);
-//                     DocLnk doc( strItem, FALSE );
-//                     doc.execute();
-                      //    Remote_View->clearSelection();
-                }
-            } //end not symlink
-            chdir(strItem.latin1());
+  if(selectedItem) {
+    QString strItem=selectedItem->text(0);
+    QString strSize=selectedItem->text(1);
+    strSize=strSize.stripWhiteSpace();
+    if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
+      // is symlink
+      QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
+      if(QDir(strItem2).exists() ) {
+        currentRemoteDir.cd(strItem2, TRUE);
+        populateRemoteView();
+      }
+    } else { // not a symlink
+      if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
+        if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) {
+          strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
+          currentRemoteDir.cd(strItem,FALSE);
+          populateRemoteView();
+        } else {
+          currentRemoteDir.cdUp();
+          populateRemoteView();
+        }
+        if(QDir(strItem).exists()){
+          currentRemoteDir.cd(strItem, TRUE);
+          populateRemoteView();
         }
+      } else {
+        strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem);
+        if( QFile::exists(strItem ) ) {
+          //                     qDebug("clicked item "+strItem);
+          //                     DocLnk doc( strItem, FALSE );
+          //                     doc.execute();
+          //    Remote_View->clearSelection();
+        }
+      } //end not symlink
+      chdir(strItem.latin1());
     }
+  }
 }
@@ -638,3 +575,3 @@ void AdvancedFm::doLocalCd()
 {
-    localListClicked( Local_View->currentItem());
+  localListClicked( Local_View->currentItem());
 }
@@ -643,3 +580,3 @@ void AdvancedFm::doRemoteCd()
 {
-    localListClicked( Remote_View->currentItem());
+  localListClicked( Remote_View->currentItem());
 }
@@ -648,17 +585,13 @@ void AdvancedFm::showHidden()
 {
-    if (b) {
+  if (b) {
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
-//     localMenu->setItemChecked(localMenu->idAt(0),TRUE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
 
-    }  else {
+  }  else {
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
-//     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
-    }
-    populateLocalView();
+  }
+  populateLocalView();
 
@@ -668,15 +601,11 @@ void AdvancedFm::showRemoteHidden()
 {
-    if (b) {
+  if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-//     viewMenu->setItemChecked(localMenu->idAt(0),TRUE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
 
-    }  else {
+  }  else {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-//     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
-    }
-    populateRemoteView();
+  }
+  populateRemoteView();
 }
@@ -685,11 +614,11 @@ void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint
 {
-qDebug("list pressed");
- switch (mouse) {
-       case 1:
-           break;
-       case 2:
-           menuTimer.start( 750, TRUE );
+  qDebug("list pressed");
+  switch (mouse) {
+  case 1:
+    break;
+  case 2:
+    menuTimer.start( 750, TRUE );
     qDebug("Start menu timer\n");
-     break;
-     };
+    break;
+  };
 }
@@ -699,10 +628,10 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint
 
-    switch (mouse) {
-       case 1:
-           break;
-       case 2:
-           menuTimer.start( 750, TRUE );
-  qDebug("Start menu timer");
-       break;
-     };
+  switch (mouse) {
+  case 1:
+    break;
+  case 2:
+    menuTimer.start( 750, TRUE );
+    qDebug("Start menu timer");
+    break;
+  };
 }
@@ -710,75 +639,71 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint
 void AdvancedFm::runThis() {
-//    QFileInfo *fi;
-    QString fs;
-    if (TabWidget->currentPageIndex() == 0) {
-        QString curFile = Local_View->currentItem()->text(0);
-        if(curFile != "../") {
-
-            fs= getFileSystemType((const QString &) currentDir.canonicalPath());
-            QFileInfo fileInfo( currentDir.canonicalPath()+"/"+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") ) {
-//        if( fileInfo.isExecutable() |
-                QCopEnvelope e("QPE/System", "execute(QString)" );
-                e << curFile;
-            } else {
-                curFile =  currentDir.canonicalPath()+"/"+curFile;
-                DocLnk nf(curFile);
-                QString execStr = nf.exec();
-                qDebug( execStr);
-                if( execStr.isEmpty() ) {
-                } else {
-                    nf.execute();
-                }
-            }
-        }
-//         MimeType mt( curFile);
-    } else {
-        QString curFile = Remote_View->currentItem()->text(0);
-        if(curFile != "../") {
-
-            fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
-            qDebug("Filesystemtype is "+fs);
-            QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
-            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 =  currentRemoteDir.canonicalPath()+"/"+curFile;
-                DocLnk nf(curFile);
-                QString execStr = nf.exec();
-                qDebug(execStr);
-                if( execStr.isEmpty() ) {
-                } else {
-                    nf.execute();
-                }
-            }
+  QString fs;
+  if (TabWidget->currentPageIndex() == 0) {
+    QString curFile = Local_View->currentItem()->text(0);
+    if(curFile != "../") {
+
+      fs= getFileSystemType((const QString &) currentDir.canonicalPath());
+      QFileInfo fileInfo( currentDir.canonicalPath()+"/"+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 =  currentDir.canonicalPath()+"/"+curFile;
+        DocLnk nf(curFile);
+        QString execStr = nf.exec();
+        qDebug( execStr);
+        if( execStr.isEmpty() ) {
+        } else {
+          nf.execute();
         }
-//         MimeType mt( curFile);
+      }
     }
-}
-
-void AdvancedFm::runText() {
-    if (TabWidget->currentPageIndex() == 0) {
-        QString curFile = Local_View->currentItem()->text(0);
-        if(curFile != "../") {
-        curFile =  currentDir.canonicalPath()+"/"+curFile;
-        QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
+  } else {
+    QString curFile = Remote_View->currentItem()->text(0);
+    if(curFile != "../") {
+
+      fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath());
+      qDebug("Filesystemtype is "+fs);
+      QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
+      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 {
-        QString curFile = Remote_View->currentItem()->text(0);
-        if(curFile != "../") {
+      } else {
         curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
         DocLnk nf(curFile);
-        QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
-        e << curFile;
+        QString execStr = nf.exec();
+        qDebug(execStr);
+        if( execStr.isEmpty() ) {
+        } else {
+          nf.execute();
         }
+      }
     }
+  }
+}
+
+void AdvancedFm::runText() {
+  if (TabWidget->currentPageIndex() == 0) {
+    QString curFile = Local_View->currentItem()->text(0);
+    if(curFile != "../") {
+      curFile =  currentDir.canonicalPath()+"/"+curFile;
+      QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
+      e << curFile;
+    }
+  } else {
+    QString curFile = Remote_View->currentItem()->text(0);
+    if(curFile != "../") {
+      curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
+      DocLnk nf(curFile);
+      QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
+      e << curFile;
+    }
+  }
 }
@@ -787,10 +712,10 @@ void AdvancedFm::localMakDir()
 {
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
-    fileDlg->exec();
-    if( fileDlg->result() == 1 ) {
-       QString  filename = fileDlg->LineEdit1->text();
-       currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
-    }
-    populateLocalView();
+  InputDialog *fileDlg;
+  fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
+  fileDlg->exec();
+  if( fileDlg->result() == 1 ) {
+    QString  filename = fileDlg->LineEdit1->text();
+    currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
+  }
+  populateLocalView();
 }
@@ -799,10 +724,10 @@ void AdvancedFm::remoteMakDir()
 {
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
-    fileDlg->exec();
-    if( fileDlg->result() == 1 ) {
-       QString  filename = fileDlg->LineEdit1->text();
-        currentRemoteDir.mkdir(  currentRemoteDir.canonicalPath()+"/"+filename);
-    }
-    populateRemoteView();
+  InputDialog *fileDlg;
+  fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
+  fileDlg->exec();
+  if( fileDlg->result() == 1 ) {
+    QString  filename = fileDlg->LineEdit1->text();
+    currentRemoteDir.mkdir(  currentRemoteDir.canonicalPath()+"/"+filename);
+  }
+  populateRemoteView();
 }
@@ -811,48 +736,48 @@ void AdvancedFm::localDelete()
 {
-    QStringList curFileList = getPath();
-    if(curFileList.count() > 0) {
-        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"),tr("Do you really want to 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;
-                      system( cmd.latin1());
-                      populateLocalView();
-                  }
-                      break;
-                  case 1:
-                        // exit
-                      break;
-                };
-
-            } else {
-                switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
-                                              +" ?",tr("Yes"),tr("No"),0,0,1) ) {
-                  case 0: {
-                      QString cmd="rm "+f;
-                      QFile file(f);
-                      file.remove();
-//                   system( cmd.latin1());
-                      populateLocalView();
-                  }
-                      break;
-                  case 1:
-                        // exit
-                      break;
-                };
-            }
+  QStringList curFileList = getPath();
+  if(curFileList.count() > 0) {
+    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"),tr("Do you really want to 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;
+          system( cmd.latin1());
+          populateLocalView();
+        }
+          break;
+        case 1:
+          // exit
+          break;
+        };
+
+      } else {
+        switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
+                                      +" ?",tr("Yes"),tr("No"),0,0,1) ) {
+        case 0: {
+          QString cmd="rm "+f;
+          QFile file(f);
+          file.remove();
+          //                   system( cmd.latin1());
+          populateLocalView();
         }
+          break;
+        case 1:
+          // exit
+          break;
+        };
+      }
     }
+  }
 }
@@ -861,48 +786,48 @@ void AdvancedFm::remoteDelete()
 {
-    QStringList curFileList = getPath();
-    if( curFileList.count() > 0) {
-        QString myFile;
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
+    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 = currentRemoteDir.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"),tr("Do you really want to 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;
-                      system( cmd.latin1());
-                      populateRemoteView();
-                  }
-                      break;
-                  case 1:
-                        // exit
-                      break;
-                };
-
-            } else {
-                switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
-                                              +" ?",tr("Yes"),tr("No"),0,0,1) ) {
-                  case 0: {
-                      QString cmd="rm "+f;
-                      QFile file(f);
-                      file.remove();
-//                   system( cmd.latin1());
-                      populateRemoteView();
-                  }
-                      break;
-                  case 1:
-                        // exit
-                      break;
-                };
-            }
+    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 = currentRemoteDir.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"),tr("Do you really want to 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;
+          system( cmd.latin1());
+          populateRemoteView();
         }
+          break;
+        case 1:
+          // exit
+          break;
+        };
+
+      } else {
+        switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
+                                      +" ?",tr("Yes"),tr("No"),0,0,1) ) {
+        case 0: {
+          QString cmd="rm "+f;
+          QFile file(f);
+          file.remove();
+          //                   system( cmd.latin1());
+          populateRemoteView();
+        }
+          break;
+        case 1:
+          // exit
+          break;
+        };
+      }
     }
+  }
 }
@@ -911,17 +836,17 @@ void AdvancedFm::localRename()
 {
-    QString curFile = Local_View->currentItem()->text(0);
-    qDebug("currentItem "+curFile);
-    if( curFile !="../") {
-        InputDialog *fileDlg;
-        fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-        fileDlg->setInputText((const QString &)curFile);
-        fileDlg->exec();
-        if( fileDlg->result() == 1 ) {
-            QString oldname = currentDir.canonicalPath() + "/" + curFile;
-            QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
-            if( rename(oldname.latin1(), newName.latin1())== -1)
-                QMessageBox::message(tr("Note"),tr("Could not rename"));
-        }
-        populateLocalView();
-   }
+  QString curFile = Local_View->currentItem()->text(0);
+  qDebug("currentItem "+curFile);
+  if( curFile !="../") {
+    InputDialog *fileDlg;
+    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
+    fileDlg->setInputText((const QString &)curFile);
+    fileDlg->exec();
+    if( fileDlg->result() == 1 ) {
+      QString oldname = currentDir.canonicalPath() + "/" + curFile;
+      QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
+      if( rename(oldname.latin1(), newName.latin1())== -1)
+        QMessageBox::message(tr("Note"),tr("Could not rename"));
+    }
+    populateLocalView();
+  }
 }
@@ -929,17 +854,17 @@ void AdvancedFm::localRename()
 void AdvancedFm::remoteRename()
-    {
-        QString curFile = Remote_View->currentItem()->text(0);
-    if( curFile !="../") {
-            InputDialog *fileDlg;
-            fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
-            fileDlg->setInputText((const QString &)curFile);
-            fileDlg->exec();
-            if( fileDlg->result() == 1 ) {
-                QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile;
-                QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
-                if( rename(oldname.latin1(), newName.latin1())== -1)
-                    QMessageBox::message(tr("Note"),tr("Could not rename"));
-            }
-            populateRemoteView();
-        }
+{
+  QString curFile = Remote_View->currentItem()->text(0);
+  if( curFile !="../") {
+    InputDialog *fileDlg;
+    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
+    fileDlg->setInputText((const QString &)curFile);
+    fileDlg->exec();
+    if( fileDlg->result() == 1 ) {
+      QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile;
+      QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
+      if( rename(oldname.latin1(), newName.latin1())== -1)
+        QMessageBox::message(tr("Note"),tr("Could not rename"));
+    }
+    populateRemoteView();
+  }
 }
@@ -948,4 +873,4 @@ void AdvancedFm::switchToLocalTab()
 {
-    TabWidget->setCurrentPage(0);
-    Local_View->setFocus();
+  TabWidget->setCurrentPage(0);
+  Local_View->setFocus();
 }
@@ -954,4 +879,4 @@ void AdvancedFm::switchToRemoteTab()
 {
-    TabWidget->setCurrentPage(1);
-    Remote_View->setFocus();
+  TabWidget->setCurrentPage(1);
+  Remote_View->setFocus();
 }
@@ -960,3 +885,3 @@ void AdvancedFm::readConfig()
 {
-    Config cfg("AdvancedFm");
+  Config cfg("AdvancedFm");
 }
@@ -965,3 +890,3 @@ void AdvancedFm::writeConfig()
 {
-    Config cfg("AdvancedFm");
+  Config cfg("AdvancedFm");
 }
@@ -970,18 +895,18 @@ void  AdvancedFm::currentPathComboChanged()
 {
-    if (TabWidget->currentPageIndex() == 0) {
-        if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
-            currentDir.setPath( currentPathCombo->lineEdit()->text() );
-            populateLocalView();
-        } else {
-            QMessageBox::message(tr("Note"),tr("That directory does not exist"));
-        }
+  if (TabWidget->currentPageIndex() == 0) {
+    if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
+      currentDir.setPath( currentPathCombo->lineEdit()->text() );
+      populateLocalView();
+    } else {
+      QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
-    if (TabWidget->currentPageIndex() == 0) {
-        if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
-             currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() );
-            populateRemoteView();
-        } else {
-            QMessageBox::message(tr("Note"),tr("That directory does not exist"));
-        }
+  }
+  if (TabWidget->currentPageIndex() == 0) {
+    if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
+      currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() );
+      populateRemoteView();
+    } else {
+      QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
+  }
 }
@@ -990,17 +915,17 @@ void  AdvancedFm::fillCombo(const QString &currentPath) {
 
-    if (TabWidget->currentPageIndex() == 0) {
-        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);
-        }
+  if (TabWidget->currentPageIndex() == 0) {
+    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);
     }
+  }
 }
@@ -1008,13 +933,13 @@ void  AdvancedFm::fillCombo(const QString &currentPath) {
 void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
-    if (TabWidget->currentPageIndex() == 0) {
-        chdir( currentPath.latin1() );
-        currentDir.cd( currentPath, TRUE);
-        populateLocalView();
-        update();
-    } else {
-        chdir( currentPath.latin1() );
-        currentRemoteDir.cd( currentPath, TRUE);
-        populateRemoteView();
-        update();
-    }
+  if (TabWidget->currentPageIndex() == 0) {
+    chdir( currentPath.latin1() );
+    currentDir.cd( currentPath, TRUE);
+    populateLocalView();
+    update();
+  } else {
+    chdir( currentPath.latin1() );
+    currentRemoteDir.cd( currentPath, TRUE);
+    populateRemoteView();
+    update();
+  }
 }
@@ -1023,24 +948,24 @@ void AdvancedFm::filePerms() {
 
-    QStringList curFileList = getPath();
-    QString filePath;
+  QStringList curFileList = getPath();
+  QString filePath;
 
-    if (TabWidget->currentPageIndex() == 0) {
-        filePath = currentDir.canonicalPath()+"/";
-    } else {
-        filePath= currentRemoteDir.canonicalPath()+"/";
-    }
+  if (TabWidget->currentPageIndex() == 0) {
+    filePath = currentDir.canonicalPath()+"/";
+  } else {
+    filePath= currentRemoteDir.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;
-    }
-    if (TabWidget->currentPageIndex() == 0) {
-        populateLocalView();
-    } else {
-        populateRemoteView();
-    }
+  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;
+  }
+  if (TabWidget->currentPageIndex() == 0) {
+    populateLocalView();
+  } else {
+    populateRemoteView();
+  }
 }
@@ -1048,18 +973,17 @@ void AdvancedFm::filePerms() {
 void AdvancedFm::doProperties() {
-    QStringList curFileList = getPath();
-    QString filePath;
-    if (TabWidget->currentPageIndex() == 0) {
-        filePath = currentDir.canonicalPath()+"/";
-    } else {
-        filePath= currentRemoteDir.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 );
-//  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
-        prop.showMaximized();
-        prop.exec();
-    }
+  QStringList curFileList = getPath();
+  QString filePath;
+  if (TabWidget->currentPageIndex() == 0) {
+    filePath = currentDir.canonicalPath()+"/";
+  } else {
+    filePath= currentRemoteDir.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();
+  }
 }
@@ -1067,23 +991,23 @@ void AdvancedFm::doProperties() {
 QStringList AdvancedFm::getPath() {
-    QStringList strList;
-    if (TabWidget->currentPageIndex() == 0) {
-        QList<QListViewItem> * getSelectedItems( QListView * Local_View );
-        QListViewItemIterator it( Local_View );
-        for ( ; it.current(); ++it ) {
-            if ( it.current()->isSelected() ) {
-                strList <<  it.current()->text(0);
-            }
-        }
-        return strList;
-    } else {
-        QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
-        QListViewItemIterator it( Remote_View );
-        for ( ; it.current(); ++it ) {
-            if ( it.current()->isSelected() ) {
-                strList << it.current()->text(0);
-            }
-        }
-        return strList;
+  QStringList strList;
+  if (TabWidget->currentPageIndex() == 0) {
+    QList<QListViewItem> * getSelectedItems( QListView * Local_View );
+    QListViewItemIterator it( Local_View );
+    for ( ; it.current(); ++it ) {
+      if ( it.current()->isSelected() ) {
+        strList <<  it.current()->text(0);
+      }
+    }
+    return strList;
+  } else {
+    QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
+    QListViewItemIterator it( Remote_View );
+    for ( ; it.current(); ++it ) {
+      if ( it.current()->isSelected() ) {
+        strList << it.current()->text(0);
+      }
     }
-    return "";
+    return strList;
+  }
+  return "";
 }
@@ -1091,12 +1015,12 @@ QStringList AdvancedFm::getPath() {
 void AdvancedFm::homeButtonPushed() {
-    QString current = QDir::homeDirPath();
-    chdir( current.latin1() );
-    if (TabWidget->currentPageIndex() == 0) {
-        currentDir.cd(  current, TRUE);
-        populateLocalView();
-    } else {
-        currentRemoteDir.cd(  current, TRUE);
-        populateRemoteView();
-    }
-    update();
+  QString current = QDir::homeDirPath();
+  chdir( current.latin1() );
+  if (TabWidget->currentPageIndex() == 0) {
+    currentDir.cd(  current, TRUE);
+    populateLocalView();
+  } else {
+    currentRemoteDir.cd(  current, TRUE);
+    populateRemoteView();
+  }
+  update();
 }
@@ -1104,12 +1028,12 @@ void AdvancedFm::homeButtonPushed() {
 void AdvancedFm::docButtonPushed() {
-    QString current = QPEApplication::documentDir();
-    chdir( current.latin1() );
-    if (TabWidget->currentPageIndex() == 0) {
-        currentDir.cd( current, TRUE);
-        populateLocalView();
-    } else {
-        currentRemoteDir.cd( current, TRUE);
-        populateRemoteView();
-    }
-    update();
+  QString current = QPEApplication::documentDir();
+  chdir( current.latin1() );
+  if (TabWidget->currentPageIndex() == 0) {
+    currentDir.cd( current, TRUE);
+    populateLocalView();
+  } else {
+    currentRemoteDir.cd( current, TRUE);
+    populateRemoteView();
+  }
+  update();
 }
@@ -1117,12 +1041,12 @@ void AdvancedFm::docButtonPushed() {
 void AdvancedFm::SDButtonPushed() {
-    QString current = "/mnt/card";
-    chdir( current.latin1() );
-    if (TabWidget->currentPageIndex() == 0) {
-        currentDir.cd( current, TRUE);
-        populateLocalView();
-    } else {
-        currentRemoteDir.cd( current, TRUE);
-        populateRemoteView();
-    }
-    update();
+  QString current = "/mnt/card";
+  chdir( current.latin1() );
+  if (TabWidget->currentPageIndex() == 0) {
+    currentDir.cd( current, TRUE);
+    populateLocalView();
+  } else {
+    currentRemoteDir.cd( current, TRUE);
+    populateRemoteView();
+  }
+  update();
 
@@ -1131,12 +1055,12 @@ void AdvancedFm::SDButtonPushed() {
 void AdvancedFm::CFButtonPushed() {
-    QString current = "/mnt/cf";
-    chdir( current.latin1() );
-    if (TabWidget->currentPageIndex() == 0) {
-        currentDir.cd( current, TRUE);
-        populateLocalView();
-    } else {
-        currentRemoteDir.cd( current, TRUE);
-        populateRemoteView();
-    }
-    update();
+  QString current = "/mnt/cf";
+  chdir( current.latin1() );
+  if (TabWidget->currentPageIndex() == 0) {
+    currentDir.cd( current, TRUE);
+    populateLocalView();
+  } else {
+    currentRemoteDir.cd( current, TRUE);
+    populateRemoteView();
+  }
+  update();
 
@@ -1147,40 +1071,135 @@ void AdvancedFm::upDir()
 {
+  if (TabWidget->currentPageIndex() == 0) {
+    QString current = currentDir.canonicalPath();
+    QDir dir(current);
+    dir.cdUp();
+    current = dir.canonicalPath();
+    chdir( current.latin1() );
+    currentDir.cd(  current, TRUE);
+    populateLocalView();
+    update();
+  } else {
+    QString current = currentRemoteDir.canonicalPath();
+    QDir dir(current);
+    dir.cdUp();
+    current = dir.canonicalPath();
+    chdir( current.latin1() );
+    currentRemoteDir.cd(  current, TRUE);
+    populateRemoteView();
+    update();
+  }
+}
+
+void AdvancedFm::copy()
+{
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
+    QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
-        QString current = currentDir.canonicalPath();
-        QDir dir(current);
-        dir.cdUp();
-        current = dir.canonicalPath();
-        chdir( current.latin1() );
-        currentDir.cd(  current, TRUE);
-        populateLocalView();
-        update();
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+        QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+        curFile = currentDir.canonicalPath()+"/"+(*it);
+        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(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
+          qWarning("nothin doing");
+        }
+      }
+      populateRemoteView();
+      TabWidget->setCurrentPage(1);
+
     } else {
-        QString current = currentRemoteDir.canonicalPath();
-        QDir dir(current);
-        dir.cdUp();
-        current = dir.canonicalPath();
-        chdir( current.latin1() );
-        currentRemoteDir.cd(  current, TRUE);
-        populateRemoteView();
-        update();
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+        QString destFile = currentDir.canonicalPath()+"/"+(*it);
+        curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+
+        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(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+
+          qWarning("nothin doing");
+        }
+      }
+      populateLocalView();
+      TabWidget->setCurrentPage(0);
     }
+  }
 }
 
-void AdvancedFm::copy()
+void AdvancedFm::copyAs()
 {
-    QStringList curFileList = getPath();
-    if( curFileList.count() > 0) {
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
     QString curFile;
+    InputDialog *fileDlg;
+    fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
+
     if (TabWidget->currentPageIndex() == 0) {
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+        QString destFile;
+        curFile = currentDir.canonicalPath()+"/"+(*it);
+        fileDlg->setInputText((const QString &) destFile );
+        fileDlg->exec();
+        if( fileDlg->result() == 1 ) {
+          QString  filename = fileDlg->LineEdit1->text();
+          destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+
+          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(destFile, curFile) ) {
+            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+            qWarning("nothin doing");
+          }
+        }
+      }
+      populateRemoteView();
+      TabWidget->setCurrentPage(1);
+    } else {
+      if (TabWidget->currentPageIndex() == 0) {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
-            QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-//             if(destFile.right(1).find("/",0,TRUE) == -1)
-//                 destFile+="/";
-//             destFile +=(*it);
-
-            curFile = currentDir.canonicalPath()+"/"+(*it);
-//             if(curFile.right(1).find("/",0,TRUE) == -1)
-//                 curFile +="/";
-//             curFile +=(*it);
+          curFile = currentDir.canonicalPath()+"/"+(*it);
+          QString destFile;
+          fileDlg->setInputText((const QString &) destFile);
+          fileDlg->exec();
+          if( fileDlg->result() == 1 ) {
+            QString  filename = fileDlg->LineEdit1->text();
+            destFile = currentDir.canonicalPath()+"/"+(*it);
 
@@ -1188,26 +1207,82 @@ void AdvancedFm::copy()
             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: 
+              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;
+              case 1:
+                return;
                 break;
-                };
+              };
             }
             if(!copyFile(destFile, curFile) ) {
-                QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile);
-                qWarning("nothin doing");
+              QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+              qWarning("nothin doing");
             }
+                        
+          }
         }
-        populateRemoteView();
-        TabWidget->setCurrentPage(1);
+        populateLocalView();
+        TabWidget->setCurrentPage(0);
+      }
+    }
+  }
 
+}
+
+void AdvancedFm::copySameDir() {
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
+    QString curFile;
+    InputDialog *fileDlg;
+
+    if (TabWidget->currentPageIndex() == 0) {
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+        QString destFile;
+        curFile = currentDir.canonicalPath()+"/"+(*it);
+        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 = currentDir.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:
+              qDebug("");
+              f.remove();
+              break;
+            case 1:
+              return;
+              break;
+            };
+          }
+          if(!copyFile(destFile, curFile) ) {
+            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+            qWarning("nothin doing");
+          }
+                    
+          qDebug("copy "+curFile+" as "+destFile);
+        }
+        delete fileDlg;
+      }
+      populateRemoteView();
+      TabWidget->setCurrentPage(1);
     } else {
+      if (TabWidget->currentPageIndex() == 0) {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
-            QString destFile = currentDir.canonicalPath()+"/"+(*it);
-            curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+          curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+          fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
+          QString destFile;
+          fileDlg->setInputText((const QString &) destFile);
+          fileDlg->exec();
+          if( fileDlg->result() == 1 ) {
+            QString  filename = fileDlg->LineEdit1->text();
+            destFile = currentDir.canonicalPath()+"/"+filename;
 
@@ -1215,18 +1290,20 @@ void AdvancedFm::copy()
             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: 
+              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;
+              case 1:
+                return;
                 break;
-                };
+              };
             }
             if(!copyFile(destFile, curFile) ) {
-                    QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-
-                    qWarning("nothin doing");
+              QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+              qWarning("nothin doing");
             }
+            qDebug("copy "+curFile+" as "+destFile);
+          }
+          delete fileDlg;
         }
@@ -1234,170 +1311,5 @@ void AdvancedFm::copy()
         TabWidget->setCurrentPage(0);
+      }
     }
-    }
-}
-
-void AdvancedFm::copyAs()
-{
-    QStringList curFileList = getPath();
-    if( curFileList.count() > 0) {
-        QString curFile;
-        InputDialog *fileDlg;
-        fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
-
-        if (TabWidget->currentPageIndex() == 0) {
-            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-                QString destFile;
-                curFile = currentDir.canonicalPath()+"/"+(*it);
-//             InputDialog *fileDlg;
-//             fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
-                fileDlg->setInputText((const QString &) destFile );
-                fileDlg->exec();
-                if( fileDlg->result() == 1 ) {
-                    QString  filename = fileDlg->LineEdit1->text();
-                    destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-
-                    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(destFile, curFile) ) {
-                        QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-                        qWarning("nothin doing");
-                    }
-                }
-            }
-            populateRemoteView();
-            TabWidget->setCurrentPage(1);
-        } else {
-            if (TabWidget->currentPageIndex() == 0) {
-                for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-
-                    curFile = currentDir.canonicalPath()+"/"+(*it);
-                    QString destFile;
-                    fileDlg->setInputText((const QString &) destFile);
-                    fileDlg->exec();
-                    if( fileDlg->result() == 1 ) {
-                        QString  filename = fileDlg->LineEdit1->text();
-                        destFile = currentDir.canonicalPath()+"/"+(*it);
-
-                        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(destFile, curFile) ) {
-                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-                            qWarning("nothin doing");
-                        }
-                        
-                    }
-                }
-                populateLocalView();
-                TabWidget->setCurrentPage(0);
-            }
-        }
-    }
-
-}
-
-void AdvancedFm::copySameDir() {
-    QStringList curFileList = getPath();
-    if( curFileList.count() > 0) {
-        QString curFile;
-        InputDialog *fileDlg;
-
-        if (TabWidget->currentPageIndex() == 0) {
-            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-                QString destFile;
-                curFile = currentDir.canonicalPath()+"/"+(*it);
-                fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
-//             InputDialog *fileDlg;
-//             fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
-                fileDlg->setInputText((const QString &) destFile );
-                fileDlg->exec();
-                if( fileDlg->result() == 1 ) {
-                    QString filename = fileDlg->LineEdit1->text();
-                    destFile = currentDir.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:
-                              qDebug("");
-                              f.remove();
-                              break;
-                          case 1:
-                              return;
-                              break;
-                        };
-                    }
-                    if(!copyFile(destFile, curFile) ) {
-                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-                        qWarning("nothin doing");
-                    }
-                    
-                    qDebug("copy "+curFile+" as "+destFile);
-                }
-                delete fileDlg;
-            }
-            populateRemoteView();
-            TabWidget->setCurrentPage(1);
-        } else {
-            if (TabWidget->currentPageIndex() == 0) {
-                for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-
-                    curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-                    fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
-                    QString destFile;
-                    fileDlg->setInputText((const QString &) destFile);
-                    fileDlg->exec();
-                    if( fileDlg->result() == 1 ) {
-                        QString  filename = fileDlg->LineEdit1->text();
-                        destFile = currentDir.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(destFile, curFile) ) {
-                            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-                            qWarning("nothin doing");
-                        }
-                        qDebug("copy "+curFile+" as "+destFile);
-                    }
-                    delete fileDlg;
-                }
-                populateLocalView();
-                TabWidget->setCurrentPage(0);
-            }
-        }
-    }
+  }
 
@@ -1407,187 +1319,128 @@ void AdvancedFm::move() {
 
-    QStringList curFileList = getPath();
-    if( curFileList.count() > 0) {
-        QString curFile;
-//    qDebug(curFile);
-        QString destFile;
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
+    QString curFile;
+    //    qDebug(curFile);
+    QString destFile;
 
-        if (TabWidget->currentPageIndex() == 0) {
-            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-                QString destFile =  currentRemoteDir.canonicalPath();
-                if(destFile.right(1).find("/",0,TRUE) == -1)
-                    destFile+="/";
-                destFile +=(*it);
-                curFile = currentDir.canonicalPath();
-                qDebug("Destination file is "+destFile);
-                if(curFile.right(1).find("/",0,TRUE) == -1)
-                    curFile +="/";
-                curFile+=(*it);
-
-                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( destFile, curFile) ) {
-                        QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
-                        return;
-                    }
-                    QFile::remove(curFile);
-                }
-            }
-            TabWidget->setCurrentPage(1);
-        } else {
-            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-                QString destFile = currentRemoteDir.canonicalPath();
-                if(destFile.right(1).find("/",0,TRUE) == -1)
-                    destFile+="/";
-                destFile +=(*it);
-                qDebug("Destination file is "+destFile);
-                curFile = currentDir.canonicalPath();
-                if(curFile.right(1).find("/",0,TRUE) == -1)
-                    curFile +="/";
-                curFile+=(*it);
-
-                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(destFile, curFile) ) {
-                        QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
-                        return;
-                    }
-                }
-                    QFile::remove(curFile);
-                    TabWidget->setCurrentPage(0);
-                }
-            }
-            populateRemoteView();
-            populateLocalView();
+    if (TabWidget->currentPageIndex() == 0) {
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+        QString destFile =  currentRemoteDir.canonicalPath();
+        if(destFile.right(1).find("/",0,TRUE) == -1)
+          destFile+="/";
+        destFile +=(*it);
+        curFile = currentDir.canonicalPath();
+        qDebug("Destination file is "+destFile);
+        if(curFile.right(1).find("/",0,TRUE) == -1)
+          curFile +="/";
+        curFile+=(*it);
+
+        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( destFile, curFile) ) {
+            QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
+            return;
+          }
+          QFile::remove(curFile);
+        }
+      }
+      TabWidget->setCurrentPage(1);
+    } else {
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+        QString destFile = currentRemoteDir.canonicalPath();
+        if(destFile.right(1).find("/",0,TRUE) == -1)
+          destFile+="/";
+        destFile +=(*it);
+        qDebug("Destination file is "+destFile);
+        curFile = currentDir.canonicalPath();
+        if(curFile.right(1).find("/",0,TRUE) == -1)
+          curFile +="/";
+        curFile+=(*it);
+
+        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(destFile, curFile) ) {
+            QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
+            return;
+          }
         }
+        QFile::remove(curFile);
+        TabWidget->setCurrentPage(0);
+      }
+    }
+    populateRemoteView();
+    populateLocalView();
+  }
 }
 
- bool AdvancedFm::copyFile( const QString & dest, const QString & src )
+bool AdvancedFm::copyFile( const QString & dest, const QString & src )
 {
-    char bf[ 50000 ];
-    int  bytesRead;
-    bool success = TRUE;
-    struct stat status;
-
-    QFile s( src );
-    QFile d( dest );
-
-    if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
-        while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
-            if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
-                success = FALSE;
-                break;
-            }
-        }
-        if( success && (bytesRead > 0) ){
-            d.writeBlock( bf, bytesRead );
-        }
-    } else {
+  char bf[ 50000 ];
+  int  bytesRead;
+  bool success = TRUE;
+  struct stat status;
+
+  QFile s( src );
+  QFile d( dest );
+
+  if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
+    while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
+      if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
         success = FALSE;
+        break;
+      }
     }
-
-      // Set file permissions
-    if( stat( (const char *) src, &status ) == 0 ){
-        chmod( (const char *) dest, status.st_mode );
+    if( success && (bytesRead > 0) ){
+      d.writeBlock( bf, bytesRead );
     }
+  } else {
+    success = FALSE;
+  }
 
-    return success;
-}
-
-void AdvancedFm::runCommand() {
-     QString curFile;
-     if (TabWidget->currentPageIndex() == 0) {
-         if( Local_View->currentItem())
-         curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
-     } else {
-         if(Remote_View->currentItem())
-         curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->currentItem()->text(0);
-     }
+  // Set file permissions
+  if( stat( (const char *) src, &status ) == 0 ){
+    chmod( (const char *) dest, status.st_mode );
+  }
 
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
-    fileDlg->setInputText(curFile);
-    fileDlg->exec();
-    QString command;
-    if( fileDlg->result() == 1 ) {
-        command = fileDlg->LineEdit1->text();
-
-//         int err=0;
-        Output *outDlg;
-        outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
-        outDlg->showMaximized();
-        outDlg->show();
-        qApp->processEvents();
-        FILE *fp;
-        char line[130];
-        sleep(1);
-//         if(command.find("2>",0,TRUE) != -1)
-            command +=" 2>&1";
-        fp = popen(  (const char *) command, "r");
-        if ( !fp ) {
-            qDebug("Could not execute '" + command + "'! err=%d", fp);
-            QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
-            pclose(fp);
-            return;
-        } else {
-            while ( fgets( line, sizeof line, fp)) {
-                QString lineStr = line;
-                lineStr=lineStr.left(lineStr.length()-1);
-                outDlg->OutputEdit->append(lineStr);
-                outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
-            }
-        }
-    }
+  return success;
 }
 
-void AdvancedFm::runCommandStd() {
-    QString curFile;
-    if (TabWidget->currentPageIndex() == 0) {
-        if( Local_View->currentItem())
-            curFile = currentDir.canonicalPath() +"/"+  Local_View->currentItem()->text(0);
-    } else {
-        if(Remote_View->currentItem())
-            curFile = currentRemoteDir.canonicalPath() +"/"+  Remote_View->currentItem()->text(0);
-    }
+void AdvancedFm::runCommand() {
+  QString curFile;
+  if (TabWidget->currentPageIndex() == 0) {
+    if( Local_View->currentItem())
+      curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0);
+  } else {
+    if(Remote_View->currentItem())
+      curFile = currentRemoteDir.canonicalPath() + "/"+Remote_View->currentItem()->text(0);
+  }
 
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
-    fileDlg->setInputText(curFile);
-    fileDlg->exec();
-    QString command;
-    if( fileDlg->result() == 1 ) {
-        qApp->processEvents();
-        command = fileDlg->LineEdit1->text() + " &";
-        system(command.latin1());
-    }
-}
+  InputDialog *fileDlg;
+  fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+  fileDlg->setInputText(curFile);
+  fileDlg->exec();
+  QString command;
+  if( fileDlg->result() == 1 ) {
+    command = fileDlg->LineEdit1->text();
 
-void AdvancedFm::fileStatus() {
-    QString curFile;
-    if (TabWidget->currentPageIndex() == 0) {
-        curFile = Local_View->currentItem()->text(0);
-    } else {
-        curFile = Remote_View->currentItem()->text(0);
-    }
-    QString command = " stat -l "+ curFile +" 2>&1";
-//     int err=0;
     Output *outDlg;
@@ -1600,16 +1453,72 @@ void AdvancedFm::fileStatus() {
     sleep(1);
+    command +=" 2>&1";
     fp = popen(  (const char *) command, "r");
     if ( !fp ) {
-        qDebug("Could not execute '" + command + "'! err=%d", fp);
-        QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
-        pclose(fp);
-        return;
+      qDebug("Could not execute '" + command + "'! err=%d", fp);
+      QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
+      pclose(fp);
+      return;
     } else {
-        while ( fgets( line, sizeof line, fp)) {
-            outDlg->OutputEdit->append(line);
-            outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+      while ( fgets( line, sizeof line, fp)) {
+        QString lineStr = line;
+        lineStr=lineStr.left(lineStr.length()-1);
+        outDlg->OutputEdit->append(lineStr);
+        outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
+      }
+    }
+  }
+}
 
-        }
+void AdvancedFm::runCommandStd() {
+  QString curFile;
+  if (TabWidget->currentPageIndex() == 0) {
+    if( Local_View->currentItem())
+      curFile = currentDir.canonicalPath() +"/"+  Local_View->currentItem()->text(0);
+  } else {
+    if(Remote_View->currentItem())
+      curFile = currentRemoteDir.canonicalPath() +"/"+  Remote_View->currentItem()->text(0);
+  }
+
+  InputDialog *fileDlg;
+  fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+  fileDlg->setInputText(curFile);
+  fileDlg->exec();
+  QString command;
+  if( fileDlg->result() == 1 ) {
+    qApp->processEvents();
+    command = fileDlg->LineEdit1->text() + " &";
+    system(command.latin1());
+  }
+}
+
+void AdvancedFm::fileStatus() {
+  QString curFile;
+  if (TabWidget->currentPageIndex() == 0) {
+    curFile = Local_View->currentItem()->text(0);
+  } else {
+    curFile = Remote_View->currentItem()->text(0);
+  }
+  QString command = " stat -l "+ curFile +" 2>&1";
+  Output *outDlg;
+  outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
+  outDlg->showMaximized();
+  outDlg->show();
+  qApp->processEvents();
+  FILE *fp;
+  char line[130];
+  sleep(1);
+  fp = popen(  (const char *) command, "r");
+  if ( !fp ) {
+    qDebug("Could not execute '" + command + "'! err=%d", fp);
+    QMessageBox::warning( this, "AdvancedFm", tr("command failed!"), tr("&OK") );
+    pclose(fp);
+    return;
+  } else {
+    while ( fgets( line, sizeof line, fp)) {
+      outDlg->OutputEdit->append(line);
+      outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
 
     }
+
+  }
 }
@@ -1617,6 +1526,6 @@ void AdvancedFm::fileStatus() {
 void AdvancedFm::mkDir() {
-    if (TabWidget->currentPageIndex() == 0)
-        localMakDir();
-    else
-        remoteMakDir();
+  if (TabWidget->currentPageIndex() == 0)
+    localMakDir();
+  else
+    remoteMakDir();
 
@@ -1625,6 +1534,6 @@ void AdvancedFm::mkDir() {
 void AdvancedFm::rn() {
-    if (TabWidget->currentPageIndex() == 0)
-        localRename();
-    else
-        remoteRename();
+  if (TabWidget->currentPageIndex() == 0)
+    localRename();
+  else
+    remoteRename();
 
@@ -1633,6 +1542,6 @@ void AdvancedFm::rn() {
 void AdvancedFm::del() {
-    if (TabWidget->currentPageIndex() == 0)
-        localDelete();
-    else
-        remoteDelete();
+  if (TabWidget->currentPageIndex() == 0)
+    localDelete();
+  else
+    remoteDelete();
 }
@@ -1640,6 +1549,6 @@ void AdvancedFm::del() {
 void AdvancedFm::doAbout() {
-    QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
-                         "is copyright 2002 by\n"
-                         "L.J.Potter<llornkcor@handhelds.org>\n"
-                         "and is licensed by the GPL"));
+  QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
+                                       "is copyright 2002 by\n"
+                                       "L.J.Potter<llornkcor@handhelds.org>\n"
+                                       "and is licensed by the GPL"));
 }
@@ -1650,61 +1559,61 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
     switch ( e->key() ) {
-      case Key_Delete:
-          del();
-          break;
-      case Key_H:
-          showHidden();
-          break;
-      case Key_E:
-          runThis();
-          break;
-      case Key_C:
-          copy();
-          break;
-      case Key_A:
-          copyAs();
-          break;
-      case Key_M:
-          move();
-          break;
-      case Key_R:
-          rn();
-          break;
-      case Key_I:
-          fileStatus();
-          break;
-      case Key_U:
-          upDir();
-          break;
-      case Key_P:
-          filePerms();
-          break;
-      case Key_N:
-          mkDir();
-          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;
+    case Key_Delete:
+      del();
+      break;
+    case Key_H:
+      showHidden();
+      break;
+    case Key_E:
+      runThis();
+      break;
+    case Key_C:
+      copy();
+      break;
+    case Key_A:
+      copyAs();
+      break;
+    case Key_M:
+      move();
+      break;
+    case Key_R:
+      rn();
+      break;
+    case Key_I:
+      fileStatus();
+      break;
+    case Key_U:
+      upDir();
+      break;
+    case Key_P:
+      filePerms();
+      break;
+    case Key_N:
+      mkDir();
+      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;
     }
@@ -1713,35 +1622,35 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e)
 void AdvancedFm::mkSym() {
-    QString cmd;
-    QStringList curFileList = getPath();
-    if( curFileList.count() > 0) {
+  QString cmd;
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
 
     if (TabWidget->currentPageIndex() == 0) {
-        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-
-            QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
-            if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
-            QString curFile =  currentDir.canonicalPath()+"/"+(*it);
-            if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
-            cmd = "ln -s "+curFile+" "+destName;
-            qDebug(cmd);
-            system(cmd.latin1() );
-        }
-        populateRemoteView();
-        TabWidget->setCurrentPage(1);
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+        QString destName = currentRemoteDir.canonicalPath()+"/"+(*it);
+        if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
+        QString curFile =  currentDir.canonicalPath()+"/"+(*it);
+        if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+        cmd = "ln -s "+curFile+" "+destName;
+        qDebug(cmd);
+        system(cmd.latin1() );
+      }
+      populateRemoteView();
+      TabWidget->setCurrentPage(1);
     } else {
-        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-
-            QString destName = currentDir.canonicalPath()+"/"+(*it);
-            if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
-            QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
-            if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
-
-            cmd = "ln -s "+curFile+" "+destName;
-            qDebug(cmd);
-            system(cmd.latin1() );
-        }
-        populateLocalView();
-        TabWidget->setCurrentPage(0);
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+        QString destName = currentDir.canonicalPath()+"/"+(*it);
+        if(destName.right(1) == "/") destName = destName.left( destName.length() -1);
+        QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
+        if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+
+        cmd = "ln -s "+curFile+" "+destName;
+        qDebug(cmd);
+        system(cmd.latin1() );
+      }
+      populateLocalView();
+      TabWidget->setCurrentPage(0);
     }
-}
+  }
 }
@@ -1749,12 +1658,12 @@ void AdvancedFm::mkSym() {
 void AdvancedFm::QPEButtonPushed() {
-    QString current = QPEApplication::qpeDir();
-    chdir( current.latin1() );
-    if (TabWidget->currentPageIndex() == 0) {
-        currentDir.cd( current, TRUE);
-        populateLocalView();
-    } else {
-        currentRemoteDir.cd( current, TRUE);
-        populateRemoteView();
-    }
-    update();
+  QString current = QPEApplication::qpeDir();
+  chdir( current.latin1() );
+  if (TabWidget->currentPageIndex() == 0) {
+    currentDir.cd( current, TRUE);
+    populateLocalView();
+  } else {
+    currentRemoteDir.cd( current, TRUE);
+    populateRemoteView();
+  }
+  update();
 }
@@ -1763,25 +1672,22 @@ void AdvancedFm::parsetab(const QString &fileName) {
 
-    fileSystemTypeList.clear();
-     fsList.clear();
-    struct mntent *me;
-//     if(fileName == "/etc/mtab") {
-    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;
-//                 deviceList << deviceName;
-//                qDebug(mountDir+"::"+filesystemType);
-                fileSystemTypeList << mountDir+"::"+filesystemType;
-            }
-        }
+  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 );
+  }
+  endmntent( mntfp );
 }
@@ -1789,15 +1695,15 @@ void AdvancedFm::parsetab(const QString &fileName) {
 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);
-        }
+  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;
+  }
+  return baseFs;
 }
@@ -1809,32 +1715,32 @@ QString  AdvancedFm::getDiskSpace( const QString &) {
 void AdvancedFm::doBeam() {
-    Ir ir;
-    if(!ir.supported()){
-    } else {
+  Ir ir;
+  if(!ir.supported()){
+  } else {
 
-        QStringList curFileList = getPath();
-        if( curFileList.count() > 0) {
+    QStringList curFileList = getPath();
+    if( curFileList.count() > 0) {
 
-        if (TabWidget->currentPageIndex() == 0) {
-            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      if (TabWidget->currentPageIndex() == 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 );
-            }
+          QString curFile =  currentDir.canonicalPath()+"/"+(*it);
+          if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+          Ir *file = new Ir(this, "IR");
+          connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
+          file->send( curFile, curFile );
+        }
 
-        }  else {
-            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      }  else {
+        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
-                QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
-                if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
-                Ir *file = new Ir(this, "IR");
-                connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
-                file->send( curFile, curFile );
+          QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
+          if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
+          Ir *file = new Ir(this, "IR");
+          connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
+          file->send( curFile, curFile );
 
-            }
         }
+      }
     }
-}
+  }
 
@@ -1847,13 +1753,2 @@ void AdvancedFm::fileBeamFinished( Ir *ir) {
 
-
-//     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
-//     QListViewItemIterator it( Local_View );
-//     for ( ; it.current(); ++it ) {
-//         if ( it.current()->isSelected() ) {
-//             QString strItem = it.current()->text(0);
-//             QString localFile = currentDir.canonicalPath()+"/"+strItem;
-//             QFileInfo fi(localFile);
-//         }
-//     }
-
 void AdvancedFm::showFileMenu() {
@@ -1873,3 +1768,2 @@ void AdvancedFm::showFileMenu() {
 
-  //  QPopupMenu m;
   QPopupMenu *m = new QPopupMenu(0);
@@ -1947,4 +1841,4 @@ void AdvancedFm::cancelMenuTimer()
 
-    qDebug("selectionChanged: cancel menu timer");
-    if( menuTimer.isActive() )
+  qDebug("selectionChanged: cancel menu timer");
+  if( menuTimer.isActive() )
     menuTimer.stop();
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 7665fe9..45f00ad 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -112,2 +112,4 @@ protected:
   QString getFileSystemType(const QString &);
+  QString getDiskSpace(const QString &);
+
   void parsetab(const QString &fileName);
@@ -135,2 +137,3 @@ protected slots:
   void fileBeamFinished( Ir *);
+
 private: