fix issues when the split view is active and the inactive column view gets selected: the request for activation is not done...

svn path=/trunk/KDE/kdebase/apps/; revision=721727
This commit is contained in:
Peter Penz 2007-10-05 23:17:18 +00:00
parent 5856090871
commit 0439ed0e78

View file

@ -252,6 +252,7 @@ void DolphinColumnWidget::paintEvent(QPaintEvent* event)
void DolphinColumnWidget::mousePressEvent(QMouseEvent* event)
{
m_view->m_controller->triggerActivation();
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 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)