-rw-r--r-- | core/pim/today/plugins/addressbook/addresspluginwidget.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp index 5662af2..75bf474 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp | |||
@@ -107,24 +107,29 @@ void AddressBookPluginWidget::getAddress() { | |||
107 | 107 | ||
108 | 108 | ||
109 | Opie::OPimContact querybirthdays; | 109 | Opie::OPimContact querybirthdays; |
110 | querybirthdays.setBirthday( lookAheadDate ); | 110 | querybirthdays.setBirthday( lookAheadDate ); |
111 | 111 | ||
112 | m_list = m_contactdb->queryByExample( querybirthdays, | 112 | m_list = m_contactdb->queryByExample( querybirthdays, |
113 | Opie::OPimContactAccess::DateDiff ); | 113 | Opie::OPimContactAccess::DateDiff ); |
114 | if ( m_list.count() > 0 ){ | 114 | if ( m_list.count() > 0 ){ |
115 | output = "<font color=" + m_headlineColor + ">" | 115 | output = "<font color=" + m_headlineColor + ">" |
116 | + QObject::tr( "Next birthdays in <b> %1 </b> days:" ) | 116 | + QObject::tr( "Next birthdays in <b> %1 </b> days:" ) |
117 | .arg( m_daysLookAhead ) | 117 | .arg( m_daysLookAhead ) |
118 | + "</font> <br>"; | 118 | + "</font> <br>"; |
119 | |||
120 | // Sort filtered results | ||
121 | m_list = m_contactdb->sorted( m_list, true, Opie::OPimContactAccess::SortBirthday, | ||
122 | Opie::OPimContactAccess::FilterOff, NULL ); | ||
123 | |||
119 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | 124 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { |
120 | if ( ammount++ < m_maxLinesTask ){ | 125 | if ( ammount++ < m_maxLinesTask ){ |
121 | // Now we want to calculate how many days | 126 | // Now we want to calculate how many days |
122 | //until birthday. We have to set | 127 | //until birthday. We have to set |
123 | // the correct year to calculate the day diff... | 128 | // the correct year to calculate the day diff... |
124 | QDate destdate = (*m_it).birthday(); | 129 | QDate destdate = (*m_it).birthday(); |
125 | destdate.setYMD( QDate::currentDate().year(), | 130 | destdate.setYMD( QDate::currentDate().year(), |
126 | destdate.month(), destdate.day() ); | 131 | destdate.month(), destdate.day() ); |
127 | if ( QDate::currentDate().daysTo(destdate) < 0 ) | 132 | if ( QDate::currentDate().daysTo(destdate) < 0 ) |
128 | destdate.setYMD( QDate::currentDate().year()+1, | 133 | destdate.setYMD( QDate::currentDate().year()+1, |
129 | destdate.month(), destdate.day() ); | 134 | destdate.month(), destdate.day() ); |
130 | 135 | ||
@@ -159,24 +164,29 @@ void AddressBookPluginWidget::getAddress() { | |||
159 | // Define the query for anniversaries and start search.. | 164 | // Define the query for anniversaries and start search.. |
160 | Opie::OPimContact queryanniversaries; | 165 | Opie::OPimContact queryanniversaries; |
161 | queryanniversaries.setAnniversary( lookAheadDate ); | 166 | queryanniversaries.setAnniversary( lookAheadDate ); |
162 | 167 | ||
163 | m_list = m_contactdb->queryByExample( queryanniversaries, Opie::OPimContactAccess::DateDiff ); | 168 | m_list = m_contactdb->queryByExample( queryanniversaries, Opie::OPimContactAccess::DateDiff ); |
164 | 169 | ||
165 | ammount = 0; | 170 | ammount = 0; |
166 | if ( m_list.count() > 0 ){ | 171 | if ( m_list.count() > 0 ){ |
167 | output += "<font color=" + m_headlineColor + ">" | 172 | output += "<font color=" + m_headlineColor + ">" |
168 | + QObject::tr( "Next anniversaries in <b> %1 </b> days:" ) | 173 | + QObject::tr( "Next anniversaries in <b> %1 </b> days:" ) |
169 | .arg( m_daysLookAhead ) | 174 | .arg( m_daysLookAhead ) |
170 | + "</font> <br>"; | 175 | + "</font> <br>"; |
176 | |||
177 | // Sort filtered results | ||
178 | m_list = m_contactdb->sorted( m_list, true, Opie::OPimContactAccess::SortAnniversary, | ||
179 | Opie::OPimContactAccess::FilterOff, NULL ); | ||
180 | |||
171 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | 181 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { |
172 | if ( ammount++ < m_maxLinesTask ){ | 182 | if ( ammount++ < m_maxLinesTask ){ |
173 | // Now we want to calculate how many days until anniversary. | 183 | // Now we want to calculate how many days until anniversary. |
174 | // We have to set the correct year to calculate the day diff... | 184 | // We have to set the correct year to calculate the day diff... |
175 | QDate destdate = (*m_it).anniversary(); | 185 | QDate destdate = (*m_it).anniversary(); |
176 | destdate.setYMD( QDate::currentDate().year(), destdate.month(), | 186 | destdate.setYMD( QDate::currentDate().year(), destdate.month(), |
177 | destdate.day() ); | 187 | destdate.day() ); |
178 | if ( QDate::currentDate().daysTo(destdate) < 0 ) | 188 | if ( QDate::currentDate().daysTo(destdate) < 0 ) |
179 | destdate.setYMD( QDate::currentDate().year()+1, | 189 | destdate.setYMD( QDate::currentDate().year()+1, |
180 | destdate.month(), destdate.day() ); | 190 | destdate.month(), destdate.day() ); |
181 | 191 | ||
182 | if ( QDate::currentDate().daysTo(destdate) < m_urgentDays ) | 192 | if ( QDate::currentDate().daysTo(destdate) < m_urgentDays ) |