there's no need having 2-liners inside their own method when this method is only...

[dolphin.git] / src / treeviewsidebarpage.cpp

diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 6b319b3e0bd6dd88eb3c82d23492762c64e8e74b..8894f8a88005fe22dcb2b02168787e4f0203b12a 100644 (file)
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -38,7 +38,6 @@
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),
 
 TreeViewSidebarPage::TreeViewSidebarPage(QWidget* parent) :
     SidebarPage(parent),

-    m_dirListerCompleted(false),

     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),
     m_dirLister(0),
     m_dolphinModel(0),
     m_proxyModel(0),


@@ -55,9 +54,7 @@ TreeViewSidebarPage::~TreeViewSidebarPage()
 
 QSize TreeViewSidebarPage::sizeHint() const
 {
 
 QSize TreeViewSidebarPage::sizeHint() const
 {

-    QSize size = SidebarPage::sizeHint();
-    size.setWidth(200);
-    return size;
+    return QSize(200, 400);

 }
 
 void TreeViewSidebarPage::setUrl(const KUrl& url)
 }
 
 void TreeViewSidebarPage::setUrl(const KUrl& url)


@@ -90,18 +87,15 @@ void TreeViewSidebarPage::showEvent(QShowEvent* event)
         m_dirLister->setDelayedMimeTypes(true);
         m_dirLister->setAutoErrorHandlingEnabled(false, this);
 
         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()),
         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&)),
 
         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);
 
         Q_ASSERT(m_proxyModel == 0);
         m_proxyModel = new DolphinSortFilterProxyModel(this);


@@ -140,39 +134,11 @@ void TreeViewSidebarPage::contextMenuEvent(QContextMenuEvent* event)
     const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
     KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex);
 
     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();
 }
 
     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);
 void TreeViewSidebarPage::updateActiveView(const QModelIndex& index)
 {
     const QModelIndex dirIndex = m_proxyModel->mapToSource(index);


@@ -195,14 +161,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);
 }
 
     // 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
 void TreeViewSidebarPage::expandToLeafDir()
 {
     // expand all directories until the parent directory of m_leafDir


@@ -220,6 +192,7 @@ void TreeViewSidebarPage::expandToLeafDir()
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
 }
 
     selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
 }
 

+

 void TreeViewSidebarPage::loadSubTree()
 {
     QItemSelectionModel* selModel = m_treeView->selectionModel();
 void TreeViewSidebarPage::loadSubTree()
 {
     QItemSelectionModel* selModel = m_treeView->selectionModel();


@@ -237,7 +210,7 @@ void TreeViewSidebarPage::loadSubTree()
         const QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
         m_treeView->scrollTo(proxyIndex);
         selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);
         const QModelIndex proxyIndex = m_proxyModel->mapFromSource(index);
         m_treeView->scrollTo(proxyIndex);
         selModel->setCurrentIndex(proxyIndex, QItemSelectionModel::Select);

-    } else if (m_dirListerCompleted) {
+    } else {

         // 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.
         // 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.


@@ -245,18 +218,6 @@ void TreeViewSidebarPage::loadSubTree()
     }
 }
 
     }
 }
 

-void TreeViewSidebarPage::slotDirListerStarted(const KUrl& url)
-{
-    Q_UNUSED(url);
-    m_dirListerCompleted = false;
-}
-
-void TreeViewSidebarPage::slotDirListerCompleted()
-{
-    m_dirListerCompleted = true;
-    QMetaObject::invokeMethod(this, "loadSubTree", Qt::QueuedConnection);
-}
-

 void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);
 void TreeViewSidebarPage::loadTree(const KUrl& url)
 {
     Q_ASSERT(m_dirLister != 0);


@@ -273,7 +234,7 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
 
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();
 
     if (m_dirLister->url() != baseUrl) {
         m_dirLister->stop();

-        m_dirLister->openUrl(baseUrl);
+        m_dirLister->openUrl(baseUrl, KDirLister::Reload);

     } else {
         loadSubTree();
     }
     } else {
         loadSubTree();
     }