sourceforge 1014886: select fonts and colors for tableview

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
@@ -241,24 +241,29 @@ ContactListView::ContactListView(KAddressBookTableView *view,
   //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() );
   }
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
@@ -74,24 +74,25 @@ public:
   /** 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 );
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
@@ -23,25 +23,25 @@
 #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;
@@ -133,47 +133,58 @@ void KAddressBookTableView::readConfig(KConfig *config)
     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));