Don't connect multiple times to the selectionChanged signal, otherwise the slot will be called as many times as we entered a directory...

svn path=/trunk/KDE/kdebase/apps/; revision=828216
This commit is contained in:
David Faure 2008-07-04 22:26:05 +00:00
parent 9078232033
commit 60ac42c048
2 changed files with 13 additions and 7 deletions

View file

@ -36,7 +36,8 @@
SelectionManager::SelectionManager(QAbstractItemView* parent) : SelectionManager::SelectionManager(QAbstractItemView* parent) :
QObject(parent), QObject(parent),
m_view(parent), m_view(parent),
m_toggle(0) m_toggle(0),
m_connected(false)
{ {
connect(parent, SIGNAL(entered(const QModelIndex&)), connect(parent, SIGNAL(entered(const QModelIndex&)),
this, SLOT(slotEntered(const QModelIndex&))); this, SLOT(slotEntered(const QModelIndex&)));
@ -64,12 +65,15 @@ void SelectionManager::slotEntered(const QModelIndex& index)
if (index.isValid() && (index.column() == DolphinModel::Name)) { if (index.isValid() && (index.column() == DolphinModel::Name)) {
m_toggle->setUrl(urlForIndex(index)); m_toggle->setUrl(urlForIndex(index));
if (!m_connected) {
connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)), connect(m_view->model(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
this, SLOT(slotRowsRemoved(const QModelIndex&, int, int))); this, SLOT(slotRowsRemoved(const QModelIndex&, int, int)));
connect(m_view->selectionModel(), connect(m_view->selectionModel(),
SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
this, this,
SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&))); SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&)));
m_connected = true;
}
const QRect rect = m_view->visualRect(index); const QRect rect = m_view->visualRect(index);
@ -89,6 +93,7 @@ void SelectionManager::slotEntered(const QModelIndex& index)
SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
this, this,
SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&))); SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&)));
m_connected = false;
} }
} }

View file

@ -70,6 +70,7 @@ private:
private: private:
QAbstractItemView* m_view; QAbstractItemView* m_view;
SelectionToggle* m_toggle; SelectionToggle* m_toggle;
bool m_connected;
}; };
#endif #endif