reactivate ScrollPerPixel again, as the Qt-patch for "divide by zero" has been applie...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 9a358b2fffd195a0cd8b9ac10f3195984779ad36..a2902afd7e547839d74e9ef2e716aad71beded7b 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -136,8 +136,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
             this, SLOT(slotItemTriggered(KFileItem)));
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_view, SIGNAL(itemTriggered(KFileItem)),
             this, SLOT(slotItemTriggered(KFileItem)));

-    connect(m_view, SIGNAL(rootUrlChanged(const KUrl&)),
-            m_urlNavigator, SLOT(saveRootUrl(const KUrl&)));
+    connect(m_view, SIGNAL(startedPathLoading(const KUrl&)),
+            this, SLOT(saveRootUrl(const KUrl&)));

 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(restoreView(const KUrl&)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(restoreView(const KUrl&)));


@@ -452,18 +452,8 @@ void DolphinViewContainer::changeNameFilter(const QString& nameFilter)
     adjustedFilter.insert(0, '*');
     adjustedFilter.append('*');
 
     adjustedFilter.insert(0, '*');
     adjustedFilter.append('*');
 

-    // Use the ProxyModel to filter:
-    // This code is #ifdefed as setNameFilter behaves
-    // slightly different than the QSortFilterProxyModel
-    // as it will not remove directories. I will ask
-    // our beloved usability experts for input
-    // -- z.
-#if 0

     m_dirLister->setNameFilter(adjustedFilter);
     m_dirLister->emitChanges();
     m_dirLister->setNameFilter(adjustedFilter);
     m_dirLister->emitChanges();

-#else
-    m_proxyModel->setFilterRegExp(nameFilter);
-#endif

 
     updateStatusBar();
 }
 
     updateStatusBar();
 }


@@ -495,8 +485,13 @@ void DolphinViewContainer::activate()
 
 void DolphinViewContainer::restoreView(const KUrl& url)
 {
 
 void DolphinViewContainer::restoreView(const KUrl& url)
 {

-    m_view->setRootUrl(m_urlNavigator->savedRootUrl());
-    m_view->setUrl(url);
+    m_view->updateView(url, m_urlNavigator->savedRootUrl());
+}
+
+void DolphinViewContainer::saveRootUrl(const KUrl& url)
+{
+    Q_UNUSED(url);
+    m_urlNavigator->saveRootUrl(m_view->rootUrl());

 }
 
 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
 }
 
 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)