X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1ce2fb199db7bdf5baf05b61e4e58c549404b4df..bd2f7179de1b42399b5f04ef65221e8e81250392:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index a7a5ae567..e26a2bb16 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -21,11 +21,14 @@ #include "dolphincontextmenu.h" #include "dolphinmainwindow.h" -#include "dolphinsettings.h" +#include "dolphinnewmenu.h" +#include "settings/dolphinsettings.h" #include "dolphinview.h" #include "dolphinviewcontainer.h" +#include "dolphin_generalsettings.h" #include +#include #include #include #include @@ -37,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -53,9 +57,12 @@ 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) + m_context(NoContext), + m_copyToMenu(parent), + m_customActions() { // The context menu either accesses the URLs of the selected items // or the items itself. To increase the performance both lists are cached. @@ -66,6 +73,13 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, DolphinContextMenu::~DolphinContextMenu() { + delete m_capabilities; + m_capabilities = 0; +} + +void DolphinContextMenu::setCustomActions(const QList& actions) +{ + m_customActions = actions; } void DolphinContextMenu::open() @@ -75,7 +89,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 +109,6 @@ void DolphinContextMenu::open() } } - void DolphinContextMenu::openTrashContextMenu() { Q_ASSERT(m_context & TrashContext); @@ -109,15 +122,17 @@ 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")); + addCustomActions(popup); + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); popup->addAction(propertiesAction); 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 +145,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); } } @@ -167,6 +182,24 @@ void DolphinContextMenu::openItemContextMenu() Q_ASSERT(!m_fileInfo.isNull()); 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(); + menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); + menu->setIcon(KIcon("document-new")); + popup->addMenu(newMenu->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(); + } addShowMenubarAction(popup); insertDefaultItemActions(popup); @@ -175,19 +208,29 @@ 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 - QVector openWithVector; - const QList openWithActions = insertOpenWithItems(popup, openWithVector); - - // Insert 'Actions' sub menu KonqMenuActions menuActions; - menuActions.setItems(m_selectedItems); - if (menuActions.addActionsTo(popup)) + menuActions.setParentWidget(m_mainWindow); + menuActions.setItemListProperties(m_selectedItems); + + // insert 'Open With...' action or sub menu + menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'"); + + // insert 'Actions' sub menu + 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,28 +241,16 @@ 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)) { - // one of the 'Open With' items has been selected - if (openWithActions.last() == activatedAction) { - // the item 'Other...' has been selected - KRun::displayOpenWithDialog(m_selectedUrls, m_mainWindow); - } else { - int id = openWithActions.indexOf(activatedAction); - KService::Ptr servicePtr = openWithVector[id]; - KRun::run(*servicePtr, m_selectedUrls, m_mainWindow); - } } - openWithVector.clear(); popup->deleteLater(); } void DolphinContextMenu::openViewportContextMenu() { - Q_ASSERT(m_fileInfo.isNull()); KMenu* popup = new KMenu(m_mainWindow); addShowMenubarAction(popup); @@ -231,7 +262,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 @@ -246,28 +277,28 @@ void DolphinContextMenu::openViewportContextMenu() QAction* columnsMode = m_mainWindow->actionCollection()->action("columns"); viewModeMenu->addAction(columnsMode); - QAction* previewsMode = m_mainWindow->actionCollection()->action("previews"); - viewModeMenu->addAction(previewsMode); - popup->addMenu(viewModeMenu); 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(); - QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); + addCustomActions(popup); + QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties")); + propertiesAction->setIcon(KIcon("document-properties")); QAction* action = popup->exec(QCursor::pos()); if (action == propertiesAction) { const KUrl& url = m_mainWindow->activeViewContainer()->url(); - KPropertiesDialog dialog(url); - dialog.exec(); + + KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow); + dialog->setAttribute(Qt::WA_DeleteOnClose); + dialog->show(); } 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 +311,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); @@ -294,8 +325,10 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) popup->addAction(renameAction); // insert 'Move to Trash' and (optionally) 'Delete' - KConfigGroup kdeConfig(KGlobal::config(), "KDE"); - bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals); + KConfigGroup configGroup(globalConfig, "KDE"); + bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false); + const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isLocalFile()) { QAction* moveToTrashAction = collection->action("move_to_trash"); @@ -310,100 +343,53 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) } } -QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, - QVector& openWithVector) +void DolphinContextMenu::addShowMenubarAction(KMenu* menu) { - // Parts of the following code have been taken - // from the class KonqOperations located in - // libqonq/konq_operations.h of Konqueror. - // (Copyright (C) 2000 David Faure ) - - // Prepare 'Open With' sub menu. Usually a sub menu is created, where all applications - // are listed which are registered to open the item. As last entry "Other..." will be - // attached which allows to select a custom application. If no applications are registered - // no sub menu is created at all, only "Open With..." will be offered. - bool insertOpenWithItems = true; - const QString contextMimeType(m_fileInfo.mimetype()); - - QListIterator mimeIt(m_selectedItems); - while (insertOpenWithItems && mimeIt.hasNext()) { - KFileItem item = mimeIt.next(); - insertOpenWithItems = (contextMimeType == item.mimetype()); + KAction* showMenuBar = m_mainWindow->showMenuBarAction(); + if (!m_mainWindow->menuBar()->isVisible()) { + menu->addAction(showMenuBar); + menu->addSeparator(); } +} - QList openWithActions; - if (insertOpenWithItems) { - // fill the 'Open with' sub menu with application types - const KMimeType::Ptr mimePtr = KMimeType::findByUrl(m_fileInfo.url()); - KService::List offers = KMimeTypeTrader::self()->query(mimePtr->name(), - "Application", - "Type == 'Application'"); - if (offers.count() > 0) { - KService::List::Iterator it; - KMenu* openWithMenu = new KMenu(i18nc("@title:menu", "Open With")); - for (it = offers.begin(); it != offers.end(); ++it) { - // The offer list from the KTrader returns duplicate - // application entries. Although this seems to be a configuration - // problem outside the scope of Dolphin, duplicated entries just - // will be skipped here. - const QString appName((*it)->name()); - if (!containsEntry(openWithMenu, appName)) { - const KIcon icon((*it)->icon()); - QAction* action = openWithMenu->addAction(icon, appName); - openWithVector.append(*it); - openWithActions << action; - } - } - - openWithMenu->addSeparator(); - QAction* action = openWithMenu->addAction(i18nc("@action:inmenu Open With", "&Other...")); - - openWithActions << action; - popup->addMenu(openWithMenu); - } else { - // No applications are registered, hence just offer - // a "Open With..." item instead of a sub menu containing - // only one entry. - QAction* action = popup->addAction(i18nc("@title:menu", "Open With...")); - openWithActions << action; - } +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; + const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir(); + if (isDir && (m_selectedItems.count() == 1)) { + 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 { - // At least one of the selected items has a different MIME type. In this case - // just show a disabled "Open With..." entry. - QAction* action = popup->addAction(i18nc("@title:menu", "Open With...")); - action->setEnabled(false); + action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); } - return openWithActions; + return action; } -bool DolphinContextMenu::containsEntry(const KMenu* menu, - const QString& entryName) const +KonqFileItemCapabilities& DolphinContextMenu::capabilities() { - Q_ASSERT(menu != 0); - - const QList list = menu->actions(); - const uint count = list.count(); - for (uint i = 0; i < count; ++i) { - const QAction* action = list.at(i); - if (action->text() == entryName) { - return true; - } + if (m_capabilities == 0) { + m_capabilities = new KonqFileItemCapabilities(m_selectedItems); } - - return false; + return *m_capabilities; } -void DolphinContextMenu::addShowMenubarAction(KMenu* menu) +void DolphinContextMenu::addCustomActions(KMenu* menu) { - KAction* showMenuBar = m_mainWindow->showMenuBarAction(); - if (!m_mainWindow->menuBar()->isVisible()) { - // TODO: it should not be necessary to uncheck the menu - // bar action, but currently the action states don't get - // updated if the menu is disabled - showMenuBar->setChecked(false); - menu->addAction(showMenuBar); - menu->addSeparator(); + foreach (QAction* action, m_customActions) { + menu->addAction(action); } }