3 files changed, 26 insertions, 9 deletions

diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 9804e28..4cc22ea 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -125,216 +125,221 @@ void DynamicTip::maybeTip( const QPoint &pos )
         }
 
       if ( notes[i] == '\n' || doBreak ) {
         s += notes.mid( a, i - a + (doBreak?1:0) ) +"\n";
 
         a = i + 1;
         lastSpace = a;
         linew = 0;
       }
 
       if ( notes[i].isSpace() ) {
         lastSpace = i;
         lastw = linew;
       }
 
       if ( lastSpace <= a ) {
         lastw = linew;
       }
 
       ++i;
     }
   }
 
   tip( r, s );
     }
         else
         hide();
         ishidden = !ishidden;
       
 }
 
 ///////////////////////////
 // ContactListViewItem Methods
 
 ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
                                          ContactListView *parent,
                                          KABC::AddressBook *doc,
                                          const KABC::Field::List &fields )
   : KListViewItem(parent), mAddressee(a), mFields( fields ),
     parentListView( parent ), mDocument(doc)
 {
   refresh();
 }
 
 QString ContactListViewItem::key(int column, bool ascending) const
 {
   return QListViewItem::key(column, ascending).lower();
 }
 
 void ContactListViewItem::paintCell(QPainter * p,
                                                     const QColorGroup & cg,
                                     int column,
                                     int width,
                                     int align)
 {
   KListViewItem::paintCell(p, cg, column, width, align);
 
   if ( !p )
     return;
 
   if (parentListView->singleLine()) {
     p->setPen( parentListView->alternateColor() );
     p->drawLine( 0, height() - 1, width, height() - 1 );
   }
 }
 
 
 ContactListView *ContactListViewItem::parent()
 {
   return parentListView;
 }
 
 
 void ContactListViewItem::refresh()
 {
   // Update our addressee, since it may have changed else were
   mAddressee = mDocument->findByUid(mAddressee.uid());
   if (mAddressee.isEmpty())
     return;
 
   int i = 0;
   KABC::Field::List::ConstIterator it;
   for( it = mFields.begin(); it != mFields.end(); ++it ) {
     setText( i++, (*it)->value( mAddressee ) );
   }
 }
 
 ///////////////////////////////
 // ContactListView
 
 ContactListView::ContactListView(KAddressBookTableView *view,
                                  KABC::AddressBook* /* doc */,
                                  QWidget *parent,
                                  const char *name )
   : KListView( parent, name ),
     pabWidget( view ),
     oldColumn( 0 )
 {
   mABackground = true;
   mSingleLine = false;
   mToolTips = true;
 #ifndef KAB_EMBEDDED  
   mAlternateColor = KGlobalSettings::alternateBackgroundColor();
 #else //KAB_EMBEDDED  
   mAlternateColor = QColor(240, 240, 240);
 #endif //KAB_EMBEDDED  
 
   setAlternateBackgroundEnabled(mABackground);
   setAcceptDrops( true );
   viewport()->setAcceptDrops( true );
   setAllColumnsShowFocus( true );
   setShowSortIndicator(true);
   
   setSelectionModeExt( KListView::Extended   );
   setDropVisualizer(false);
   // setFrameStyle(QFrame::NoFrame);
   //setLineWidth ( 0 );
   //setMidLineWidth ( 0 );
   //setMargin ( 0 );
 #ifndef KAB_EMBEDDED  
   connect(this, SIGNAL(dropped(QDropEvent*)),
           this, SLOT(itemDropped(QDropEvent*)));
 #endif //KAB_EMBEDDED  
 
           
   new DynamicTip( this );
 }
 
