From e536466ac75e7fa3cfdc18728596beac36996128 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 26 Jan 2010 08:27:42 +0000 Subject: * Assure that the URL navigator is synchronized with the active column. * Removed obsolete triggerUrlChangeRequest() method + signal in the DolphinController. This is not needed anymore because of the refactored column view. svn path=/trunk/KDE/kdebase/apps/; revision=1080351 --- src/dolphincolumnview.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/dolphincolumnview.cpp') diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index ee3d85278..3437de499 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -334,13 +334,7 @@ void DolphinColumnView::keyPressEvent(QKeyEvent* event) void DolphinColumnView::contextMenuEvent(QContextMenuEvent* event) { - if (!m_active) { - m_container->requestActivation(this); - Q_ASSERT(m_container->m_controller->itemView() == this); - m_container->m_controller->triggerUrlChangeRequest(m_url); - } - Q_ASSERT(m_active); - + requestActivation(); QListView::contextMenuEvent(event); m_container->m_controller->triggerContextMenuRequest(event->pos()); } @@ -390,11 +384,8 @@ void DolphinColumnView::slotEntered(const QModelIndex& index) void DolphinColumnView::requestActivation() { - m_container->m_controller->setItemView(this); - m_container->m_controller->requestActivation(); if (!m_active) { m_container->requestActivation(this); - m_container->m_controller->triggerUrlChangeRequest(m_url); selectionModel()->clear(); } } -- cgit v1.3