Treeview fixes (backport):

[dolphin.git] / src / treeviewsidebarpage.h

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index 9810908558e55140f29a2ed2d7e251dff78a6fda..d0c3850e925ee639414a68bd70efc2159fa04a3e 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  *


@@ -24,8 +24,7 @@
 #include <sidebarpage.h>
 
 class KDirLister;
 #include <sidebarpage.h>
 
 class KDirLister;

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

 
 class DolphinSortFilterProxyModel;
 class SidebarTreeView;
 
 class DolphinSortFilterProxyModel;
 class SidebarTreeView;


@@ -33,7 +32,7 @@ class QModelIndex;
 
 /**
  * @brief Shows a tree view of the directories starting from
 
 /**
  * @brief Shows a tree view of the directories starting from

- *        the currently selected bookmark.
+ *        the currently selected place.

  *
  * The tree view is always synchronized with the currently active view
  * from the main window.
  *
  * The tree view is always synchronized with the currently active view
  * from the main window.


@@ -43,49 +42,86 @@ class TreeViewSidebarPage : public SidebarPage
     Q_OBJECT
 
 public:
     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);

 
     /**
 
     /**

-     * Expands the tree in a way that the item with the URL m_selectedUrl
-     * gets visible. Is called by TreeViewSidebarPage::updateSelection()
-     * if the dir lister has been completed.
+     * 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 expandSelectionParent();
+    void triggerExpanding();

 
     /**
 
     /**

-     * Updates the active view to the URL
-     * which is given by the item with the index \a index.
+     * Invokes loadSubTree() asynchronously (the loading
+     * may not be done in the context of this slot).

      */
      */

-    void updateActiveView(const QModelIndex& index);
+    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 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 loadTree(const KUrl& url);
+
+    /**
+     * Selects the current leaf directory m_leafDir and assures
+     * that the directory is visible if the leaf has been set by
+     * TreeViewSidebarPage::setUrl().

      */
      */

-    void connectToActiveView();
+    void selectLeafDirectory();

 
 private:
 
 private:

+    bool m_setLeafVisible;
+    bool m_dirListerCompleted;

     KDirLister* m_dirLister;
     KDirLister* m_dirLister;

-    KDirModel* m_dirModel;
+    DolphinModel* m_dolphinModel;

     DolphinSortFilterProxyModel* m_proxyModel;
     SidebarTreeView* m_treeView;
     DolphinSortFilterProxyModel* m_proxyModel;
     SidebarTreeView* m_treeView;

-    KUrl m_selectedUrl;
+    KUrl m_leafDir;

 };
 
 };
 

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