-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 | |||
@@ -730,10 +730,12 @@ void AdvancedFm::showFileMenu() { | |||
730 | QFile fi(curApp); | 730 | QFile fi(curApp); |
731 | 731 | ||
732 | QPopupMenu *m = new QPopupMenu(0); | 732 | QPopupMenu *m = new QPopupMenu(0); |
733 | QPopupMenu *n = new QPopupMenu(0); | ||
734 | // QPopupMenu *o = new QPopupMenu(0); | ||
733 | 735 | ||
734 | m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); | 736 | m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); |
735 | if ( !QFileInfo(fi).isDir() ) { | 737 | if ( !QFileInfo(fi).isDir() ) { |
736 | m->insertSeparator(); | 738 | // m->insertSeparator(); |
737 | // m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); | 739 | // m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); |
738 | // } else { | 740 | // } else { |
739 | 741 | ||
@@ -745,42 +747,40 @@ void AdvancedFm::showFileMenu() { | |||
745 | 747 | ||
746 | m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) ); | 748 | m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) ); |
747 | } | 749 | } |
748 | m->insertSeparator(); | 750 | |
751 | m->insertItem(tr("Actions"),n); | ||
752 | if(isLocalView) | ||
753 | n->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); | ||
754 | else | ||
755 | n->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); | ||
756 | |||
757 | n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() )); | ||
758 | |||
759 | n->insertSeparator(); | ||
749 | 760 | ||
750 | 761 | ||
751 | if(isLocalView) | 762 | if(isLocalView) |
752 | m->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); | 763 | n->insertItem( tr( "Rename" ), this, SLOT( localRename() )); |
753 | else | 764 | else |
754 | m->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); | 765 | n->insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); |
755 | 766 | ||
756 | m->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() )); | 767 | n->insertItem( tr( "Copy" ), this, SLOT( copy() )); |
757 | m->insertSeparator(); | 768 | n->insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); |
769 | n->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() )); | ||
770 | n->insertItem( tr( "Move" ), this, SLOT( move() )); | ||
771 | |||
772 | n->insertSeparator(); | ||
758 | 773 | ||
759 | if(isLocalView) | 774 | if(isLocalView) |
760 | m->insertItem( tr( "Rename" ), this, SLOT( localRename() )); | 775 | n->insertItem( tr( "Delete" ), this, SLOT( localDelete() )); |
761 | else | 776 | else |
762 | m->insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); | 777 | n->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); |
763 | 778 | ||
764 | m->insertItem( tr( "Copy" ), this, SLOT( copy() )); | ||
765 | m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); | ||
766 | m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() )); | ||
767 | m->insertItem( tr( "Move" ), this, SLOT( move() )); | ||
768 | m->insertSeparator(); | ||
769 | m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() )); | ||
770 | 779 | ||
771 | // if(isLocalView) | 780 | m->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() )); |
772 | // m->insertItem( tr( "Rescan" ), this, SLOT( populateLocalView() )); | ||
773 | // else | ||
774 | // m->insertItem( tr( "Rescan" ), this, SLOT( populateRemoteView() )); | ||
775 | 781 | ||
776 | m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); | 782 | m->insertItem( tr( "Run Command" ), this, SLOT( runCommand() )); |
777 | m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); | 783 | m->insertItem( tr( "File Info" ), this, SLOT( fileStatus() )); |
778 | m->insertSeparator(); | ||
779 | |||
780 | if(isLocalView) | ||
781 | m->insertItem( tr( "Delete" ), this, SLOT( localDelete() )); | ||
782 | else | ||
783 | m->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); | ||
784 | 784 | ||
785 | m->insertSeparator(); | 785 | m->insertSeparator(); |
786 | m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() )); | 786 | m->insertItem( tr( "Set Permissions" ), this, SLOT( filePerms() )); |