1 files changed, 24 insertions, 24 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index ec475a4..7fba0af 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -349,510 +349,510 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem) {
 
 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
       QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
         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();
     Remote_View->ensureItemVisible(Remote_View->firstChild());
         } else {
           currentRemoteDir.cdUp();
           populateRemoteView();
     Remote_View->ensureItemVisible(Remote_View->firstChild());
         }
         if(QDir(strItem).exists()){
           currentRemoteDir.cd(strItem, TRUE);
           populateRemoteView();
     Remote_View->ensureItemVisible(Remote_View->firstChild());
         }
       } 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());
     }
   }
 }
 
 
 void AdvancedFm::localListPressed( int mouse, QListViewItem *, const QPoint& , int ) {
 //  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*, const QPoint&, int ) {
 
   switch (mouse) {
   case 1:
     break;
   case 2:
     menuTimer.start( 750, TRUE );
     qDebug("Start menu timer");
     break;
   };
 }
 
 
 void AdvancedFm::switchToLocalTab() {
   TabWidget->setCurrentPage(0);
   Local_View->setFocus();
 }
 
 void AdvancedFm::switchToRemoteTab() {
   TabWidget->setCurrentPage(1);
   Remote_View->setFocus();
 }
 
 void AdvancedFm::readConfig() {
   Config cfg("AdvancedFm");
 }
 
 void AdvancedFm::writeConfig() {
   Config cfg("AdvancedFm");
 }
 
 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()) {
       currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() );
       populateRemoteView();
     } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
   }
 }
 
 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);
     }
   }
 }
 
 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();
   }
 }
 
 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);
         qDebug(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);
         qDebug(it.current()->text(0));
       }
     }
     return strList;
   }
   return "";
 }
 
 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();
 }
 
 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();
 }
 
 void AdvancedFm::SDButtonPushed() {
     QString current = "/mnt/card";// this can change so fix
   chdir( current.latin1() );
   if (TabWidget->currentPageIndex() == 0) {
     currentDir.cd( current, TRUE);
     populateLocalView();
   } else {
     currentRemoteDir.cd( current, TRUE);
     populateRemoteView();
   }
   update();
 
 }
 
 void AdvancedFm::CFButtonPushed() {
     QString current;
     if(zaurusDevice)
         current= "/mnt/cf"; //zaurus
     else
         current = "/mnt/hda"; //ipaq
      
     chdir( current.latin1() );
     if (TabWidget->currentPageIndex() == 0) {
         currentDir.cd( current, TRUE);
         populateLocalView();
     } else {
         currentRemoteDir.cd( current, TRUE);
         populateRemoteView();
     }
     update();
 }
 
 
 
 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"));
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
   if( TabWidget->hasFocus()) 
     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;
     }
 }
 
 
 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;
   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;
     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 = 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->insertSeparator();
 //         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( Resource::loadPixmap( app->name()), tr( "Execute" ), this, SLOT( runThis() ) );
 
         m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) );
     }
-    m->insertSeparator();
 
+    m->insertItem(tr("Actions"),n);
+    if(isLocalView)
+        n->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
+    else
+        n->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+
+    n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
 
+    n->insertSeparator();
+    
+    
     if(isLocalView)
-        m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
+        n->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     else
-        m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
+        n->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
 
-    m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
-    m->insertSeparator();
+    n->insertItem( tr( "Copy" ), this, SLOT( copy() ));
+    n->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
+    n->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
+    n->insertItem( tr( "Move" ), this, SLOT( move() ));
+
+    n->insertSeparator();
 
     if(isLocalView)
-        m->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
+        n->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
     else
-        m->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
+        n->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
-    m->insertItem( tr( "Copy" ), this, SLOT( copy() ));
-    m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() ));
-    m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() ));
-    m->insertItem( tr( "Move" ), this, SLOT( move() ));
-    m->insertSeparator();
-    m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
 
-//   if(isLocalView)
-//     m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() ));
-//   else
-//     m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() ));
+    m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
 
     m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() ));
     m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() ));
-    m->insertSeparator();
-
-    if(isLocalView)
-        m->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
-    else
-        m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
     m->insertSeparator();
     m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() ));
 
 #if defined(QT_QWS_OPIE)
     m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
 #endif    
     m->setCheckable(TRUE);
     if (!b)
         m->setItemChecked(m->idAt(0),TRUE);
     else
         m->setItemChecked(m->idAt(0),FALSE);
 
     if(Ir::supported())
         m->insertItem( tr( "Beam File" ), this, SLOT( doBeam() ));
     m->setFocus();
     m->exec( QCursor::pos() );
     sleep(1);
     if(m) delete m;
 }
 
 
 void AdvancedFm::cancelMenuTimer() {
 
 //  qDebug("selectionChanged: cancel menu timer");
   if( menuTimer.isActive() )
     menuTimer.stop();
 }
 
 QString AdvancedFm::checkDiskSpace(const QString &path) {
   struct statfs fss;
   if ( !statfs( path.latin1(), &fss ) ) {
     int blkSize = fss.f_bsize;
 //    int totalBlks = fs.f_blocks;
     int availBlks = fss.f_bavail;
 
     long mult = blkSize / 1024;
     long div = 1024 / blkSize;
     if ( !mult ) mult = 1;
     if ( !div ) div = 1;
 
 
     return QString::number(availBlks * mult / div);
   }
   return "";
 }
 
 void AdvancedFm::addToDocs() {
     QStringList strListPaths = getPath();
     if( strListPaths.count() > 0) {
         QString curFile;
         if (TabWidget->currentPageIndex() == 0) {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile = currentDir.canonicalPath()+"/"+(*it);
                 qDebug(curFile);
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
                 f.setFile( curFile);
                 f.writeLink();
             }
         } else {
             for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
                 curFile =  currentRemoteDir.canonicalPath()+"/"+(*it);
                 qDebug(curFile);
 
                 DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
                 f.setName((*it));
                 f.setFile( curFile);
                 f.writeLink();
             }
         }
     }
 }