Support changing the sorting type and sort order (TODO: does not work yet as the...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 9a647af4daa0019bcbe9af9b6935b419607cf17c..2f287f353359b4c524c9c38c0effd94c372e9f6b 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -176,14 +176,14 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
-void DolphinView::setShowHiddenFilesEnabled(bool show)
+void DolphinView::setShowHiddenFiles(bool show)
 {
     if (m_dirLister->showingDotFiles() == show) {
         return;
     }
 
     ViewProperties props(m_urlNavigator->url());
-    props.setShowHiddenFilesEnabled(show);
+    props.setShowHiddenFiles(show);
     props.save();
 
     m_dirLister->setShowingDotFiles(show);
@@ -193,7 +193,7 @@ void DolphinView::setShowHiddenFilesEnabled(bool show)
     reload();
 }
 
-bool DolphinView::isShowHiddenFilesEnabled() const
+bool DolphinView::showHiddenFiles() const
 {
     return m_dirLister->showingDotFiles();
 }
@@ -203,7 +203,7 @@ void DolphinView::setViewProperties(const ViewProperties& props)
     setMode(props.viewMode());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
-    setShowHiddenFilesEnabled(props.isShowHiddenFilesEnabled());
+    setShowHiddenFiles(props.showHiddenFiles());
 }
 
 void DolphinView::renameSelectedItems()
@@ -392,61 +392,43 @@ bool DolphinView::isZoomOutPossible() const
 void DolphinView::setSorting(Sorting sorting)
 {
     if (sorting != this->sorting()) {
-        /*KFileView* view = fileView();
-        int spec = view->sorting() & ~QDir::Name & ~QDir::Size & ~QDir::Time & ~QDir::Unsorted;
-
-        switch (sorting) {
-            case SortByName: spec = spec | QDir::Name; break;
-            case SortBySize: spec = spec | QDir::Size; break;
-            case SortByDate: spec = spec | QDir::Time; break;
-            default: break;
-        }
-
         ViewProperties props(url());
         props.setSorting(sorting);
 
-        view->setSorting(static_cast<QDir::SortFlags>(spec));
+        KDirModel* dirModel = static_cast<KDirModel*>(m_iconsView->model());
+        dirModel->sort(columnIndex(sorting), props.sortOrder());
 
-        emit signalSortingChanged(sorting);*/
+        emit sortingChanged(sorting);
     }
 }
 
 DolphinView::Sorting DolphinView::sorting() const
 {
-    /*const QDir::SortFlags spec = fileView()->sorting();
-
-    if (spec & QDir::Time) {
-        return SortByDate;
-    }
-
-    if (spec & QDir::Size) {
-        return SortBySize;
-    }*/
-
-    return SortByName;
+    // TODO: instead of getting the sorting from the properties just fetch
+    // them from KDirModel, if such an interface will be offered (David?)
+    ViewProperties props(url());
+    return props.sorting();
 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {
-        /*KFileView* view = fileView();
-        int sorting = view->sorting();
-        sorting = (order == Qt::Ascending) ? (sorting & ~QDir::Reversed) :
-                                             (sorting | QDir::Reversed);
-
         ViewProperties props(url());
         props.setSortOrder(order);
 
-        view->setSorting(static_cast<QDir::SortFlags>(sorting));
+        KDirModel* dirModel = static_cast<KDirModel*>(m_iconsView->model());
+        dirModel->sort(columnIndex(props.sorting()), order);
 
-        emit signalSortOrderChanged(order);*/
+        emit sortOrderChanged(order);
     }
 }
 
 Qt::SortOrder DolphinView::sortOrder() const
 {
-    //return fileView()->isReversed() ? Qt::Descending : Qt::Ascending;
-    return Qt::Descending;
+    // TODO: instead of getting the order from the properties just fetch
+    // them from KDirModel, if such an interface will be offered (David?)
+    ViewProperties props(url());
+    return props.sortOrder();
 }
 
 void DolphinView::goBack()
@@ -635,8 +617,8 @@ void DolphinView::loadDirectory(const KUrl& url)
     const ViewProperties props(url);
     setMode(props.viewMode());
 
-    const bool showHiddenFiles = props.isShowHiddenFilesEnabled();
-    setShowHiddenFilesEnabled(showHiddenFiles);
+    const bool showHiddenFiles = props.showHiddenFiles();
+    setShowHiddenFiles(showHiddenFiles);
     m_dirLister->setShowingDotFiles(showHiddenFiles);
 
     setSorting(props.sorting());
@@ -1047,11 +1029,23 @@ void DolphinView::applyModeToView()
             m_iconsView->setGridSize(QSize(256, 24));
             break;
 
-        case PreviewsView:
-            m_iconsView->setViewMode(QListView::IconMode);
-            m_iconsView->setGridSize(QSize(128, 128));
-            break;
+        //case PreviewsView:
+        //    m_iconsView->setViewMode(QListView::IconMode);
+        //    m_iconsView->setGridSize(QSize(128, 128));
+        //    break;
+    }
+}
+
+int DolphinView::columnIndex(Sorting sorting) const
+{
+    int index = 0;
+    switch (sorting) {
+        case SortByName: index = KDirModel::Name; break;
+        case SortBySize: index = KDirModel::Size; break;
+        case SortByDate: index = KDirModel::ModifiedTime; break;
+        default: assert(false);
     }
+    return index;
 }
 
 #include "dolphinview.moc"