code cleanup

2 files changed, 3 insertions, 106 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
@@ -54,243 +54,219 @@
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qregexp.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <time.h>
 #include <fcntl.h>
 #include <mntent.h>
 #include <string.h>
 #include <errno.h>
 
 AdvancedFm::AdvancedFm( )
         : QMainWindow( )
 {
     setCaption( tr( "AdvancedFm" ) );
-//      menuTimer( this );
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
 
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QPEMenuBar *menuBar = new QPEMenuBar(this);
-//    fileMenu  = new QPopupMenu( this );
     fileMenu = new QPopupMenu( this );
     viewMenu  = new QPopupMenu( this );
 
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 1 );
 
     menuBar->insertItem( tr( "File" ), fileMenu);
     menuBar->insertItem( tr( "View" ), viewMenu);
 
     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);
 
     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);
 
     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);
 
     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);
 
     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);
 
     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());
 
     connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
               this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
     connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
              this,SLOT(currentPathComboChanged()));
 
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7);
 
 
     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);
 
     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);
 
      QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
-
-
     tabLayout->addWidget( Local_View, 0, 0 );
 
     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)) );
 
     connect( Local_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
 
     TabWidget->insertTab( tab, tr("1"));
 
     tab_2 = new QWidget( TabWidget, "tab_2" );
     tabLayout_2 = new QGridLayout( tab_2 );
     tabLayout_2->setSpacing( 2);
     tabLayout_2->setMargin( 2);
 
     Remote_View = new QListView( tab_2, "Remote_View" );
     Remote_View->addColumn( tr("File"),130);
     Remote_View->addColumn( tr("Size"),-1);
     Remote_View->setColumnAlignment(1,QListView::AlignRight);
     Remote_View->addColumn( tr("Date"),-1);
     Remote_View->setColumnAlignment(2,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
      Remote_View->setMultiSelection( TRUE );
      Remote_View->setSelectionMode(QListView::Extended);
 
 
      QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
     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 );
 
 
     TabWidget->insertTab( tab_2, tr( "2"));
 
      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);
 
 
 //     OFileDialog fileDialog;
 // fileDialog;
 //    fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy
 //     fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow");
 //      OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/");
 
 QListView *fileTree;
     fileTree = new QListView( tab_3, "tree" );
 
       
      tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
 
        TabWidget->insertTab( tab_3, tr( "Remote" ) );
        */
          
 ///////////////
 
-////////////////////     
-
-     
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
 
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentRemoteDir.setPath( QDir::currentDirPath());
 
     b = TRUE;
 
     filterStr="*";
     b=FALSE;
 
     connect( &menuTimer, SIGNAL( timeout() ), SLOT( showFileMenu() ) );
     
     populateLocalView();
     populateRemoteView();
     currentPathCombo->setFocus();
 }
 
 AdvancedFm::~AdvancedFm()
 {
 }
 
 void AdvancedFm::cleanUp()
 {
@@ -306,257 +282,218 @@ void AdvancedFm::cleanUp()
 
 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() == 1) {
             currentPathCombo->lineEdit()->setText( currentRemoteDir.canonicalPath());
             viewMenu->setItemChecked(viewMenu->idAt(1),TRUE);
             viewMenu->setItemChecked(viewMenu->idAt(0),FALSE);
     }
 }
 
 
 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);
             }
         }
         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);
     }
 
     Local_View->setSorting( 3,FALSE);
     fillCombo( (const QString &) currentDir.canonicalPath());
 }
 
 
 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);
     }
     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);
                 }
             }
 
         closedir(dir);
     }
 
     Remote_View->setSorting( 3,FALSE);
     fillCombo( (const QString &) currentRemoteDir.canonicalPath() );
 }
 
 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
@@ -628,160 +565,148 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem)
 //                     doc.execute();
                       //    Remote_View->clearSelection();
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
     }
 }
 
 void AdvancedFm::doLocalCd()
 {
     localListClicked( Local_View->currentItem());
 }
 
 void AdvancedFm::doRemoteCd()
 {
     localListClicked( Remote_View->currentItem());
 }
 
 void AdvancedFm::showHidden()
 {
     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 {
     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();
 
 }
 
 void AdvancedFm::showRemoteHidden()
 {
     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 {
     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();
 }
 
 void AdvancedFm::localListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
 qDebug("list pressed");
  switch (mouse) {
        case 1:
            break;
        case 2:
            menuTimer.start( 750, TRUE );
     qDebug("Start menu timer\n");
      break;
      };
 }
 
 void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
 
     switch (mouse) {
        case 1:
            break;
        case 2:
            menuTimer.start( 750, TRUE );
   qDebug("Start menu timer");
        break;
      };
 }
 
 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();
                 }
             }
         }