+void ContactListView::setAlternateColor(const QColor &m_AlternateColor)
+{
+  mAlternateColor = m_AlternateColor;
+}
+
 void ContactListView::paintEmptyArea( QPainter * p, const QRect & rect )
 {
   QBrush b = palette().brush(QPalette::Active, QColorGroup::Base);
 
   // Get the brush, which will have the background pixmap if there is one.
   if (b.pixmap())
   {
     p->drawTiledPixmap( rect.left(), rect.top(), rect.width(), rect.height(),
       *(b.pixmap()),
       rect.left() + contentsX(),
       rect.top() + contentsY() );
   }
 
   else
   {
     // Do a normal paint
     KListView::paintEmptyArea(p, rect);
   }
 }
 
 void ContactListView::contentsMousePressEvent(QMouseEvent* e)
 {
   presspos = e->pos();
   KListView::contentsMousePressEvent(e);
 }
 
 
 // To initiate a drag operation
 void ContactListView::contentsMouseMoveEvent( QMouseEvent *e )
 {
   if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
     emit startAddresseeDrag();
   }
   else
     KListView::contentsMouseMoveEvent( e );
 }
 
 bool ContactListView::acceptDrag(QDropEvent *e) const
 {
 #ifndef KAB_EMBEDDED  
   return QTextDrag::canDecode(e);
 #else //KAB_EMBEDDED  
 qDebug("ContactListView::acceptDrag has to be fixed");
   return false;
 #endif //KAB_EMBEDDED  
 }
 
 void ContactListView::itemDropped(QDropEvent *e)
 {
   contentsDropEvent(e);
 }
 
 void ContactListView::contentsDropEvent( QDropEvent *e )
 {
   emit addresseeDropped(e);
 }
 
 void ContactListView::setAlternateBackgroundEnabled(bool enabled)
 {
   mABackground = enabled;
 
   if (mABackground)
   {
     setAlternateBackground(mAlternateColor);
   }
   else
   {
     setAlternateBackground(QColor());
   }
 }
 
 void ContactListView::setBackgroundPixmap(const QString &filename)
 {
   if (filename.isEmpty())
   {
     unsetPalette();
   }
   else
   {
   qDebug("ContactListView::setBackgroundPixmap has to be verified");
 //US    setPaletteBackgroundPixmap(QPixmap(filename));
     KListView::setBackgroundPixmap((const QPixmap&)QPixmap(filename));
   }
   
 }
 #ifndef KAB_EMBEDDED    
 #include "contactlistview.moc"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index ae9c994..fad7f38 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -1,128 +1,129 @@
 #ifndef CONTACTLISTVIEW_H
 #define CONTACTLISTVIEW_H
 
 #include <qcolor.h>
 #include <qpixmap.h>
 #include <qtooltip.h>
 #include <qstring.h>
 
 #include <klistview.h>
 
 #include <kabc/field.h>
 #include <kabc/addressee.h>
 #include <kabc/addressbook.h>
 
 
 class QDropEvent;
 class KAddressBookTableView;
 class ContactListView;
 
 /** The whole tooltip design needs a lot of work. Currently it is
 * hacked together to function.
 */
 class DynamicTip : public QToolTip
 {
   public:
     DynamicTip( ContactListView * parent );
 
   protected:
     void maybeTip( const QPoint & );
     
   private:
 };
 
 class ContactListViewItem : public KListViewItem
 {
 
 public:
   ContactListViewItem(const KABC::Addressee &a, ContactListView* parent, 
                       KABC::AddressBook *doc, const KABC::Field::List &fields );
   const KABC::Addressee &addressee() const { return mAddressee; }
   virtual void refresh();
   virtual ContactListView* parent();
   virtual QString key ( int, bool ) const;
   
   /** Adds the border around the cell if the user wants it.
   * This is how the single line config option is implemented.
   */
   virtual void paintCell(QPainter * p, const QColorGroup & cg, 
                          int column, int width, int align );
 
 private:
   KABC::Addressee mAddressee;
   KABC::Field::List mFields;
   ContactListView *parentListView;
   KABC::AddressBook *mDocument;
 };
 
 
 /////////////////////////////////////////////
 // ContactListView
 
 class ContactListView : public KListView
 {
   Q_OBJECT
 
 public:
   ContactListView(KAddressBookTableView *view, 
                   KABC::AddressBook *doc,
                   QWidget *parent, 
                   const char *name = 0L );
   virtual ~ContactListView() {}
   //void resort();
   
   /** Returns true if tooltips should be displayed, false otherwise
   */
   bool tooltips() const { return mToolTips; }
   void setToolTipsEnabled(bool enabled) { mToolTips = enabled; }
   
   bool alternateBackground() const { return mABackground; }
   void setAlternateBackgroundEnabled(bool enabled);
   
   bool singleLine() const { return mSingleLine; }
   void setSingleLineEnabled(bool enabled) { mSingleLine = enabled; }
   
   const QColor &alternateColor() const { return mAlternateColor; }
+  void setAlternateColor(const QColor &mAlternateColor);
   
   /** Sets the background pixmap to <i>filename</i>. If the
   * QString is empty (QString::isEmpty()), then the background
   * pixmap will be disabled.
   */
   void setBackgroundPixmap(const QString &filename);
 
 protected:
   /** Paints the background pixmap in the empty area. This method is needed
   * since Qt::FixedPixmap will not scroll with the list view.
   */
   virtual void paintEmptyArea( QPainter * p, const QRect & rect );
   virtual void contentsMousePressEvent(QMouseEvent*);
   void contentsMouseMoveEvent( QMouseEvent *e );
   void contentsDropEvent( QDropEvent *e );
   virtual bool acceptDrag(QDropEvent *e) const;
 
 protected slots:
   void itemDropped(QDropEvent *e);
   
 public slots:
 
 signals:
   void startAddresseeDrag();
   void addresseeDropped(QDropEvent *);
   
 private:
   KAddressBookTableView *pabWidget;
   int oldColumn;
   int column;
   bool ascending;
 
   bool mABackground;
   bool mSingleLine;
   bool mToolTips;
 
   QColor mAlternateColor;
   
   QPoint presspos;
 };
 
 
 #endif
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 0847b64..ab11e2a 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -1,295 +1,306 @@
 // $Id$
 
 #include <qvbox.h>
 #include <qlistbox.h>
 #include <qwidget.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qcombobox.h>
 #include <qapplication.h>
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qurl.h>
 #include <qpixmap.h>
 
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
 //US#include "configuretableviewdialog.h"
 #include "contactlistview.h"
 #include "kabprefs.h"
 #include "undocmds.h"
 #include "viewmanager.h"
 
 #include <qlayout.h>
