Fix temporary regression of sorting introduced by SVN commit 1126410

[dolphin.git] / src / dolphindetailsview.h

diff --git a/src/dolphindetailsview.h b/src/dolphindetailsview.h
index 25a60911e4795cd3281c645bfafcd6c82e2b0f0a..1dff8fe59d3708f8b66f1529949f842e1a3cc9b5 100644 (file)
--- a/src/dolphindetailsview.h
+++ b/src/dolphindetailsview.h
@@ -25,9 +25,9 @@
 #include <QTreeView>
 #include <libdolphin_export.h>
 
-class DolphinController;
-class SelectionManager;
-class DolphinViewAutoScroller;
+class DolphinViewController;
+class DolphinSortFilterProxyModel;
+class ViewExtensionsFactory;
 
 /**
  * @brief Represents the details view which shows the name, size,
@@ -42,9 +42,28 @@ class LIBDOLPHINPRIVATE_EXPORT DolphinDetailsView : public QTreeView
     Q_OBJECT
 
 public:
-    explicit DolphinDetailsView(QWidget* parent, DolphinController* controller);
+    /**
+     * @param parent                Parent widget.
+     * @param dolphinViewController Allows the DolphinDetailsView to control the
+     *                              DolphinView in a limited way.
+     * @param viewModeController    Controller that is used by the DolphinView
+     *                              to control the DolphinDetailsView. The DolphinDetailsView
+     *                              only has read access to the controller.
+     * @param model                 Directory that is shown.
+     */
+    explicit DolphinDetailsView(QWidget* parent,
+                                DolphinViewController* dolphinViewController,
+                                const ViewModeController* viewModeController,
+                                DolphinSortFilterProxyModel* model);
     virtual ~DolphinDetailsView();
 
+    /**
+     * Returns a set containing the URLs of all expanded items.
+     */
+    QSet<KUrl> expandedUrls() const;
+
+    virtual QRegion visualRegionForSelection(const QItemSelection& selection) const;
+
 protected:
     virtual bool event(QEvent* event);
     virtual QStyleOptionViewItem viewOptions() const;
@@ -65,6 +84,7 @@ protected:
     virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
     virtual bool eventFilter(QObject* watched, QEvent* event);
     virtual QModelIndex indexAt (const QPoint& point) const;
+    virtual QRect visualRect(const QModelIndex& index) const;
     virtual void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags command);
     virtual void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible);
 
@@ -167,7 +187,23 @@ private slots:
      */
     void setFoldersExpandable(bool expandable);
 
+    /**
+     * These slots update the list of expanded items.
+     */
+    void slotExpanded(const QModelIndex& index);
+    void slotCollapsed(const QModelIndex& index);
+
+protected slots:
+
+    virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
+
 private:
+    /**
+     * Removes the URLs corresponding to the children of \a index in the rows
+     * between \a start and \a end inclusive from the set of expanded URLs.
+     */
+    void removeExpandedIndexes(const QModelIndex& parent, int start, int end);
+
     /**
      * Updates the size of the decoration dependent on the
      * icon size of the DetailsModeSettings. The controller
@@ -183,13 +219,16 @@ private:
      */
     void resizeColumns();
 
-    QRect nameColumnRect(const QModelIndex& index) const;
-
     /**
      * Returns true, if \a pos is within the expanding toggle of a tree.
      */
     bool isAboveExpandingToggle(const QPoint& pos) const;
 
+    /**
+     * Sets the maximum size available for editing in the delegate.
+     */
+    void adjustMaximumSizeForEditing(const QModelIndex& index);
+
 private:
     bool m_autoResize : 1;        // if true, the columns are resized automatically to the available width
     bool m_expandingTogglePressed : 1;
@@ -197,11 +236,17 @@ private:
     bool m_useDefaultIndexAt : 1; // true, if QTreeView::indexAt() should be used
     bool m_ignoreScrollTo : 1;    // true if calls to scrollTo(...) should do nothing.
 
-    DolphinController* m_controller;
-    SelectionManager* m_selectionManager;
-    DolphinViewAutoScroller* m_autoScroller;
+    DolphinViewController* m_dolphinViewController;
+    const ViewModeController* m_viewModeController;
+    ViewExtensionsFactory* m_extensionsFactory;
     QAction* m_expandableFoldersAction;
 
+    // A set containing the URLs of all currently expanded folders.
+    // We cannot use a QSet<QModelIndex> because a QModelIndex is not guaranteed to remain valid over time.
+    // Also a QSet<QPersistentModelIndex> does not work as expected because it is not guaranteed that
+    // subsequent expand/collapse events of the same file item will yield the same QPersistentModelIndex.
+    QSet<KUrl> m_expandedUrls;
+
     QFont m_font;
     QSize m_decorationSize;