Prevent unnecessary reloading of KDirLister on startup

When Dolphin is started with a directory as argument unnecessary reload operations of KDirListers are done. The patch improves this by just letting the DolphinView internally do a loading as soon as it gets visible (and without reloading). Also in case if only one directory is passed as argument the current tab gets reused instead of creating new tabs and removing the current tab.

Thanks a lot to David Faure for pointing out this unefficient handling.

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index c50a42a404f9e4675a18ed7b5e4dbd83980f967b..e0f6019c001ae5185d9da10fa375bfbc671809ec 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -163,6 +163,11 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
         return;
     }
 
         return;
     }
 

+    if (dirs.count() == 1) {
+        m_activeViewContainer->setUrl(dirs.first());
+        return;
+    }
+

     const int oldOpenTabsCount = m_viewTab.count();
 
     const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
     const int oldOpenTabsCount = m_viewTab.count();
 
     const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();


@@ -419,7 +424,6 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
     viewTab.primaryView = new DolphinViewContainer(url, viewTab.splitter);
     viewTab.primaryView->setActive(false);
     connectViewSignals(viewTab.primaryView);
     viewTab.primaryView = new DolphinViewContainer(url, viewTab.splitter);
     viewTab.primaryView->setActive(false);
     connectViewSignals(viewTab.primaryView);

-    viewTab.primaryView->view()->reload();

 
     m_viewTab.append(viewTab);
 
 
     m_viewTab.append(viewTab);
 


@@ -1307,7 +1311,6 @@ void DolphinMainWindow::init()
     m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
     connectViewSignals(m_activeViewContainer);
     DolphinView* view = m_activeViewContainer->view();
     m_activeViewContainer = m_viewTab[m_tabIndex].primaryView;
     connectViewSignals(m_activeViewContainer);
     DolphinView* view = m_activeViewContainer->view();

-    view->reload();

     m_activeViewContainer->show();
     m_actionHandler->setCurrentView(view);
 
     m_activeViewContainer->show();
     m_actionHandler->setCurrentView(view);
 


@@ -1924,7 +1927,6 @@ void DolphinMainWindow::createSecondaryView(int tabIndex)
     splitter->addWidget(m_viewTab[tabIndex].secondaryView);
     splitter->setSizes(QList<int>() << newWidth << newWidth);
     connectViewSignals(m_viewTab[tabIndex].secondaryView);
     splitter->addWidget(m_viewTab[tabIndex].secondaryView);
     splitter->setSizes(QList<int>() << newWidth << newWidth);
     connectViewSignals(m_viewTab[tabIndex].secondaryView);

-    m_viewTab[tabIndex].secondaryView->view()->reload();

     m_viewTab[tabIndex].secondaryView->setActive(false);
     m_viewTab[tabIndex].secondaryView->show();
 }
     m_viewTab[tabIndex].secondaryView->setActive(false);
     m_viewTab[tabIndex].secondaryView->show();
 }

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 4ab16e0528a7eb3e4a8ae98c3cc25437c673ad61..6108c9d4a105475fe9b50c0831a8175543d12edf 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -768,6 +768,14 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
     return QWidget::eventFilter(watched, event);
 }
 
     return QWidget::eventFilter(watched, event);
 }
 

+void DolphinView::showEvent(QShowEvent* event)
+{
+    QWidget::showEvent(event);
+    if (!event->spontaneous()) {
+        loadDirectory(url());
+    }
+}
+

 void DolphinView::activate()
 {
     setActive(true);
 void DolphinView::activate()
 {
     setActive(true);

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 1d1d316ea19f34ef50a2516b249d157328a77cde..48967e62bacd5a18d68be8f509e05a13ba5fcc83 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -559,6 +559,7 @@ protected:
     /** @see QWidget::mouseReleaseEvent */
     virtual void mouseReleaseEvent(QMouseEvent* event);
     virtual bool eventFilter(QObject* watched, QEvent* event);
     /** @see QWidget::mouseReleaseEvent */
     virtual void mouseReleaseEvent(QMouseEvent* event);
     virtual bool eventFilter(QObject* watched, QEvent* event);

+    virtual void showEvent(QShowEvent* event);

 
 private slots:
     /**
 
 private slots:
     /**