Let the user choose if folders are always shown first in the views of

[dolphin.git] / src / dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 3b3e86a75578dbd352299f8e6116db2e161ca5c6..f34be92e9b58e96809a1c3ef9a0eaeb66108cea5 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -65,6 +65,8 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control
             this, SLOT(slotSortingChanged(DolphinView::Sorting)));
     connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
+    connect(view, SIGNAL(sortFoldersFirstChanged(bool)),
+            this, SLOT(slotSortFoldersFirstChanged(bool)));
     connect(view, SIGNAL(showHiddenFilesChanged()),
             this, SLOT(slotShowHiddenFilesChanged()));
     connect(view, SIGNAL(showPreviewChanged()),
@@ -369,9 +371,9 @@ void DolphinColumnView::wheelEvent(QWheelEvent* event)
     // let Ctrl+wheel events propagate to the DolphinView for icon zooming
     if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) {
         event->ignore();
-       return;
+    } else {
+        QAbstractItemView::wheelEvent(event);
     }
-    QAbstractItemView::wheelEvent(event);
 }
 
 void DolphinColumnView::setZoomLevel(int level)
@@ -448,6 +450,13 @@ void DolphinColumnView::slotSortOrderChanged(Qt::SortOrder order)
     }
 }
 
+void DolphinColumnView::slotSortFoldersFirstChanged(bool foldersFirst)
+{
+    foreach (DolphinColumnWidget* column, m_columns) {
+        column->setSortFoldersFirst(foldersFirst);
+    }
+}
+
 void DolphinColumnView::slotShowHiddenFilesChanged()
 {
     const bool show = m_controller->dolphinView()->showHiddenFiles();
@@ -601,9 +610,9 @@ void DolphinColumnView::deleteColumn(DolphinColumnWidget* column)
         column->m_previewGenerator->deleteLater();
         column->m_previewGenerator = 0;
         column->hide();
-        // Prevent automatic destruction of column when this DolphinColumnView 
+        // Prevent automatic destruction of column when this DolphinColumnView
         // is destroyed.
-        column->setParent(0); 
+        column->setParent(0);
         column->disconnect();
         emit requestColumnDeletion(column);
     }