summaryrefslogtreecommitdiff
path: root/core
Unidiff
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.cpp30
1 files changed, 26 insertions, 4 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index 015ac6a..0d4cec8 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -107,8 +107,19 @@ void AddressBookPluginWidget::getAddress() {
107 if ( m_list.count() > 0 ){ 107 if ( m_list.count() > 0 ){
108 output = QObject::tr( "Next birthdays in <b> %1 </b> days: <br>" ).arg( m_daysLookAhead ); 108 output = QObject::tr( "Next birthdays in <b> %1 </b> days: <br>" ).arg( m_daysLookAhead );
109 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { 109 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
110 if ( ammount++ < m_maxLinesTask ) 110 if ( ammount++ < m_maxLinesTask ){
111 output += "<font color=#e00000><b>-" + (*m_it).fullName() + "</b></font><br>"; 111 // Now we want to calculate how many days until birthday. We have to set
112 // the correct year to calculate the day diff...
113 QDate destdate = (*m_it).birthday();
114 destdate.setYMD( QDate::currentDate().year(), destdate.month(), destdate.day() );
115 if ( QDate::currentDate().daysTo(destdate) < 0 )
116 destdate.setYMD( QDate::currentDate().year()+1, destdate.month(), destdate.day() );
117
118 output += "<font color=#e00000><b>-" + (*m_it).fullName()
119 + " ("
120 + QString::number(QDate::currentDate().daysTo(destdate))
121 + " Days) </b></font><br>";
122 }
112 } 123 }
113 } else { 124 } else {
114 output = QObject::tr( "No birthdays in <b> %1 </b> days! <br>" ).arg( m_daysLookAhead ); 125 output = QObject::tr( "No birthdays in <b> %1 </b> days! <br>" ).arg( m_daysLookAhead );
@@ -124,8 +135,19 @@ void AddressBookPluginWidget::getAddress() {
124 if ( m_list.count() > 0 ){ 135 if ( m_list.count() > 0 ){
125 output += QObject::tr( "Next anniversaries in <b> %1 </b> days: <br>" ).arg( m_daysLookAhead ); 136 output += QObject::tr( "Next anniversaries in <b> %1 </b> days: <br>" ).arg( m_daysLookAhead );
126 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { 137 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
127 if ( ammount++ < m_maxLinesTask ) 138 if ( ammount++ < m_maxLinesTask ){
128 output += "<font color=#e00000><b>-" + (*m_it).fullName() + "</b></font><br>"; 139 // Now we want to calculate how many days until anniversary. We have to set
140 // the correct year to calculate the day diff...
141 QDate destdate = (*m_it).anniversary();
142 destdate.setYMD( QDate::currentDate().year(), destdate.month(), destdate.day() );
143 if ( QDate::currentDate().daysTo(destdate) < 0 )
144 destdate.setYMD( QDate::currentDate().year()+1, destdate.month(), destdate.day() );
145
146 output += "<font color=#e00000><b>-" + (*m_it).fullName()
147 + " ("
148 + QString::number(QDate::currentDate().daysTo( destdate ) )
149 + " Days) </b></font><br>";
150 }
129 } 151 }
130 } else { 152 } else {
131 output += QObject::tr( "No anniversaries in <b> %1 </b> days! <br>" ).arg( m_daysLookAhead ); 153 output += QObject::tr( "No anniversaries in <b> %1 </b> days! <br>" ).arg( m_daysLookAhead );