X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9340a52cf8b310545fdb06f1f5aeec0f6a32d539..e53ce0959feaeec8340dfeb92ca410018240b95a:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index cd3195e9a..d76cd8d23 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -21,9 +21,8 @@ #include "dolphincontextmenu.h" #include "dolphinmainwindow.h" -#include "dolphinnewmenu.h" +#include "dolphinnewfilemenu.h" #include "settings/dolphinsettings.h" -#include "dolphinview.h" #include "dolphinviewcontainer.h" #include "dolphin_generalsettings.h" @@ -38,13 +37,12 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include -#include #include #include @@ -52,6 +50,9 @@ #include #include +#include "views/dolphinview.h" +#include "views/viewmodecontroller.h" + DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, const KFileItem& fileInfo, const KUrl& baseUrl) : @@ -88,7 +89,7 @@ void DolphinContextMenu::open() m_context |= TrashContext; } - if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) { + if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) { m_context |= ItemContext; // TODO: handle other use cases like devices + desktop files } @@ -124,6 +125,11 @@ void DolphinContextMenu::openTrashContextMenu() QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), i18nc("@action:inmenu Add current folder to places", "Add to Places")); + // Don't show if url is already in places + if (placeExists(m_mainWindow->activeViewContainer()->url())) { + addToPlacesAction->setVisible(false); + } + addCustomActions(popup); QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); @@ -183,15 +189,17 @@ void DolphinContextMenu::openItemContextMenu() KMenu* popup = new KMenu(m_mainWindow); if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) { // setup 'Create New' menu - DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow); - newMenu->slotCheckUpToDate(); - newMenu->setPopupFiles(m_fileInfo.url()); - newMenu->setEnabled(capabilities().supportsWriting()); - - KMenu* menu = newMenu->menu(); + DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(popup, m_mainWindow); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles()); + newFileMenu->checkUpToDate(); + newFileMenu->setPopupFiles(m_fileInfo.url()); + newFileMenu->setEnabled(capabilities().supportsWriting()); + + KMenu* menu = newFileMenu->menu(); menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); menu->setIcon(KIcon("document-new")); - popup->addMenu(newMenu->menu()); + popup->addMenu(menu); popup->addSeparator(); // insert 'Open in new window' and 'Open in new tab' entries @@ -204,27 +212,11 @@ void DolphinContextMenu::openItemContextMenu() popup->addSeparator(); - // 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("bookmark-new"), - i18nc("@action:inmenu Add selected folder to places", "Add to Places")); - } - - KonqMenuActions menuActions; - menuActions.setParentWidget(m_mainWindow); - menuActions.setItemListProperties(m_selectedItems); + KFileItemActions fileItemActions; + fileItemActions.setItemListProperties(capabilities()); + addServiceActions(popup, fileItemActions); - // insert 'Open With...' action or sub menu - menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'"); - - // insert 'Actions' sub menu - if (menuActions.addActionsTo(popup)) { - popup->addSeparator(); - } - - // insert revision control actions - addRevisionControlActions(popup); + addVersionControlActions(popup); // insert 'Copy To' and 'Move To' sub menus if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) { @@ -234,6 +226,13 @@ void DolphinContextMenu::openItemContextMenu() popup->addSeparator(); } + // insert 'Add to Places' entry if exactly one item is selected + QAction* addToPlacesAction = 0; + if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1) && !placeExists(m_fileInfo.url())) { + addToPlacesAction = popup->addAction(KIcon("bookmark-new"), + i18nc("@action:inmenu Add selected folder to places", "Add to Places")); + } + // insert 'Properties...' entry QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); popup->addAction(propertiesAction); @@ -258,35 +257,38 @@ void DolphinContextMenu::openViewportContextMenu() addShowMenubarAction(popup); // setup 'Create New' menu - KNewMenu* newMenu = m_mainWindow->newMenu(); - newMenu->slotCheckUpToDate(); - newMenu->setPopupFiles(m_baseUrl); - popup->addMenu(newMenu->menu()); + KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); + const DolphinView* view = m_mainWindow->activeViewContainer()->view(); + newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles()); + newFileMenu->checkUpToDate(); + newFileMenu->setPopupFiles(m_baseUrl); + popup->addMenu(newFileMenu->menu()); + popup->addSeparator(); + + // insert 'Open in new window' and 'Open in new tab' entries + popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window")); + popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab")); popup->addSeparator(); QAction* pasteAction = createPasteAction(); popup->addAction(pasteAction); - - // setup 'View Mode' menu - KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode")); - - QAction* iconsMode = m_mainWindow->actionCollection()->action("icons"); - viewModeMenu->addAction(iconsMode); - - QAction* detailsMode = m_mainWindow->actionCollection()->action("details"); - viewModeMenu->addAction(detailsMode); - - QAction* columnsMode = m_mainWindow->actionCollection()->action("columns"); - viewModeMenu->addAction(columnsMode); - - popup->addMenu(viewModeMenu); - popup->addSeparator(); - addRevisionControlActions(popup); + // insert service actions + const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl); + const KFileItemListProperties baseUrlProperties(KFileItemList() << item); + KFileItemActions fileItemActions; + fileItemActions.setItemListProperties(baseUrlProperties); + addServiceActions(popup, fileItemActions); - QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"), - i18nc("@action:inmenu Add current folder to places", "Add to Places")); + addVersionControlActions(popup); + + // insert 'Add to Places' entry if exactly one item is selected + QAction* addToPlacesAction = 0; + if (!placeExists(m_mainWindow->activeViewContainer()->url())) { + addToPlacesAction = popup->addAction(KIcon("bookmark-new"), + i18nc("@action:inmenu Add current folder to places", "Add to Places")); + } addCustomActions(popup); @@ -299,7 +301,7 @@ void DolphinContextMenu::openViewportContextMenu() KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->show(); - } else if (action == addToPlacesAction) { + } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { DolphinSettings::instance().placesModel()->addPlace(placesName(url), url); @@ -365,6 +367,21 @@ QString DolphinContextMenu::placesName(const KUrl& url) const return name; } +bool DolphinContextMenu::placeExists(const KUrl& url) const +{ + const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel(); + const int count = placesModel->rowCount(); + + for (int i = 0; i < count; ++i) { + const QModelIndex index = placesModel->index(i, 0); + + if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) { + return true; + } + } + return false; +} + QAction* DolphinContextMenu::createPasteAction() { QAction* action = 0; @@ -390,12 +407,25 @@ KFileItemListProperties& DolphinContextMenu::capabilities() return *m_capabilities; } -void DolphinContextMenu::addRevisionControlActions(KMenu* menu) +void DolphinContextMenu::addServiceActions(KMenu* menu, KFileItemActions& fileItemActions) +{ + fileItemActions.setParentWidget(m_mainWindow); + + // insert 'Open With...' action or sub menu + fileItemActions.addOpenWithActionsTo(menu, "DesktopEntryName != 'dolphin'"); + + // insert 'Actions' sub menu + if (fileItemActions.addServiceActionsTo(menu)) { + menu->addSeparator(); + } +} + +void DolphinContextMenu::addVersionControlActions(KMenu* menu) { const DolphinView* view = m_mainWindow->activeViewContainer()->view(); - const QList revControlActions = view->revisionControlActions(m_selectedItems); - if (revControlActions.count() > 0) { - foreach (QAction* action, revControlActions) { + const QList versionControlActions = view->versionControlActions(m_selectedItems); + if (!versionControlActions.isEmpty()) { + foreach (QAction* action, versionControlActions) { menu->addAction(action); } menu->addSeparator();