DolphinContextMenu: Set the properties action from actionCollection

[dolphin.git] / src / views / dolphindetailsview.cpp

diff --git a/src/views/dolphindetailsview.cpp b/src/views/dolphindetailsview.cpp
index 64f964aa862e1df2a3ca6fa367b6a415c566e4e6..5c2e9576fe26f12cec44bb03c412e7f703b2d670 100644 (file)
--- a/src/views/dolphindetailsview.cpp
+++ b/src/views/dolphindetailsview.cpp
@@ -36,10 +36,10 @@
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 
-#include <kdirmodel.h>
-#include <kdirlister.h>
-#include <klocale.h>
-#include <kmenu.h>
+#include <KDirModel>
+#include <KDirLister>
+#include <KLocale>
+#include <KMenu>
 
 #include <QApplication>
 #include <QHeaderView>
@@ -52,7 +52,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
     DolphinTreeView(parent),
     m_autoResize(true),
     m_dolphinViewController(dolphinViewController),
-    m_viewModeController(viewModeController),
     m_extensionsFactory(0),
     m_expandableFoldersAction(0),
     m_expandedUrls(),
@@ -60,14 +59,13 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
     m_decorationSize()
 {
     const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    Q_ASSERT(settings != 0);
-    Q_ASSERT(dolphinViewController != 0);
-    Q_ASSERT(viewModeController != 0);
+    Q_ASSERT(settings);
+    Q_ASSERT(dolphinViewController);
+    Q_ASSERT(viewModeController);
 
     setLayoutDirection(Qt::LeftToRight);
     setAcceptDrops(true);
     setSortingEnabled(true);
-    setUniformRowHeights(true);
     setSelectionBehavior(SelectItems);
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
@@ -158,9 +156,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
 
     KDirLister *dirLister = qobject_cast<KDirModel*>(proxyModel->sourceModel())->dirLister();
     connect(dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(resizeColumns()));
-
-    // setFocus() must be called after m_extensionsFactory is initialised (see bug 240374).
-    setFocus();
 }
 
 DolphinDetailsView::~DolphinDetailsView()
@@ -225,20 +220,14 @@ void DolphinDetailsView::startDrag(Qt::DropActions supportedActions)
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 {
-    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {
-        event->acceptProposedAction();
-    }
+    event->acceptProposedAction();
     DolphinTreeView::dragEnterEvent(event);
 }
 
 void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
 {
     DolphinTreeView::dragMoveEvent(event);
-
-    if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) {
-        // Accept URL drops, independently from the destination item
-        event->acceptProposedAction();
-    }
+    event->acceptProposedAction();
 }
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)
@@ -248,7 +237,7 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
     if (index.isValid() && (index.column() == DolphinModel::Name)) {
         item = m_dolphinViewController->itemForIndex(index);
     }
-    m_dolphinViewController->indicateDroppedUrls(item, m_viewModeController->url(), event);
+    m_dolphinViewController->indicateDroppedUrls(item, event);
     DolphinTreeView::dropEvent(event);
 }
 
@@ -399,7 +388,7 @@ void DolphinDetailsView::configureSettings(const QPoint& pos)
     popup.addSeparator();
 
     QAction* activatedAction = popup.exec(header()->mapToGlobal(pos));
-    if (activatedAction != 0) {
+    if (activatedAction) {
         const bool show = activatedAction->isChecked();
         const int columnIndex = activatedAction->data().toInt();
 
@@ -585,7 +574,7 @@ void DolphinDetailsView::slotGlobalSettingsChanged(int category)
     Q_UNUSED(category);
 
     const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    Q_ASSERT(settings != 0);
+    Q_ASSERT(settings);
     if (settings->useSystemFont()) {
         m_font = KGlobalSettings::generalFont();
     }