summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.cpp12
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginconfig.h5
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.cpp3
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.h1
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
@@ -48,50 +48,62 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char*
QLabel* clipLabel = new QLabel( box2, "" );
clipLabel->setText( tr( "Clip line after X chars" ) );
SpinBoxClip = new QSpinBox( box2, "SpinClip" );
SpinBoxClip->setMaxValue( 200 );
QWhatsThis::add( SpinBoxClip , tr( "After how many chars should be the info about the task be cut off" ) );
QHBox *box3 = new QHBox( this );
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
@@ -10,51 +10,54 @@
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#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();
private:
/**
* if changed then save
*/
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
@@ -58,32 +58,33 @@ AddressBookPluginWidget::~AddressBookPluginWidget() {
}
void AddressBookPluginWidget::refresh( const OContactAccess* )
{
qWarning(" AddressBookPluginWidget::Database was changed externally ! ");
m_contactdb->reload();
getAddress();
}
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() {
if ( ! layoutTodo ){
layoutTodo = new QVBoxLayout( this );
}
if ( ! addressLabel ) {
addressLabel = new OClickableLabel( this );
connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
layoutTodo->addWidget( addressLabel );
@@ -102,33 +103,33 @@ void AddressBookPluginWidget::getAddress() {
querybirthdays.setBirthday( lookAheadDate );
int ammount = 0;
m_list = m_contactdb->queryByExample( querybirthdays, OContactAccess::DateDiff );
if ( m_list.count() > 0 ){
output = QObject::tr( "Next birthdays in <b> %1 </b> days: <br>" ).arg( m_daysLookAhead );
for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
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 );
}
// Define the query for anniversaries and start search..
OContact queryanniversaries;
queryanniversaries.setAnniversary( lookAheadDate );
m_list = m_contactdb->queryByExample( queryanniversaries, OContactAccess::DateDiff );
ammount = 0;
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
@@ -39,19 +39,20 @@ protected slots:
void startAddressBook();
void refresh( const OContactAccess* db );
private:
OClickableLabel* addressLabel;
QVBoxLayout* layoutTodo;
OContactAccess * m_contactdb;
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