allow to configure which meta data should be shown for tooltips

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 9d37fa674c098eef63100cde12d94b2ce6895732..9d32dd247fd72a7d26a3834dd1d7d3ac591a5a99 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -114,8 +114,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
             this, SLOT(slotEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),
             controller, SLOT(emitViewportEntered()));
-    connect(controller, SIGNAL(nameFilterChanged(const QString&)),
-            this, SLOT(setNameFilter(const QString&)));
     connect(controller, SIGNAL(zoomLevelChanged(int)),
             this, SLOT(setZoomLevel(int)));
     connect(controller->dolphinView(), SIGNAL(additionalInfoChanged()),
@@ -153,10 +151,11 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent,
     connect(m_expandableFoldersAction, SIGNAL(toggled(bool)),
             this, SLOT(setFoldersExpandable(bool)));
 
+    updateDecorationSize(view->showPreview());
+
     m_extensionsFactory = new ViewExtensionsFactory(this, controller);
     m_extensionsFactory->fileItemDelegate()->setMinimizedNameColumn(true);
-
-    updateDecorationSize(view->showPreview());
+    m_extensionsFactory->setAutoFolderExpandingEnabled(settings->expandableFolders());
 }
 
 DolphinDetailsView::~DolphinDetailsView()
@@ -402,12 +401,6 @@ void DolphinDetailsView::resizeEvent(QResizeEvent* event)
 
 void DolphinDetailsView::wheelEvent(QWheelEvent* event)
 {
-    // let Ctrl+wheel events propagate to the DolphinView for icon zooming
-    if (event->modifiers() & Qt::ControlModifier) {
-        event->ignore();
-        return;
-    }
-
     const int height = m_decorationSize.height();
     const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2;
     verticalScrollBar()->setSingleStep(step);
@@ -422,7 +415,7 @@ void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModel
     // Stay consistent with QListView: When changing the current index by key presses,
     // also change the selection.
     if (m_keyPressed) {
-        selectionModel()->select(current, QItemSelectionModel::ClearAndSelect);
+        setCurrentIndex(current);
     }
 }
 
@@ -525,12 +518,6 @@ QRect DolphinDetailsView::elasticBandRect() const
     return QRect(topLeft, bottomRight).normalized();
 }
 
-void DolphinDetailsView::setNameFilter(const QString& nameFilter)
-{
-    DolphinSortFilterProxyModel* proxyModel = static_cast<DolphinSortFilterProxyModel*>(model());
-    proxyModel->setFilterRegExp(nameFilter);
-}
-
 void DolphinDetailsView::setZoomLevel(int level)
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(level);