CVS commit by waba: Oops, previous commit broke mouse activation of desktop items. M +9 -3 kdiconview.cc 1.66.2.5 M +1 -0 kdiconview.h 1.19.2.2 --- kdebase/kdesktop/kdiconview.cc #1.66.2.4:1.66.2.5 @@ -79,5 +79,5 @@ KDIconView::KDIconView( QWidget *parent, connect( this, SIGNAL( executed( QIconViewItem * ) ), - SLOT( slotReturnPressed( QIconViewItem * ) ) ); + SLOT( slotExecuted( QIconViewItem * ) ) ); connect( this, SIGNAL( returnPressed( QIconViewItem * ) ), SLOT( slotReturnPressed( QIconViewItem * ) ) ); @@ -446,5 +446,5 @@ void KDIconView::slotMouseButtonClickedK //kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl; if ( _item && _button == MidButton ) - slotReturnPressed( _item ); + slotExecuted( _item ); } @@ -453,7 +453,13 @@ void KDIconView::slotMouseButtonClickedK void KDIconView::slotReturnPressed( QIconViewItem *item ) { + if (item && item->isSelected()) + slotExecuted(item); +} + +void KDIconView::slotExecuted( QIconViewItem *item ) +{ kapp->propagateSessionManager(); m_lastDeletedIconPos = QPoint(); // user action -> not renaming an icon - if (item && item->isSelected()) { + if (item) { visualActivate(item); ((KFileIVI*)item)->returnPressed(); --- kdebase/kdesktop/kdiconview.h #1.19.2.1:1.19.2.2 @@ -85,4 +85,5 @@ protected slots: // slots connected to the icon view void slotReturnPressed( QIconViewItem *item ); + void slotExecuted( QIconViewItem *item ); void slotMouseButtonPressed(int _button, QIconViewItem* _item, const QPoint& _global); void slotMouseButtonClickedKDesktop(int _button, QIconViewItem* _item, const QPoint& _global);