summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/views/contactlistview.cpp5
-rw-r--r--kaddressbook/views/contactlistview.h1
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp29
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
@@ -247,12 +247,17 @@ ContactListView::ContactListView(KAddressBookTableView *view,
247#endif //KAB_EMBEDDED 247#endif //KAB_EMBEDDED
248 248
249 249
250 new DynamicTip( this ); 250 new DynamicTip( this );
251} 251}
252 252
253void ContactListView::setAlternateColor(const QColor &m_AlternateColor)
254{
255 mAlternateColor = m_AlternateColor;
256}
257
253void ContactListView::paintEmptyArea( QPainter * p, const QRect & rect ) 258void ContactListView::paintEmptyArea( QPainter * p, const QRect & rect )
254{ 259{
255 QBrush b = palette().brush(QPalette::Active, QColorGroup::Base); 260 QBrush b = palette().brush(QPalette::Active, QColorGroup::Base);
256 261
257 // Get the brush, which will have the background pixmap if there is one. 262 // Get the brush, which will have the background pixmap if there is one.
258 if (b.pixmap()) 263 if (b.pixmap())
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
@@ -80,12 +80,13 @@ public:
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 87
87 /** Sets the background pixmap to <i>filename</i>. If the 88 /** Sets the background pixmap to <i>filename</i>. If the
88 * QString is empty (QString::isEmpty()), then the background 89 * QString is empty (QString::isEmpty()), then the background
89 * pixmap will be disabled. 90 * pixmap will be disabled.
90 */ 91 */
91 void setBackgroundPixmap(const QString &filename); 92 void setBackgroundPixmap(const QString &filename);
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
@@ -29,13 +29,13 @@
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 35#include <qheader.h>
36 36
37#include "kaddressbooktableview.h" 37#include "kaddressbooktableview.h"
38 38
39 39
40KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, 40KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
41 QWidget *parent, const char *name ) 41 QWidget *parent, const char *name )
@@ -139,35 +139,46 @@ void KAddressBookTableView::readConfig(KConfig *config)
139 c = p.color(QPalette::Normal, QColorGroup::ButtonText ); 139 c = p.color(QPalette::Normal, QColorGroup::ButtonText );
140 p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); 140 p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
141 c = p.color(QPalette::Normal, QColorGroup::Highlight ); 141 c = p.color(QPalette::Normal, QColorGroup::Highlight );
142 p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); 142 p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
143 c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); 143 c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
144 p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); 144 p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
145 c = p.color(QPalette::Normal, QColorGroup::Base ); 145#ifndef KAB_EMBEDDED
146 p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "AlternatingBackgroundColor", &c ) ); 146 c = KGlobalSettings::alternateBackgroundColor();
147 mListView->viewport()->setPalette( p ); 147#else //KAB_EMBEDDED
148 c = QColor(240, 240, 240);
149#endif //KAB_EMBEDDED
150 c = config->readColorEntry ("AlternatingBackgroundColor", &c);
151 mListView->setAlternateColor(c);
152
153
154 //US mListView->viewport()->setPalette( p );
155 mListView->setPalette( p );
148 } 156 }
149 else 157 else
150 { 158 {
151 // needed if turned off during a session. 159 // needed if turned off during a session.
152 mListView->viewport()->setPalette( mListView->palette() ); 160 //US mListView->viewport()->setPalette( mListView->palette() );
161 mListView->setPalette( mListView->palette() );
153 } 162 }
154 163
155 //custom fonts? 164 //custom fonts?
156 QFont f( font() ); 165 QFont f( font() );
157 if ( config->readBoolEntry( "EnableCustomFonts", false ) ) 166 if ( config->readBoolEntry( "EnableCustomFonts", false ) )
158 { 167 {
159 // mListView->setFont( config->readFontEntry( "TextFont", &f) ); 168 mListView->setFont( config->readFontEntry( "TextFont", &f) );
160 f.setBold( true ); 169 f.setBold( true );
161 // mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); 170 //US mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
171 mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) );
162 } 172 }
163 else 173 else
164 { 174 {
165 // mListView->setFont( f ); 175 mListView->setFont( f );
166 f.setBold( true ); 176 f.setBold( true );
167 // mListView->setHeaderFont( f ); 177 //US mListView->setHeaderFont( f );
178 mListView->header()->setFont( f );
168 } 179 }
169 180
170 181
171 182
172 183
173 184