If the user changes the sorting by clicking on a header section, the resulting sortin...

svn path=/trunk/playground/utils/dolphin/; revision=630740

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index fc40d9585a4de15e8d7dc29ba17f4eb6c8cc86b7..f434936dc0de3c7b9c9948b087934a0c972405b4 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -20,15 +20,17 @@
 
 #include "dolphindetailsview.h"
 
-#include <assert.h>
 #include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "viewproperties.h"
+
+#include <assert.h>
+#include <kdirmodel.h>
 #include <QHeaderView>
 
 DolphinDetailsView::DolphinDetailsView(DolphinView* parent) :
     QTreeView(parent),
-    m_parentView(parent)
+    m_dolphinView(parent)
 {
     assert(parent != 0);
 
@@ -41,6 +43,9 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) :
     setSortIndicatorSection(props.sorting());
     setSortIndicatorOrder(props.sortOrder());
 
+    connect(header(), SIGNAL(sectionClicked(int)),
+            this, SLOT(synchronizeSortingState(int)));
+
     connect(parent, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(setSortIndicatorSection(DolphinView::Sorting)));
     connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)),
@@ -88,16 +93,16 @@ void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 
     const QModelIndex index = indexAt(event->pos());
     if (index.isValid()) {
-        item = m_parentView->fileItem(index);
+        item = m_dolphinView->fileItem(index);
     }
 
-    m_parentView->openContextMenu(item, event->globalPos());
+    m_dolphinView->openContextMenu(item, event->globalPos());
 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);
-    m_parentView->declareViewActive();
+    m_dolphinView->declareViewActive();
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
@@ -115,8 +120,8 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
 
         // TODO: handle dropping above a directory
 
-        const KUrl& destination = m_parentView->url();
-        m_parentView->mainWindow()->dropUrls(urls, destination);
+        const KUrl& destination = m_dolphinView->url();
+        m_dolphinView->mainWindow()->dropUrls(urls, destination);
     }
 }
 
@@ -132,4 +137,38 @@ void DolphinDetailsView::setSortIndicatorOrder(Qt::SortOrder sortOrder)
     headerView->setSortIndicator(headerView->sortIndicatorSection(), sortOrder);
 }
 
+void DolphinDetailsView::synchronizeSortingState(int column)
+{
+    // The sorting has already been changed in QTreeView if this slot is
+    // invoked, but Dolphin was not informed about this. This is bypassed by changing
+    // the sorting and sort order to a temporary other value and readjust it again.
+    const bool update = (column == KDirModel::Name) || (column == KDirModel::Size) ||
+                        (column == KDirModel::ModifiedTime);
+    if (update) {
+        DolphinView::Sorting sorting = DolphinView::SortByName;
+        switch (column) {
+            case KDirModel::Size:         sorting = DolphinView::SortBySize; break;
+            case KDirModel::ModifiedTime: sorting = DolphinView::SortByDate; break;
+            case KDirModel::Name:
+            default: break;
+        }
+
+        const Qt::SortOrder sortOrder = header()->sortIndicatorOrder();
+
+        // temporary adjust the sorting and sort order to different values...
+        const DolphinView::Sorting tempSorting = (sorting == DolphinView::SortByName) ?
+                                                 DolphinView::SortBySize :
+                                                 DolphinView::SortByName;
+        m_dolphinView->setSorting(tempSorting);
+        const Qt::SortOrder tempSortOrder = (sortOrder == Qt::Ascending) ?
+                                            Qt::Descending : Qt::Ascending;
+        m_dolphinView->setSortOrder(tempSortOrder);
+
+        // ... so that setting them again results in storing the new setting.
+        m_dolphinView->setSorting(sorting);
+        m_dolphinView->setSortOrder(sortOrder);
+    }
+
+}
+
 #include "dolphindetailsview.moc"

diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index e035d3c12b7a20027b1fa42ce257bceb4a5e54a0..6197376a8137d4650c87ee7f0f1f81d88eeeec17 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -61,8 +61,15 @@ private slots:
      */
     void setSortIndicatorOrder(Qt::SortOrder sortOrder);
 
+    /**
+     * Synchronizes the sorting state of the Dolphin menu 'View -> Sort'
+     * with the current state of the details view.
+     * @param column Index of the current sorting column.
+     */
+     void synchronizeSortingState(int column);
+
 private:
-    DolphinView* m_parentView;
+    DolphinView* m_dolphinView;
 };
 
 #endif