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
@@ -685,147 +685,147 @@ QString  AdvancedFm::getFileSystemType(const QString &currentText) {
   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() {