]> cloud.milkyroute.net Git - dolphin.git/commitdiff
DolphinContextMenu: Set the properties action from actionCollection
authorPeter Penz <peter.penz19@gmail.com>
Sun, 10 Apr 2011 16:47:25 +0000 (18:47 +0200)
committerPeter Penz <peter.penz19@gmail.com>
Sun, 10 Apr 2011 16:49:55 +0000 (18:49 +0200)
Patch has been provided by Alex Fiestas at
https://git.reviewboard.kde.org/r/101076/

CCMAIL: alex@eyeos.org

src/dolphincontextmenu.cpp

index 0aa82b2060664de2a62ad619d147c451dfb2c090..79ffdaa2eca6451230224aa6be54af5b3624c5fc 100644 (file)
@@ -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);
         }