-
+#include <qheader.h>
 
 #include "kaddressbooktableview.h"
 
 
 KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
                                               QWidget *parent, const char *name )
   : KAddressBookView( ab, parent, name )
 {
   mainLayout = new QVBoxLayout( viewWidget(), 2 );
 
   // The list view will be created when the config is read.
   mListView = 0;
 }
 
 KAddressBookTableView::~KAddressBookTableView()
 {
 }
 
 void KAddressBookTableView::reconstructListView()
 {
     if (mListView)
     {
         disconnect(mListView, SIGNAL(selectionChanged()),
                    this, SLOT(addresseeSelected()));
         disconnect(mListView, SIGNAL(executed(QListViewItem*)),
                    this, SLOT(addresseeExecuted(QListViewItem*)));
         disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
                    this, SLOT(addresseeExecuted(QListViewItem*)));
         disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                    SIGNAL(startDrag()));
         disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
 
         disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
                    SIGNAL(dropped(QDropEvent*)));
         delete mListView;
     }
 
   mListView = new ContactListView( this, addressBook(), viewWidget() );
 
   // Add the columns
   KABC::Field::List fieldList = fields();
   KABC::Field::List::ConstIterator it;
 
   int c = 0;
   for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
       mListView->addColumn( (*it)->label() );
       mListView->setColumnWidthMode(c++, QListView::Manual);
 //US
       //  qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
   }
 
   connect(mListView, SIGNAL(selectionChanged()),
           this, SLOT(addresseeSelected()));
   connect(mListView, SIGNAL(startAddresseeDrag()), this,
           SIGNAL(startDrag()));
   connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
           SIGNAL(dropped(QDropEvent*)));
 
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mListView, SIGNAL(executed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
   else
     connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
     connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
           this, SLOT(addresseeExecuted(QListViewItem*)));
     connect(mListView, SIGNAL(signalDelete()),
           this, SLOT(addresseeDeleted()));
 
 //US performceimprovement. Refresh is done from the outside
 //US refresh();
 
   mListView->setSorting( 0, true );
   mainLayout->addWidget( mListView );
   mainLayout->activate();
   mListView->show();
 }
 
 void KAddressBookTableView::writeConfig(KConfig *config)
 {
   KAddressBookView::writeConfig(config);
 
   mListView->saveLayout(config, config->group());
 }
 
 void KAddressBookTableView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig( config );
   // The config could have changed the fields, so we need to reconstruct
   // the listview.
   reconstructListView();
 
   // costum colors?
   if ( config->readBoolEntry( "EnableCustomColors", false ) )
   {
     QPalette p( mListView->palette() );
     QColor c = p.color(QPalette::Normal, QColorGroup::Base );
     p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Text );
     p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Button );
     p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::ButtonText );
     p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::Highlight );
     p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
     c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
     p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
