there is no need anymore to check whether the KDirLister is currently loading before...

[dolphin.git] / src / treeviewsidebarpage.h

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index 045586bccf2edbb37b84850c9d1c29a2876d299b..978323f409ea4db16fac76bd5cee5eb33e9a29d6 100644 (file)
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>
+ *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -20,57 +20,100 @@
 #ifndef TREEVIEWSIDEBARPAGE_H
 #define TREEVIEWSIDEBARPAGE_H
 
 #ifndef TREEVIEWSIDEBARPAGE_H
 #define TREEVIEWSIDEBARPAGE_H
 

+#include <kurl.h>

 #include <sidebarpage.h>
 
 class KDirLister;
 #include <sidebarpage.h>
 
 class KDirLister;

-class KDirModel;
-class KUrl;
+class DolphinModel;

 
 

+class DolphinSortFilterProxyModel;
+class SidebarTreeView;

 class QModelIndex;
 class QModelIndex;

-class QTreeView;

 
 /**
 
 /**

- * @brief
+ * @brief Shows a tree view of the directories starting from
+ *        the currently selected place.
+ *
+ * The tree view is always synchronized with the currently active view
+ * from the main window.

  */
 class TreeViewSidebarPage : public SidebarPage
 {
     Q_OBJECT
 
 public:
  */
 class TreeViewSidebarPage : public SidebarPage
 {
     Q_OBJECT
 
 public:

-    TreeViewSidebarPage(DolphinMainWindow* mainWindow, QWidget* parent = 0);
+    TreeViewSidebarPage(QWidget* parent = 0);

     virtual ~TreeViewSidebarPage();
 
     virtual ~TreeViewSidebarPage();
 

-protected:
-    /** @see SidebarPage::activeViewChanged() */
-    virtual void activeViewChanged();
+    /** @see QWidget::sizeHint() */
+    virtual QSize sizeHint() const;

 
 

+public slots:
+    /**
+     * Changes the current selection inside the tree to \a url.
+     */
+    virtual void setUrl(const KUrl& url);
+
+protected:

     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);
 
     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);
 

+    /** @see QWidget::contextMenuEvent() */
+    virtual void contextMenuEvent(QContextMenuEvent* event);
+

 private slots:
     /**
 private slots:
     /**

-     * Updates the current selection inside the tree to
-     * \a url.
+     * Updates the active view to the URL
+     * which is given by the item with the index \a index.

      */
      */

-    void updateSelection(const KUrl& url);
+    void updateActiveView(const QModelIndex& index);

 
     /**
 
     /**

-     * Updates the URL of the active view to the URL
-     * which is given by the item with the index \a index.
+     * Is emitted if the URLs \a urls have been dropped
+     * to the index \a index. */
+    void dropUrls(const KUrl::List& urls,
+                  const QModelIndex& index);
+
+    /**
+     * Invokes expandToLeafDir() asynchronously (the expanding
+     * may not be done in the context of this slot).
+     */
+    void triggerExpanding();
+
+    /**
+     * Invokes loadSubTree() asynchronously (the loading
+     * may not be done in the context of this slot).
+     */
+    void triggerLoadSubTree();
+
+    /**
+     * Expands all directories to make m_leafDir visible and
+     * adjusts the selection.
+     */
+    void expandToLeafDir();
+
+    /**
+     * Loads the sub tree to make m_leafDir visible. Is invoked
+     * indirectly by loadTree() after the directory lister has
+     * finished loading the root items.

      */
      */

-    void updateViewUrl(const QModelIndex& index);
+    void loadSubTree();

 
 private:
     /**
 
 private:
     /**

-     * Connects to signals from the currently active Dolphin view to get
-     * informed about highlighting changes.
+     * Initializes the base URL of the tree and expands all
+     * directories until \a url.
+     * @param url  URL of the leaf directory that should get expanded.

      */
      */

-    void connectToActiveView();
+    void loadTree(const KUrl& url);

 
 private:
 
 private:

+    bool m_dirListerCompleted;

     KDirLister* m_dirLister;
     KDirLister* m_dirLister;

-    KDirModel* m_dirModel;
-    QTreeView* m_treeView;
+    DolphinModel* m_dolphinModel;
+    DolphinSortFilterProxyModel* m_proxyModel;
+    SidebarTreeView* m_treeView;
+    KUrl m_leafDir;

 };
 
 };
 

-#endif // BOOKMARKSSIDEBARPAGE_H
+#endif // TREEVIEWSIDEBARPAGE_H