-//         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)" );
         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;
         }
     }
 }
 
 void AdvancedFm::localMakDir()
 {
@@ -1037,49 +962,48 @@ void AdvancedFm::filePerms() {
         filePerm->exec();
         if( filePerm)
             delete  filePerm;
     }
     if (TabWidget->currentPageIndex() == 0) {
         populateLocalView();
     } else {
         populateRemoteView();
     }
 }
 
 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 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);
             }
         }
@@ -1154,57 +1078,49 @@ void AdvancedFm::upDir()
         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) {
         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);
-
             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 {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
@@ -1227,50 +1143,48 @@ void AdvancedFm::copy()
             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::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");
                     }
                 }
@@ -1307,50 +1221,48 @@ void AdvancedFm::copyAs()
                             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");
                     }
@@ -1510,107 +1422,104 @@ void AdvancedFm::move() {
         chmod( (const char *) dest, status.st_mode );
     }
 
     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);
      }
 
     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);
             }
         }
     }
 }
 
 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";
-//     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);
     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);
 
         }
 
     }
 }
 
@@ -1743,63 +1652,60 @@ void AdvancedFm::mkSym() {
         populateLocalView();
         TabWidget->setCurrentPage(0);
     }
 }
 }
 
 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();
 }
 
 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;
             }
         }
     }
     endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
     parsetab("/etc/mtab"); //why did TT forget filesystem type?
     QString current = currentText;//.right( currentText.length()-1);
     QString baseFs;
     for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
         QString temp = (*it);
         QString path = temp.left(temp.find("::",0,TRUE) );
         path = path.right( path.length()-1);
         if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
         if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
             return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
         }
     }
     return baseFs;
 }
 
 QString  AdvancedFm::getDiskSpace( const QString &) {
@@ -1824,75 +1730,63 @@ void AdvancedFm::doBeam() {
                 file->send( curFile, curFile );
             }
 
         }  else {
             for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
 
                 QString curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
                 if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1);
                 Ir *file = new Ir(this, "IR");
                 connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
                 file->send( curFile, curFile );
 
             }
         }
     }
 }
 
 }
 
 void AdvancedFm::fileBeamFinished( Ir *ir) {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 
 }
 
-
-//     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() {
 
   QString curApp;
   bool isLocalView = false;
   if (TabWidget->currentPageIndex() == 0) {
     isLocalView = TRUE;
     curApp = Local_View->currentItem()->text(0);
   }   else {
     curApp = Remote_View->currentItem()->text(0);
   }
 
   MimeType mt( curApp );
   const AppLnk* app = mt.application();
   QFile fi(curApp);
 
-  //  QPopupMenu m;
   QPopupMenu *m = new QPopupMenu(0);
 
   m->insertItem(  tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
   m->insertSeparator();
   if ( QFileInfo(fi).isDir() ) {
     m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
   } else {
 
     if ( app )
       m->insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( runThis() ) );
     else if( QFileInfo(fi).isExecutable() )
       m->insertItem(  tr( "Execute" ), this, SLOT( runThis() ) );
 
     m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
   }
   m->insertSeparator();
 
 
   if(isLocalView)
     m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
   else
     m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
 
   m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
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
@@ -89,52 +89,55 @@ protected slots:
     void remoteDelete();
 /*     bool remoteDirList(const QString &); */
 /*     bool remoteChDir(const QString &); */
     void tabChanged(QWidget*);
     void cleanUp();
     void remoteRename();
     void localRename();
     void runThis();
     void runText();
     void filePerms();
     void doProperties();
     void runCommand();
     void runCommandStd();
     QStringList getPath();
     void mkSym();
   void switchToLocalTab();
   void switchToRemoteTab();
 
 protected:
   QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
   QStringList remoteDirPathStringList, localDirPathStringList;
 
   void keyReleaseEvent( QKeyEvent *);
   QString getFileSystemType(const QString &);
+  QString getDiskSpace(const QString &);
+
   void parsetab(const QString &fileName);
   
 protected slots:
   void showFileMenu();
   void cancelMenuTimer();
   void homeButtonPushed();
   void docButtonPushed();
   void SDButtonPushed();
   void CFButtonPushed();
   void QPEButtonPushed();
   void upDir();
   void currentPathComboChanged();
   void copy();
   void copyAs();
   void copySameDir();
   void currentPathComboActivated(const QString &);
   void fillCombo(const QString &);
   bool copyFile( const QString & , const QString & );
   void move();
   void fileStatus();
   void doAbout();
   void doBeam();
   void fileBeamFinished( Ir *);
+
 private:
       QTimer menuTimer;
 };
 
 #endif // ADVANCEDFM_H