made cardview handling singleclick and return pressed

1 files changed, 4 insertions, 1 deletions

diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 65f793c..6351c11 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -635,48 +635,49 @@ CardViewItem::Field *CardViewItem::fieldAt( const QPoint & itempos ) const
 //BEGIN CardView
 
 CardView::CardView(QWidget *parent, const char *name)
   : QScrollView(parent, name),
     d(new CardViewPrivate())
 {
   d->mItemList.setAutoDelete(true);
   d->mSeparatorList.setAutoDelete(true);
 
   QFont f = font();
   d->mFm = new QFontMetrics(f);
   f.setBold(true);
   d->mHeaderFont = f;
   d->mBFm = new QFontMetrics(f);
   d->mTip = ( new CardViewTip( viewport() ) ),
   d->mTip->hide();
   d->mTimer = ( new QTimer(this, "mouseTimer") ),
 
   viewport()->setMouseTracking( true );
   viewport()->setFocusProxy(this);
   viewport()->setFocusPolicy(WheelFocus);
   viewport()->setBackgroundMode(PaletteBase);
 
   connect( d->mTimer, SIGNAL(timeout()), this, SLOT(tryShowFullText()) );
+  connect( this, SIGNAL(executed(CardViewItem *)), this, SIGNAL( doubleClicked(CardViewItem *)) );
 
 //US  setBackgroundMode(PaletteBackground, PaletteBase);
   setBackgroundMode(PaletteBackground);
 
   // no reason for a vertical scrollbar
   setVScrollBarMode(AlwaysOff);
 }
 
 CardView::~CardView()
 {
     delete d->mFm;
     delete d->mBFm;
     delete d;
     d = 0;
 }
 
 void CardView::insertItem(CardViewItem *item)
 {
   d->mItemList.inSort(item);
   setLayoutDirty(true);
 }
 
 void CardView::takeItem(CardViewItem *item)
 {
@@ -1245,49 +1246,49 @@ void CardView::contentsMouseReleaseEvent(QMouseEvent *e)
 
   // Get the item at this position
   CardViewItem *item = itemAt(e->pos());
 
   if (item && KGlobalSettings::singleClick())
   {
     emit executed(item);
   }
 }
 
 void CardView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
   QScrollView::contentsMouseDoubleClickEvent(e);
 
   CardViewItem *item = itemAt(e->pos());
 
   if (item)
   {
     d->mCurrentItem = item;
   }
 
   if (item && !KGlobalSettings::singleClick())
   {
       emit executed(item);
-  }
+  } else
   emit doubleClicked(item);
 }
 
 void CardView::contentsMouseMoveEvent( QMouseEvent *e )
 {
   // resizing
   if ( d->mResizeAnchor )
   {
     int x = e->x();
     if ( x != d->mRubberBandAnchor )
       drawRubberBands( x );
       return;
   }
 	
   if (d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
      ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
 	  
      startDrag();
 	 return;
   }
 
   d->mTimer->start( 500 );
 
   // see if we are over a separator
@@ -1432,50 +1433,52 @@ void CardView::keyPressEvent( QKeyEvent *e )
       // TODO: consider if a partly visible (or even hidden) item at the
       //       bottom of the rightmost column exists
       int cw = columnWidth();
       int theCol = ( (( contentsX() + visibleWidth() )/cw) * cw ) + d->mItemSpacing + 1;
       // if separators are on, we may need to we may be one column further right if only the spacing/sep is hidden
       if ( d->mDrawSeparators && cw - (( contentsX() + visibleWidth() )%cw) <= int( d->mItemSpacing + d->mSepWidth ) )
         theCol += cw;
 
       // make sure this is not too far right
       while ( theCol > contentsWidth() )
         theCol -= columnWidth();
 
       aItem = itemAt( QPoint( theCol, d->mItemSpacing + 1 ) );
 
       if ( aItem )
         setCurrentItem( aItem );
     }
     break;
     case Key_Space:
     setSelected( d->mCurrentItem, !d->mCurrentItem->isSelected() );
     emit selectionChanged();
     break;
     case Key_Return:
     case Key_Enter:
+        {
     emit returnPressed( d->mCurrentItem );
     emit executed( d->mCurrentItem );
+        }
     break;
     default:
     if ( (e->state() & ControlButton) && e->key() == Key_A )
     {
       // select all
       selectAll( true );
       break;
     }
     // if we have a string, do autosearch
     else if ( ! e->text().isEmpty() && e->text()[0].isPrint() )
     {
 
     }
     break;
   }
   // handle selection
   if ( aItem )
   {
     if ( d->mSelectionMode == CardView::Extended )
     {
       if ( (e->state() & ShiftButton) )
       {
         // shift button: toggle range
         // if control button is pressed, leave all items