-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 48 |
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 @@ -709,99 +709,99 @@ QString AdvancedFm::getDiskSpace( const QString &path) { 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() { |