1 files changed, 7 insertions, 5 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 73d0d57..48332b7 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -281,243 +281,245 @@ void AdvancedFm::refreshCurrentTab() {
 }
 
 void AdvancedFm::switchToLocalTab() {
                 TabWidget->setCurrentWidget(0);
                 Local_View->setFocus();
                 whichTab = 1;
 }
 
 void AdvancedFm::switchToRemoteTab() {
                 TabWidget->setCurrentWidget(1);
                 Remote_View->setFocus();
                 whichTab = 2;
 }
 
 void  AdvancedFm::currentPathComboChanged() {
    if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
       populateView();
    } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
    }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
 
          if ( TabWidget->currentWidget() == tab) {
 //   if ( whichTab == 1) {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
          currentPathCombo->clear();
          localDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( localDirPathStringList,-1);
       }
    } else {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
          currentPathCombo->clear();
          remoteDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( remoteDirPathStringList,-1);
       }
    }
 }
 
 void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
    chdir( currentPath.latin1() );
    CurrentDir()->cd( currentPath, TRUE);
    populateView();
    update();
 }
 
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    QListView *thisView=CurrentView();
    QList<QListViewItem> * getSelectedItems( QListView * thisView );
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
 void AdvancedFm::changeTo(QString dir) {
    chdir( dir.latin1());
    CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::homeButtonPushed() {
  changeTo(QDir::homeDirPath());
 }
 
 void AdvancedFm::docButtonPushed() {
    changeTo(QPEApplication::documentDir());
 }
 
 void AdvancedFm::SDButtonPushed() {
    changeTo("/mnt/card");// this can change so fix
 }
 
 void AdvancedFm::CFButtonPushed() {
    if(zaurusDevice)
                          changeTo("/mnt/cf"); //zaurus
    else
                          changeTo("/mnt/hda"); //ipaq
 }
 
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
+                qDebug("keypressevent");
+}
+
+void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
+                qDebug("key release");
+   if( CurrentView()->hasFocus() )
+      e->ignore();
                 if(  e->key() ==  Key_Left ) 
                                 upDir();
                 else if( e->key() == Key_Return || e->key() == Key_Enter)
                                 navigateToSelected();
                 else if( e->key() == Key_Tab)
                                 setOtherTabCurrent();
                 else if( e->key() == Key_Delete )
                                 del();
                 else if( e->key() ==  Key_A)
                                 copyAs();
                 else if( e->key() ==  Key_C)
                                 copy();
                 else if( e->key() ==  Key_E)
                                 runThis();
                 else if( e->key() ==  Key_G)
                                 currentPathCombo->lineEdit()->setFocus();
                 else if( e->key() == Key_H )
                                 showHidden();
                 else if( e->key() == Key_I)
                                 fileStatus();
                 else if( e->key() == Key_M)
                                 move();
                 else if( e->key() == Key_N )
                                 mkDir();
                 else if( e->key() ==  Key_P)
                                 filePerms();
                 else if( e->key() ==  Key_R )
                                 rn();
                 else if( e->key() ==  Key_U )
                                 upDir();
                 else if( e->key() ==  Key_1)
                                 switchToLocalTab();
                 else if( e->key() == Key_2)
                                 switchToRemoteTab();
                 else if( e->key() ==  Key_3)
                                 CFButtonPushed();
                 else if( e->key() == Key_4)
                                 SDButtonPushed();
                 else if( e->key() == Key_5 )
                                 homeButtonPushed();
                 else if( e->key() ==  Key_6 )
                                 docButtonPushed();
                 else
                                 e->accept();
 }
 
-void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
-   if( CurrentView()->hasFocus() )
-      e->ignore();
-}
-
 
 void AdvancedFm::QPEButtonPushed() {
    QString current = QPEApplication::qpeDir();
    chdir( current.latin1() );
    CurrentDir()->cd( current, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::parsetab(const QString &fileName) {
 
    fileSystemTypeList.clear();
    fsList.clear();
    struct mntent *me;
    FILE *mntfp = setmntent( fileName.latin1(), "r" );
    if ( mntfp ) {
       while ( (me = getmntent( mntfp )) != 0 ) {
          QString deviceName = me->mnt_fsname;
          QString filesystemType = me->mnt_type;
          QString mountDir = me->mnt_dir;
          if(deviceName != "none") {
             if( fsList.contains(filesystemType) == 0
                 & filesystemType.find("proc",0,TRUE) == -1
                 & filesystemType.find("cramfs",0,TRUE) == -1
                 & filesystemType.find("auto",0,TRUE) == -1)
                fsList << filesystemType;
             fileSystemTypeList << mountDir+"::"+filesystemType;
          }
       }
    }
    endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
    parsetab("/etc/mtab"); //why did TT forget filesystem type?
    QString current = currentText;//.right( currentText.length()-1);
    QString baseFs;
    for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
       QString temp = (*it);
       QString path = temp.left(temp.find("::",0,TRUE) );
       path = path.right( path.length()-1);
       if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
          return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       }
    }
    return baseFs;
 }
 
 QString  AdvancedFm::getDiskSpace( const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
       int blkSize = fss.f_bsize;
       //    int totalBlks = fs.f_blocks;
       int availBlks = fss.f_bavail;
 
       long mult = blkSize / 1024;
       long div = 1024 / blkSize;
       if ( !mult ) mult = 1;
       if ( !div ) div = 1;
 
       return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 
 void AdvancedFm::showFileMenu() {
    QString curApp;
    curApp = CurrentView()->currentItem()->text(0);
 
    MimeType mt(curApp);
    const AppLnk* app = mt.application();
    QFile fi(curApp);
    QPopupMenu *m = new QPopupMenu(0);
    QPopupMenu *n = new QPopupMenu(0);
    //    QPopupMenu *o = new QPopupMenu(0);
    m->insertItem(tr("Show Hidden Files"),this,SLOT(showHidden()));
 
    if ( QFileInfo(fi).isDir()) {
       m->insertSeparator();
       m->insertItem(tr("Change Directory"),this,SLOT(doDirChange()));
    } else {
 
       if (app)
          m->insertItem(app->pixmap(),tr("Open in " + app->name()),this,SLOT(runThis()));
       else if(QFileInfo(fi).isExecutable() ) //damn opie doesnt like this
          m->insertItem(tr("Execute"),this,SLOT(runThis()));
       m->insertItem(Resource::loadPixmap("txt"),tr("Open as text"),this,SLOT(runText()));
    }
 
    m->insertItem(tr("Actions"),n);
    n->insertItem(tr("Make Directory"),this,SLOT(makeDir()));
 
    n->insertItem(tr("Make Symlink"),this,SLOT(mkSym()));