X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1ce2fb199db7bdf5baf05b61e4e58c549404b4df..927a621f0e04de0cfb3b2326d564a905abcc089f:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index a7a5ae567..a9a5ffefe 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -24,6 +24,7 @@ #include "dolphinsettings.h" #include "dolphinview.h" #include "dolphinviewcontainer.h" +#include "dolphin_generalsettings.h" #include #include @@ -37,8 +38,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -53,6 +56,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, const KFileItem& fileInfo, const KUrl& baseUrl) : m_mainWindow(parent), + m_capabilities(0), m_fileInfo(fileInfo), m_baseUrl(baseUrl), m_context(NoContext) @@ -66,6 +70,8 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, DolphinContextMenu::~DolphinContextMenu() { + delete m_capabilities; + m_capabilities = 0; } void DolphinContextMenu::open() @@ -75,7 +81,7 @@ void DolphinContextMenu::open() m_context |= TrashContext; } - if (!m_fileInfo.isNull()) { + if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) { m_context |= ItemContext; // TODO: handle other use cases like devices + desktop files } @@ -95,7 +101,6 @@ void DolphinContextMenu::open() } } - void DolphinContextMenu::openTrashContextMenu() { Q_ASSERT(m_context & TrashContext); @@ -109,7 +114,7 @@ void DolphinContextMenu::openTrashContextMenu() emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); popup->addAction(emptyTrashAction); - QAction* addToPlacesAction = popup->addAction(KIcon("folder-bookmarks"), + QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), i18nc("@action:inmenu Add current folder to places", "Add to Places")); QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); @@ -117,7 +122,7 @@ void DolphinContextMenu::openTrashContextMenu() QAction *action = popup->exec(QCursor::pos()); if (action == emptyTrashAction) { - const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will get deleted.")); + const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted.")); const bool del = KMessageBox::warningContinueCancel(m_mainWindow, text, QString(), @@ -130,7 +135,7 @@ void DolphinContextMenu::openTrashContextMenu() } else if (action == addToPlacesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(i18n("Trash"), url); + DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url); } } @@ -175,19 +180,33 @@ void DolphinContextMenu::openItemContextMenu() // insert 'Bookmark This Folder' entry if exactly one item is selected QAction* addToPlacesAction = 0; if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { - addToPlacesAction = popup->addAction(KIcon("folder-bookmarks"), + addToPlacesAction = popup->addAction(KIcon("bookmark-new"), i18nc("@action:inmenu Add selected folder to places", "Add to Places")); } // Insert 'Open With...' sub menu + // TODO: port to menuActions.addOpenWithActionsTo(popup); QVector openWithVector; const QList openWithActions = insertOpenWithItems(popup, openWithVector); + KonqPopupMenuInformation popupInfo; + popupInfo.setItems(m_selectedItems); + popupInfo.setParentWidget(m_mainWindow); + // Insert 'Actions' sub menu KonqMenuActions menuActions; - menuActions.setItems(m_selectedItems); - if (menuActions.addActionsTo(popup)) + menuActions.setPopupMenuInfo(popupInfo); + if (menuActions.addActionsTo(popup)) { + popup->addSeparator(); + } + + // Insert 'Copy To' and 'Move To' sub menus + if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) { + m_copyToMenu.setItems(m_selectedItems); + m_copyToMenu.setReadOnly(!capabilities().supportsWriting()); + m_copyToMenu.addActionsTo(popup); popup->addSeparator(); + } // insert 'Properties...' entry QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); @@ -198,7 +217,7 @@ void DolphinContextMenu::openItemContextMenu() if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) { const KUrl selectedUrl(m_fileInfo.url()); if (selectedUrl.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(), + DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl), selectedUrl); } } else if (openWithActions.contains(activatedAction)) { @@ -219,7 +238,6 @@ void DolphinContextMenu::openItemContextMenu() void DolphinContextMenu::openViewportContextMenu() { - Q_ASSERT(m_fileInfo.isNull()); KMenu* popup = new KMenu(m_mainWindow); addShowMenubarAction(popup); @@ -231,7 +249,7 @@ void DolphinContextMenu::openViewportContextMenu() popup->addMenu(newMenu->menu()); popup->addSeparator(); - QAction* pasteAction = m_mainWindow->actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); + QAction* pasteAction = createPasteAction(); popup->addAction(pasteAction); // setup 'View Mode' menu @@ -253,7 +271,7 @@ void DolphinContextMenu::openViewportContextMenu() popup->addSeparator(); - QAction* addToPlacesAction = popup->addAction(KIcon("folder-bookmarks"), + QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), i18nc("@action:inmenu Add current folder to places", "Add to Places")); popup->addSeparator(); @@ -262,12 +280,12 @@ void DolphinContextMenu::openViewportContextMenu() QAction* action = popup->exec(QCursor::pos()); if (action == propertiesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); - KPropertiesDialog dialog(url); + KPropertiesDialog dialog(url, m_mainWindow); dialog.exec(); } else if (action == addToPlacesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { - DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url); + DolphinSettings::instance().placesModel()->addPlace(placesName(url), url); } } @@ -280,9 +298,9 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) const KActionCollection* collection = m_mainWindow->actionCollection(); // insert 'Cut', 'Copy' and 'Paste' - QAction* cutAction = collection->action(KStandardAction::stdName(KStandardAction::Cut)); - QAction* copyAction = collection->action(KStandardAction::stdName(KStandardAction::Copy)); - QAction* pasteAction = collection->action(KStandardAction::stdName(KStandardAction::Paste)); + QAction* cutAction = collection->action(KStandardAction::name(KStandardAction::Cut)); + QAction* copyAction = collection->action(KStandardAction::name(KStandardAction::Copy)); + QAction* pasteAction = createPasteAction(); popup->addAction(cutAction); popup->addAction(copyAction); @@ -407,4 +425,37 @@ void DolphinContextMenu::addShowMenubarAction(KMenu* menu) } } +QString DolphinContextMenu::placesName(const KUrl& url) const +{ + QString name = url.fileName(); + if (name.isEmpty()) { + name = url.host(); + } + return name; +} + +QAction* DolphinContextMenu::createPasteAction() +{ + QAction* action = 0; + if ((m_selectedItems.count() == 1) && m_fileInfo.isDir()) { + action = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this); + const QMimeData* mimeData = QApplication::clipboard()->mimeData(); + const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData); + action->setEnabled(!pasteData.isEmpty() && capabilities().supportsWriting()); + connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder())); + } else { + action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); + } + + return action; +} + +KonqFileItemCapabilities& DolphinContextMenu::capabilities() +{ + if (m_capabilities == 0) { + m_capabilities = new KonqFileItemCapabilities(m_selectedItems); + } + return *m_capabilities; +} + #include "dolphincontextmenu.moc"