From 0217168998bb6b9c327cd1a803dfe19a10543db7 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 3 Feb 2009 18:35:19 +0000 Subject: [PATCH] Don't differ between single-click and double-click in the column view, stay consistent with the behavior like the Places Panel or Folders Panel. svn path=/trunk/KDE/kdebase/apps/; revision=920753 --- src/dolphincolumnwidget.cpp | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index af6246809..4a6527c1b 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -495,13 +495,8 @@ void DolphinColumnWidget::activate() connect(this, SIGNAL(clicked(const QModelIndex&)), m_view->m_controller, SLOT(requestTab(const QModelIndex&))); - if (KGlobalSettings::singleClick()) { - connect(this, SIGNAL(clicked(const QModelIndex&)), - m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); - } else { - connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); - } + connect(this, SIGNAL(clicked(const QModelIndex&)), + m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); if (selectionModel() && selectionModel()->currentIndex().isValid()) selectionModel()->setCurrentIndex(selectionModel()->currentIndex(), QItemSelectionModel::SelectCurrent); @@ -513,16 +508,8 @@ void DolphinColumnWidget::deactivate() { clearFocus(); - // TODO: Connecting to the signal 'activated()' is not possible, as kstyle - // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is - // necessary connecting the signal 'singleClick()' or 'doubleClick'. - if (KGlobalSettings::singleClick()) { - disconnect(this, SIGNAL(clicked(const QModelIndex&)), - m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); - } else { - disconnect(this, SIGNAL(doubleClicked(const QModelIndex&)), - m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); - } + disconnect(this, SIGNAL(clicked(const QModelIndex&)), + m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); const QModelIndex current = selectionModel()->currentIndex(); selectionModel()->clear(); -- 2.47.3