From 41d8b21edef00745ff2f17b6bd54fca29d6cd598 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 10 Apr 2011 18:47:25 +0200 Subject: [PATCH] DolphinContextMenu: Set the properties action from actionCollection Patch has been provided by Alex Fiestas at https://git.reviewboard.kde.org/r/101076/ CCMAIL: alex@eyeos.org --- src/dolphincontextmenu.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 0aa82b206..79ffdaa2e 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -365,20 +365,14 @@ void DolphinContextMenu::openViewportContextMenu() addCustomActions(); - QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties")); - propertiesAction->setIcon(KIcon("document-properties")); + QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties"); + m_popup->addAction(propertiesAction); addShowMenuBarAction(); QAction* action = m_popup->exec(QCursor::pos()); - if (action == propertiesAction) { - const KUrl& url = m_mainWindow->activeViewContainer()->url(); - - KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); - } else if (addToPlacesAction && (action == addToPlacesAction)) { - const KUrl& url = m_mainWindow->activeViewContainer()->url(); + if (addToPlacesAction && (action == addToPlacesAction)) { + const KUrl url = m_mainWindow->activeViewContainer()->url(); if (url.isValid()) { DolphinSettings::instance().placesModel()->addPlace(placesName(url), url); } -- 2.47.3