3 files changed, 69 insertions, 25 deletions

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index 25bb1cf0d..fc79ec569 100644
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -23,50 +23,80 @@
 #include <kdirmodel.h>
 #include <kfileitem.h>
 
+static const int dolphin_map_size = 3;
+static int dolphin_view_to_dir_model_column[] = {
+    /* SortByName */ KDirModel::Name,
+    /* SortBySize */ KDirModel::Size,
+    /* SortByDate */ KDirModel::ModifiedTime 
+};
+
+static DolphinView::Sorting dir_model_column_to_dolphin_view[] = {
+    /* KDirModel::Name */ DolphinView::SortByName,
+    /* KDirModel::Size */ DolphinView::SortBySize,
+    /* KDirModel::ModifiedTime */ DolphinView::SortByDate
+};
+
+
 DolphinSortFilterProxyModel::DolphinSortFilterProxyModel(QObject* parent) :
-    QSortFilterProxyModel(parent),
-    m_sorting(DolphinView::SortByName),
-    m_sortOrder(Qt::Ascending)
+    QSortFilterProxyModel(parent)
 {
+    setDynamicSortFilter(true);
+
+    /*
+     * sort by the user visible string for now
+     */
+    setSortRole(Qt::DisplayRole);
+    setSortCaseSensitivity(Qt::CaseInsensitive);
+    sort(KDirModel::Name, Qt::Ascending);
 }
 
 DolphinSortFilterProxyModel::~DolphinSortFilterProxyModel()
 {
 }
 
+/*
+ * Update the sort column by mapping DolpginView::Sorting to
+ * KDirModel::ModelColumns.
+ * We will keep the sortOrder
+ */
 void DolphinSortFilterProxyModel::setSorting(DolphinView::Sorting sorting)
 {
-    if (sorting != m_sorting) {
-        m_sorting = sorting;
-        clear();
-    }
+    Q_ASSERT( static_cast<int>(sorting) >= 0 && static_cast<int>(sorting) <= dolphin_map_size );
+    sort(dolphin_view_to_dir_model_column[static_cast<int>(sorting)],
+         m_sortOrder );
+}
+
+/**
+ * @reimplemented, @internal
+ *
+ * If the view 'forces' sorting order to change we will
+ * notice now.
+ */
+void DolphinSortFilterProxyModel::sort(int column, Qt::SortOrder sortOrder)
+{
+    m_sortOrder = sortOrder;
+    m_sorting = column >= 0 && column <= dolphin_map_size ?
+                dir_model_column_to_dolphin_view[column]  :
+                DolphinView::SortByName; 
+    QSortFilterProxyModel::sort(column,sortOrder);
 }
 
+/*
+ * change the sort order by keeping the current column
+ */
 void DolphinSortFilterProxyModel::setSortOrder(Qt::SortOrder sortOrder)
 {
-    if (sortOrder != m_sortOrder) {
-        m_sortOrder = sortOrder;
-        clear();
-    }
+    sort(dolphin_view_to_dir_model_column[m_sorting], sortOrder);
 }
 
 bool DolphinSortFilterProxyModel::lessThan(const QModelIndex& left,
                                            const QModelIndex& right) const
 {
-    // TODO: this is just a test implementation
-    KDirModel* model = static_cast<KDirModel*>(sourceModel());
-
-    KFileItem* leftItem = model->itemForIndex(left);
-    if (leftItem == 0) {
-        return true;
-    }
-
-    KFileItem* rightItem = model->itemForIndex(right);
-    if (rightItem == 0) {
-        return false;
-    }
-
-    return leftItem->name() > rightItem->name();
+    /*
+     * We have set a SortRole and trust the ProxyModel to do
+     * the right thing for now
+     */
+    return QSortFilterProxyModel::lessThan(left,right);
 }
 
 #include "dolphinsortfilterproxymodel.moc"
diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h
index b400400f6..e2c605dc7 100644
--- a/src/dolphinsortfilterproxymodel.h
+++ b/src/dolphinsortfilterproxymodel.h
@@ -41,6 +41,8 @@ public:
     void setSorting(DolphinView::Sorting sorting);
     DolphinView::Sorting sorting() const { return m_sorting; }
 
+    virtual void sort (int column, 
+                       Qt::SortOrder order = Qt::AscendingOrder);
     void setSortOrder(Qt::SortOrder sortOrder);
     Qt::SortOrder sortOrder() const { return m_sortOrder; }
 
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 1efe33384..8fb16d1d5 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -968,8 +968,20 @@ void DolphinView::slotChangeNameFilter(const QString& nameFilter)
     adjustedFilter.insert(0, '*');
     adjustedFilter.append('*');
 
+/*
+ * Use the ProxyModel to filter:
+ *   This code is #ifdefed as setNameFilter behaves
+ *   slightly different than the QSortFilterProxyModel
+ *   as it will not remove directories. I will ask
+ *   our beloved usability experts for input
+ *     -- z.
+ */
+#if 0
     m_dirLister->setNameFilter(adjustedFilter);
     m_dirLister->emitChanges();
+#else
+    m_proxyModel->setFilterRegExp( nameFilter );
+#endif
 }
 
 void DolphinView::applyModeToView()