Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index e04ff76180f70496d3bd7245ce137d5b0b544b59..0b350f8b2fb85d643c18b747ddd701a77180eb1b 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -19,19 +19,40 @@
  ***************************************************************************/
 
 #include "dolphindetailsview.h"
  ***************************************************************************/
 
 #include "dolphindetailsview.h"

-#include "dolphinmainwindow.h"
-#include "dolphinview.h"

 
 

+#include "dolphincontroller.h"
+#include "dolphinsortfilterproxymodel.h"
+#include "viewproperties.h"
+
+#include <assert.h>
+#include <kdirmodel.h>

 #include <QHeaderView>
 
 #include <QHeaderView>
 

-DolphinDetailsView::DolphinDetailsView(DolphinView* parent) :
+DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :

     QTreeView(parent),
     QTreeView(parent),

-    m_parentView(parent)
+    m_controller(controller)

 {
 {

+    assert(controller != 0);
+

     setAcceptDrops(true);
     setRootIsDecorated(false);
     setSortingEnabled(true);
     setUniformRowHeights(true);
     setAcceptDrops(true);
     setRootIsDecorated(false);
     setSortingEnabled(true);
     setUniformRowHeights(true);

+
+    const ViewProperties props(controller->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)));
+
+    connect(this, SIGNAL(clicked(const QModelIndex&)),
+            controller, SLOT(triggerItem(const QModelIndex&)));

 }
 
 DolphinDetailsView::~DolphinDetailsView()
 }
 
 DolphinDetailsView::~DolphinDetailsView()


@@ -70,21 +91,13 @@ QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 {
     QTreeView::contextMenuEvent(event);
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 {
     QTreeView::contextMenuEvent(event);

-
-    KFileItem* item = 0;
-
-    const QModelIndex index = indexAt(event->pos());
-    if (index.isValid()) {
-        item = m_parentView->fileItem(index);
-    }
-
-    m_parentView->openContextMenu(item, event->globalPos());
+    m_controller->triggerContextMenuRequest(event->pos());

 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);
 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);

-    m_parentView->declareViewActive();
+    m_controller->triggerActivation();

 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 }
 
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)


@@ -97,14 +110,35 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 void DolphinDetailsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
 void DolphinDetailsView::dropEvent(QDropEvent* event)
 {
     const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());

-    if (!urls.isEmpty()) {
+    if (urls.isEmpty() || (event->source() == this)) {
+        QTreeView::dropEvent(event);
+    }
+    else {

         event->acceptProposedAction();
         event->acceptProposedAction();

+        m_controller->indicateDroppedUrls(urls, event->pos());
+    }
+}
+
+void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
+{
+    QHeaderView* headerView = header();
+    headerView->setSortIndicator(sorting, headerView->sortIndicatorOrder());
+}

 
 

-        // TODO: handle dropping above a directory
+void DolphinDetailsView::setSortIndicatorOrder(Qt::SortOrder sortOrder)
+{
+    QHeaderView* headerView = header();
+    headerView->setSortIndicator(headerView->sortIndicatorSection(), sortOrder);
+}

 
 

-        const KUrl& destination = m_parentView->url();
-        m_parentView->mainWindow()->dropUrls(urls, destination);
-    }
+void DolphinDetailsView::synchronizeSortingState(int column)
+{
+    // The sorting has already been changed in QTreeView if this slot is
+    // invoked, but Dolphin is not informed about this.
+    DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(column);
+    const Qt::SortOrder sortOrder = header()->sortIndicatorOrder();
+    m_controller->indicateSortingChange(sorting);
+    m_controller->indicateSortOrderChange(sortOrder);

 }
 
 #include "dolphindetailsview.moc"
 }
 
 #include "dolphindetailsview.moc"