X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8a4f1fd8d3c9b50e51b7234123b3fbe0b979552..da795d20e2f2fa57ac9cafdffcfac4d092d8eaea:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 752f28e12..468b7d69d 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -42,18 +42,18 @@
 #include <kstandardaction.h>
 #include <kstandarddirs.h>
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
-#include <Q3ValueList>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QDir>
+#include <Qt3Support/Q3ValueList>
 
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        KFileItem* fileInfo,
                                        const KUrl& baseUrl) :
-        m_mainWindow(parent),
-        m_fileInfo(fileInfo),
-        m_baseUrl(baseUrl),
-        m_context(NoContext)
+    m_mainWindow(parent),
+    m_fileInfo(fileInfo),
+    m_baseUrl(baseUrl),
+    m_context(NoContext)
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
@@ -99,7 +99,7 @@ void DolphinContextMenu::openTrashContextMenu()
 
     KMenu* popup = new KMenu(m_mainWindow);
 
-    QAction* emptyTrashAction = new QAction(KIcon("emptytrash"), 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);
@@ -226,6 +226,9 @@ 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);
 
@@ -239,7 +242,9 @@ void DolphinContextMenu::openViewportContextMenu()
 
     QAction* activatedAction = popup->exec(QCursor::pos());
     if (activatedAction == propertiesAction) {
-        new KPropertiesDialog(m_mainWindow->activeView()->url());
+        const KUrl& url = m_mainWindow->activeView()->url();
+        KPropertiesDialog dialog(url);
+        dialog.exec();
     } else if (activatedAction == bookmarkAction) {
         const KUrl& url = m_mainWindow->activeView()->url();
         if (url.isValid()) {