X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e8f247159e1fbacfd74dbce6c81f4e4855fad293..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index ef3180a01..69da1b94f 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -481,7 +481,6 @@ void DolphinMainWindow::toggleSplitView() setActiveViewContainer(m_viewContainer[PrimaryView]); updateViewActions(); - emit activeViewChanged(); // TODO unused; remove? } void DolphinMainWindow::reloadView() @@ -697,6 +696,8 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain m_activeViewContainer = viewContainer; m_activeViewContainer->setActive(true); + m_actionHandler->setCurrentView(viewContainer->view()); + updateHistory(); updateEditActions(); updateViewActions(); @@ -705,9 +706,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 +883,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"));