the signal urlsDropped is not available anymore in the DolphinView

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index d3ad163c90416231ff1a20f1ecd32960f1340b3e..0b28b97e8889c60e5d6cd7ce87b1911fd0df0353 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"
@@ -48,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)
@@ -89,8 +89,6 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_dirLister->setDelayedMimeTypes(true);
         m_dirLister->setAutoErrorHandlingEnabled(false, this);
 
-        connect(m_dirLister, SIGNAL(started(const KUrl&)),
-                this, SLOT(slotDirListerStarted(const KUrl&)));
         connect(m_dirLister, SIGNAL(completed()),
                 this, SLOT(triggerLoadSubTree()));
 
@@ -194,6 +192,8 @@ void TreeViewSidebarPage::expandToLeafDir()
 
     QItemSelectionModel* selModel = m_treeView->selectionModel();
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
+
+    m_treeView->resizeColumnToContents(DolphinModel::Name);
 }
 
 
@@ -203,6 +203,8 @@ void TreeViewSidebarPage::loadSubTree()
     selModel->clearSelection();
 
     if (m_leafDir.isParentOf(m_dirLister->url())) {
+        m_treeView->resizeColumnToContents(DolphinModel::Name);
+
         // The leaf directory is not a child of the base URL, hence
         // no sub directory must be loaded or selected.
         return;
@@ -220,6 +222,8 @@ void TreeViewSidebarPage::loadSubTree()
         // get invoked if the expanding has been finished.
         m_dolphinModel->expandToUrl(m_leafDir);
     }
+
+    m_treeView->resizeColumnToContents(DolphinModel::Name);
 }
 
 void TreeViewSidebarPage::loadTree(const KUrl& url)
@@ -238,10 +242,12 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
 
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
-        m_dirLister->openUrl(baseUrl, false, true);
+        m_dirLister->openUrl(baseUrl, KDirLister::Reload);
     } else {
         loadSubTree();
     }
+
+    m_treeView->resizeColumnToContents(DolphinModel::Name);
 }
 
 #include "treeviewsidebarpage.moc"