X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1cdb64a12bf5e6f3b97d38992799ba6bfbb06ef5..462c8c65b9dfc7f56126b1ae8f23e84e4e54de9e:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 915f7e3e1..038902e6b 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -23,11 +23,10 @@ #include "dolphinmainwindow.h" #include "dolphinsettings.h" #include "dolphinview.h" -#include "editbookmarkdialog.h" +#include "dolphinviewcontainer.h" #include -#include -#include +#include #include #include #include @@ -36,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -43,29 +43,29 @@ #include #include -#include +#include +#include +#include +#include DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, KFileItem* fileInfo, - const KUrl& baseUrl, - KFileItemList selectedItems) : + const KUrl& baseUrl) : m_mainWindow(parent), m_fileInfo(fileInfo), m_baseUrl(baseUrl), - m_selectedItems(selectedItems), m_context(NoContext) { // The context menu either accesses the URLs of the selected items - // or the items itself. To increase the performance the URLs are cached. - KFileItemList::const_iterator it = selectedItems.begin(); - const KFileItemList::const_iterator end = selectedItems.end(); - while (it != end) { - KFileItem* item = *it; - m_selectedUrls.append(item->url()); - ++it; - } + // or the items itself. To increase the performance both lists are cached. + DolphinView* view = m_mainWindow->activeViewContainer()->view(); + m_selectedUrls = view->selectedUrls(); + m_selectedItems = view->selectedItems(); } +DolphinContextMenu::~DolphinContextMenu() +{} + void DolphinContextMenu::open() { // get the context information @@ -76,29 +76,23 @@ void DolphinContextMenu::open() if (m_fileInfo != 0) { m_context |= ItemContext; // TODO: handle other use cases like devices + desktop files - } + } // open the corresponding popup for the context if (m_context & TrashContext) { if (m_context & ItemContext) { openTrashItemContextMenu(); - } - else { + } else { openTrashContextMenu(); } - } - else if (m_context & ItemContext) { + } else if (m_context & ItemContext) { openItemContextMenu(); - } - else { + } else { Q_ASSERT(m_context == NoContext); openViewportContextMenu(); } } -DolphinContextMenu::~DolphinContextMenu() -{ -} void DolphinContextMenu::openTrashContextMenu() { @@ -106,7 +100,7 @@ void DolphinContextMenu::openTrashContextMenu() KMenu* popup = new KMenu(m_mainWindow); - QAction* emptyTrashAction = new QAction(KIcon("user-trash"), i18n("Emtpy Trash"), popup); + QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), i18n("Empty Trash"), popup); KConfig trashConfig("trashrc", KConfig::OnlyLocal); emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); popup->addAction(emptyTrashAction); @@ -117,10 +111,10 @@ void DolphinContextMenu::openTrashContextMenu() if (popup->exec(QCursor::pos()) == emptyTrashAction) { const QString text(i18n("Do you really want to empty the Trash? All items will get deleted.")); const bool del = KMessageBox::warningContinueCancel(m_mainWindow, - text, - QString(), - KGuiItem(i18n("Empty Trash"), KIcon("user-trash")) - ) == KMessageBox::Continue; + text, + QString(), + KGuiItem(i18n("Empty Trash"), KIcon("user-trash")) + ) == KMessageBox::Continue; if (del) { KonqOperations::emptyTrash(m_mainWindow); } @@ -159,10 +153,12 @@ void DolphinContextMenu::openItemContextMenu() KMenu* popup = new KMenu(m_mainWindow); insertDefaultItemActions(popup); - // insert 'Bookmark this folder' entry if exactly one item is selected + popup->addSeparator(); + + // insert 'Bookmark This Folder' entry if exactly one item is selected QAction* bookmarkAction = 0; if (m_fileInfo->isDir() && (m_selectedUrls.count() == 1)) { - bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder")); + bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark Folder...")); } // Insert 'Open With...' sub menu @@ -170,7 +166,7 @@ void DolphinContextMenu::openItemContextMenu() const QList openWithActions = insertOpenWithItems(popup, openWithVector); // Insert 'Actions' sub menu - QVector actionsVector; + QVector actionsVector; const QList serviceActions = insertActionItems(popup, actionsVector); popup->addSeparator(); @@ -180,31 +176,22 @@ void DolphinContextMenu::openItemContextMenu() QAction* activatedAction = popup->exec(QCursor::pos()); - if ((bookmarkAction!= 0) && (activatedAction == bookmarkAction)) { + if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) { const KUrl selectedUrl(m_fileInfo->url()); - KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - selectedUrl.fileName(), - selectedUrl, - "bookmark"); - if (!bookmark.isNull()) { - KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - KBookmarkGroup root = manager->root(); - root.addBookmark(manager, bookmark); - manager->emitChanged(root); + if (selectedUrl.isValid()) { + DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(), + selectedUrl); } - } - else if (serviceActions.contains(activatedAction)) { + } else if (serviceActions.contains(activatedAction)) { // one of the 'Actions' items has been selected int id = serviceActions.indexOf(activatedAction); - KDEDesktopMimeType::executeService(m_selectedUrls, actionsVector[id]); - } - else if (openWithActions.contains(activatedAction)) { + KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]); + } 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 { + } else { int id = openWithActions.indexOf(activatedAction); KService::Ptr servicePtr = openWithVector[id]; KRun::run(*servicePtr, m_selectedUrls, m_mainWindow); @@ -240,33 +227,38 @@ void DolphinContextMenu::openViewportContextMenu() QAction* detailsMode = m_mainWindow->actionCollection()->action("details"); viewModeMenu->addAction(detailsMode); + 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* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark this folder")); + QAction* toggleViewsAction = 0; + if (m_mainWindow->isSplit()) { + toggleViewsAction = popup->addAction(i18n("Toggle Views")); + } + popup->addSeparator(); - QAction* propertiesAction = popup->addAction(i18n("Properties...")); + QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"), i18n("Bookmark This Folder...")); + popup->addSeparator(); - QAction* activatedAction = popup->exec(QCursor::pos()); - if (activatedAction == propertiesAction) { - new KPropertiesDialog(m_mainWindow->activeView()->url()); - } - else if (activatedAction == bookmarkAction) { - const KUrl& url = m_mainWindow->activeView()->url(); - KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - url.fileName(), - url, - "bookmark"); - if (!bookmark.isNull()) { - KBookmarkManager* manager = DolphinSettings::instance().bookmarkManager(); - KBookmarkGroup root = manager->root(); - root.addBookmark(manager, bookmark); - manager->emitChanged(root); + QAction* propertiesAction = popup->addAction(i18n("Properties")); + + QAction* action = popup->exec(QCursor::pos()); + if (action == propertiesAction) { + const KUrl& url = m_mainWindow->activeViewContainer()->url(); + KPropertiesDialog dialog(url); + dialog.exec(); + } else if (action == bookmarkAction) { + const KUrl& url = m_mainWindow->activeViewContainer()->url(); + if (url.isValid()) { + DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url); } + } else if ((toggleViewsAction != 0) && (action == toggleViewsAction)) { + m_mainWindow->toggleViews(); } popup->deleteLater(); @@ -275,48 +267,42 @@ void DolphinContextMenu::openViewportContextMenu() void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) { Q_ASSERT(popup != 0); + const KActionCollection* collection = m_mainWindow->actionCollection(); // insert 'Cut', 'Copy' and 'Paste' - const KStandardAction::StandardAction actionNames[] = { - KStandardAction::Cut, - KStandardAction::Copy, - KStandardAction::Paste - }; - - const int count = sizeof(actionNames) / sizeof(KStandardAction::StandardAction); - for (int i = 0; i < count; ++i) { - QAction* action = m_mainWindow->actionCollection()->action(KStandardAction::stdName(actionNames[i])); - if (action != 0) { - popup->addAction(action); - } - } + QAction* cutAction = collection->action(KStandardAction::stdName(KStandardAction::Cut)); + QAction* copyAction = collection->action(KStandardAction::stdName(KStandardAction::Copy)); + QAction* pasteAction = collection->action(KStandardAction::stdName(KStandardAction::Paste)); + + popup->addAction(cutAction); + popup->addAction(copyAction); + popup->addAction(pasteAction); popup->addSeparator(); // insert 'Rename' - QAction* renameAction = m_mainWindow->actionCollection()->action("rename"); + QAction* renameAction = collection->action("rename"); popup->addAction(renameAction); // insert 'Move to Trash' and (optionally) 'Delete' const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); const KConfigGroup kdeConfig(globalConfig, "KDE"); bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); - const KUrl& url = m_mainWindow->activeView()->url(); + const KUrl& url = m_mainWindow->activeViewContainer()->url(); if (url.isLocalFile()) { - QAction* moveToTrashAction = m_mainWindow->actionCollection()->action("move_to_trash"); + QAction* moveToTrashAction = collection->action("move_to_trash"); popup->addAction(moveToTrashAction); - } - else { + } else { showDeleteCommand = true; } if (showDeleteCommand) { - QAction* deleteAction = m_mainWindow->actionCollection()->action("delete"); + QAction* deleteAction = collection->action("delete"); popup->addAction(deleteAction); } } QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, - QVector& openWithVector) + QVector& openWithVector) { // Parts of the following code have been taken // from the class KonqOperations located in @@ -341,12 +327,12 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, // 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'"); + "Application", + "Type == 'Application'"); if (offers.count() > 0) { KService::List::Iterator it; KMenu* openWithMenu = new KMenu(i18n("Open With")); - for(it = offers.begin(); it != offers.end(); ++it) { + 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 @@ -354,7 +340,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, const QString appName((*it)->name()); if (!containsEntry(openWithMenu, appName)) { const KIcon icon((*it)->icon()); - QAction *action = openWithMenu->addAction(icon, appName); + QAction* action = openWithMenu->addAction(icon, appName); openWithVector.append(*it); openWithActions << action; } @@ -364,21 +350,17 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, QAction* action = openWithMenu->addAction(i18n("&Other...")); openWithActions << action; - popup->addSeparator(); popup->addMenu(openWithMenu); - } - else { + } 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(i18n("Open With...")); openWithActions << action; } - } - else { + } else { // At least one of the selected items has a different MIME type. In this case // just show a disabled "Open With..." entry. - popup->addSeparator(); QAction* action = popup->addAction(i18n("Open With...")); action->setEnabled(false); } @@ -387,7 +369,7 @@ QList DolphinContextMenu::insertOpenWithItems(KMenu* popup, } QList DolphinContextMenu::insertActionItems(KMenu* popup, - QVector& actionsVector) + QVector& actionsVector) { // Parts of the following code have been taken // from the class KonqOperations located in @@ -409,7 +391,7 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, QStringList entries = dir.entryList(QDir::Files); for (QStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { - KConfigGroup cfg(KSharedConfig::openConfig( *dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry" ); + KConfigGroup cfg(KSharedConfig::openConfig(*dirIt + *entryIt, KConfig::OnlyLocal), "Desktop Entry"); if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { //const QStringList types = cfg.readListEntry("ServiceTypes"); QStringList types; @@ -450,24 +432,23 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, if (insert) { menu = actionsMenu; - const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); + const QString submenuName = cfg.readEntry("X-KDE-Submenu"); if (!submenuName.isEmpty()) { menu = new KMenu(submenuName); actionsMenu->addMenu(menu); } - Q3ValueList userServices = - KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true); + Q3ValueList userServices = + KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true); - Q3ValueList::Iterator serviceIt; + Q3ValueList::Iterator serviceIt; for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) { - KDEDesktopMimeType::Service service = (*serviceIt); + KDesktopFileActions::Service service = (*serviceIt); if (!service.m_strIcon.isEmpty()) { - QAction* action = menu->addAction(SmallIcon(service.m_strIcon), + QAction* action = menu->addAction(KIcon(service.m_strIcon), service.m_strName); serviceActions << action; - } - else { + } else { QAction *action = menu->addAction(service.m_strName); serviceActions << action; } @@ -500,21 +481,18 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, QAction* action = popup->addAction(text); serviceActions.clear(); serviceActions << action; - } - else { + } else { QAction* action = popup->addAction(icon, text); serviceActions.clear(); serviceActions << action; } - } - else { + } else { // The item is a sub menu, hence show the sub menu in the root menu. popup->addMenu(menu); } actionsMenu->deleteLater(); actionsMenu = 0; - } - else { + } else { popup->addMenu(actionsMenu); } @@ -537,3 +515,5 @@ bool DolphinContextMenu::containsEntry(const KMenu* menu, return false; } + +#include "dolphincontextmenu.moc"