From 74541a5d48e59703db4d27ee253ab10188f8a36e Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 12 Mar 2008 16:58:11 +0000 Subject: [PATCH] menu actions have not been updated correctly when changing between the split views (regression from KDE 4.0.1 to KDE 4.0.2) BUG: 158317 svn path=/trunk/KDE/kdebase/apps/; revision=784853 --- src/dolphinmainwindow.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index ef3180a01..0bc6e569c 100644 --- 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_actionHandler->setCurrentView(viewContainer->view()); + updateHistory(); updateEditActions(); updateViewActions(); @@ -705,8 +707,6 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain const KUrl& url = m_activeViewContainer->url(); setCaption(url.fileName()); - m_actionHandler->setCurrentView(viewContainer->view()); - 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 - + 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")); -- 2.47.3