don't trigger an item if the user does a selection by using the control- or shift...

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index e04ff76180f70496d3bd7245ce137d5b0b544b59..24692b5a83c20ca63c55858ec23cbb17b1e6051c 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -19,19 +19,38 @@
  ***************************************************************************/
 
 #include "dolphindetailsview.h"
+
 #include "dolphinmainwindow.h"
+#include "dolphinsortfilterproxymodel.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);
+
     setAcceptDrops(true);
     setRootIsDecorated(false);
     setSortingEnabled(true);
     setUniformRowHeights(true);
+
+    const ViewProperties props(parent->url());
+    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)),
+            this, SLOT(setSortIndicatorOrder(Qt::SortOrder)));
 }
 
 DolphinDetailsView::~DolphinDetailsView()
@@ -75,16 +94,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)
@@ -102,9 +121,43 @@ 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);
     }
 }
 
+void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
+{
+    QHeaderView* headerView = header();
+    headerView->setSortIndicator(sorting, headerView->sortIndicatorOrder());
+}
+
+void DolphinDetailsView::setSortIndicatorOrder(Qt::SortOrder sortOrder)
+{
+    QHeaderView* headerView = header();
+    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.
+    DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(column);
+    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"