SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index d73f62bea22f85a5e31ca5af6dab3c8d6f47aaa5..7aac7707bb7c161698ef0e0122b5ab10fec5b2d9 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -49,6 +49,7 @@
 #include <KPropertiesDialog>
 #include <KStandardAction>
 #include <KStandardDirs>
+#include <KToolBar>
 
 #include <QApplication>
 #include <QClipboard>
@@ -184,20 +185,11 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     m_popup->addAction(propertiesAction);
 
-    addShowMenubarAction();
+    addShowMenuBarAction();
 
     QAction *action = m_popup->exec(QCursor::pos());
     if (action == emptyTrashAction) {
-        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(),
-                                                            KGuiItem(i18nc("@action:button", "Empty Trash"),
-                                                                     KIcon("user-trash"))
-                                                           ) == KMessageBox::Continue;
-        if (del) {
-            KonqOperations::emptyTrash(m_mainWindow);
-        }
+        KonqOperations::emptyTrash(m_mainWindow);
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
@@ -364,20 +356,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();
+    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);
         }
@@ -409,10 +395,11 @@ void DolphinContextMenu::insertDefaultItemActions()
     }
 }
 
-void DolphinContextMenu::addShowMenubarAction()
+void DolphinContextMenu::addShowMenuBarAction()
 {
-    KAction* showMenuBar = m_mainWindow->showMenuBarAction();
-    if (!m_mainWindow->menuBar()->isVisible()) {
+    const KActionCollection* ac = m_mainWindow->actionCollection();
+    QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar));
+    if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) {
         m_popup->addSeparator();
         m_popup->addAction(showMenuBar);
     }