Also reconnect signals for the directory lister when changing the view or the URL...

svn path=/trunk/KDE/kdebase/apps/; revision=1201082

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index e6207c90c91b3b25957849c8da1516b25d6485c2..c2e998e5a4f976c448bb155f8e3bd4cdee2ae7c7 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -125,14 +125,6 @@ DolphinView::DolphinView(QWidget* parent,
     connect(m_dolphinViewController, SIGNAL(urlChangeRequested(KUrl)),
             m_viewModeController, SLOT(setUrl(KUrl)));
 
     connect(m_dolphinViewController, SIGNAL(urlChangeRequested(KUrl)),
             m_viewModeController, SLOT(setUrl(KUrl)));
 

-    KDirLister* dirLister = m_viewAccessor.dirLister();
-    connect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
-            this, SLOT(slotRedirection(KUrl,KUrl)));
-    connect(dirLister, SIGNAL(completed()),
-            this, SLOT(slotDirListerCompleted()));
-    connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
-            this, SLOT(slotRefreshItems()));
-

     // When a new item has been created by the "Create New..." menu, the item should
     // get selected and it must be assured that the item will get visible. As the
     // creation is done asynchronously, several signals must be checked:
     // When a new item has been created by the "Create New..." menu, the item should
     // get selected and it must be assured that the item will get visible. As the
     // creation is done asynchronously, several signals must be checked:


@@ -526,12 +518,10 @@ void DolphinView::setUrl(const KUrl& url)
         return;
     }
 
         return;
     }
 

-    // The selection model might change in the case of the column view. Disconnect
-    // from the current selection model and reconnect later after the URL switch.

     const bool hadSelection = hasSelection();
     const bool hadSelection = hasSelection();

-    QAbstractItemView* view = m_viewAccessor.itemView();
-    disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
-               this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+
+    // The selection model and directory lister might change in the case of the column view:
+    disconnectViewAccessor();

 
     m_newFileNames.clear();
 
 
     m_newFileNames.clear();
 


@@ -546,10 +536,9 @@ void DolphinView::setUrl(const KUrl& url)
 
     emit startedPathLoading(url);
 
 
     emit startedPathLoading(url);
 

-    // Reconnect to the (probably) new selection model
-    view = m_viewAccessor.itemView();
-    connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
-            this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+    // Reconnect to the (probably) new selection model and directory lister
+    connectViewAccessor();
+

     if (hadSelection || hasSelection()) {
         emitSelectionChangedSignal();
     }
     if (hadSelection || hasSelection()) {
         emitSelectionChangedSignal();
     }


@@ -1184,8 +1173,7 @@ void DolphinView::createView()
     const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize());
     m_viewModeController->setZoomLevel(zoomLevel);
 
     const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize());
     m_viewModeController->setZoomLevel(zoomLevel);
 

-    connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
-            this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+    connectViewAccessor();

 
     setFocusProxy(m_viewAccessor.layoutTarget());
     m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
 
     setFocusProxy(m_viewAccessor.layoutTarget());
     m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());


@@ -1198,10 +1186,7 @@ void DolphinView::deleteView()
     m_dolphinViewController->setItemView(0);
 
     if (view != 0) {
     m_dolphinViewController->setItemView(0);
 
     if (view != 0) {

-        if (view->selectionModel() != 0) {
-            disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
-                       this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
-        }
+        disconnectViewAccessor();

 
         // It's important to set the keyboard focus to the parent
         // before deleting the view: Otherwise when having a split
 
         // It's important to set the keyboard focus to the parent
         // before deleting the view: Otherwise when having a split


@@ -1288,6 +1273,36 @@ QItemSelection DolphinView::childrenMatchingPattern(const QModelIndex& parent, c
     return matchingIndexes;
 }
 
     return matchingIndexes;
 }
 

+void DolphinView::connectViewAccessor()
+{
+    KDirLister* dirLister = m_viewAccessor.dirLister();
+    connect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
+            this, SLOT(slotRedirection(KUrl,KUrl)));
+    connect(dirLister, SIGNAL(completed()),
+            this, SLOT(slotDirListerCompleted()));
+    connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
+            this, SLOT(slotRefreshItems()));
+
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+            this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+}
+
+void DolphinView::disconnectViewAccessor()
+{
+    KDirLister* dirLister = m_viewAccessor.dirLister();
+    disconnect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
+               this, SLOT(slotRedirection(KUrl,KUrl)));
+    disconnect(dirLister, SIGNAL(completed()),
+               this, SLOT(slotDirListerCompleted()));
+    disconnect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
+               this, SLOT(slotRefreshItems()));
+
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+               this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+}
+

 DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) :
     m_rootUrl(),
     m_iconsView(0),
 DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) :
     m_rootUrl(),
     m_iconsView(0),

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index d513eba1b17c167af8d40f0b8be401711f3ca39e..bb6108e1a305f5d2799bdcaaa5f880e74e43f659 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -723,6 +723,9 @@ private:
      */
     QItemSelection childrenMatchingPattern(const QModelIndex& parent, const QRegExp& pattern) const;
 
      */
     QItemSelection childrenMatchingPattern(const QModelIndex& parent, const QRegExp& pattern) const;
 

+    void connectViewAccessor();
+    void disconnectViewAccessor();
+

 private:
     /**
      * Abstracts the access to the different view implementations
 private:
     /**
      * Abstracts the access to the different view implementations