Merge branch 'KDE/4.14'

[dolphin.git] / src / dolphintabpage.cpp

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index c8e42633594d37671a237faef0c6928dccdeb936..23e33c95833b308222afec9f93c8121ea8489928 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -76,6 +76,10 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled)
         if (enabled) {
             const KUrl& url = m_primaryViewContainer->url();
             m_secondaryViewContainer = createViewContainer(url);
         if (enabled) {
             const KUrl& url = m_primaryViewContainer->url();
             m_secondaryViewContainer = createViewContainer(url);

+
+            const bool placesSelectorVisible = m_primaryViewContainer->urlNavigator()->isPlacesSelectorVisible();
+            m_secondaryViewContainer->urlNavigator()->setPlacesSelectorVisible(placesSelectorVisible);
+

             m_splitter->addWidget(m_secondaryViewContainer);
             m_secondaryViewContainer->show();
             m_secondaryViewContainer->setActive(true);
             m_splitter->addWidget(m_secondaryViewContainer);
             m_secondaryViewContainer->show();
             m_secondaryViewContainer->setActive(true);


@@ -183,6 +187,10 @@ QByteArray DolphinTabPage::saveState() const
 
 void DolphinTabPage::restoreState(const QByteArray& state)
 {
 
 void DolphinTabPage::restoreState(const QByteArray& state)
 {

+    if (state.isEmpty()) {
+        return;
+    }
+

     QByteArray sd = state;
     QDataStream stream(&sd, QIODevice::ReadOnly);
 
     QByteArray sd = state;
     QDataStream stream(&sd, QIODevice::ReadOnly);
 


@@ -242,7 +250,7 @@ void DolphinTabPage::slotViewActivated()
     }
 
     emit activeViewUrlChanged(activeViewContainer()->url());
     }
 
     emit activeViewUrlChanged(activeViewContainer()->url());

-    emit activeViewChanged();
+    emit activeViewChanged(activeViewContainer());

 }
 
 DolphinViewContainer* DolphinTabPage::createViewContainer(const KUrl& url) const
 }
 
 DolphinViewContainer* DolphinTabPage::createViewContainer(const KUrl& url) const