fix issues when the split view is active and the inactive column view gets selected...

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

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 4c6faaceae00d1c27109a24a280b77750ea3cfa3..eea70a8e393f34cec0267f16345bf2d5b44a8780 100644 (file)
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -252,6 +252,7 @@ void DolphinColumnWidget::paintEvent(QPaintEvent* event)
 
 void DolphinColumnWidget::mousePressEvent(QMouseEvent* event)
 {
 
 void DolphinColumnWidget::mousePressEvent(QMouseEvent* event)
 {

+    m_view->m_controller->triggerActivation();

     if (!m_active) {
         m_view->requestActivation(this);
     }
     if (!m_active) {
         m_view->requestActivation(this);
     }


@@ -302,24 +303,6 @@ void DolphinColumnWidget::triggerItem(const QModelIndex& index)
 {
     const KFileItem item = m_dolphinModel->itemForIndex(m_proxyModel->mapToSource(index));
     m_view->m_controller->triggerItem(item);
 {
     const KFileItem item = m_dolphinModel->itemForIndex(m_proxyModel->mapToSource(index));
     m_view->m_controller->triggerItem(item);

-    /*
-    const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
-    if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
-        // items are selected by the user, hence don't trigger the
-        // item specified by 'index'
-        return;
-    }
-
-    // TODO: check ZIP support (see DolphinViewContainer::triggerItem)
-    KFileItem item = m_dolphinModel->itemForIndex(m_proxyModel->mapToSource(index));
-    if (item.isDir()) {
-        bool isLocal;
-        const KUrl url = item.mostLocalUrl(isLocal);
-        m_view->showColumn(url);
-        m_view->m_controller->setUrl(url);
-    } else if (item.isFile()) {
-        item.run();
-    }*/

 }
 
 void DolphinColumnWidget::generatePreviews(const KFileItemList& items)
 }
 
 void DolphinColumnWidget::generatePreviews(const KFileItemList& items)