Color for entries is now customizeable

4 files changed, 19 insertions, 2 deletions

diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index 686d72c..f00cffe 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -56,42 +56,54 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
     QLabel* daysLabel = new QLabel( box3, "" );
     daysLabel->setText( tr( "Days look ahead" ) );
 
     SpinDaysClip = new QSpinBox( box3, "SpinDays" );
     SpinDaysClip->setMaxValue( 200 );
     QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
 
+    QHBox *box4 = new QHBox( this );
+
+    QLabel* colorLabel = new QLabel( box4, "" );
+    colorLabel->setText( tr( "Set Entry Color \n(restart Today \nafter change!)" ) );
+
+    entryColor = new OColorButton( box4, red, "entryColor" );
+    QWhatsThis::add( entryColor , tr( "What color should be used for shown birthdays/anniversaries?" ) );
+
     layout->addWidget( box1 );
     layout->addWidget( box2 );
     layout->addWidget( box3 );
+    layout->addWidget( box4 );
 
     readConfig();
 }
 
 void AddressBookPluginConfig::readConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     m_max_lines_task = cfg.readNumEntry( "maxlinestask", 5 );
     SpinBox2->setValue( m_max_lines_task );
     m_maxCharClip =  cfg.readNumEntry( "maxcharclip", 38 );
     SpinBoxClip->setValue( m_maxCharClip );
     m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 );
     SpinDaysClip->setValue( m_daysLookAhead );
+    m_entryColor = cfg.readEntry( "entrycolor", Qt::red.name() );
 }
 
 
 void AddressBookPluginConfig::writeConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     m_max_lines_task = SpinBox2->value();
     cfg.writeEntry( "maxlinestask", m_max_lines_task );
     m_maxCharClip = SpinBoxClip->value();
     cfg.writeEntry( "maxcharclip",  m_maxCharClip );
     m_daysLookAhead = SpinDaysClip->value();
     cfg.writeEntry( "dayslookahead",  m_daysLookAhead );
+    m_entryColor = entryColor->color().name();
+    cfg.writeEntry( "entrycolor", m_entryColor );
     cfg.write();
 }
 
 
 AddressBookPluginConfig::~AddressBookPluginConfig() {
 }
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h
index 6f128d4..54c8b4f 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.h
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h
@@ -18,16 +18,17 @@
 
 #ifndef ADDRESSBOOK_PLUGIN_CONFIG_H
 #define ADDRESSBOOK_PLUGIN_CONFIG_H
 
 #include <qwidget.h>
 #include <qspinbox.h>
 
 #include <opie/todayconfigwidget.h>
+#include <opie/ocolorbutton.h>
 
 class AddressBookPluginConfig : public TodayConfigWidget {
 
 
 public:
 
     AddressBookPluginConfig( QWidget *parent,  const char *name );
     ~AddressBookPluginConfig();
@@ -38,23 +39,25 @@ private:
      */
     bool changed();
     void readConfig();
     void writeConfig();
 
     QSpinBox* SpinBox2;
     QSpinBox* SpinBoxClip;
     QSpinBox* SpinDaysClip;
+    OColorButton* entryColor;
 
     // how many lines should be showed in the AddressBook section
     int m_max_lines_task;
     // clip the lines after X chars
     int m_maxCharClip;
     // How many days look ahead
     int m_daysLookAhead;
-
+    // Entry Color
+    QString m_entryColor;
 };
 
 
 
 
 
 #endif
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index 0d4cec8..c81beee 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -66,16 +66,17 @@ void AddressBookPluginWidget::refresh( const OContactAccess* )
 
 
 void AddressBookPluginWidget::readConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     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() );
 }
 
 
 /**
  * Get the addresss
  */
 void AddressBookPluginWidget::getAddress() {
 
@@ -110,17 +111,17 @@ void AddressBookPluginWidget::getAddress() {
                                 if ( ammount++ < m_maxLinesTask ){
                                         // Now we want to calculate how many days until birthday. We have to set 
                                         // the correct year to calculate the day diff...
                                         QDate destdate = (*m_it).birthday();
                                         destdate.setYMD( QDate::currentDate().year(), destdate.month(), destdate.day() );
                                         if ( QDate::currentDate().daysTo(destdate) < 0 )
                                                 destdate.setYMD( QDate::currentDate().year()+1, destdate.month(), destdate.day() );
 
-                                        output += "<font color=#e00000><b>-" + (*m_it).fullName() 
+                                        output += "<font color=" + m_entryColor + "><b>-" + (*m_it).fullName() 
                                                 + " (" 
                                                 + QString::number(QDate::currentDate().daysTo(destdate)) 
                                                 + " Days) </b></font><br>";
                                 }
                         }
                 } else {
                         output = QObject::tr( "No birthdays in <b> %1 </b> days! <br>" ).arg( m_daysLookAhead );
                 }
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h
index 75e223a..fa464de 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.h
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h
@@ -47,11 +47,12 @@ private:
     OContactAccess::List m_list;
     OContactAccess::List::Iterator m_it;
 
     void readConfig();
     void getAddress();
     int m_maxLinesTask;
     int m_maxCharClip;
     int m_daysLookAhead;
+    QString m_entryColor;
 };
 
 #endif