-    c = p.color(QPalette::Normal, QColorGroup::Base );
-    p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "AlternatingBackgroundColor", &c ) );
-    mListView->viewport()->setPalette( p );
+#ifndef KAB_EMBEDDED  
+  c = KGlobalSettings::alternateBackgroundColor();
+#else //KAB_EMBEDDED  
+  c = QColor(240, 240, 240);
+#endif //KAB_EMBEDDED  
+    c = config->readColorEntry ("AlternatingBackgroundColor", &c);
+    mListView->setAlternateColor(c);
+
+
+    //US    mListView->viewport()->setPalette( p );
+    mListView->setPalette( p );
   }
   else
   {
     // needed if turned off during a session.
-    mListView->viewport()->setPalette( mListView->palette() );
+    //US    mListView->viewport()->setPalette( mListView->palette() );
+    mListView->setPalette( mListView->palette() );
   }
   
   //custom fonts?
   QFont f( font() );
   if ( config->readBoolEntry( "EnableCustomFonts", false ) )
   {
-    //    mListView->setFont( config->readFontEntry( "TextFont", &f) );
+    mListView->setFont( config->readFontEntry( "TextFont", &f) );
     f.setBold( true );
-    //   mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
+    //US    mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
+    mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) );
   }
   else
   {
-    //   mListView->setFont( f );
+    mListView->setFont( f );
     f.setBold( true );
-    //   mListView->setHeaderFont( f );
+    //US    mListView->setHeaderFont( f );
+    mListView->header()->setFont( f );
   }  
 
 
 
 
 
   // Set the list view options
   mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground",
                                                                  true));
   mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false));
   mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true));
 
   if (config->readBoolEntry("Background", false))
     mListView->setBackgroundPixmap(config->readEntry("BackgroundName"));
 
   // Restore the layout of the listview
   mListView->restoreLayout(config, config->group());
 }
 
 void KAddressBookTableView::refresh(QString uid)
 {
   // For now just repopulate. In reality this method should
   // check the value of uid, and if valid iterate through
   // the listview to find the entry, then tell it to refresh.
 
   if (uid.isNull()) {
     // Clear the list view
     QString currentUID, nextUID;
 #ifndef KAB_EMBEDDED
     ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() );
 #else //KAB_EMBEDDED
     ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() );
 #endif //KAB_EMBEDDED
 
     if ( currentItem ) {
 #ifndef KAB_EMBEDDED
       ContactListViewItem *nextItem = dynamic_cast<ContactListViewItem*>( currentItem->itemBelow() );
 #else //KAB_EMBEDDED
       ContactListViewItem *nextItem = (ContactListViewItem*)( currentItem->itemBelow() );
 #endif //KAB_EMBEDDED
       if ( nextItem )
         nextUID = nextItem->addressee().uid();
       currentUID = currentItem->addressee().uid();
     }
 
     mListView->clear();
 
     currentItem = 0;
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it;
     for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
       ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
       if ( (*it).uid() == currentUID )
         currentItem = item;
       else if ( (*it).uid() == nextUID && !currentItem )
         currentItem = item;
     }
 
     // Sometimes the background pixmap gets messed up when we add lots
     // of items.
     mListView->repaint();
 
     if ( currentItem ) {
       mListView->setCurrentItem( currentItem );
       mListView->ensureItemVisible( currentItem );
     }
   } else {
     // Only need to update on entry. Iterate through and try to find it
     ContactListViewItem *ceItem;
     QListViewItemIterator it( mListView );
     while ( it.current() ) {
 #ifndef KAB_EMBEDDED
       ceItem = dynamic_cast<ContactListViewItem*>( it.current() );
 #else //KAB_EMBEDDED
       ceItem = (ContactListViewItem*)( it.current() );
 #endif //KAB_EMBEDDED
 
       if ( ceItem && ceItem->addressee().uid() == uid ) {
         ceItem->refresh();
         return;
       }
       ++it;
     }
 
     refresh( QString::null );
   }
 }
 
 QStringList KAddressBookTableView::selectedUids()
 {
     QStringList uidList;
     QListViewItem *item;
     ContactListViewItem *ceItem;
 
     for(item = mListView->firstChild(); item; item = item->itemBelow())
     {
         if (mListView->isSelected( item ))
         {
 #ifndef KAB_EMBEDDED
             ceItem = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
             ceItem = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
 
             if (ceItem != 0L)
                 uidList << ceItem->addressee().uid();
         }
     }
     if ( uidList.count() == 0 )
         if ( mListView->currentItem() ) {
             ceItem = (ContactListViewItem*)(mListView->currentItem()) ;
             uidList << ceItem->addressee().uid();
         }
 
     return uidList;
 }
 
 void KAddressBookTableView::setSelected(QString uid, bool selected)
 {
     QListViewItem *item;
     ContactListViewItem *ceItem;
 
     if (uid.isNull())
     {
         mListView->selectAll(selected);
     }
     else
     {