4 files changed, 104 insertions, 23 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp index f00cffe..45d9a3e 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp @@ -37,7 +37,7 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QHBox *box1 = new QHBox( this ); QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" ); - TextLabel6->setText( tr( "Max Lines " ) ); + TextLabel6->setText( tr( "Max Lines: " ) ); SpinBox2 = new QSpinBox( box1, "SpinBox2" ); SpinBox2->setMaxValue( 40 ); @@ -46,7 +46,7 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QHBox *box2 = new QHBox( this ); QLabel* clipLabel = new QLabel( box2, "" ); - clipLabel->setText( tr( "Clip line after X chars" ) ); + clipLabel->setText( tr( "Clip line after X chars: " ) ); SpinBoxClip = new QSpinBox( box2, "SpinClip" ); SpinBoxClip->setMaxValue( 200 ); @@ -55,8 +55,7 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QHBox *box3 = new QHBox( this ); QLabel* daysLabel = new QLabel( box3, "" ); - daysLabel->setText( tr( "Days look ahead" ) ); - + 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" ) ); @@ -64,17 +63,45 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* QHBox *box4 = new QHBox( this ); QLabel* colorLabel = new QLabel( box4, "" ); - colorLabel->setText( tr( "Set Entry Color \n(restart Today \nafter change!)" ) ); + colorLabel->setText( tr( "To activate color settings:\nRestart application !" ) ); + + QHBox *box5 = new QHBox( this ); + + QLabel* colorLabel2 = new QLabel( box5, "" ); + colorLabel2->setText( tr( "Set Headline Color: " ) ); + headlineColor = new OColorButton( box5, black , "headlineColor" ); + QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) ); + + QHBox *box6 = new QHBox( this ); + + QLabel* colorLabel3= new QLabel( box6, "" ); + colorLabel3->setText( tr( "Set Entry Color: " ) ); + entryColor = new OColorButton( box6, black , "entryColor" ); + QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) ); + + QHBox *box7 = new QHBox( this ); + + QLabel* colorLabel5 = new QLabel( box7, "" ); + colorLabel5->setText( tr( "Set Urgent\nColor if below " ) ); + SpinUrgentClip = new QSpinBox( box7, "SpinDays" ); + SpinUrgentClip->setMaxValue( 200 ); + QLabel* colorLabel6 = new QLabel( box7, "" ); + colorLabel6->setText( tr( "days: " ) ); + urgentColor = new OColorButton( box7, red , "urgentColor" ); + QWhatsThis::add( urgentColor , tr( "This color will be used if we are close to the event !" ) ); + QWhatsThis::add( SpinUrgentClip , tr( "How many days we should search forward" ) ); - 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 ); + layout->addWidget( box5 ); + layout->addWidget( box6 ); + layout->addWidget( box7 ); readConfig(); + } void AddressBookPluginConfig::readConfig() { @@ -86,7 +113,15 @@ void AddressBookPluginConfig::readConfig() { SpinBoxClip->setValue( m_maxCharClip ); m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 ); SpinDaysClip->setValue( m_daysLookAhead ); - m_entryColor = cfg.readEntry( "entrycolor", Qt::red.name() ); + m_urgentDays = cfg.readNumEntry( "urgentdays", 7 ); + SpinUrgentClip->setValue( m_urgentDays ); + + m_entryColor = cfg.readEntry( "entrycolor", Qt::black.name() ); + entryColor->setColor( QColor( m_entryColor ) ); + m_headlineColor = cfg.readEntry( "headlinecolor", Qt::black.name() ); + headlineColor->setColor( QColor( m_headlineColor ) ); + m_urgentColor = cfg.readEntry( "urgentcolor", Qt::red.name() ); + urgentColor->setColor( QColor( m_urgentColor ) ); } @@ -99,8 +134,17 @@ void AddressBookPluginConfig::writeConfig() { cfg.writeEntry( "maxcharclip", m_maxCharClip ); m_daysLookAhead = SpinDaysClip->value(); cfg.writeEntry( "dayslookahead", m_daysLookAhead ); + m_urgentDays = SpinUrgentClip->value(); + if ( m_urgentDays > m_daysLookAhead ) + m_urgentDays = m_daysLookAhead; + cfg.writeEntry( "urgentdays", m_urgentDays ); + m_entryColor = entryColor->color().name(); cfg.writeEntry( "entrycolor", m_entryColor ); + m_headlineColor = headlineColor->color().name(); + cfg.writeEntry( "headlinecolor", m_headlineColor ); + m_urgentColor = urgentColor->color().name(); + cfg.writeEntry( "urgentcolor", m_urgentColor ); cfg.write(); } diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h index 54c8b4f..ea03368 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.h +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h @@ -44,7 +44,10 @@ private: QSpinBox* SpinBox2; QSpinBox* SpinBoxClip; QSpinBox* SpinDaysClip; + QSpinBox* SpinUrgentClip; OColorButton* entryColor; + OColorButton* headlineColor; + OColorButton* urgentColor; // how many lines should be showed in the AddressBook section int m_max_lines_task; @@ -52,8 +55,14 @@ private: int m_maxCharClip; // How many days look ahead int m_daysLookAhead; + // Days until urgent color is used + int m_urgentDays; // Entry Color QString m_entryColor; + // Headline Color + QString m_headlineColor; + // Urgent Color + QString m_urgentColor; }; 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 @@ -68,10 +68,13 @@ 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_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() ); } @@ -106,7 +109,9 @@ void AddressBookPluginWidget::getAddress() { 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 ); + 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 ) { if ( ammount++ < m_maxLinesTask ){ // Now we want to calculate how many days until birthday. We have to set @@ -116,14 +121,24 @@ void AddressBookPluginWidget::getAddress() { if ( QDate::currentDate().daysTo(destdate) < 0 ) destdate.setYMD( QDate::currentDate().year()+1, destdate.month(), destdate.day() ); - 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>"; } } } 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>"; } // Define the query for anniversaries and start search.. @@ -134,7 +149,9 @@ void AddressBookPluginWidget::getAddress() { ammount = 0; 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 ) { if ( ammount++ < m_maxLinesTask ){ // Now we want to calculate how many days until anniversary. We have to set @@ -144,14 +161,22 @@ void AddressBookPluginWidget::getAddress() { if ( QDate::currentDate().daysTo(destdate) < 0 ) destdate.setYMD( QDate::currentDate().year()+1, destdate.month(), destdate.day() ); - 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>"; } } } 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>"; } diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h index fa464de..89ffe7f 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.h +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h @@ -52,7 +52,10 @@ private: int m_maxLinesTask; int m_maxCharClip; int m_daysLookAhead; + int m_urgentDays; QString m_entryColor; + QString m_headlineColor; + QString m_urgentColor; }; #endif |