Simplify DolphinController: don't remember the show-preview state in the controller...

[dolphin.git] / src / dolphincolumnview.h

diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h
index a95ccfcaea613afff8fa7ac76653cac552a1cc5a..af393ce8185273048367e74f30bef47522140350 100644 (file)
--- a/src/dolphincolumnview.h
+++ b/src/dolphincolumnview.h
@@ -20,15 +20,18 @@
 #ifndef DOLPHINCOLUMNVIEW_H
 #define DOLPHINCOLUMNVIEW_H
 
+#include <kurl.h>
+
 #include <QAbstractItemView>
 #include <QList>
+#include <QString>
 #include <QStyleOption>
 
-class ColumnWidget;
+class DolphinColumnWidget;
 class DolphinController;
 class DolphinModel;
-class KUrl;
 class QAbstractProxyModel;
+class QFrame;
 class QTimeLine;
 
 /**
@@ -48,7 +51,6 @@ public:
     virtual QModelIndex indexAt(const QPoint& point) const;
     virtual void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible);
     virtual QRect visualRect(const QModelIndex& index) const;
-    virtual void setModel(QAbstractItemModel* model);
 
     /** Inverts the selection of the currently active column. */
     void invertSelection();
@@ -60,6 +62,27 @@ public:
      */
     void reload();
 
+    /**
+     * Adjusts the root URL of the first column and removes all
+     * other columns.
+     */
+    void setRootUrl(const KUrl& url);
+
+    /** Returns the URL of the first column. */
+    KUrl rootUrl() const;
+
+    /**
+     * Filters the currently shown items by \a nameFilter. All items
+     * which contain the given filter string will be shown.
+     */
+    void setNameFilter(const QString& nameFilter);
+
+    /**
+     * Returns the currently used name filter. All items
+     * which contain the name filter will be shown.
+     */
+    QString nameFilter() const;
+
 public slots:
     /**
      * Shows the column which represents the URL \a url. If the column
@@ -100,42 +123,19 @@ private slots:
     void updateDecorationSize();
 
     /**
-     * Expands the directory model the the currently active URL.
-     * Used by DolphinColumnView::reload() after the directory
-     * lister has been loaded.
-     */
-    void expandToActiveUrl();
-
-    /**
-     * Triggers the updating of columns after the model index
-     * \a index has been expanded. Used by DolphinModel::expandToActiveUrl().
-     */
-    void triggerUpdateColumns(const QModelIndex& index);
-
-    /**
-     * Adjusts the root index of all columns to represent the reloaded
-     * model. Used by DolphinModel::triggerUpdateColumns().
-     */
-    void updateColumns();
-
-    /**
-     * Is invoked when the directory lister has started the loading
-     * of the URL \a url and sets the internal m_dirListerCompleted
-     * state to false.
+     * Updates the background color of the columns to respect
+     * the current activation state \a active.
      */
-    void slotDirListerStarted(const KUrl& url);
+    void updateColumnsBackground(bool active);
 
-    /**
-     * Is invoked when the directory lister has completed the loading
-     * and sets the internal m_dirListerCompleted state to true.
-     */
-    void slotDirListerCompleted();
+    void slotShowHiddenFilesChanged();
+    void slotShowPreviewChanged();
 
 private:
     bool isZoomInPossible() const;
     bool isZoomOutPossible() const;
 
-    inline ColumnWidget* activeColumn() const;
+    DolphinColumnWidget* activeColumn() const;
 
     /**
      * Deactivates the currently active column and activates
@@ -159,24 +159,25 @@ private:
      * that the columns gets fully visible by adjusting the horizontal
      * position of the content.
      */
-    void requestActivation(ColumnWidget* column);
+    void requestActivation(DolphinColumnWidget* column);
+
+    /** Removes all columns except of the root column. */
+    void removeAllColumns();
 
 private:
     DolphinController* m_controller;
-    bool m_restoreActiveColumnFocus;
-    bool m_dirListerCompleted;
+    bool m_active;
     int m_index;
     int m_contentX;
-    QList<ColumnWidget*> m_columns;
+    QList<DolphinColumnWidget*> m_columns;
+    QFrame* m_emptyViewport;
     QTimeLine* m_animation;
+    QString m_nameFilter;
 
-    DolphinModel* m_dolphinModel;
-    QAbstractProxyModel* m_proxyModel;
-
-    friend class ColumnWidget;
+    friend class DolphinColumnWidget;
 };
 
-ColumnWidget* DolphinColumnView::activeColumn() const
+inline DolphinColumnWidget* DolphinColumnView::activeColumn() const
 {
     return m_columns[m_index];
 }