summaryrefslogtreecommitdiffabout
path: root/kaddressbook/views
Unidiff
Diffstat (limited to 'kaddressbook/views') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/views/cardview.cpp31
-rw-r--r--kaddressbook/views/cardview.h7
-rw-r--r--kaddressbook/views/contactlistview.cpp29
-rw-r--r--kaddressbook/views/contactlistview.h4
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp4
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp4
6 files changed, 76 insertions, 3 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 03df444..84d3116 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -1,131 +1,132 @@
1/* 1/*
2 This file is part of KAddressBook. 2 This file is part of KAddressBook.
3 Copyright (c) 2002 Mike Pilone <mpilone@slac.com> 3 Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24//BEGIN Includes 24//BEGIN Includes
25#include "cardview.h" 25#include "cardview.h"
26 26
27#include <limits.h> 27#include <limits.h>
28 28
29#include <qpainter.h> 29#include <qpainter.h>
30#include <qtimer.h> 30#include <qtimer.h>
31#include <qdatetime.h> 31#include <qdatetime.h>
32#include <qlabel.h> 32#include <qlabel.h>
33#include <qstyle.h> 33#include <qstyle.h>
34#include <qcursor.h> 34#include <qcursor.h>
35#include <qtooltip.h> 35#include <qtooltip.h>
36#include <qapplication.h>
36 37
37#include "kabprefs.h" 38#include "kabprefs.h"
38#include <kdebug.h> 39#include <kdebug.h>
39#include <kglobalsettings.h> 40#include <kglobalsettings.h>
40//END includes 41//END includes
41 42
42#define MIN_ITEM_WIDTH 80 43#define MIN_ITEM_WIDTH 80
43 44
44//BEGIN Helpers 45//BEGIN Helpers
45////////////////////////////////////// 46//////////////////////////////////////
46// CardViewTip 47// CardViewTip
47class CardViewTip : public QLabel { 48class CardViewTip : public QLabel {
48 public: 49 public:
49 CardViewTip(QWidget *parent=0, const char *name=0) : QLabel( parent, name ) 50 CardViewTip(QWidget *parent=0, const char *name=0) : QLabel( parent, name )
50 { 51 {
51 setPalette( QToolTip::palette() ); 52 setPalette( QToolTip::palette() );
52 setFrameStyle( Panel|Plain ); 53 setFrameStyle( Panel|Plain );
53 setMidLineWidth(0); 54 setMidLineWidth(0);
54 setIndent(1); 55 setIndent(1);
55 } 56 }
56 57
57 ~CardViewTip() {}; 58 ~CardViewTip() {};
58 protected: 59 protected:
59 void leaveEvent( QEvent * ) 60 void leaveEvent( QEvent * )
60 { 61 {
61 hide(); 62 hide();
62 } 63 }
63}; 64};
64 65
65////////////////////////////////////// 66//////////////////////////////////////
66// CardViewItemList 67// CardViewItemList
67 68
68 69
69// 70//
70// Warning: make sure you use findRef() instead of find() to find an 71// Warning: make sure you use findRef() instead of find() to find an
71// item! Only the pointer value is unique in the list. 72// item! Only the pointer value is unique in the list.
72// 73//
73class CardViewItemList : public QPtrList<CardViewItem> 74class CardViewItemList : public QPtrList<CardViewItem>
74{ 75{
75 protected: 76 protected:
76 virtual int compareItems(QPtrCollection::Item item1, 77 virtual int compareItems(QPtrCollection::Item item1,
77 QPtrCollection::Item item2) 78 QPtrCollection::Item item2)
78 { 79 {
79 CardViewItem *cItem1 = (CardViewItem*)item1; 80 CardViewItem *cItem1 = (CardViewItem*)item1;
80 CardViewItem *cItem2 = (CardViewItem*)item2; 81 CardViewItem *cItem2 = (CardViewItem*)item2;
81 82
82 if ( cItem1 == cItem2 ) 83 if ( cItem1 == cItem2 )
83 return 0; 84 return 0;
84 85
85 if ((cItem1 == 0) || (cItem2 == 0)) 86 if ((cItem1 == 0) || (cItem2 == 0))
86 return cItem1 ? -1 : 1; 87 return cItem1 ? -1 : 1;
87 88
88 if (cItem1->caption() < cItem2->caption()) 89 if (cItem1->caption() < cItem2->caption())
89 return -1; 90 return -1;
90 91
91 else if (cItem1->caption() > cItem2->caption()) 92 else if (cItem1->caption() > cItem2->caption())
92 return 1; 93 return 1;
93 94
94 return 0; 95 return 0;
95 } 96 }
96 97
97 private: 98 private:
98 /*int find( const CardViewItem * ) 99 /*int find( const CardViewItem * )
99 { 100 {
100 qDebug("DON'T USE CardViewItemList::find( item )! Use findRef( item )!"); 101 qDebug("DON'T USE CardViewItemList::find( item )! Use findRef( item )!");
101 }*/ 102 }*/
102}; 103};
103 104
104////////////////////////////////////// 105//////////////////////////////////////
105// CardViewSeparator 106// CardViewSeparator
106class CardViewSeparator 107class CardViewSeparator
107{ 108{
108 friend class CardView; 109 friend class CardView;
109 110
110 public: 111 public:
111 CardViewSeparator(CardView *view) 112 CardViewSeparator(CardView *view)
112 : mView(view) 113 : mView(view)
113 { 114 {
114 mRect = QRect(0, 0, view->separatorWidth(), 0); 115 mRect = QRect(0, 0, view->separatorWidth(), 0);
115 } 116 }
116 117
117 ~CardViewSeparator() {} 118 ~CardViewSeparator() {}
118 119
119 void paintSeparator(QPainter *p, QColorGroup &cg) 120 void paintSeparator(QPainter *p, QColorGroup &cg)
120 { 121 {
121 p->fillRect(0, 0, mRect.width(), mRect.height(), 122 p->fillRect(0, 0, mRect.width(), mRect.height(),
122 cg.brush(QColorGroup::Button)); 123 cg.brush(QColorGroup::Button));
123 } 124 }
124 125
125 void repaintSeparator() 126 void repaintSeparator()
126 { 127 {
127 mView->repaintContents(mRect); 128 mView->repaintContents(mRect);
128 } 129 }
129 130
130 private: 131 private:
131 CardView *mView; 132 CardView *mView;
@@ -546,192 +547,194 @@ void CardViewItem::showFullString( const QPoint &itempos, CardViewTip *tip )
546 { 547 {
547 if ( itempos.y() < 8 + mrg || itempos.y() > y - 4 ) 548 if ( itempos.y() < 8 + mrg || itempos.y() > y - 4 )
548 return; 549 return;
549 // this is the caption 550 // this is the caption
550 s = caption(); 551 s = caption();
551 trimmed = mView->d->mBFm->width( s ) > w - 4; 552 trimmed = mView->d->mBFm->width( s ) > w - 4;
552 y = 2 + mrg; 553 y = 2 + mrg;
553 lw = 0; 554 lw = 0;
554 isLabel=true; 555 isLabel=true;
555 } else { 556 } else {
556 // find the field 557 // find the field
557 Field *f = fieldAt( itempos ); 558 Field *f = fieldAt( itempos );
558 if ( !f || ( !mView->showEmptyFields() && f->second.isEmpty() ) ) 559 if ( !f || ( !mView->showEmptyFields() && f->second.isEmpty() ) )
559 return; 560 return;
560 561
561 // y position: 562 // y position:
562 // header font height + 4px hader margin + 2px leading + item margin 563 // header font height + 4px hader margin + 2px leading + item margin
563 // + actual field index * (fontheight + 2px leading) 564 // + actual field index * (fontheight + 2px leading)
564 int maxLines = mView->maxFieldLines(); 565 int maxLines = mView->maxFieldLines();
565 bool se = mView->showEmptyFields(); 566 bool se = mView->showEmptyFields();
566 int fh = mView->d->mFm->height(); 567 int fh = mView->d->mFm->height();
567// { 568// {
568 Field *_f; 569 Field *_f;
569 for (_f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next()) 570 for (_f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next())
570 if ( se || ! _f->second.isEmpty() ) 571 if ( se || ! _f->second.isEmpty() )
571 y += ( QMIN(_f->second.contains('\n')+1, maxLines) * fh ) + 2; 572 y += ( QMIN(_f->second.contains('\n')+1, maxLines) * fh ) + 2;
572// } 573// }
573 if ( isLabel && itempos.y() > y + fh ) 574 if ( isLabel && itempos.y() > y + fh )
574 return; 575 return;
575 // label or data? 576 // label or data?
576 s = isLabel ? f->first : f->second; 577 s = isLabel ? f->first : f->second;
577 // trimmed? 578 // trimmed?
578 int colonWidth = mView->d->mFm->width(":"); 579 int colonWidth = mView->d->mFm->width(":");
579 lw = drawLabels ? // label width 580 lw = drawLabels ? // label width
580 QMIN( w/2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) : 581 QMIN( w/2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) :
581 0; 582 0;
582 int mw = isLabel ? lw - colonWidth : w - lw - (mrg*2); // max width for string 583 int mw = isLabel ? lw - colonWidth : w - lw - (mrg*2); // max width for string
583 if ( isLabel ) 584 if ( isLabel )
584 { 585 {
585 trimmed = mView->d->mFm->width( s ) > mw - colonWidth; 586 trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
586 } else { 587 } else {
587 QRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) ); 588 QRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
588 trimmed = r.width() > mw || r.height()/fh > QMIN(s.contains('\n') + 1, maxLines); 589 trimmed = r.width() > mw || r.height()/fh > QMIN(s.contains('\n') + 1, maxLines);
589 } 590 }
590 } 591 }
591 if ( trimmed ) 592 if ( trimmed )
592 { 593 {
593 tip->setFont( (isLabel && !lw) ? mView->headerFont() : mView->font() ); // if condition is true, a header 594 tip->setFont( (isLabel && !lw) ? mView->headerFont() : mView->font() ); // if condition is true, a header
594 tip->setText( s ); 595 tip->setText( s );
595 tip->adjustSize(); 596 tip->adjustSize();
596 // find a proper position 597 // find a proper position
597 int lx; 598 int lx;
598 lx = isLabel || !drawLabels ? mrg : lw + mrg + 2 /*-1*/; 599 lx = isLabel || !drawLabels ? mrg : lw + mrg + 2 /*-1*/;
599 QPoint pnt(mView->contentsToViewport( QPoint(d->x, d->y) )); 600 QPoint pnt(mView->contentsToViewport( QPoint(d->x, d->y) ));
600 pnt += QPoint(lx, y); 601 pnt += QPoint(lx, y);
601 if ( pnt.x() < 0 ) 602 if ( pnt.x() < 0 )
602 pnt.setX( 0 ); 603 pnt.setX( 0 );
603 if ( pnt.x() + tip->width() > mView->visibleWidth() ) 604 if ( pnt.x() + tip->width() > mView->visibleWidth() )
604 pnt.setX( mView->visibleWidth() - tip->width() ); 605 pnt.setX( mView->visibleWidth() - tip->width() );
605 if ( pnt.y() + tip->height() > mView->visibleHeight() ) 606 if ( pnt.y() + tip->height() > mView->visibleHeight() )
606 pnt.setY( QMAX( 0, mView->visibleHeight() - tip->height() ) ); 607 pnt.setY( QMAX( 0, mView->visibleHeight() - tip->height() ) );
607 // show 608 // show
608 tip->move( pnt ); 609 tip->move( pnt );
609 tip->show(); 610 tip->show();
610 } 611 }
611} 612}
612 613
613CardViewItem::Field *CardViewItem::fieldAt( const QPoint & itempos ) const 614CardViewItem::Field *CardViewItem::fieldAt( const QPoint & itempos ) const
614{ 615{
615 int ypos = mView->d->mBFm->height() + 7 + mView->d->mItemMargin; 616 int ypos = mView->d->mBFm->height() + 7 + mView->d->mItemMargin;
616 int iy = itempos.y(); 617 int iy = itempos.y();
617 // skip below caption 618 // skip below caption
618 if ( iy <= ypos ) 619 if ( iy <= ypos )
619 return 0; 620 return 0;
620 // try find a field 621 // try find a field
621 bool showEmpty = mView->showEmptyFields(); 622 bool showEmpty = mView->showEmptyFields();
622 int fh = mView->d->mFm->height(); 623 int fh = mView->d->mFm->height();
623 int maxLines = mView->maxFieldLines(); 624 int maxLines = mView->maxFieldLines();
624 Field *f; 625 Field *f;
625 for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) 626 for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() )
626 { 627 {
627 if ( showEmpty || !f->second.isEmpty() ) 628 if ( showEmpty || !f->second.isEmpty() )
628 ypos += ( QMIN( f->second.contains('\n')+1, maxLines ) *fh)+2; 629 ypos += ( QMIN( f->second.contains('\n')+1, maxLines ) *fh)+2;
629 if ( iy <= ypos ) 630 if ( iy <= ypos )
630 break; 631 break;
631 } 632 }
632 return f ? f : 0; 633 return f ? f : 0;
633} 634}
634//END CardViewItem 635//END CardViewItem
635 636
636//BEGIN CardView 637//BEGIN CardView
637 638
638CardView::CardView(QWidget *parent, const char *name) 639CardView::CardView(QWidget *parent, const char *name)
639 : QScrollView(parent, name), 640 : QScrollView(parent, name),
640 d(new CardViewPrivate()) 641 d(new CardViewPrivate())
641{ 642{
643 mFlagKeyPressed = false;
644 mFlagBlockKeyPressed = false;
642 d->mItemList.setAutoDelete(true); 645 d->mItemList.setAutoDelete(true);
643 d->mSeparatorList.setAutoDelete(true); 646 d->mSeparatorList.setAutoDelete(true);
644 647
645 QFont f = font(); 648 QFont f = font();
646 d->mFm = new QFontMetrics(f); 649 d->mFm = new QFontMetrics(f);
647 f.setBold(true); 650 f.setBold(true);
648 d->mHeaderFont = f; 651 d->mHeaderFont = f;
649 d->mBFm = new QFontMetrics(f); 652 d->mBFm = new QFontMetrics(f);
650 d->mTip = ( new CardViewTip( viewport() ) ), 653 d->mTip = ( new CardViewTip( viewport() ) ),
651 d->mTip->hide(); 654 d->mTip->hide();
652 d->mTimer = ( new QTimer(this, "mouseTimer") ), 655 d->mTimer = ( new QTimer(this, "mouseTimer") ),
653 656
654 viewport()->setMouseTracking( true ); 657 viewport()->setMouseTracking( true );
655 viewport()->setFocusProxy(this); 658 viewport()->setFocusProxy(this);
656 viewport()->setFocusPolicy(WheelFocus); 659 viewport()->setFocusPolicy(WheelFocus);
657 viewport()->setBackgroundMode(PaletteBase); 660 viewport()->setBackgroundMode(PaletteBase);
658 661
659 connect( d->mTimer, SIGNAL(timeout()), this, SLOT(tryShowFullText()) ); 662 connect( d->mTimer, SIGNAL(timeout()), this, SLOT(tryShowFullText()) );
660 663
661//US setBackgroundMode(PaletteBackground, PaletteBase); 664//US setBackgroundMode(PaletteBackground, PaletteBase);
662 setBackgroundMode(PaletteBackground); 665 setBackgroundMode(PaletteBackground);
663 666
664 // no reason for a vertical scrollbar 667 // no reason for a vertical scrollbar
665 setVScrollBarMode(AlwaysOff); 668 setVScrollBarMode(AlwaysOff);
666} 669}
667 670
668CardView::~CardView() 671CardView::~CardView()
669{ 672{
670 delete d->mFm; 673 delete d->mFm;
671 delete d->mBFm; 674 delete d->mBFm;
672 delete d; 675 delete d;
673 d = 0; 676 d = 0;
674} 677}
675 678
676void CardView::insertItem(CardViewItem *item) 679void CardView::insertItem(CardViewItem *item)
677{ 680{
678 d->mItemList.inSort(item); 681 d->mItemList.inSort(item);
679 setLayoutDirty(true); 682 setLayoutDirty(true);
680} 683}
681 684
682void CardView::takeItem(CardViewItem *item) 685void CardView::takeItem(CardViewItem *item)
683{ 686{
684 if ( d->mCurrentItem == item ) 687 if ( d->mCurrentItem == item )
685 d->mCurrentItem = item->nextItem(); 688 d->mCurrentItem = item->nextItem();
686 d->mItemList.take(d->mItemList.findRef(item)); 689 d->mItemList.take(d->mItemList.findRef(item));
687 690
688 setLayoutDirty(true); 691 setLayoutDirty(true);
689} 692}
690 693
691void CardView::clear() 694void CardView::clear()
692{ 695{
693 d->mItemList.clear(); 696 d->mItemList.clear();
694 697
695 setLayoutDirty(true); 698 setLayoutDirty(true);
696} 699}
697 700
698CardViewItem *CardView::currentItem() 701CardViewItem *CardView::currentItem()
699{ 702{
700 if ( ! d->mCurrentItem && d->mItemList.count() ) 703 if ( ! d->mCurrentItem && d->mItemList.count() )
701 d->mCurrentItem = d->mItemList.first(); 704 d->mCurrentItem = d->mItemList.first();
702 return d->mCurrentItem; 705 return d->mCurrentItem;
703} 706}
704 707
705void CardView::setCurrentItem( CardViewItem *item ) 708void CardView::setCurrentItem( CardViewItem *item )
706{ 709{
707 if ( !item ) 710 if ( !item )
708 return; 711 return;
709 else if ( item->cardView() != this ) 712 else if ( item->cardView() != this )
710 { 713 {
711 kdDebug(5720)<<"CardView::setCurrentItem: Item ("<<item<<") not owned! Backing out.."<<endl; 714 kdDebug(5720)<<"CardView::setCurrentItem: Item ("<<item<<") not owned! Backing out.."<<endl;
712 return; 715 return;
713 } 716 }
714 else if ( item == currentItem() ) 717 else if ( item == currentItem() )
715 { 718 {
716 return; 719 return;
717 } 720 }
718 721
719 if ( d->mSelectionMode == Single ) 722 if ( d->mSelectionMode == Single )
720 { 723 {
721 setSelected( item, true ); 724 setSelected( item, true );
722 } 725 }
723 else 726 else
724 { 727 {
725 CardViewItem *it = d->mCurrentItem; 728 CardViewItem *it = d->mCurrentItem;
726 d->mCurrentItem = item; 729 d->mCurrentItem = item;
727 if ( it ) 730 if ( it )
728 it->repaintCard(); 731 it->repaintCard();
729 item->repaintCard(); 732 item->repaintCard();
730 } 733 }
731 if ( ! d->mOnSeparator ) 734 if ( ! d->mOnSeparator )
732 ensureItemVisible( item ); 735 ensureItemVisible( item );
733 emit currentChanged( item ); 736 emit currentChanged( item );
734} 737}
735 738
736CardViewItem *CardView::itemAt(const QPoint &viewPos) 739CardViewItem *CardView::itemAt(const QPoint &viewPos)
737{ 740{
@@ -1258,193 +1261,201 @@ void CardView::contentsMouseDoubleClickEvent(QMouseEvent *e)
1258 QScrollView::contentsMouseDoubleClickEvent(e); 1261 QScrollView::contentsMouseDoubleClickEvent(e);
1259 1262
1260 CardViewItem *item = itemAt(e->pos()); 1263 CardViewItem *item = itemAt(e->pos());
1261 1264
1262 if (item) 1265 if (item)
1263 { 1266 {
1264 d->mCurrentItem = item; 1267 d->mCurrentItem = item;
1265 } 1268 }
1266 1269
1267 if (item && !KABPrefs::instance()->mHonorSingleClick) 1270 if (item && !KABPrefs::instance()->mHonorSingleClick)
1268 { 1271 {
1269 emit executed(item); 1272 emit executed(item);
1270 } else 1273 } else
1271 emit doubleClicked(item); 1274 emit doubleClicked(item);
1272} 1275}
1273 1276
1274void CardView::contentsMouseMoveEvent( QMouseEvent *e ) 1277void CardView::contentsMouseMoveEvent( QMouseEvent *e )
1275{ 1278{
1276 // resizing 1279 // resizing
1277 if ( d->mResizeAnchor ) 1280 if ( d->mResizeAnchor )
1278 { 1281 {
1279 int x = e->x(); 1282 int x = e->x();
1280 if ( x != d->mRubberBandAnchor ) 1283 if ( x != d->mRubberBandAnchor )
1281 drawRubberBands( x ); 1284 drawRubberBands( x );
1282 return; 1285 return;
1283 } 1286 }
1284 1287
1285 if (d->mLastClickOnItem && (e->state() & Qt::LeftButton) && 1288 if (d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
1286 ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) { 1289 ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
1287 1290
1288 startDrag(); 1291 startDrag();
1289 return; 1292 return;
1290 } 1293 }
1291 1294
1292 d->mTimer->start( 500 ); 1295 d->mTimer->start( 500 );
1293 1296
1294 // see if we are over a separator 1297 // see if we are over a separator
1295 // only if we actually have them painted? 1298 // only if we actually have them painted?
1296 if ( d->mDrawSeparators ) 1299 if ( d->mDrawSeparators )
1297 { 1300 {
1298 int colcontentw = d->mItemWidth + (2*d->mItemSpacing); 1301 int colcontentw = d->mItemWidth + (2*d->mItemSpacing);
1299 int colw = colcontentw + d->mSepWidth; 1302 int colw = colcontentw + d->mSepWidth;
1300 int m = e->x()%colw; 1303 int m = e->x()%colw;
1301 if ( m >= colcontentw && m > 0 ) 1304 if ( m >= colcontentw && m > 0 )
1302 { 1305 {
1303 setCursor( SplitVCursor ); // Why does this fail sometimes? 1306 setCursor( SplitVCursor ); // Why does this fail sometimes?
1304 d->mOnSeparator = true; 1307 d->mOnSeparator = true;
1305 } 1308 }
1306 else 1309 else
1307 { 1310 {
1308 setCursor( ArrowCursor ); 1311 setCursor( ArrowCursor );
1309 d->mOnSeparator = false; 1312 d->mOnSeparator = false;
1310 } 1313 }
1311 } 1314 }
1312} 1315}
1313 1316
1314void CardView::enterEvent( QEvent * ) 1317void CardView::enterEvent( QEvent * )
1315{ 1318{
1316 d->mTimer->start( 500 ); 1319 d->mTimer->start( 500 );
1317} 1320}
1318 1321
1319void CardView::leaveEvent( QEvent * ) 1322void CardView::leaveEvent( QEvent * )
1320{ 1323{
1321 d->mTimer->stop(); 1324 d->mTimer->stop();
1322 if (d->mOnSeparator) 1325 if (d->mOnSeparator)
1323 { 1326 {
1324 d->mOnSeparator = false; 1327 d->mOnSeparator = false;
1325 setCursor( ArrowCursor ); 1328 setCursor( ArrowCursor );
1326 } 1329 }
1327} 1330}
1328 1331
1329void CardView::focusInEvent( QFocusEvent * ) 1332void CardView::focusInEvent( QFocusEvent * )
1330{ 1333{
1331 if (!d->mCurrentItem && d->mItemList.count() ) 1334 if (!d->mCurrentItem && d->mItemList.count() )
1332 { 1335 {
1333 setCurrentItem( d->mItemList.first() ); 1336 setCurrentItem( d->mItemList.first() );
1334 } 1337 }
1335 else if ( d->mCurrentItem ) 1338 else if ( d->mCurrentItem )
1336 { 1339 {
1337 d->mCurrentItem->repaintCard(); 1340 d->mCurrentItem->repaintCard();
1338 } 1341 }
1339} 1342}
1340 1343
1341void CardView::focusOutEvent( QFocusEvent * ) 1344void CardView::focusOutEvent( QFocusEvent * )
1342{ 1345{
1343 if (d->mCurrentItem) 1346 if (d->mCurrentItem)
1344 d->mCurrentItem->repaintCard(); 1347 d->mCurrentItem->repaintCard();
1345} 1348}
1346 1349
1347void CardView::keyPressEvent( QKeyEvent *e ) 1350void CardView::keyPressEvent( QKeyEvent *e )
1348{ 1351{
1349 if ( ! ( childCount() && d->mCurrentItem ) ) 1352 if ( ! ( childCount() && d->mCurrentItem ) )
1350 { 1353 {
1351 e->ignore(); 1354 e->ignore();
1352 return; 1355 return;
1353 } 1356 }
1354 1357 if ( mFlagBlockKeyPressed )
1358 return;
1359 qApp->processEvents();
1360 if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
1361 e->accept();
1362 return;
1363 }
1364 if (! e->isAutoRepeat() )
1365 mFlagKeyPressed = true;
1355 uint pos = d->mItemList.findRef( d->mCurrentItem ); 1366 uint pos = d->mItemList.findRef( d->mCurrentItem );
1356 CardViewItem *aItem = 0L; // item that gets the focus 1367 CardViewItem *aItem = 0L; // item that gets the focus
1357 CardViewItem *old = d->mCurrentItem; 1368 CardViewItem *old = d->mCurrentItem;
1358 1369
1359 switch ( e->key() ) 1370 switch ( e->key() )
1360 { 1371 {
1361 case Key_Up: 1372 case Key_Up:
1362 if ( pos > 0 ) 1373 if ( pos > 0 )
1363 { 1374 {
1364 aItem = d->mItemList.at( pos - 1 ); 1375 aItem = d->mItemList.at( pos - 1 );
1365 setCurrentItem( aItem ); 1376 setCurrentItem( aItem );
1366 } 1377 }
1367 break; 1378 break;
1368 case Key_Down: 1379 case Key_Down:
1369 if ( pos < d->mItemList.count() - 1 ) 1380 if ( pos < d->mItemList.count() - 1 )
1370 { 1381 {
1371 aItem = d->mItemList.at( pos + 1 ); 1382 aItem = d->mItemList.at( pos + 1 );
1372 setCurrentItem( aItem ); 1383 setCurrentItem( aItem );
1373 } 1384 }
1374 break; 1385 break;
1375 case Key_Left: 1386 case Key_Left:
1376 { 1387 {
1377 // look for an item in the previous/next column, starting from 1388 // look for an item in the previous/next column, starting from
1378 // the vertical middle of the current item. 1389 // the vertical middle of the current item.
1379 // FIXME use nice calculatd measures!!! 1390 // FIXME use nice calculatd measures!!!
1380 QPoint aPoint( d->mCurrentItem->d->x, d->mCurrentItem->d->y ); 1391 QPoint aPoint( d->mCurrentItem->d->x, d->mCurrentItem->d->y );
1381 aPoint -= QPoint( 30,-(d->mCurrentItem->height()/2) ); 1392 aPoint -= QPoint( 30,-(d->mCurrentItem->height()/2) );
1382 aItem = itemAt( aPoint ); 1393 aItem = itemAt( aPoint );
1383 // maybe we hit some space below an item 1394 // maybe we hit some space below an item
1384 while ( !aItem && aPoint.y() > 27 ) 1395 while ( !aItem && aPoint.y() > 27 )
1385 { 1396 {
1386 aPoint -= QPoint( 0, 16 ); 1397 aPoint -= QPoint( 0, 16 );
1387 aItem = itemAt( aPoint ); 1398 aItem = itemAt( aPoint );
1388 } 1399 }
1389 if ( aItem ) 1400 if ( aItem )
1390 setCurrentItem( aItem ); 1401 setCurrentItem( aItem );
1391 } 1402 }
1392 break; 1403 break;
1393 case Key_Right: 1404 case Key_Right:
1394 { 1405 {
1395 // FIXME use nice calculated measures!!! 1406 // FIXME use nice calculated measures!!!
1396 QPoint aPoint( d->mCurrentItem->d->x + d->mItemWidth, d->mCurrentItem->d->y ); 1407 QPoint aPoint( d->mCurrentItem->d->x + d->mItemWidth, d->mCurrentItem->d->y );
1397 aPoint += QPoint( 30,(d->mCurrentItem->height()/2) ); 1408 aPoint += QPoint( 30,(d->mCurrentItem->height()/2) );
1398 aItem = itemAt( aPoint ); 1409 aItem = itemAt( aPoint );
1399 while ( !aItem && aPoint.y() > 27 ) 1410 while ( !aItem && aPoint.y() > 27 )
1400 { 1411 {
1401 aPoint -= QPoint( 0, 16 ); 1412 aPoint -= QPoint( 0, 16 );
1402 aItem = itemAt( aPoint ); 1413 aItem = itemAt( aPoint );
1403 } 1414 }
1404 if ( aItem ) 1415 if ( aItem )
1405 setCurrentItem( aItem ); 1416 setCurrentItem( aItem );
1406 } 1417 }
1407 break; 1418 break;
1408 case Key_Home: 1419 case Key_Home:
1409 aItem = d->mItemList.first(); 1420 aItem = d->mItemList.first();
1410 setCurrentItem( aItem ); 1421 setCurrentItem( aItem );
1411 break; 1422 break;
1412 case Key_End: 1423 case Key_End:
1413 aItem = d->mItemList.last(); 1424 aItem = d->mItemList.last();
1414 setCurrentItem( aItem ); 1425 setCurrentItem( aItem );
1415 break; 1426 break;
1416 case Key_Prior: // PageUp 1427 case Key_Prior: // PageUp
1417 { 1428 {
1418 // QListView: "Make the item above the top visible and current" 1429 // QListView: "Make the item above the top visible and current"
1419 // TODO if contentsY(), pick the top item of the leftmost visible column 1430 // TODO if contentsY(), pick the top item of the leftmost visible column
1420 if ( contentsX() <= 0 ) 1431 if ( contentsX() <= 0 )
1421 return; 1432 return;
1422 int cw = columnWidth(); 1433 int cw = columnWidth();
1423 int theCol = ( QMAX( 0, ( contentsX()/cw) * cw ) ) + d->mItemSpacing; 1434 int theCol = ( QMAX( 0, ( contentsX()/cw) * cw ) ) + d->mItemSpacing;
1424 aItem = itemAt( QPoint( theCol + 1, d->mItemSpacing + 1 ) ); 1435 aItem = itemAt( QPoint( theCol + 1, d->mItemSpacing + 1 ) );
1425 if ( aItem ) 1436 if ( aItem )
1426 setCurrentItem( aItem ); 1437 setCurrentItem( aItem );
1427 } 1438 }
1428 break; 1439 break;
1429 case Key_Next: // PageDown 1440 case Key_Next: // PageDown
1430 { 1441 {
1431 // QListView: "Make the item below the bottom visible and current" 1442 // QListView: "Make the item below the bottom visible and current"
1432 // find the first not fully visible column. 1443 // find the first not fully visible column.
1433 // TODO: consider if a partly visible (or even hidden) item at the 1444 // TODO: consider if a partly visible (or even hidden) item at the
1434 // bottom of the rightmost column exists 1445 // bottom of the rightmost column exists
1435 int cw = columnWidth(); 1446 int cw = columnWidth();
1436 int theCol = ( (( contentsX() + visibleWidth() )/cw) * cw ) + d->mItemSpacing + 1; 1447 int theCol = ( (( contentsX() + visibleWidth() )/cw) * cw ) + d->mItemSpacing + 1;
1437 // if separators are on, we may need to we may be one column further right if only the spacing/sep is hidden 1448 // if separators are on, we may need to we may be one column further right if only the spacing/sep is hidden
1438 if ( d->mDrawSeparators && cw - (( contentsX() + visibleWidth() )%cw) <= int( d->mItemSpacing + d->mSepWidth ) ) 1449 if ( d->mDrawSeparators && cw - (( contentsX() + visibleWidth() )%cw) <= int( d->mItemSpacing + d->mSepWidth ) )
1439 theCol += cw; 1450 theCol += cw;
1440 1451
1441 // make sure this is not too far right 1452 // make sure this is not too far right
1442 while ( theCol > contentsWidth() ) 1453 while ( theCol > contentsWidth() )
1443 theCol -= columnWidth(); 1454 theCol -= columnWidth();
1444 1455
1445 aItem = itemAt( QPoint( theCol, d->mItemSpacing + 1 ) ); 1456 aItem = itemAt( QPoint( theCol, d->mItemSpacing + 1 ) );
1446 1457
1447 if ( aItem ) 1458 if ( aItem )
1448 setCurrentItem( aItem ); 1459 setCurrentItem( aItem );
1449 } 1460 }
1450 break; 1461 break;
@@ -1622,101 +1633,119 @@ void CardView::tryShowFullText()
1622void CardView::drawRubberBands( int pos ) 1633void CardView::drawRubberBands( int pos )
1623{ 1634{
1624 if ( pos && ((pos-d->firstX)/d->span) - d->colspace - d->mSepWidth < MIN_ITEM_WIDTH ) return; 1635 if ( pos && ((pos-d->firstX)/d->span) - d->colspace - d->mSepWidth < MIN_ITEM_WIDTH ) return;
1625 1636
1626 int tmpcw = (d->mRubberBandAnchor-d->firstX)/d->span; 1637 int tmpcw = (d->mRubberBandAnchor-d->firstX)/d->span;
1627 int x = d->firstX + tmpcw - d->mSepWidth - contentsX(); 1638 int x = d->firstX + tmpcw - d->mSepWidth - contentsX();
1628 int h = visibleHeight(); 1639 int h = visibleHeight();
1629 1640
1630 QPainter p( viewport() ); 1641 QPainter p( viewport() );
1631 p.setRasterOp( XorROP ); 1642 p.setRasterOp( XorROP );
1632 p.setPen( gray ); 1643 p.setPen( gray );
1633 p.setBrush( gray ); 1644 p.setBrush( gray );
1634 uint n = d->first; 1645 uint n = d->first;
1635 // erase 1646 // erase
1636 if ( d->mRubberBandAnchor ) 1647 if ( d->mRubberBandAnchor )
1637 do { 1648 do {
1638 p.drawRect( x, 0, 2, h ); 1649 p.drawRect( x, 0, 2, h );
1639 x += tmpcw; 1650 x += tmpcw;
1640 n++; 1651 n++;
1641 } while ( x < visibleWidth() && n < d->mSeparatorList.count() ); 1652 } while ( x < visibleWidth() && n < d->mSeparatorList.count() );
1642 // paint new 1653 // paint new
1643 if ( ! pos ) return; 1654 if ( ! pos ) return;
1644 tmpcw = (pos - d->firstX)/d->span; 1655 tmpcw = (pos - d->firstX)/d->span;
1645 n = d->first; 1656 n = d->first;
1646 x = d->firstX + tmpcw - d->mSepWidth - contentsX(); 1657 x = d->firstX + tmpcw - d->mSepWidth - contentsX();
1647 do { 1658 do {
1648 p.drawRect( x, 0, 2, h ); 1659 p.drawRect( x, 0, 2, h );
1649 x += tmpcw; 1660 x += tmpcw;
1650 n++; 1661 n++;
1651 } while ( x < visibleWidth() && n < d->mSeparatorList.count() ); 1662 } while ( x < visibleWidth() && n < d->mSeparatorList.count() );
1652 d->mRubberBandAnchor = pos; 1663 d->mRubberBandAnchor = pos;
1653} 1664}
1654 1665
1655 1666
1656int CardView::itemWidth() const 1667int CardView::itemWidth() const
1657{ 1668{
1658 return d->mItemWidth; 1669 return d->mItemWidth;
1659} 1670}
1660 1671
1661void CardView::setItemWidth( int w ) 1672void CardView::setItemWidth( int w )
1662{ 1673{
1663 if ( w == d->mItemWidth ) 1674 if ( w == d->mItemWidth )
1664 return; 1675 return;
1665 if ( w < MIN_ITEM_WIDTH ) 1676 if ( w < MIN_ITEM_WIDTH )
1666 w = MIN_ITEM_WIDTH; 1677 w = MIN_ITEM_WIDTH;
1667 d->mItemWidth = w; 1678 d->mItemWidth = w;
1668 setLayoutDirty( true ); 1679 setLayoutDirty( true );
1669#ifndef KAB_EMBEDDED 1680#ifndef KAB_EMBEDDED
1670 updateContents(); 1681 updateContents();
1671#else //KAB_EMBEDDED 1682#else //KAB_EMBEDDED
1672//US updateContents( d->contentsX(), d->contentsY(), visibleWidth(), visibleHeight() ); 1683//US updateContents( d->contentsX(), d->contentsY(), visibleWidth(), visibleHeight() );
1673qDebug("CardView::setItemWidth has to be verified"); 1684qDebug("CardView::setItemWidth has to be verified");
1674 updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); 1685 updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() );
1675#endif //KAB_EMBEDDED 1686#endif //KAB_EMBEDDED
1676} 1687}
1677 1688
1678void CardView::setHeaderFont( const QFont &fnt ) 1689void CardView::setHeaderFont( const QFont &fnt )
1679{ 1690{
1680 d->mHeaderFont = fnt; 1691 d->mHeaderFont = fnt;
1681 delete d->mBFm; 1692 delete d->mBFm;
1682 d->mBFm = new QFontMetrics( fnt ); 1693 d->mBFm = new QFontMetrics( fnt );
1683} 1694}
1684 1695
1685QFont CardView::headerFont() const 1696QFont CardView::headerFont() const
1686{ 1697{
1687 return d->mHeaderFont; 1698 return d->mHeaderFont;
1688} 1699}
1689 1700
1690void CardView::setFont( const QFont &fnt ) 1701void CardView::setFont( const QFont &fnt )
1691{ 1702{
1692 QScrollView::setFont( fnt ); 1703 QScrollView::setFont( fnt );
1693 delete d->mFm; 1704 delete d->mFm;
1694 d->mFm = new QFontMetrics( fnt ); 1705 d->mFm = new QFontMetrics( fnt );
1695} 1706}
1696 1707
1697int CardView::separatorWidth() 1708int CardView::separatorWidth()
1698{ 1709{
1699 return d->mSepWidth; 1710 return d->mSepWidth;
1700} 1711}
1701 1712
1702void CardView::setSeparatorWidth( int width ) 1713void CardView::setSeparatorWidth( int width )
1703{ 1714{
1704 d->mSepWidth = width; 1715 d->mSepWidth = width;
1705 setLayoutDirty( true ); // hmm, actually I could just adjust the x'es... 1716 setLayoutDirty( true ); // hmm, actually I could just adjust the x'es...
1706} 1717}
1707 1718
1708int CardView::maxFieldLines() const 1719int CardView::maxFieldLines() const
1709{ 1720{
1710 return d->mMaxFieldLines; 1721 return d->mMaxFieldLines;
1711} 1722}
1712 1723
1713void CardView::setMaxFieldLines( int howmany ) 1724void CardView::setMaxFieldLines( int howmany )
1714{ 1725{
1715 d->mMaxFieldLines = howmany ? howmany : INT_MAX; 1726 d->mMaxFieldLines = howmany ? howmany : INT_MAX;
1716 // FIXME update, forcing the items to recalc height!! 1727 // FIXME update, forcing the items to recalc height!!
1717} 1728}
1729
1730void CardView::keyReleaseEvent ( QKeyEvent * e )
1731{
1732 if ( mFlagBlockKeyPressed )
1733 return;
1734 if ( !e->isAutoRepeat() ) {
1735 mFlagBlockKeyPressed = true;
1736 qApp->processEvents();
1737 mFlagBlockKeyPressed = false;
1738 mFlagKeyPressed = false;
1739 }
1740 QScrollView::keyReleaseEvent ( e );
1741}
1742
1743
1744
1745
1746
1718//END Cardview 1747//END Cardview
1719 1748
1720#ifndef KAB_EMBEDDED 1749#ifndef KAB_EMBEDDED
1721#include "cardview.moc" 1750#include "cardview.moc"
1722#endif //KAB_EMBEDDED 1751#endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 37dddb6..2ea3771 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -312,162 +312,165 @@ class CardView : public QScrollView
312 bool showEmptyFields() const; 312 bool showEmptyFields() const;
313 313
314 /** @return the advisory internal margin in items. Setting a value above 1 means 314 /** @return the advisory internal margin in items. Setting a value above 1 means
315 * a space between the item contents and the focus recttangle drawn around 315 * a space between the item contents and the focus recttangle drawn around
316 * the current item. The default value is 0. 316 * the current item. The default value is 0.
317 * The value should be used by CardViewItem and derived classes. 317 * The value should be used by CardViewItem and derived classes.
318 * Note that this should not be greater than half of the minimal item width, 318 * Note that this should not be greater than half of the minimal item width,
319 * which is 80. It is currently not checked, so setting a value greater than 40 319 * which is 80. It is currently not checked, so setting a value greater than 40
320 * will probably mean a crash in the items painting routine. 320 * will probably mean a crash in the items painting routine.
321 * @private Note: I looked for a value in QStyle::PixelMetric to use, but I could 321 * @private Note: I looked for a value in QStyle::PixelMetric to use, but I could
322 * not see a usefull one. One may turn up in a future version of Qt. 322 * not see a usefull one. One may turn up in a future version of Qt.
323 */ 323 */
324 uint itemMargin(); 324 uint itemMargin();
325 325
326 /** Sets the internal item margin. @see itemMargin(). 326 /** Sets the internal item margin. @see itemMargin().
327 */ 327 */
328 void setItemMargin( uint margin ); 328 void setItemMargin( uint margin );
329 329
330 /** @return the item spacing. 330 /** @return the item spacing.
331 * The item spacing is the space (in pixels) between each item in a 331 * The item spacing is the space (in pixels) between each item in a
332 * column, between the items and column separators if drawn, and between 332 * column, between the items and column separators if drawn, and between
333 * the items and the borders of the widget. The default value is set to 333 * the items and the borders of the widget. The default value is set to
334 * 10. 334 * 10.
335 * @private Note: There is no usefull QStyle::PixelMetric to use for this atm. 335 * @private Note: There is no usefull QStyle::PixelMetric to use for this atm.
336 * An option would be using KDialog::spacingHint(). 336 * An option would be using KDialog::spacingHint().
337 */ 337 */
338 uint itemSpacing(); 338 uint itemSpacing();
339 339
340 /** Sets the item spacing. 340 /** Sets the item spacing.
341 * @see itemSpacing() 341 * @see itemSpacing()
342 */ 342 */
343 void setItemSpacing( uint spacing ); 343 void setItemSpacing( uint spacing );
344 344
345 /** @return the width made available to the card items. */ 345 /** @return the width made available to the card items. */
346 int itemWidth() const; 346 int itemWidth() const;
347 347
348 /** Sets the width made available to card items. */ 348 /** Sets the width made available to card items. */
349 void setItemWidth( int width ); 349 void setItemWidth( int width );
350 350
351 /** Sets the header font */ 351 /** Sets the header font */
352 void setHeaderFont( const QFont &fnt ); 352 void setHeaderFont( const QFont &fnt );
353 353
354 /** @return the header font */ 354 /** @return the header font */
355 QFont headerFont() const; 355 QFont headerFont() const;
356 356
357 /** @reimp */ 357 /** @reimp */
358 void setFont( const QFont &fnt ); 358 void setFont( const QFont &fnt );
359 359
360 /** Sets the column separator width */ 360 /** Sets the column separator width */
361 void setSeparatorWidth( int width ); 361 void setSeparatorWidth( int width );
362 362
363 /** @return the column separator width */ 363 /** @return the column separator width */
364 int separatorWidth(); 364 int separatorWidth();
365 365
366 /** Sets the maximum number of lines to display pr field. 366 /** Sets the maximum number of lines to display pr field.
367 If set to 0 (the default) all lines will be displayed. 367 If set to 0 (the default) all lines will be displayed.
368 */ 368 */
369 void setMaxFieldLines( int howmany ); 369 void setMaxFieldLines( int howmany );
370 370
371 /** @return the maximum number of lines pr field */ 371 /** @return the maximum number of lines pr field */
372 int maxFieldLines() const; 372 int maxFieldLines() const;
373 373
374 signals: 374 signals:
375 /** Emitted whenever the selection changes. This means a user highlighted 375 /** Emitted whenever the selection changes. This means a user highlighted
376 * a new item or unhighlighted a currently selected item. 376 * a new item or unhighlighted a currently selected item.
377 */ 377 */
378 void selectionChanged(); 378 void selectionChanged();
379 379
380 /** Same as above method, only it carries the item that was selected. This 380 /** Same as above method, only it carries the item that was selected. This
381 * method will only be emitted in single select mode, since it defineds 381 * method will only be emitted in single select mode, since it defineds
382 * which item was selected. 382 * which item was selected.
383 */ 383 */
384 void selectionChanged(CardViewItem *); 384 void selectionChanged(CardViewItem *);
385 385
386 /** This method is emitted whenever an item is clicked. 386 /** This method is emitted whenever an item is clicked.
387 */ 387 */
388 void clicked(CardViewItem *); 388 void clicked(CardViewItem *);
389 389
390 /** Emitted whenever the user 'executes' an item. This is dependant on 390 /** Emitted whenever the user 'executes' an item. This is dependant on
391 * the KDE global config. This could be a single click or a doubleclick. 391 * the KDE global config. This could be a single click or a doubleclick.
392 * Also emitted when the return key is pressed on an item. 392 * Also emitted when the return key is pressed on an item.
393 */ 393 */
394 void executed(CardViewItem *); 394 void executed(CardViewItem *);
395 395
396 /** Emitted whenever the user double clicks on an item. 396 /** Emitted whenever the user double clicks on an item.
397 */ 397 */
398 void doubleClicked(CardViewItem *); 398 void doubleClicked(CardViewItem *);
399 399
400 /** Emitted when the current item changes 400 /** Emitted when the current item changes
401 */ 401 */
402 void currentChanged( CardViewItem * ); 402 void currentChanged( CardViewItem * );
403 403
404 /** Emitted when the return key is pressed in an item. 404 /** Emitted when the return key is pressed in an item.
405 */ 405 */
406 void returnPressed( CardViewItem * ); 406 void returnPressed( CardViewItem * );
407 407
408 protected: 408 protected:
409 bool mFlagKeyPressed;
410 bool mFlagBlockKeyPressed;
411 virtual void keyPressEvent ( QKeyEvent * );
412 virtual void keyReleaseEvent ( QKeyEvent * );
409 /** Determines which cards intersect that region and tells them to paint 413 /** Determines which cards intersect that region and tells them to paint
410 * themselves. 414 * themselves.
411 */ 415 */
412 void drawContents(QPainter *p, int clipx, int clipy, int clipw, int cliph); 416 void drawContents(QPainter *p, int clipx, int clipy, int clipw, int cliph);
413 417
414 /** Sets the layout to dirty and repaints. 418 /** Sets the layout to dirty and repaints.
415 */ 419 */
416 void resizeEvent(QResizeEvent *e); 420 void resizeEvent(QResizeEvent *e);
417 421
418 /** Changes the direction the canvas scolls. 422 /** Changes the direction the canvas scolls.
419 */ 423 */
420 void contentsWheelEvent(QWheelEvent *e); 424 void contentsWheelEvent(QWheelEvent *e);
421 425
422 /** Sets the layout to dirty and calls for a repaint. 426 /** Sets the layout to dirty and calls for a repaint.
423 */ 427 */
424 void setLayoutDirty(bool dirty); 428 void setLayoutDirty(bool dirty);
425 429
426 /** Does the math based on the bounding rect of the cards to properly 430 /** Does the math based on the bounding rect of the cards to properly
427 * lay the cards out on the screen. This is only done if the layout is 431 * lay the cards out on the screen. This is only done if the layout is
428 * marked as dirty. 432 * marked as dirty.
429 */ 433 */
430 void calcLayout(); 434 void calcLayout();
431 435
432// virtual void mousePressEvent(QMouseEvent *e); 436// virtual void mousePressEvent(QMouseEvent *e);
433// virtual void mouseReleaseEvent(QMouseEvent *e); 437// virtual void mouseReleaseEvent(QMouseEvent *e);
434// virtual void mouseMoveEvent(QMouseEvent *e); 438// virtual void mouseMoveEvent(QMouseEvent *e);
435 439
436 virtual void contentsMousePressEvent(QMouseEvent *e); 440 virtual void contentsMousePressEvent(QMouseEvent *e);
437 virtual void contentsMouseMoveEvent(QMouseEvent *e); 441 virtual void contentsMouseMoveEvent(QMouseEvent *e);
438 virtual void contentsMouseReleaseEvent(QMouseEvent *e); 442 virtual void contentsMouseReleaseEvent(QMouseEvent *e);
439 virtual void contentsMouseDoubleClickEvent(QMouseEvent *e); 443 virtual void contentsMouseDoubleClickEvent(QMouseEvent *e);
440 444
441 virtual void enterEvent( QEvent * ); 445 virtual void enterEvent( QEvent * );
442 virtual void leaveEvent( QEvent * ); 446 virtual void leaveEvent( QEvent * );
443 447
444 virtual void focusInEvent( QFocusEvent * ); 448 virtual void focusInEvent( QFocusEvent * );
445 virtual void focusOutEvent( QFocusEvent * ); 449 virtual void focusOutEvent( QFocusEvent * );
446 450
447 virtual void keyPressEvent( QKeyEvent * );
448 451
449 /** Overload this method to be told when a drag should be started. 452 /** Overload this method to be told when a drag should be started.
450 * In most cases you will want to start a drag event with the currently 453 * In most cases you will want to start a drag event with the currently
451 * selected item. 454 * selected item.
452 */ 455 */
453 virtual void startDrag(); 456 virtual void startDrag();
454 457
455 private slots: 458 private slots:
456 /** Called by a timer to display a label with truncated text. 459 /** Called by a timer to display a label with truncated text.
457 * Pop up a label, if there is a field with obscured text or 460 * Pop up a label, if there is a field with obscured text or
458 * label at the cursor position. 461 * label at the cursor position.
459 */ 462 */
460 void tryShowFullText(); 463 void tryShowFullText();
461 464
462 private: 465 private:
463 /** draws and erases the rubber bands while columns are resized. 466 /** draws and erases the rubber bands while columns are resized.
464 * @p pos is the horizontal position inside the viewport to use as 467 * @p pos is the horizontal position inside the viewport to use as
465 * the anchor. 468 * the anchor.
466 * If pos is 0, only erase is done. 469 * If pos is 0, only erase is done.
467 */ 470 */
468 void drawRubberBands( int pos ); 471 void drawRubberBands( int pos );
469 472
470 CardViewPrivate *d; 473 CardViewPrivate *d;
471}; 474};
472 475
473#endif 476#endif
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index e75810e..09d9c03 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -1,127 +1,128 @@
1/* 1/*
2 This file is part of KAddressBook. 2 This file is part of KAddressBook.
3 Copyright (c) 2002 Mike Pilone <mpilone@slac.com> 3 Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <qheader.h> 24#include <qheader.h>
25#include <qiconset.h> 25#include <qiconset.h>
26#include <qimage.h> 26#include <qimage.h>
27#include <qdragobject.h> 27#include <qdragobject.h>
28#include <qcombobox.h> 28#include <qcombobox.h>
29#include <qpainter.h> 29#include <qpainter.h>
30#include <qbrush.h> 30#include <qbrush.h>
31#include <qevent.h> 31#include <qevent.h>
32#include <qapplication.h>
32 33
33#include <klocale.h> 34#include <klocale.h>
34#include <kglobalsettings.h> 35#include <kglobalsettings.h>
35#include <kiconloader.h> 36#include <kiconloader.h>
36#include <kdebug.h> 37#include <kdebug.h>
37#include <kconfig.h> 38#include <kconfig.h>
38#include <kapplication.h> 39#include <kapplication.h>
39#include <kurl.h> 40#include <kurl.h>
40 41
41#include "kaddressbooktableview.h" 42#include "kaddressbooktableview.h"
42 43
43#include "contactlistview.h" 44#include "contactlistview.h"
44 45
45///////////////////////////////// 46/////////////////////////////////
46// DynamicTip Methods 47// DynamicTip Methods
47 48
48DynamicTip::DynamicTip( ContactListView *parent) 49DynamicTip::DynamicTip( ContactListView *parent)
49 : QToolTip( parent ) 50 : QToolTip( parent )
50{ 51{
51} 52}
52 53
53void DynamicTip::maybeTip( const QPoint &pos ) 54void DynamicTip::maybeTip( const QPoint &pos )
54{ 55{
55 static bool ishidden = true; 56 static bool ishidden = true;
56 if (!parentWidget()->inherits( "ContactListView" )) 57 if (!parentWidget()->inherits( "ContactListView" ))
57 return; 58 return;
58 59
59 ContactListView *plv = (ContactListView*)parentWidget(); 60 ContactListView *plv = (ContactListView*)parentWidget();
60 if (!plv->tooltips()) 61 if (!plv->tooltips())
61 return; 62 return;
62 63
63 QPoint posVp = plv->viewport()->pos(); 64 QPoint posVp = plv->viewport()->pos();
64 65
65 QListViewItem *lvi = plv->itemAt( pos - posVp ); 66 QListViewItem *lvi = plv->itemAt( pos - posVp );
66 if (!lvi) 67 if (!lvi)
67 return; 68 return;
68 69
69#ifndef KAB_EMBEDDED 70#ifndef KAB_EMBEDDED
70 ContactListViewItem *plvi = dynamic_cast< ContactListViewItem* >(lvi); 71 ContactListViewItem *plvi = dynamic_cast< ContactListViewItem* >(lvi);
71#else //KAB_EMBEDDED 72#else //KAB_EMBEDDED
72 ContactListViewItem *plvi = (ContactListViewItem*)(lvi); 73 ContactListViewItem *plvi = (ContactListViewItem*)(lvi);
73#endif //KAB_EMBEDDED 74#endif //KAB_EMBEDDED
74 75
75 if (!plvi) 76 if (!plvi)
76 return; 77 return;
77 78
78 if (ishidden) { 79 if (ishidden) {
79 QString s; 80 QString s;
80 QRect r = plv->itemRect( lvi ); 81 QRect r = plv->itemRect( lvi );
81 r.moveBy( posVp.x(), posVp.y() ); 82 r.moveBy( posVp.x(), posVp.y() );
82 83
83 //kdDebug() << "Tip rec: " << r.x() << "," << r.y() << "," << r.width() 84 //kdDebug() << "Tip rec: " << r.x() << "," << r.y() << "," << r.width()
84 // << "," << r.height() << endl; 85 // << "," << r.height() << endl;
85 86
86 KABC::Addressee a = plvi->addressee(); 87 KABC::Addressee a = plvi->addressee();
87 if (a.isEmpty()) 88 if (a.isEmpty())
88 return; 89 return;
89 90
90 s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel()) 91 s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel())
91 .arg(a.formattedName()); 92 .arg(a.formattedName());
92 93
93 s += '\n'; 94 s += '\n';
94 s += i18n("label: value", "%1: %2").arg(a.organizationLabel()) 95 s += i18n("label: value", "%1: %2").arg(a.organizationLabel())
95 .arg(a.organization()); 96 .arg(a.organization());
96 97
97 QString notes = a.note().stripWhiteSpace(); 98 QString notes = a.note().stripWhiteSpace();
98 if ( !notes.isEmpty() ) { 99 if ( !notes.isEmpty() ) {
99 notes += '\n'; 100 notes += '\n';
100 s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel()); 101 s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel());
101 QFontMetrics fm( font() ); 102 QFontMetrics fm( font() );
102 103
103 // Begin word wrap code based on QMultiLineEdit code 104 // Begin word wrap code based on QMultiLineEdit code
104 int i = 0; 105 int i = 0;
105 bool doBreak = false; 106 bool doBreak = false;
106 int linew = 0; 107 int linew = 0;
107 int lastSpace = -1; 108 int lastSpace = -1;
108 int a = 0; 109 int a = 0;
109 int lastw = 0; 110 int lastw = 0;
110 111
111 while ( i < int(notes.length()) ) { 112 while ( i < int(notes.length()) ) {
112 doBreak = FALSE; 113 doBreak = FALSE;
113 if ( notes[i] != '\n' ) 114 if ( notes[i] != '\n' )
114 linew += fm.width( notes[i] ); 115 linew += fm.width( notes[i] );
115 116
116 if ( lastSpace >= a && notes[i] != '\n' ) 117 if ( lastSpace >= a && notes[i] != '\n' )
117 if (linew >= parentWidget()->width()) { 118 if (linew >= parentWidget()->width()) {
118 doBreak = TRUE; 119 doBreak = TRUE;
119 if ( lastSpace > a ) { 120 if ( lastSpace > a ) {
120 i = lastSpace; 121 i = lastSpace;
121 linew = lastw; 122 linew = lastw;
122 } 123 }
123 else 124 else
124 i = QMAX( a, i-1 ); 125 i = QMAX( a, i-1 );
125 } 126 }
126 127
127 if ( notes[i] == '\n' || doBreak ) { 128 if ( notes[i] == '\n' || doBreak ) {
@@ -155,246 +156,274 @@ void DynamicTip::maybeTip( const QPoint &pos )
155 156
156/////////////////////////// 157///////////////////////////
157// ContactListViewItem Methods 158// ContactListViewItem Methods
158 159
159ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, 160ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
160 ContactListView *parent, 161 ContactListView *parent,
161 KABC::AddressBook *doc, 162 KABC::AddressBook *doc,
162 const KABC::Field::List &fields ) 163 const KABC::Field::List &fields )
163 : KListViewItem(parent), mAddressee(a), mFields( fields ), 164 : KListViewItem(parent), mAddressee(a), mFields( fields ),
164 parentListView( parent ), mDocument(doc) 165 parentListView( parent ), mDocument(doc)
165{ 166{
166 refresh(); 167 refresh();
167} 168}
168 169
169QString ContactListViewItem::key(int column, bool ascending) const 170QString ContactListViewItem::key(int column, bool ascending) const
170{ 171{
171#ifndef DESKTOP_VERSION 172#ifndef DESKTOP_VERSION
172 int lan = KGlobal::locale()->language(); 173 int lan = KGlobal::locale()->language();
173 //qDebug("language %d ", lan); 174 //qDebug("language %d ", lan);
174 if ( lan == 1 ) { //GERMAN 175 if ( lan == 1 ) { //GERMAN
175 QString ret = QListViewItem::key(column, ascending).lower().utf8(); 176 QString ret = QListViewItem::key(column, ascending).lower().utf8();
176 int start = -1; 177 int start = -1;
177 while ( (start = ret.find( 'ä', start+1)) > 0 ) { 178 while ( (start = ret.find( 'ä', start+1)) > 0 ) {
178 ret.at(start-1) = 'a'; 179 ret.at(start-1) = 'a';
179 } 180 }
180 start = -1; 181 start = -1;
181 while ( (start = ret.find( 'ö', start+1)) > 0 ) { 182 while ( (start = ret.find( 'ö', start+1)) > 0 ) {
182 ret.at(start-1) = 'o'; 183 ret.at(start-1) = 'o';
183 } 184 }
184 start = -1; 185 start = -1;
185 while ( (start = ret.find( 'ü', start+1)) > 0 ) { 186 while ( (start = ret.find( 'ü', start+1)) > 0 ) {
186 ret.at(start-1) = 'o'; 187 ret.at(start-1) = 'o';
187 } 188 }
188 start = -1; 189 start = -1;
189 while ( (start = ret.find( 'ß', start+1)) > 0 ) { 190 while ( (start = ret.find( 'ß', start+1)) > 0 ) {
190 ret.at(start-1) = 's'; 191 ret.at(start-1) = 's';
191 } 192 }
192 //qDebug("conv string %s ", ret.latin1()); 193 //qDebug("conv string %s ", ret.latin1());
193 194
194 return ret; 195 return ret;
195 196
196 } 197 }
197 else 198 else
198#endif 199#endif
199 return QListViewItem::key(column, ascending).lower(); 200 return QListViewItem::key(column, ascending).lower();
200} 201}
201 202
202void ContactListViewItem::paintCell(QPainter * p, 203void ContactListViewItem::paintCell(QPainter * p,
203 const QColorGroup & cg, 204 const QColorGroup & cg,
204 int column, 205 int column,
205 int width, 206 int width,
206 int align) 207 int align)
207{ 208{
208 KListViewItem::paintCell(p, cg, column, width, align); 209 KListViewItem::paintCell(p, cg, column, width, align);
209 210
210 if ( !p ) 211 if ( !p )
211 return; 212 return;
212 213
213 if (parentListView->singleLine()) { 214 if (parentListView->singleLine()) {
214 p->setPen( parentListView->alternateColor() ); 215 p->setPen( parentListView->alternateColor() );
215 p->drawLine( 0, height() - 1, width, height() - 1 ); 216 p->drawLine( 0, height() - 1, width, height() - 1 );
216 } 217 }
217} 218}
218 219
219 220
220ContactListView *ContactListViewItem::parent() 221ContactListView *ContactListViewItem::parent()
221{ 222{
222 return parentListView; 223 return parentListView;
223} 224}
224 225
225 226
226void ContactListViewItem::refresh() 227void ContactListViewItem::refresh()
227{ 228{
228 // Update our addressee, since it may have changed else were 229 // Update our addressee, since it may have changed else were
229 mAddressee = mDocument->findByUid(mAddressee.uid()); 230 mAddressee = mDocument->findByUid(mAddressee.uid());
230 if (mAddressee.isEmpty()) 231 if (mAddressee.isEmpty())
231 return; 232 return;
232 233
233 int i = 0; 234 int i = 0;
234 KABC::Field::List::ConstIterator it; 235 KABC::Field::List::ConstIterator it;
235 for( it = mFields.begin(); it != mFields.end(); ++it ) { 236 for( it = mFields.begin(); it != mFields.end(); ++it ) {
236 setText( i++, (*it)->value( mAddressee ) ); 237 setText( i++, (*it)->value( mAddressee ) );
237 } 238 }
238} 239}
239 240
240/////////////////////////////// 241///////////////////////////////
241// ContactListView 242// ContactListView
242 243
243ContactListView::ContactListView(KAddressBookTableView *view, 244ContactListView::ContactListView(KAddressBookTableView *view,
244 KABC::AddressBook* /* doc */, 245 KABC::AddressBook* /* doc */,
245 QWidget *parent, 246 QWidget *parent,
246 const char *name ) 247 const char *name )
247 : KListView( parent, name ), 248 : KListView( parent, name ),
248 pabWidget( view ), 249 pabWidget( view ),
249 oldColumn( 0 ) 250 oldColumn( 0 )
250{ 251{
252 mFlagBlockKeyPressed = false;
253 mFlagKeyPressed = false;
251 mABackground = true; 254 mABackground = true;
252 mSingleLine = false; 255 mSingleLine = false;
253 mToolTips = true; 256 mToolTips = true;
254#ifndef KAB_EMBEDDED 257#ifndef KAB_EMBEDDED
255 mAlternateColor = KGlobalSettings::alternateBackgroundColor(); 258 mAlternateColor = KGlobalSettings::alternateBackgroundColor();
256#else //KAB_EMBEDDED 259#else //KAB_EMBEDDED
257 mAlternateColor = QColor(240, 240, 240); 260 mAlternateColor = QColor(240, 240, 240);
258#endif //KAB_EMBEDDED 261#endif //KAB_EMBEDDED
259 262
260 setAlternateBackgroundEnabled(mABackground); 263 setAlternateBackgroundEnabled(mABackground);
261 setAcceptDrops( true ); 264 setAcceptDrops( true );
262 viewport()->setAcceptDrops( true ); 265 viewport()->setAcceptDrops( true );
263 setAllColumnsShowFocus( true ); 266 setAllColumnsShowFocus( true );
264 setShowSortIndicator(true); 267 setShowSortIndicator(true);
265 268
266 setSelectionModeExt( KListView::Extended ); 269 setSelectionModeExt( KListView::Extended );
267 setDropVisualizer(false); 270 setDropVisualizer(false);
268 // setFrameStyle(QFrame::NoFrame); 271 // setFrameStyle(QFrame::NoFrame);
269 //setLineWidth ( 0 ); 272 //setLineWidth ( 0 );
270 //setMidLineWidth ( 0 ); 273 //setMidLineWidth ( 0 );
271 //setMargin ( 0 ); 274 //setMargin ( 0 );
272#ifndef KAB_EMBEDDED 275#ifndef KAB_EMBEDDED
273 connect(this, SIGNAL(dropped(QDropEvent*)), 276 connect(this, SIGNAL(dropped(QDropEvent*)),
274 this, SLOT(itemDropped(QDropEvent*))); 277 this, SLOT(itemDropped(QDropEvent*)));
275#endif //KAB_EMBEDDED 278#endif //KAB_EMBEDDED
276 279
277 280
278 new DynamicTip( this ); 281 new DynamicTip( this );
279} 282}
280void ContactListView::printMe() 283void ContactListView::printMe()
281{ 284{
282#ifdef DESKTOP_VERSION 285#ifdef DESKTOP_VERSION
283 QPrinter printer; 286 QPrinter printer;
284 if (!printer.setup() ) 287 if (!printer.setup() )
285 return; 288 return;
286 QPainter p; 289 QPainter p;
287 p.begin ( &printer ); 290 p.begin ( &printer );
288 QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); 291 QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
289 float dx, dy; 292 float dx, dy;
290 int wid = (m.width() * 9)/10; 293 int wid = (m.width() * 9)/10;
291 dx = (float) wid/(float)contentsWidth (); 294 dx = (float) wid/(float)contentsWidth ();
292 dy = (float)(m.height()) / (float)contentsHeight (); 295 dy = (float)(m.height()) / (float)contentsHeight ();
293 float scale; 296 float scale;
294 // scale to fit the width or height of the paper 297 // scale to fit the width or height of the paper
295 if ( dx < dy ) 298 if ( dx < dy )
296 scale = dx; 299 scale = dx;
297 else 300 else
298 scale = dy; 301 scale = dy;
299 p.translate( m.width()/10,0 ); 302 p.translate( m.width()/10,0 );
300 p.scale( scale, scale ); 303 p.scale( scale, scale );
301 qDebug("scale %f ", scale); 304 qDebug("scale %f ", scale);
302 drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); 305 drawContents ( &p, 0,0, contentsWidth (), contentsHeight () );
303 p.end(); 306 p.end();
304 qDebug("Why does it not print??? "); 307 qDebug("Why does it not print??? ");
305#endif 308#endif
306} 309}
307 310
308void ContactListView::setAlternateColor(const QColor &m_AlternateColor) 311void ContactListView::setAlternateColor(const QColor &m_AlternateColor)
309{ 312{
310 mAlternateColor = m_AlternateColor; 313 mAlternateColor = m_AlternateColor;
311} 314}
312 315
313void ContactListView::paintEmptyArea( QPainter * p, const QRect & rect ) 316void ContactListView::paintEmptyArea( QPainter * p, const QRect & rect )
314{ 317{
315 QBrush b = palette().brush(QPalette::Active, QColorGroup::Base); 318 QBrush b = palette().brush(QPalette::Active, QColorGroup::Base);
316 319
317 // Get the brush, which will have the background pixmap if there is one. 320 // Get the brush, which will have the background pixmap if there is one.
318 if (b.pixmap()) 321 if (b.pixmap())
319 { 322 {
320 p->drawTiledPixmap( rect.left(), rect.top(), rect.width(), rect.height(), 323 p->drawTiledPixmap( rect.left(), rect.top(), rect.width(), rect.height(),
321 *(b.pixmap()), 324 *(b.pixmap()),
322 rect.left() + contentsX(), 325 rect.left() + contentsX(),
323 rect.top() + contentsY() ); 326 rect.top() + contentsY() );
324 } 327 }
325 328
326 else 329 else
327 { 330 {
328 // Do a normal paint 331 // Do a normal paint
329 KListView::paintEmptyArea(p, rect); 332 KListView::paintEmptyArea(p, rect);
330 } 333 }
331} 334}
332 335
333void ContactListView::contentsMousePressEvent(QMouseEvent* e) 336void ContactListView::contentsMousePressEvent(QMouseEvent* e)
334{ 337{
335 presspos = e->pos(); 338 presspos = e->pos();
336 KListView::contentsMousePressEvent(e); 339 KListView::contentsMousePressEvent(e);
337} 340}
338 341
339 342
340// To initiate a drag operation 343// To initiate a drag operation
341void ContactListView::contentsMouseMoveEvent( QMouseEvent *e ) 344void ContactListView::contentsMouseMoveEvent( QMouseEvent *e )
342{ 345{
343 if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) { 346 if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
344 emit startAddresseeDrag(); 347 emit startAddresseeDrag();
345 } 348 }
346 else 349 else
347 KListView::contentsMouseMoveEvent( e ); 350 KListView::contentsMouseMoveEvent( e );
348} 351}
349 352
350bool ContactListView::acceptDrag(QDropEvent *e) const 353bool ContactListView::acceptDrag(QDropEvent *e) const
351{ 354{
352#ifndef KAB_EMBEDDED 355#ifndef KAB_EMBEDDED
353 return QTextDrag::canDecode(e); 356 return QTextDrag::canDecode(e);
354#else //KAB_EMBEDDED 357#else //KAB_EMBEDDED
355qDebug("ContactListView::acceptDrag has to be fixed"); 358qDebug("ContactListView::acceptDrag has to be fixed");
356 return false; 359 return false;
357#endif //KAB_EMBEDDED 360#endif //KAB_EMBEDDED
358} 361}
359 362
360void ContactListView::itemDropped(QDropEvent *e) 363void ContactListView::itemDropped(QDropEvent *e)
361{ 364{
362 contentsDropEvent(e); 365 contentsDropEvent(e);
363} 366}
364 367
365void ContactListView::contentsDropEvent( QDropEvent *e ) 368void ContactListView::contentsDropEvent( QDropEvent *e )
366{ 369{
367 emit addresseeDropped(e); 370 emit addresseeDropped(e);
368} 371}
369 372
370void ContactListView::setAlternateBackgroundEnabled(bool enabled) 373void ContactListView::setAlternateBackgroundEnabled(bool enabled)
371{ 374{
372 mABackground = enabled; 375 mABackground = enabled;
373 376
374 if (mABackground) 377 if (mABackground)
375 { 378 {
376 setAlternateBackground(mAlternateColor); 379 setAlternateBackground(mAlternateColor);
377 } 380 }
378 else 381 else
379 { 382 {
380 setAlternateBackground(QColor()); 383 setAlternateBackground(QColor());
381 } 384 }
382} 385}
383 386
384void ContactListView::setBackgroundPixmap(const QString &filename) 387void ContactListView::setBackgroundPixmap(const QString &filename)
385{ 388{
386 if (filename.isEmpty()) 389 if (filename.isEmpty())
387 { 390 {
388 unsetPalette(); 391 unsetPalette();
389 } 392 }
390 else 393 else
391 { 394 {
392 qDebug("ContactListView::setBackgroundPixmap has to be verified"); 395 qDebug("ContactListView::setBackgroundPixmap has to be verified");
393//US setPaletteBackgroundPixmap(QPixmap(filename)); 396//US setPaletteBackgroundPixmap(QPixmap(filename));
394 KListView::setBackgroundPixmap((const QPixmap&)QPixmap(filename)); 397 KListView::setBackgroundPixmap((const QPixmap&)QPixmap(filename));
395 } 398 }
396 399
397} 400}
401
402void ContactListView::keyPressEvent ( QKeyEvent * e )
403{
404 if ( mFlagBlockKeyPressed )
405 return;
406 qApp->processEvents();
407 if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
408 e->accept();
409 return;
410 }
411 if (! e->isAutoRepeat() )
412 mFlagKeyPressed = true;
413 KListView::keyPressEvent ( e );
414}
415void ContactListView::keyReleaseEvent ( QKeyEvent * e )
416{
417 if ( mFlagBlockKeyPressed )
418 return;
419 if ( !e->isAutoRepeat() ) {
420 mFlagBlockKeyPressed = true;
421 qApp->processEvents();
422 mFlagBlockKeyPressed = false;
423 mFlagKeyPressed = false;
424 }
425 KListView::keyReleaseEvent ( e );
426}
398#ifndef KAB_EMBEDDED 427#ifndef KAB_EMBEDDED
399#include "contactlistview.moc" 428#include "contactlistview.moc"
400#endif //KAB_EMBEDDED 429#endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 9d1a672..46477e1 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -1,130 +1,134 @@
1#ifndef CONTACTLISTVIEW_H 1#ifndef CONTACTLISTVIEW_H
2#define CONTACTLISTVIEW_H 2#define CONTACTLISTVIEW_H
3 3
4#include <qcolor.h> 4#include <qcolor.h>
5#include <qpixmap.h> 5#include <qpixmap.h>
6#include <qtooltip.h> 6#include <qtooltip.h>
7#include <qstring.h> 7#include <qstring.h>
8 8
9#include <klistview.h> 9#include <klistview.h>
10 10
11#include <kabc/field.h> 11#include <kabc/field.h>
12#include <kabc/addressee.h> 12#include <kabc/addressee.h>
13#include <kabc/addressbook.h> 13#include <kabc/addressbook.h>
14 14
15 15
16class QDropEvent; 16class QDropEvent;
17class KAddressBookTableView; 17class KAddressBookTableView;
18class ContactListView; 18class ContactListView;
19 19
20/** The whole tooltip design needs a lot of work. Currently it is 20/** The whole tooltip design needs a lot of work. Currently it is
21* hacked together to function. 21* hacked together to function.
22*/ 22*/
23class DynamicTip : public QToolTip 23class DynamicTip : public QToolTip
24{ 24{
25 public: 25 public:
26 DynamicTip( ContactListView * parent ); 26 DynamicTip( ContactListView * parent );
27 27
28 protected: 28 protected:
29 void maybeTip( const QPoint & ); 29 void maybeTip( const QPoint & );
30 30
31 private: 31 private:
32}; 32};
33 33
34class ContactListViewItem : public KListViewItem 34class ContactListViewItem : public KListViewItem
35{ 35{
36 36
37public: 37public:
38 ContactListViewItem(const KABC::Addressee &a, ContactListView* parent, 38 ContactListViewItem(const KABC::Addressee &a, ContactListView* parent,
39 KABC::AddressBook *doc, const KABC::Field::List &fields ); 39 KABC::AddressBook *doc, const KABC::Field::List &fields );
40 const KABC::Addressee &addressee() const { return mAddressee; } 40 const KABC::Addressee &addressee() const { return mAddressee; }
41 virtual void refresh(); 41 virtual void refresh();
42 virtual ContactListView* parent(); 42 virtual ContactListView* parent();
43 virtual QString key ( int, bool ) const; 43 virtual QString key ( int, bool ) const;
44 44
45 /** Adds the border around the cell if the user wants it. 45 /** Adds the border around the cell if the user wants it.
46 * This is how the single line config option is implemented. 46 * This is how the single line config option is implemented.
47 */ 47 */
48 virtual void paintCell(QPainter * p, const QColorGroup & cg, 48 virtual void paintCell(QPainter * p, const QColorGroup & cg,
49 int column, int width, int align ); 49 int column, int width, int align );
50 50
51private: 51private:
52 KABC::Addressee mAddressee; 52 KABC::Addressee mAddressee;
53 KABC::Field::List mFields; 53 KABC::Field::List mFields;
54 ContactListView *parentListView; 54 ContactListView *parentListView;
55 KABC::AddressBook *mDocument; 55 KABC::AddressBook *mDocument;
56}; 56};
57 57
58 58
59///////////////////////////////////////////// 59/////////////////////////////////////////////
60// ContactListView 60// ContactListView
61 61
62class ContactListView : public KListView 62class ContactListView : public KListView
63{ 63{
64 Q_OBJECT 64 Q_OBJECT
65 65
66public: 66public:
67 ContactListView(KAddressBookTableView *view, 67 ContactListView(KAddressBookTableView *view,
68 KABC::AddressBook *doc, 68 KABC::AddressBook *doc,
69 QWidget *parent, 69 QWidget *parent,
70 const char *name = 0L ); 70 const char *name = 0L );
71 virtual ~ContactListView() {} 71 virtual ~ContactListView() {}
72 //void resort(); 72 //void resort();
73 73
74 /** Returns true if tooltips should be displayed, false otherwise 74 /** Returns true if tooltips should be displayed, false otherwise
75 */ 75 */
76 bool tooltips() const { return mToolTips; } 76 bool tooltips() const { return mToolTips; }
77 void setToolTipsEnabled(bool enabled) { mToolTips = enabled; } 77 void setToolTipsEnabled(bool enabled) { mToolTips = enabled; }
78 78
79 bool alternateBackground() const { return mABackground; } 79 bool alternateBackground() const { return mABackground; }
80 void setAlternateBackgroundEnabled(bool enabled); 80 void setAlternateBackgroundEnabled(bool enabled);
81 81
82 bool singleLine() const { return mSingleLine; } 82 bool singleLine() const { return mSingleLine; }
83 void setSingleLineEnabled(bool enabled) { mSingleLine = enabled; } 83 void setSingleLineEnabled(bool enabled) { mSingleLine = enabled; }
84 84
85 const QColor &alternateColor() const { return mAlternateColor; } 85 const QColor &alternateColor() const { return mAlternateColor; }
86 void setAlternateColor(const QColor &mAlternateColor); 86 void setAlternateColor(const QColor &mAlternateColor);
87 87
88 /** Sets the background pixmap to <i>filename</i>. If the 88 /** Sets the background pixmap to <i>filename</i>. If the
89 * QString is empty (QString::isEmpty()), then the background 89 * QString is empty (QString::isEmpty()), then the background
90 * pixmap will be disabled. 90 * pixmap will be disabled.
91 */ 91 */
92 void setBackgroundPixmap(const QString &filename); 92 void setBackgroundPixmap(const QString &filename);
93 93
94protected: 94protected:
95 bool mFlagKeyPressed;
96 bool mFlagBlockKeyPressed;
97 virtual void keyPressEvent ( QKeyEvent * );
98 virtual void keyReleaseEvent ( QKeyEvent * );
95 /** Paints the background pixmap in the empty area. This method is needed 99 /** Paints the background pixmap in the empty area. This method is needed
96 * since Qt::FixedPixmap will not scroll with the list view. 100 * since Qt::FixedPixmap will not scroll with the list view.
97 */ 101 */
98 virtual void paintEmptyArea( QPainter * p, const QRect & rect ); 102 virtual void paintEmptyArea( QPainter * p, const QRect & rect );
99 virtual void contentsMousePressEvent(QMouseEvent*); 103 virtual void contentsMousePressEvent(QMouseEvent*);
100 void contentsMouseMoveEvent( QMouseEvent *e ); 104 void contentsMouseMoveEvent( QMouseEvent *e );
101 void contentsDropEvent( QDropEvent *e ); 105 void contentsDropEvent( QDropEvent *e );
102 virtual bool acceptDrag(QDropEvent *e) const; 106 virtual bool acceptDrag(QDropEvent *e) const;
103 107
104protected slots: 108protected slots:
105 void itemDropped(QDropEvent *e); 109 void itemDropped(QDropEvent *e);
106 110
107public slots: 111public slots:
108 void printMe(); 112 void printMe();
109 113
110signals: 114signals:
111 void startAddresseeDrag(); 115 void startAddresseeDrag();
112 void addresseeDropped(QDropEvent *); 116 void addresseeDropped(QDropEvent *);
113 117
114private: 118private:
115 KAddressBookTableView *pabWidget; 119 KAddressBookTableView *pabWidget;
116 int oldColumn; 120 int oldColumn;
117 int column; 121 int column;
118 bool ascending; 122 bool ascending;
119 123
120 bool mABackground; 124 bool mABackground;
121 bool mSingleLine; 125 bool mSingleLine;
122 bool mToolTips; 126 bool mToolTips;
123 127
124 QColor mAlternateColor; 128 QColor mAlternateColor;
125 129
126 QPoint presspos; 130 QPoint presspos;
127}; 131};
128 132
129 133
130#endif 134#endif
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index cce68b9..9c35fd6 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -115,198 +115,202 @@ AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
115} 115}
116 116
117AddresseeCardView::~AddresseeCardView() 117AddresseeCardView::~AddresseeCardView()
118{ 118{
119} 119}
120void AddresseeCardView::printMe() 120void AddresseeCardView::printMe()
121{ 121{
122#ifdef DESKTOP_VERSION 122#ifdef DESKTOP_VERSION
123 QPrinter printer; 123 QPrinter printer;
124 if (!printer.setup() ) 124 if (!printer.setup() )
125 return; 125 return;
126 QPainter p; 126 QPainter p;
127 p.begin ( &printer ); 127 p.begin ( &printer );
128 QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer ); 128 QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
129 float dx, dy; 129 float dx, dy;
130 int wid = (m.width() * 9)/10; 130 int wid = (m.width() * 9)/10;
131 dx = (float) wid/(float)contentsWidth (); 131 dx = (float) wid/(float)contentsWidth ();
132 dy = (float)(m.height()) / (float)contentsHeight (); 132 dy = (float)(m.height()) / (float)contentsHeight ();
133 float scale; 133 float scale;
134 // scale to fit the width or height of the paper 134 // scale to fit the width or height of the paper
135 if ( dx < dy ) 135 if ( dx < dy )
136 scale = dx; 136 scale = dx;
137 else 137 else
138 scale = dy; 138 scale = dy;
139 p.translate( m.width()/10,0 ); 139 p.translate( m.width()/10,0 );
140 p.scale( scale, scale ); 140 p.scale( scale, scale );
141 drawContents ( &p, 0,0, contentsWidth (), contentsHeight () ); 141 drawContents ( &p, 0,0, contentsWidth (), contentsHeight () );
142 p.end(); 142 p.end();
143 repaint(); 143 repaint();
144#endif 144#endif
145} 145}
146 146
147 147
148void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e) 148void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
149{ 149{
150#ifndef KAB_EMBEDDED 150#ifndef KAB_EMBEDDED
151 if (QTextDrag::canDecode(e)) 151 if (QTextDrag::canDecode(e))
152 e->accept(); 152 e->accept();
153#else //KAB_EMBEDDED 153#else //KAB_EMBEDDED
154qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented"); 154qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented");
155#endif //KAB_EMBEDDED 155#endif //KAB_EMBEDDED
156} 156}
157 157
158void AddresseeCardView::dropEvent(QDropEvent *e) 158void AddresseeCardView::dropEvent(QDropEvent *e)
159{ 159{
160 emit addresseeDropped(e); 160 emit addresseeDropped(e);
161} 161}
162 162
163void AddresseeCardView::startDrag() 163void AddresseeCardView::startDrag()
164{ 164{
165 emit startAddresseeDrag(); 165 emit startAddresseeDrag();
166} 166}
167 167
168 168
169/////////////////////////////// 169///////////////////////////////
170// KAddressBookCardView 170// KAddressBookCardView
171 171
172KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab, 172KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab,
173 QWidget *parent, const char *name ) 173 QWidget *parent, const char *name )
174 : KAddressBookView( ab, parent, name ) 174 : KAddressBookView( ab, parent, name )
175{ 175{
176 mShowEmptyFields = false; 176 mShowEmptyFields = false;
177 177
178 // Init the GUI 178 // Init the GUI
179 QVBoxLayout *layout = new QVBoxLayout(viewWidget()); 179 QVBoxLayout *layout = new QVBoxLayout(viewWidget());
180 180
181 mCardView = new AddresseeCardView(viewWidget(), "mCardView"); 181 mCardView = new AddresseeCardView(viewWidget(), "mCardView");
182 mCardView->setSelectionMode(CardView::Extended); 182 mCardView->setSelectionMode(CardView::Extended);
183 layout->addWidget(mCardView); 183 layout->addWidget(mCardView);
184 184
185 // Connect up the signals 185 // Connect up the signals
186 connect(mCardView, SIGNAL(executed(CardViewItem *)), 186 connect(mCardView, SIGNAL(executed(CardViewItem *)),
187 this, SLOT(addresseeExecuted(CardViewItem *))); 187 this, SLOT(addresseeExecuted(CardViewItem *)));
188 connect(mCardView, SIGNAL(selectionChanged()), 188 connect(mCardView, SIGNAL(selectionChanged()),
189 this, SLOT(addresseeSelected())); 189 this, SLOT(addresseeSelected()));
190 connect(mCardView, SIGNAL(addresseeDropped(QDropEvent*)), 190 connect(mCardView, SIGNAL(addresseeDropped(QDropEvent*)),
191 this, SIGNAL(dropped(QDropEvent*))); 191 this, SIGNAL(dropped(QDropEvent*)));
192 connect(mCardView, SIGNAL(startAddresseeDrag()), 192 connect(mCardView, SIGNAL(startAddresseeDrag()),
193 this, SIGNAL(startDrag())); 193 this, SIGNAL(startDrag()));
194 connect(this, SIGNAL(printView()), 194 connect(this, SIGNAL(printView()),
195 mCardView , SLOT(printMe())); 195 mCardView , SLOT(printMe()));
196} 196}
197 197
198KAddressBookCardView::~KAddressBookCardView() 198KAddressBookCardView::~KAddressBookCardView()
199{ 199{
200} 200}
201void KAddressBookCardView::setFocusAV() 201void KAddressBookCardView::setFocusAV()
202{ 202{
203 if ( mCardView ) 203 if ( mCardView )
204 mCardView->setFocus(); 204 mCardView->setFocus();
205 205
206} 206}
207void KAddressBookCardView::scrollUP() 207void KAddressBookCardView::scrollUP()
208{ 208{
209 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); 209 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
210 QApplication::postEvent( mCardView, ev ); 210 QApplication::postEvent( mCardView, ev );
211 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
212 QApplication::postEvent( mCardView, ev );
211 213
212} 214}
213void KAddressBookCardView::scrollDOWN() 215void KAddressBookCardView::scrollDOWN()
214{ 216{
215 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); 217 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
216 QApplication::postEvent( mCardView, ev ); 218 QApplication::postEvent( mCardView, ev );
219 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
220 QApplication::postEvent( mCardView, ev );
217} 221}
218void KAddressBookCardView::readConfig(KConfig *config) 222void KAddressBookCardView::readConfig(KConfig *config)
219{ 223{
220 KAddressBookView::readConfig(config); 224 KAddressBookView::readConfig(config);
221 225
222 // costum colors? 226 // costum colors?
223 if ( config->readBoolEntry( "EnableCustomColors", false ) ) 227 if ( config->readBoolEntry( "EnableCustomColors", false ) )
224 { 228 {
225 QPalette p( mCardView->palette() ); 229 QPalette p( mCardView->palette() );
226 QColor c = p.color(QPalette::Normal, QColorGroup::Base ); 230 QColor c = p.color(QPalette::Normal, QColorGroup::Base );
227 p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); 231 p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
228 c = p.color(QPalette::Normal, QColorGroup::Text ); 232 c = p.color(QPalette::Normal, QColorGroup::Text );
229 p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); 233 p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
230 c = p.color(QPalette::Normal, QColorGroup::Button ); 234 c = p.color(QPalette::Normal, QColorGroup::Button );
231 p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); 235 p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
232 c = p.color(QPalette::Normal, QColorGroup::ButtonText ); 236 c = p.color(QPalette::Normal, QColorGroup::ButtonText );
233 p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); 237 p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
234 c = p.color(QPalette::Normal, QColorGroup::Highlight ); 238 c = p.color(QPalette::Normal, QColorGroup::Highlight );
235 p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); 239 p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
236 c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); 240 c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
237 p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); 241 p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
238 mCardView->viewport()->setPalette( p ); 242 mCardView->viewport()->setPalette( p );
239 } 243 }
240 else 244 else
241 { 245 {
242 // needed if turned off during a session. 246 // needed if turned off during a session.
243 mCardView->viewport()->setPalette( mCardView->palette() ); 247 mCardView->viewport()->setPalette( mCardView->palette() );
244 } 248 }
245 249
246 //custom fonts? 250 //custom fonts?
247 QFont f( font() ); 251 QFont f( font() );
248 if ( config->readBoolEntry( "EnableCustomFonts", false ) ) 252 if ( config->readBoolEntry( "EnableCustomFonts", false ) )
249 { 253 {
250 mCardView->setFont( config->readFontEntry( "TextFont", &f) ); 254 mCardView->setFont( config->readFontEntry( "TextFont", &f) );
251 f.setBold( true ); 255 f.setBold( true );
252 mCardView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); 256 mCardView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
253 } 257 }
254 else 258 else
255 { 259 {
256 mCardView->setFont( f ); 260 mCardView->setFont( f );
257 f.setBold( true ); 261 f.setBold( true );
258 mCardView->setHeaderFont( f ); 262 mCardView->setHeaderFont( f );
259 } 263 }
260 264
261 mCardView->setDrawCardBorder(config->readBoolEntry("DrawBorder", true)); 265 mCardView->setDrawCardBorder(config->readBoolEntry("DrawBorder", true));
262 mCardView->setDrawColSeparators(config->readBoolEntry("DrawSeparators", 266 mCardView->setDrawColSeparators(config->readBoolEntry("DrawSeparators",
263 true)); 267 true));
264 mCardView->setDrawFieldLabels(config->readBoolEntry("DrawFieldLabels",false)); 268 mCardView->setDrawFieldLabels(config->readBoolEntry("DrawFieldLabels",false));
265 mShowEmptyFields = config->readBoolEntry("ShowEmptyFields", false); 269 mShowEmptyFields = config->readBoolEntry("ShowEmptyFields", false);
266 270
267 mCardView->setShowEmptyFields( mShowEmptyFields ); 271 mCardView->setShowEmptyFields( mShowEmptyFields );
268 272
269 mCardView->setItemWidth( config->readNumEntry( "ItemWidth", 200 ) ); 273 mCardView->setItemWidth( config->readNumEntry( "ItemWidth", 200 ) );
270 mCardView->setItemMargin( config->readNumEntry( "ItemMargin", 0 ) ); 274 mCardView->setItemMargin( config->readNumEntry( "ItemMargin", 0 ) );
271 mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) ); 275 mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) );
272 mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) ); 276 mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) );
273 277
274#if 0 278#if 0
275 // LR KABPrefs::instance()->mHonorSingleClick is handled and fixed in cardviews contentsMouseDoubleClickEven 279 // LR KABPrefs::instance()->mHonorSingleClick is handled and fixed in cardviews contentsMouseDoubleClickEven
276 disconnect(mCardView, SIGNAL(executed(CardViewItem *)), 280 disconnect(mCardView, SIGNAL(executed(CardViewItem *)),
277 this, SLOT(addresseeExecuted(CardViewItem *))); 281 this, SLOT(addresseeExecuted(CardViewItem *)));
278 282
279 if (KABPrefs::instance()->mHonorSingleClick) 283 if (KABPrefs::instance()->mHonorSingleClick)
280 connect(mCardView, SIGNAL(executed(CardViewItem *)), 284 connect(mCardView, SIGNAL(executed(CardViewItem *)),
281 this, SLOT(addresseeExecuted(CardViewItem *))); 285 this, SLOT(addresseeExecuted(CardViewItem *)));
282 else 286 else
283 connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)), 287 connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)),
284 this, SLOT(addresseeExecuted(CardViewItem *))); 288 this, SLOT(addresseeExecuted(CardViewItem *)));
285#endif 289#endif
286 290
287 connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)), 291 connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)),
288 this, SLOT(addresseeExecuted(CardViewItem *))); 292 this, SLOT(addresseeExecuted(CardViewItem *)));
289} 293}
290 294
291void KAddressBookCardView::writeConfig( KConfig *config ) 295void KAddressBookCardView::writeConfig( KConfig *config )
292{ 296{
293 config->writeEntry( "ItemWidth", mCardView->itemWidth() ); 297 config->writeEntry( "ItemWidth", mCardView->itemWidth() );
294 KAddressBookView::writeConfig( config ); 298 KAddressBookView::writeConfig( config );
295} 299}
296void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) 300void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field )
297{ 301{
298 mCardView->clear(); 302 mCardView->clear();
299 if ( s.isEmpty() || s == "*" ) { 303 if ( s.isEmpty() || s == "*" ) {
300 refresh(); 304 refresh();
301 return; 305 return;
302 } 306 }
303 QRegExp re = getRegExp( s ); 307 QRegExp re = getRegExp( s );
304 if (!re.isValid()) 308 if (!re.isValid())
305 return; 309 return;
306 mCardView->viewport()->setUpdatesEnabled( false ); 310 mCardView->viewport()->setUpdatesEnabled( false );
307 KABC::Addressee::List addresseeList = addressees(); 311 KABC::Addressee::List addresseeList = addressees();
308 KABC::Addressee::List::Iterator it; 312 KABC::Addressee::List::Iterator it;
309 if ( field ) { 313 if ( field ) {
310 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 314 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
311 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) 315 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
312 continue; 316 continue;
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index f4b008c..e322473 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -1,164 +1,168 @@
1// $Id$ 1// $Id$
2 2
3#include <qvbox.h> 3#include <qvbox.h>
4#include <qlistbox.h> 4#include <qlistbox.h>
5#include <qwidget.h> 5#include <qwidget.h>
6#include <qfile.h> 6#include <qfile.h>
7#include <qimage.h> 7#include <qimage.h>
8#include <qcombobox.h> 8#include <qcombobox.h>
9#include <qapplication.h> 9#include <qapplication.h>
10#include <qdragobject.h> 10#include <qdragobject.h>
11#include <qevent.h> 11#include <qevent.h>
12#include <qurl.h> 12#include <qurl.h>
13#include <qpixmap.h> 13#include <qpixmap.h>
14 14
15#include <kabc/addressbook.h> 15#include <kabc/addressbook.h>
16#include <kapplication.h> 16#include <kapplication.h>
17#include <kconfig.h> 17#include <kconfig.h>
18#include <kcolorbutton.h> 18#include <kcolorbutton.h>
19#include <kdebug.h> 19#include <kdebug.h>
20#include <kglobal.h> 20#include <kglobal.h>
21#include <kiconloader.h> 21#include <kiconloader.h>
22#include <klineedit.h> 22#include <klineedit.h>
23#include <klocale.h> 23#include <klocale.h>
24#include <kmessagebox.h> 24#include <kmessagebox.h>
25#include <kurl.h> 25#include <kurl.h>
26#include <kurlrequester.h> 26#include <kurlrequester.h>
27 27
28//US#include "configuretableviewdialog.h" 28//US#include "configuretableviewdialog.h"
29#include "contactlistview.h" 29#include "contactlistview.h"
30#include "kabprefs.h" 30#include "kabprefs.h"
31#include "undocmds.h" 31#include "undocmds.h"
32#include "viewmanager.h" 32#include "viewmanager.h"
33 33
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qheader.h> 35#include <qheader.h>
36#include <qregexp.h> 36#include <qregexp.h>
37 37
38#include "kaddressbooktableview.h" 38#include "kaddressbooktableview.h"
39 39
40 40
41KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, 41KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
42 QWidget *parent, const char *name ) 42 QWidget *parent, const char *name )
43 : KAddressBookView( ab, parent, name ) 43 : KAddressBookView( ab, parent, name )
44{ 44{
45 mainLayout = new QVBoxLayout( viewWidget(), 2 ); 45 mainLayout = new QVBoxLayout( viewWidget(), 2 );
46 46
47 // The list view will be created when the config is read. 47 // The list view will be created when the config is read.
48 mListView = 0; 48 mListView = 0;
49} 49}
50 50
51KAddressBookTableView::~KAddressBookTableView() 51KAddressBookTableView::~KAddressBookTableView()
52{ 52{
53} 53}
54void KAddressBookTableView::setFocusAV() 54void KAddressBookTableView::setFocusAV()
55{ 55{
56 if ( mListView ) 56 if ( mListView )
57 mListView->setFocus(); 57 mListView->setFocus();
58 58
59} 59}
60void KAddressBookTableView::scrollUP() 60void KAddressBookTableView::scrollUP()
61{ 61{
62 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); 62 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
63 QApplication::postEvent( mListView, ev ); 63 QApplication::postEvent( mListView, ev );
64 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
65 QApplication::postEvent( mListView, ev );
64} 66}
65void KAddressBookTableView::scrollDOWN() 67void KAddressBookTableView::scrollDOWN()
66{ 68{
67 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); 69 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
68 QApplication::postEvent( mListView, ev ); 70 QApplication::postEvent( mListView, ev );
71 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
72 QApplication::postEvent( mListView, ev );
69} 73}
70void KAddressBookTableView::reconstructListView() 74void KAddressBookTableView::reconstructListView()
71{ 75{
72 if (mListView) 76 if (mListView)
73 { 77 {
74 disconnect(mListView, SIGNAL(selectionChanged()), 78 disconnect(mListView, SIGNAL(selectionChanged()),
75 this, SLOT(addresseeSelected())); 79 this, SLOT(addresseeSelected()));
76 disconnect(mListView, SIGNAL(executed(QListViewItem*)), 80 disconnect(mListView, SIGNAL(executed(QListViewItem*)),
77 this, SLOT(addresseeExecuted(QListViewItem*))); 81 this, SLOT(addresseeExecuted(QListViewItem*)));
78 disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), 82 disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
79 this, SLOT(addresseeExecuted(QListViewItem*))); 83 this, SLOT(addresseeExecuted(QListViewItem*)));
80 disconnect(mListView, SIGNAL(startAddresseeDrag()), this, 84 disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
81 SIGNAL(startDrag())); 85 SIGNAL(startDrag()));
82 disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), 86 disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
83 this, SLOT(addresseeExecuted(QListViewItem*))); 87 this, SLOT(addresseeExecuted(QListViewItem*)));
84 88
85 disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, 89 disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
86 SIGNAL(dropped(QDropEvent*))); 90 SIGNAL(dropped(QDropEvent*)));
87 delete mListView; 91 delete mListView;
88 } 92 }
89 93
90 mListView = new ContactListView( this, addressBook(), viewWidget() ); 94 mListView = new ContactListView( this, addressBook(), viewWidget() );
91 95
92 connect(this, SIGNAL(printView()), 96 connect(this, SIGNAL(printView()),
93 mListView , SLOT(printMe())); 97 mListView , SLOT(printMe()));
94 //US set singleClick manually, because it is no global configparameter in embedded space 98 //US set singleClick manually, because it is no global configparameter in embedded space
95 mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick); 99 mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick);
96 100
97 // Add the columns 101 // Add the columns
98 KABC::Field::List fieldList = fields(); 102 KABC::Field::List fieldList = fields();
99 KABC::Field::List::ConstIterator it; 103 KABC::Field::List::ConstIterator it;
100 104
101 int c = 0; 105 int c = 0;
102 for( it = fieldList.begin(); it != fieldList.end(); ++it ) { 106 for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
103 mListView->addColumn( (*it)->label() ); 107 mListView->addColumn( (*it)->label() );
104 mListView->setColumnWidthMode(c++, QListView::Manual); 108 mListView->setColumnWidthMode(c++, QListView::Manual);
105//US 109//US
106 // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); 110 // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
107 } 111 }
108 112
109 connect(mListView, SIGNAL(selectionChanged()), 113 connect(mListView, SIGNAL(selectionChanged()),
110 this, SLOT(addresseeSelected())); 114 this, SLOT(addresseeSelected()));
111 connect(mListView, SIGNAL(startAddresseeDrag()), this, 115 connect(mListView, SIGNAL(startAddresseeDrag()), this,
112 SIGNAL(startDrag())); 116 SIGNAL(startDrag()));
113 connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, 117 connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
114 SIGNAL(dropped(QDropEvent*))); 118 SIGNAL(dropped(QDropEvent*)));
115 119
116 if (KABPrefs::instance()->mHonorSingleClick) { 120 if (KABPrefs::instance()->mHonorSingleClick) {
117 // qDebug("KAddressBookTableView::reconstructListView single"); 121 // qDebug("KAddressBookTableView::reconstructListView single");
118 connect(mListView, SIGNAL(executed(QListViewItem*)), 122 connect(mListView, SIGNAL(executed(QListViewItem*)),
119 this, SLOT(addresseeExecuted(QListViewItem*))); 123 this, SLOT(addresseeExecuted(QListViewItem*)));
120 } else { 124 } else {
121 // qDebug("KAddressBookTableView::reconstructListView double"); 125 // qDebug("KAddressBookTableView::reconstructListView double");
122 connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), 126 connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
123 this, SLOT(addresseeExecuted(QListViewItem*))); 127 this, SLOT(addresseeExecuted(QListViewItem*)));
124 } 128 }
125 connect(mListView, SIGNAL(returnPressed(QListViewItem*)), 129 connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
126 this, SLOT(addresseeExecuted(QListViewItem*))); 130 this, SLOT(addresseeExecuted(QListViewItem*)));
127 connect(mListView, SIGNAL(signalDelete()), 131 connect(mListView, SIGNAL(signalDelete()),
128 this, SLOT(addresseeDeleted())); 132 this, SLOT(addresseeDeleted()));
129 133
130//US performceimprovement. Refresh is done from the outside 134//US performceimprovement. Refresh is done from the outside
131//US refresh(); 135//US refresh();
132 136
133 mListView->setSorting( 0, true ); 137 mListView->setSorting( 0, true );
134 mainLayout->addWidget( mListView ); 138 mainLayout->addWidget( mListView );
135 mainLayout->activate(); 139 mainLayout->activate();
136 mListView->show(); 140 mListView->show();
137} 141}
138 142
139void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) 143void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field )
140{ 144{
141 mListView->clear(); 145 mListView->clear();
142 if ( s.isEmpty() || s == "*" ) { 146 if ( s.isEmpty() || s == "*" ) {
143 refresh(); 147 refresh();
144 return; 148 return;
145 } 149 }
146 QRegExp re = getRegExp( s ); 150 QRegExp re = getRegExp( s );
147 if (!re.isValid()) 151 if (!re.isValid())
148 return; 152 return;
149 KABC::Addressee::List addresseeList = addressees(); 153 KABC::Addressee::List addresseeList = addressees();
150 KABC::Addressee::List::Iterator it; 154 KABC::Addressee::List::Iterator it;
151 if ( field ) { 155 if ( field ) {
152 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 156 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
153 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) 157 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
154 continue; 158 continue;
155#if QT_VERSION >= 0x030000 159#if QT_VERSION >= 0x030000
156 if (re.search(field->value( *it ).lower()) == 0) 160 if (re.search(field->value( *it ).lower()) == 0)
157#else 161#else
158 if (re.match(field->value( *it ).lower()) != -1) 162 if (re.match(field->value( *it ).lower()) != -1)
159#endif 163#endif
160 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); 164 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
161 165
162 } 166 }
163 } else { 167 } else {
164 KABC::Field::List fieldList = allFields(); 168 KABC::Field::List fieldList = allFields();