-rw-r--r-- | korganizer/kolistview.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 8f17e6e..43e1113 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -190,97 +190,97 @@ bool ListItemVisitor::visit(Todo *t) | |||
190 | } | 190 | } |
191 | } else { | 191 | } else { |
192 | mItem->setText(7,"---"); | 192 | mItem->setText(7,"---"); |
193 | mItem->setText(8,"---"); | 193 | mItem->setText(8,"---"); |
194 | } | 194 | } |
195 | mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No")); | 195 | mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No")); |
196 | mItem->setText(10,t->categoriesStr()); | 196 | mItem->setText(10,t->categoriesStr()); |
197 | mItem->setText(11, KOPrefs::instance()->calName( t->calID() )); | 197 | mItem->setText(11, KOPrefs::instance()->calName( t->calID() )); |
198 | 198 | ||
199 | QString key; | 199 | QString key; |
200 | QDate d; | 200 | QDate d; |
201 | if (t->hasDueDate()) { | 201 | if (t->hasDueDate()) { |
202 | d = t->dtDue().date(); | 202 | d = t->dtDue().date(); |
203 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time(); | 203 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time(); |
204 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); | 204 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); |
205 | mItem->setSortKey(7,key); | 205 | mItem->setSortKey(7,key); |
206 | } | 206 | } |
207 | if ( t->hasStartDate() ) { | 207 | if ( t->hasStartDate() ) { |
208 | d = t->dtStart().date(); | 208 | d = t->dtStart().date(); |
209 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time(); | 209 | QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time(); |
210 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); | 210 | key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute()); |
211 | mItem->setSortKey(1,key); | 211 | mItem->setSortKey(1,key); |
212 | } | 212 | } |
213 | return true; | 213 | return true; |
214 | } | 214 | } |
215 | 215 | ||
216 | bool ListItemVisitor::visit(Journal * j) | 216 | bool ListItemVisitor::visit(Journal * j) |
217 | { | 217 | { |
218 | 218 | ||
219 | QString des; | 219 | QString des; |
220 | if ( !j->summary().isEmpty() ) { | 220 | if ( !j->summary().isEmpty() ) { |
221 | des = j->summary(); | 221 | des = j->summary(); |
222 | } else { | 222 | } else { |
223 | des = j->description().left(30); | 223 | des = j->description().left(30); |
224 | des = des.simplifyWhiteSpace (); | 224 | des = des.simplifyWhiteSpace (); |
225 | des.replace (QRegExp ("\\n"),"" ); | 225 | des.replace (QRegExp ("\\n"),"" ); |
226 | des.replace (QRegExp ("\\r"),"" ); | 226 | des.replace (QRegExp ("\\r"),"" ); |
227 | } | 227 | } |
228 | mItem->setText(0,i18n("Journal: ")+des.left(25)); | 228 | mItem->setText(0,i18n("Journal: ")+des.left(25)); |
229 | mItem->setText(1,j->dtStartDateStr()); | 229 | mItem->setText(1,j->dtStartDateStr()); |
230 | mItem->setText(2,"---"); | 230 | mItem->setText(2,"---"); |
231 | mItem->setText(3,"---"); | 231 | mItem->setText(3,"---"); |
232 | mItem->setText(4,"---"); | 232 | mItem->setText(4,"---"); |
233 | mItem->setText(5,"---"); | 233 | mItem->setText(5,"---"); |
234 | mItem->setText(6,"---"); | 234 | mItem->setText(6,"---"); |
235 | mItem->setText(7,j->dtStartDateStr()); | 235 | mItem->setText(7,j->dtStartDateStr()); |
236 | mItem->setText(8,"---"); | 236 | mItem->setText(8,"---"); |
237 | mItem->setText(9,"---"); | 237 | mItem->setText(9,"---"); |
238 | mItem->setText(10,i18n("Last Modified: ")+ KGlobal::locale()->formatDateTime( j->lastModified() , true) ); | 238 | mItem->setText(10,j->categoriesStr()); |
239 | mItem->setText(11, KOPrefs::instance()->calName( j->calID() )); | 239 | mItem->setText(11, KOPrefs::instance()->calName( j->calID() )); |
240 | 240 | ||
241 | QString key; | 241 | QString key; |
242 | QDate d = j->dtStart().date(); | 242 | QDate d = j->dtStart().date(); |
243 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); | 243 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); |
244 | mItem->setSortKey(1,key); | 244 | mItem->setSortKey(1,key); |
245 | mItem->setSortKey(7,key); | 245 | mItem->setSortKey(7,key); |
246 | 246 | ||
247 | return true; | 247 | return true; |
248 | } | 248 | } |
249 | 249 | ||
250 | KOListView::KOListView(Calendar *calendar, QWidget *parent, | 250 | KOListView::KOListView(Calendar *calendar, QWidget *parent, |
251 | const char *name) | 251 | const char *name) |
252 | : KOEventView(calendar, parent, name) | 252 | : KOEventView(calendar, parent, name) |
253 | { | 253 | { |
254 | 254 | ||
255 | mActiveItem = 0; | 255 | mActiveItem = 0; |
256 | mForceShowCompletedTodos = false; | 256 | mForceShowCompletedTodos = false; |
257 | mListView = new KOListViewListView(this); | 257 | mListView = new KOListViewListView(this); |
258 | mListView->addColumn(i18n("Summary")); | 258 | mListView->addColumn(i18n("Summary")); |
259 | mListView->addColumn(i18n("Start Date")); | 259 | mListView->addColumn(i18n("Start Date")); |
260 | mListView->addColumn(i18n("Start Time")); | 260 | mListView->addColumn(i18n("Start Time")); |
261 | mListView->addColumn(i18n("End Date")); | 261 | mListView->addColumn(i18n("End Date")); |
262 | mListView->addColumn(i18n("End Time")); | 262 | mListView->addColumn(i18n("End Time")); |
263 | mListView->addColumn(i18n("Alarm")); // alarm set? | 263 | mListView->addColumn(i18n("Alarm")); // alarm set? |
264 | mListView->addColumn(i18n("Recurs")); // recurs? | 264 | mListView->addColumn(i18n("Recurs")); // recurs? |
265 | mListView->addColumn(i18n("Due Date")); | 265 | mListView->addColumn(i18n("Due Date")); |
266 | mListView->addColumn(i18n("Due Time")); | 266 | mListView->addColumn(i18n("Due Time")); |
267 | mListView->addColumn(i18n("Cancelled")); | 267 | mListView->addColumn(i18n("Cancelled")); |
268 | mListView->addColumn(i18n("Categories")); | 268 | mListView->addColumn(i18n("Categories")); |
269 | mListView->addColumn(i18n("Calendar")); | 269 | mListView->addColumn(i18n("Calendar")); |
270 | 270 | ||
271 | mListView->setColumnAlignment(0,AlignLeft); | 271 | mListView->setColumnAlignment(0,AlignLeft); |
272 | mListView->setColumnAlignment(1,AlignLeft); | 272 | mListView->setColumnAlignment(1,AlignLeft); |
273 | mListView->setColumnAlignment(2,AlignHCenter); | 273 | mListView->setColumnAlignment(2,AlignHCenter); |
274 | mListView->setColumnAlignment(3,AlignLeft); | 274 | mListView->setColumnAlignment(3,AlignLeft); |
275 | mListView->setColumnAlignment(4,AlignHCenter); | 275 | mListView->setColumnAlignment(4,AlignHCenter); |
276 | mListView->setColumnAlignment(5,AlignLeft); | 276 | mListView->setColumnAlignment(5,AlignLeft); |
277 | mListView->setColumnAlignment(6,AlignLeft); | 277 | mListView->setColumnAlignment(6,AlignLeft); |
278 | mListView->setColumnAlignment(7,AlignLeft); | 278 | mListView->setColumnAlignment(7,AlignLeft); |
279 | mListView->setColumnAlignment(8,AlignLeft); | 279 | mListView->setColumnAlignment(8,AlignLeft); |
280 | mListView->setColumnAlignment(9,AlignLeft); | 280 | mListView->setColumnAlignment(9,AlignLeft); |
281 | mListView->setColumnAlignment(10,AlignLeft); | 281 | mListView->setColumnAlignment(10,AlignLeft); |
282 | mListView->setColumnAlignment(11,AlignLeft); | 282 | mListView->setColumnAlignment(11,AlignLeft); |
283 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); | 283 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); |
284 | 284 | ||
285 | int iii = 0; | 285 | int iii = 0; |
286 | for ( iii = 0; iii< 12 ; ++iii ) | 286 | for ( iii = 0; iii< 12 ; ++iii ) |
@@ -966,106 +966,102 @@ void KOListView::showDates(bool show) | |||
966 | 966 | ||
967 | void KOListView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 967 | void KOListView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
968 | const QDate &td) | 968 | const QDate &td) |
969 | { | 969 | { |
970 | #ifndef KORG_NOPRINTER | 970 | #ifndef KORG_NOPRINTER |
971 | calPrinter->preview(CalPrinter::Day, fd, td); | 971 | calPrinter->preview(CalPrinter::Day, fd, td); |
972 | #endif | 972 | #endif |
973 | } | 973 | } |
974 | 974 | ||
975 | void KOListView::showDates() | 975 | void KOListView::showDates() |
976 | { | 976 | { |
977 | showDates(true); | 977 | showDates(true); |
978 | } | 978 | } |
979 | 979 | ||
980 | void KOListView::hideDates() | 980 | void KOListView::hideDates() |
981 | { | 981 | { |
982 | showDates(false); | 982 | showDates(false); |
983 | } | 983 | } |
984 | 984 | ||
985 | void KOListView::resetFocus() | 985 | void KOListView::resetFocus() |
986 | { | 986 | { |
987 | topLevelWidget()->setActiveWindow(); | 987 | topLevelWidget()->setActiveWindow(); |
988 | topLevelWidget()->raise(); | 988 | topLevelWidget()->raise(); |
989 | mListView->setFocus(); | 989 | mListView->setFocus(); |
990 | } | 990 | } |
991 | void KOListView::updateView() | 991 | void KOListView::updateView() |
992 | { | 992 | { |
993 | mListView->setFocus(); | 993 | mListView->setFocus(); |
994 | if ( mListView->firstChild () ) | 994 | if ( mListView->firstChild () ) |
995 | mListView->setCurrentItem( mListView->firstChild () ); | 995 | mListView->setCurrentItem( mListView->firstChild () ); |
996 | } | 996 | } |
997 | void KOListView::updateConfig() | 997 | void KOListView::updateConfig() |
998 | { | 998 | { |
999 | 999 | ||
1000 | mListView->setFont ( KOPrefs::instance()->mListViewFont ); | 1000 | mListView->setFont ( KOPrefs::instance()->mListViewFont ); |
1001 | updateView(); | 1001 | updateView(); |
1002 | 1002 | ||
1003 | } | 1003 | } |
1004 | void KOListView::setStartDate(const QDate &start) | 1004 | void KOListView::setStartDate(const QDate &start) |
1005 | { | 1005 | { |
1006 | mStartDate = start; | 1006 | mStartDate = start; |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | void KOListView::showDates(const QDate &start, const QDate &end) | 1009 | void KOListView::showDates(const QDate &start, const QDate &end) |
1010 | { | 1010 | { |
1011 | clear(); | 1011 | clear(); |
1012 | mStartDate = start; | 1012 | mStartDate = start; |
1013 | QDate date = start; | 1013 | QDate date = start; |
1014 | QPtrList<Journal> j_list; | ||
1015 | while( date <= end ) { | 1014 | while( date <= end ) { |
1016 | addEvents(calendar()->events(date)); | 1015 | addEvents(calendar()->events(date)); |
1017 | addTodos(calendar()->todos(date)); | 1016 | addTodos(calendar()->todos(date)); |
1018 | Journal* jo = calendar()->journal(date); | 1017 | addJournals( calendar()->journals4Date(date) ); |
1019 | if ( jo ) | ||
1020 | j_list.append( jo ); | ||
1021 | date = date.addDays( 1 ); | 1018 | date = date.addDays( 1 ); |
1022 | } | 1019 | } |
1023 | addJournals(j_list); | ||
1024 | emit incidenceSelected( 0 ); | 1020 | emit incidenceSelected( 0 ); |
1025 | updateView(); | 1021 | updateView(); |
1026 | 1022 | ||
1027 | } | 1023 | } |
1028 | 1024 | ||
1029 | void KOListView::addEvents(QPtrList<Event> eventList) | 1025 | void KOListView::addEvents(QPtrList<Event> eventList) |
1030 | { | 1026 | { |
1031 | 1027 | ||
1032 | Event *ev; | 1028 | Event *ev; |
1033 | for(ev = eventList.first(); ev; ev = eventList.next()) { | 1029 | for(ev = eventList.first(); ev; ev = eventList.next()) { |
1034 | addIncidence(ev); | 1030 | addIncidence(ev); |
1035 | } | 1031 | } |
1036 | if ( !mListView->currentItem() ){ | 1032 | if ( !mListView->currentItem() ){ |
1037 | updateView(); | 1033 | updateView(); |
1038 | } | 1034 | } |
1039 | } | 1035 | } |
1040 | 1036 | ||
1041 | void KOListView::addTodos(QPtrList<Todo> eventList) | 1037 | void KOListView::addTodos(QPtrList<Todo> eventList) |
1042 | { | 1038 | { |
1043 | Todo *ev; | 1039 | Todo *ev; |
1044 | for(ev = eventList.first(); ev; ev = eventList.next()) { | 1040 | for(ev = eventList.first(); ev; ev = eventList.next()) { |
1045 | addIncidence(ev); | 1041 | addIncidence(ev); |
1046 | } | 1042 | } |
1047 | if ( !mListView->currentItem() ){ | 1043 | if ( !mListView->currentItem() ){ |
1048 | updateView(); | 1044 | updateView(); |
1049 | } | 1045 | } |
1050 | } | 1046 | } |
1051 | void KOListView::addJournals(QPtrList<Journal> eventList) | 1047 | void KOListView::addJournals(QPtrList<Journal> eventList) |
1052 | { | 1048 | { |
1053 | Journal *ev; | 1049 | Journal *ev; |
1054 | for(ev = eventList.first(); ev; ev = eventList.next()) { | 1050 | for(ev = eventList.first(); ev; ev = eventList.next()) { |
1055 | addIncidence(ev); | 1051 | addIncidence(ev); |
1056 | } | 1052 | } |
1057 | if ( !mListView->currentItem() ){ | 1053 | if ( !mListView->currentItem() ){ |
1058 | updateView(); | 1054 | updateView(); |
1059 | } | 1055 | } |
1060 | } | 1056 | } |
1061 | 1057 | ||
1062 | void KOListView::showCompletedTodos() | 1058 | void KOListView::showCompletedTodos() |
1063 | { | 1059 | { |
1064 | mForceShowCompletedTodos = true; | 1060 | mForceShowCompletedTodos = true; |
1065 | } | 1061 | } |
1066 | void KOListView::addIncidence(Incidence *incidence) | 1062 | void KOListView::addIncidence(Incidence *incidence) |
1067 | { | 1063 | { |
1068 | if ( mUidDict.find( incidence->uid() ) ) return; | 1064 | if ( mUidDict.find( incidence->uid() ) ) return; |
1069 | 1065 | ||
1070 | // mListView->setFont ( KOPrefs::instance()->mListViewFont ); | 1066 | // mListView->setFont ( KOPrefs::instance()->mListViewFont ); |
1071 | if ( incidence->typeID() == todoID ) { | 1067 | if ( incidence->typeID() == todoID ) { |