menu actions have not been updated correctly when changing between the split views...

BUG: 158317

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ef3180a0180c0993167b01338f4634663c4090e0..0bc6e569c2ad27b1ff38792aa55413857086dfee 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -697,6 +697,8 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     m_activeViewContainer = viewContainer;
     m_activeViewContainer->setActive(true);
 
     m_activeViewContainer = viewContainer;
     m_activeViewContainer->setActive(true);
 

+    m_actionHandler->setCurrentView(viewContainer->view());
+

     updateHistory();
     updateEditActions();
     updateViewActions();
     updateHistory();
     updateEditActions();
     updateViewActions();


@@ -705,8 +707,6 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
     const KUrl& url = m_activeViewContainer->url();
     setCaption(url.fileName());
 
     const KUrl& url = m_activeViewContainer->url();
     setCaption(url.fileName());
 

-    m_actionHandler->setCurrentView(viewContainer->view());
-

     emit activeViewChanged(); // TODO unused; remove?
     emit urlChanged(url);
 }
     emit activeViewChanged(); // TODO unused; remove?
     emit urlChanged(url);
 }


@@ -885,14 +885,14 @@ void DolphinMainWindow::setupDockWidgets()
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));
 #endif
     connect(this, SIGNAL(urlChanged(KUrl)),
             terminalWidget, SLOT(setUrl(KUrl)));
 #endif

-                       
+

     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
         infoDock->hide();
         treeViewDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
         infoDock->hide();
         treeViewDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();

-#endif         
+#endif

     }
 
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
     }
 
     QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));