As requested by Peter: upgrade version to 1.0

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 8096b966a4b72d455c340875a5219cc1dc87680c..82e2a0507f43f882561ee9d61749628e32c896eb 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -20,7 +20,6 @@
 #include "treeviewsidebarpage.h"
 
 #include "dolphinmodel.h"
-#include "dolphinmainwindow.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinsettings.h"
@@ -38,7 +37,6 @@
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
-    m_dirListerCompleted(false),
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
@@ -49,15 +47,16 @@ TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
 
 TreeViewSidebarPage::~TreeViewSidebarPage()
 {
-    delete m_dirLister;
-    m_dirLister = 0;
+    delete m_proxyModel;
+    m_proxyModel = 0;
+    delete m_dolphinModel;
+    m_dolphinModel = 0;
+    m_dirLister = 0; // deleted by m_dolphinModel
 }
 
 QSize TreeViewSidebarPage::sizeHint() const
 {
-    QSize size = SidebarPage::sizeHint();
-    size.setWidth(200);
-    return size;
+    return QSize(200, 400);
 }
 
 void TreeViewSidebarPage::setUrl(const KUrl& url)
@@ -90,18 +89,15 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_dirLister->setDelayedMimeTypes(true);
         m_dirLister->setAutoErrorHandlingEnabled(false, this);
 
-        m_dirListerCompleted = true;
-        connect(m_dirLister, SIGNAL(started(const KUrl&)),
-                this, SLOT(slotDirListerStarted(const KUrl&)));
         connect(m_dirLister, SIGNAL(completed()),
-                this, SLOT(slotDirListerCompleted()));
+                this, SLOT(triggerLoadSubTree()));
 
         Q_ASSERT(m_dolphinModel == 0);
         m_dolphinModel = new DolphinModel(this);
         m_dolphinModel->setDirLister(m_dirLister);
         m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
         connect(m_dolphinModel, SIGNAL(expand(const QModelIndex&)),
-                this, SLOT(triggerExpanding(const QModelIndex&)));
+                this, SLOT(triggerExpanding()));
 
         Q_ASSERT(m_proxyModel == 0);
         m_proxyModel = new DolphinSortFilterProxyModel(this);
@@ -140,39 +136,11 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
     const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
     KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex);
 
-    emit changeSelection(QList<KFileItem>());
+    emit changeSelection(KFileItemList());
     TreeViewContextMenu contextMenu(this, item);
     contextMenu.open();
 }
 
-void TreeViewSidebarPage::expandSelectionParent()
-{
-    disconnect(m_dirLister, SIGNAL(completed()),
-               this, SLOT(expandSelectionParent()));
-
-    // expand the parent folder of the selected item
-    KUrl parentUrl = url().upUrl();
-    if (!m_dirLister->url().isParentOf(parentUrl)) {
-        return;
-    }
-
-    QModelIndex index = m_dolphinModel->indexForUrl(parentUrl);
-    if (index.isValid()) {
-        QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
-        m_treeView->setExpanded(proxyIndex, true);
-
-        // select the item and assure that the item is visible
-        index = m_dolphinModel->indexForUrl(url());
-        if (index.isValid()) {
-            proxyIndex = m_proxyModel->mapFromSource(index);
-            m_treeView->scrollTo(proxyIndex);
-
-            QItemSelectionModel* selModel = m_treeView->selectionModel();
-            selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
-        }
-    }
-}
-
 void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
 {
     const QModelIndex dirIndex = m_proxyModel->mapToSource(index);
@@ -195,14 +163,20 @@ void TreeViewSidebarPage::dropUrls(const KUrl::List& urls,
     }
 }
 
-void TreeViewSidebarPage::triggerExpanding(const QModelIndex& index)
+void TreeViewSidebarPage::triggerExpanding()
 {
-    Q_UNUSED(index);
     // the expanding of the folders may not be done in the context
     // of this slot
     QMetaObject::invokeMethod(this, "expandToLeafDir", Qt::QueuedConnection);
 }
 
+void TreeViewSidebarPage::triggerLoadSubTree()
+{
+    // the loading of the sub tree may not be done in the context
+    // of this slot
+    QMetaObject::invokeMethod(this, "loadSubTree", Qt::QueuedConnection);
+}
+
 void TreeViewSidebarPage::expandToLeafDir()
 {
     // expand all directories until the parent directory of m_leafDir
@@ -220,11 +194,9 @@ void TreeViewSidebarPage::expandToLeafDir()
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
 }
 
+
 void TreeViewSidebarPage::loadSubTree()
 {
-    disconnect(m_dirLister, SIGNAL(completed()),
-               this, SLOT(loadSubTree()));
-
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->clearSelection();
 
@@ -244,23 +216,10 @@ void TreeViewSidebarPage::loadSubTree()
         // Load all sub directories that need to get expanded for making
         // the leaf directory visible. The slot triggerExpanding() will
         // get invoked if the expanding has been finished.
-        Q_ASSERT(m_dirListerCompleted);
         m_dolphinModel->expandToUrl(m_leafDir);
     }
 }
 
-void TreeViewSidebarPage::slotDirListerStarted(const KUrl& url)
-{
-    Q_UNUSED(url);
-    m_dirListerCompleted = false;
-}
-
-void TreeViewSidebarPage::slotDirListerCompleted()
-{
-    m_dirListerCompleted = true;
-}
-
-
 void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);
@@ -275,11 +234,9 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
         baseUrl = url;
     }
 
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(loadSubTree()));
-    if ((m_dirLister->url() != baseUrl) || !m_dirListerCompleted) {
+    if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
-        m_dirLister->openUrl(baseUrl);
+        m_dirLister->openUrl(baseUrl, KDirLister::Reload);
     } else {
         loadSubTree();
     }