Bugfixed and improved color settings ! Now it is possible to change

the color if the anniversary/birthday is close.. :)

1 files changed, 40 insertions, 15 deletions

diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index c81beee..7d87fca 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -70,6 +70,9 @@ void AddressBookPluginWidget::readConfig() {
     cfg.setGroup( "config" );
-    m_maxLinesTask =  cfg.readNumEntry( "maxlinestask", 5 );
-    m_maxCharClip =   cfg.readNumEntry( "maxcharclip", 38 );
+    m_maxLinesTask  = cfg.readNumEntry( "maxlinestask", 5 );
+    m_maxCharClip   = cfg.readNumEntry( "maxcharclip", 38 );
     m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 );
-    m_entryColor = cfg.readEntry("entrycolor", Qt::red.name() );
+    m_urgentDays    = cfg.readNumEntry( "urgentdays", 7 );
+    m_entryColor    = cfg.readEntry("entrycolor", Qt::black.name() );
+    m_headlineColor = cfg.readEntry( "headlinecolor", Qt::black.name() );
+    m_urgentColor   = cfg.readEntry( "urgentcolor", Qt::red.name() );
 }
@@ -108,3 +111,5 @@ void AddressBookPluginWidget::getAddress() {
 		if ( m_list.count() > 0 ){
-			output = QObject::tr( "Next birthdays in <b> %1 </b> days: <br>" ).arg( m_daysLookAhead );
+			output = "<font color=" + m_headlineColor + ">"
+				+ QObject::tr( "Next birthdays in <b> %1 </b> days:" ).arg( m_daysLookAhead )
+				+ "</font> <br>";
 			for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
@@ -118,6 +123,14 @@ void AddressBookPluginWidget::getAddress() {
 
-					output += "<font color=" + m_entryColor + "><b>-" + (*m_it).fullName() 
-						+ " (" 
-						+ QString::number(QDate::currentDate().daysTo(destdate)) 
-						+ " Days) </b></font><br>";
+					
+					if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
+						output += "<font color=" + m_urgentColor + "><b>-" + (*m_it).fullName() 
+							+ " (" 
+							+ QString::number(QDate::currentDate().daysTo(destdate)) 
+							+ " Days) </b></font><br>";
+					
+					else
+						output += "<font color=" + m_entryColor + "><b>-" + (*m_it).fullName() 
+							+ " (" 
+							+ QString::number(QDate::currentDate().daysTo(destdate)) 
+							+ " Days) </b></font><br>";
 				}
@@ -125,3 +138,5 @@ void AddressBookPluginWidget::getAddress() {
 		} else {
-			output = QObject::tr( "No birthdays in <b> %1 </b> days! <br>" ).arg( m_daysLookAhead );
+			output = "<font color=" + m_headlineColor + ">"
+				+ QObject::tr( "No birthdays in <b> %1 </b> days!" ).arg( m_daysLookAhead )
+				+ "</font> <br>";
 		}
@@ -136,3 +151,5 @@ void AddressBookPluginWidget::getAddress() {
 		if ( m_list.count() > 0 ){
-			output += QObject::tr( "Next anniversaries in <b> %1 </b> days: <br>" ).arg( m_daysLookAhead );
+			output += "<font color=" + m_headlineColor + ">"
+				+ QObject::tr( "Next anniversaries in <b> %1 </b> days:" ).arg( m_daysLookAhead )
+				+ "</font> <br>";
 			for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
@@ -146,6 +163,12 @@ void AddressBookPluginWidget::getAddress() {
 
-					output += "<font color=#e00000><b>-" + (*m_it).fullName() 
-						+ " (" 
-						+ QString::number(QDate::currentDate().daysTo( destdate ) ) 
-						+ " Days) </b></font><br>";
+					if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
+						output += "<font color=" + m_urgentColor + "><b>-" + (*m_it).fullName() 
+							+ " (" 
+							+ QString::number(QDate::currentDate().daysTo( destdate ) ) 
+							+ " Days) </b></font><br>";
+					else
+						output += "<font color=" + m_entryColor + "><b>-" + (*m_it).fullName() 
+							+ " (" 
+							+ QString::number(QDate::currentDate().daysTo( destdate ) ) 
+							+ " Days) </b></font><br>";
 				}
@@ -153,3 +176,5 @@ void AddressBookPluginWidget::getAddress() {
 		} else {
-			output += QObject::tr( "No anniversaries in <b> %1 </b> days! <br>" ).arg( m_daysLookAhead );
+			output += "<font color=" + m_headlineColor + ">" 
+				+ QObject::tr( "No anniversaries in <b> %1 </b> days!" ).arg( m_daysLookAhead )
+				+ "</font> <br>";
 		}