X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6baba131b2e112c37015412b701bc3ea01a86c04..85bc196887fbed01187e3830cd28c2500cb01cb2:/src/dolphincontextmenu.cpp diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 6ff20fe7f..fff3b5ac3 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -43,29 +44,23 @@ #include #include +#include +#include #include DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, KFileItem* fileInfo, - const KUrl& baseUrl, - ViewType viewType) : + const KUrl& baseUrl) : m_mainWindow(parent), m_fileInfo(fileInfo), m_baseUrl(baseUrl), - m_viewType(viewType), m_context(NoContext) { - if (viewType == ItemsView) { - // The context menu either accesses the URLs of the selected items - // or the items itself. To increase the performance both lists are cached. - DolphinView* view = m_mainWindow->activeView(); - m_selectedUrls = view->selectedUrls(); - m_selectedItems = view->selectedItems(); - } - else if (fileInfo != 0) { - m_selectedUrls.append(fileInfo->url()); - m_selectedItems.append(fileInfo); - } + // The context menu either accesses the URLs of the selected items + // or the items itself. To increase the performance both lists are cached. + DolphinView* view = m_mainWindow->activeView(); + m_selectedUrls = view->selectedUrls(); + m_selectedItems = view->selectedItems(); } DolphinContextMenu::~DolphinContextMenu() @@ -102,40 +97,6 @@ void DolphinContextMenu::open() } } -void DolphinContextMenu::cut() -{ - // TODO -} - -void DolphinContextMenu::copy() -{ - // TODO -} - -void DolphinContextMenu::paste() -{ - // TODO -} - -void DolphinContextMenu::rename() -{ - // TODO -} - -void DolphinContextMenu::moveToTrash() -{ - // TODO -} - -void DolphinContextMenu::deleteItem() -{ - // TODO -} - -void DolphinContextMenu::showProperties() -{ - new KPropertiesDialog(m_fileInfo->url()); -} void DolphinContextMenu::openTrashContextMenu() { @@ -143,7 +104,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("Emtpy Trash"), popup); KConfig trashConfig("trashrc", KConfig::OnlyLocal); emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); popup->addAction(emptyTrashAction); @@ -209,19 +170,12 @@ 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(); // insert 'Properties...' entry - QAction* propertiesAction = 0; - if (m_viewType == SidebarView) { - propertiesAction = new QAction(i18n("Properties..."), this); - connect(this, SIGNAL(triggered()), this, SLOT(showProperties())); - } - else { - propertiesAction = m_mainWindow->actionCollection()->action("properties"); - } + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); popup->addAction(propertiesAction); QAction* activatedAction = popup->exec(QCursor::pos()); @@ -242,7 +196,7 @@ void DolphinContextMenu::openItemContextMenu() else if (serviceActions.contains(activatedAction)) { // one of the 'Actions' items has been selected int id = serviceActions.indexOf(activatedAction); - KDEDesktopMimeType::executeService(m_selectedUrls, actionsVector[id]); + KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]); } else if (openWithActions.contains(activatedAction)) { // one of the 'Open With' items has been selected @@ -322,29 +276,11 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) { Q_ASSERT(popup != 0); const KActionCollection* collection = m_mainWindow->actionCollection(); - const bool insertSidebarActions = (m_viewType == SidebarView); // insert 'Cut', 'Copy' and 'Paste' - QAction* cutAction = 0; - QAction* copyAction = 0; - QAction* pasteAction = 0; - if (insertSidebarActions) { - cutAction = new QAction(KIcon("edit-cut"), i18n("Cut"), this); - connect(cutAction, SIGNAL(triggered()), this, SLOT(cut())); - - copyAction = new QAction(KIcon("edit-copy"), i18n("Copy"), this); - connect(copyAction, SIGNAL(triggered()), this, SLOT(copy())); - - const QAction* menuPasteAction = collection->action(KStandardAction::stdName(KStandardAction::Paste)); - pasteAction = new QAction(KIcon("edit-paste"), menuPasteAction->text(), this); - pasteAction->setEnabled(menuPasteAction->isEnabled()); - connect(pasteAction, SIGNAL(triggered()), this, SLOT(paste())); - } - else { - cutAction = collection->action(KStandardAction::stdName(KStandardAction::Cut)); - copyAction = collection->action(KStandardAction::stdName(KStandardAction::Copy)); - pasteAction = collection->action(KStandardAction::stdName(KStandardAction::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)); popup->addAction(cutAction); popup->addAction(copyAction); @@ -352,14 +288,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) popup->addSeparator(); // insert 'Rename' - QAction* renameAction = 0; - if (insertSidebarActions) { - renameAction = new QAction(i18n("Rename"), this); - connect(renameAction, SIGNAL(triggered()), this, SLOT(paste())); - } - else { - collection->action("rename"); - } + QAction* renameAction = collection->action("rename"); popup->addAction(renameAction); // insert 'Move to Trash' and (optionally) 'Delete' @@ -368,14 +297,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false); const KUrl& url = m_mainWindow->activeView()->url(); if (url.isLocalFile()) { - QAction* moveToTrashAction = 0; - if (insertSidebarActions) { - moveToTrashAction = new QAction(KIcon("edit-trash"), i18n("Move To Trash"), this); - connect(moveToTrashAction, SIGNAL(triggered()), this, SLOT(moveToTrash())); - } - else { - collection->action("move_to_trash"); - } + QAction* moveToTrashAction = collection->action("move_to_trash"); popup->addAction(moveToTrashAction); } else { @@ -383,14 +305,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup) } if (showDeleteCommand) { - QAction* deleteAction = 0; - if (insertSidebarActions) { - deleteAction = new QAction(KIcon("edit-delete"), i18n("Delete"), this); - connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItem())); - } - else { - collection->action("delete"); - } + QAction* deleteAction = collection->action("delete"); popup->addAction(deleteAction); } } @@ -465,7 +380,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 @@ -534,12 +449,12 @@ QList DolphinContextMenu::insertActionItems(KMenu* popup, 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), service.m_strName);