author | zautrix <zautrix> | 2005-06-18 09:21:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-18 09:21:06 (UTC) |
commit | 252c62bffc34f2c71002c71abea480807fa1455a (patch) (unidiff) | |
tree | ed84520d75b534bb6013fc45fdb93f1a39e6e2e0 /korganizer | |
parent | 39112dfe29d2108d54d37f25dc57dcd9299f1f93 (diff) | |
download | kdepimpi-252c62bffc34f2c71002c71abea480807fa1455a.zip kdepimpi-252c62bffc34f2c71002c71abea480807fa1455a.tar.gz kdepimpi-252c62bffc34f2c71002c71abea480807fa1455a.tar.bz2 |
fixx
-rw-r--r-- | korganizer/kolistview.cpp | 11 | ||||
-rw-r--r-- | korganizer/kolistview.h | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 0b2f9a4..22d9ac0 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -234,32 +234,33 @@ bool ListItemVisitor::visit(Journal * j) | |||
234 | 234 | ||
235 | QString key; | 235 | QString key; |
236 | QDate d = j->dtStart().date(); | 236 | QDate d = j->dtStart().date(); |
237 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); | 237 | key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day()); |
238 | mItem->setSortKey(1,key); | 238 | mItem->setSortKey(1,key); |
239 | mItem->setSortKey(7,key); | 239 | mItem->setSortKey(7,key); |
240 | 240 | ||
241 | return true; | 241 | return true; |
242 | } | 242 | } |
243 | 243 | ||
244 | KOListView::KOListView(Calendar *calendar, QWidget *parent, | 244 | KOListView::KOListView(Calendar *calendar, QWidget *parent, |
245 | const char *name) | 245 | const char *name) |
246 | : KOEventView(calendar, parent, name) | 246 | : KOEventView(calendar, parent, name) |
247 | { | 247 | { |
248 | 248 | ||
249 | mActiveItem = 0; | 249 | mActiveItem = 0; |
250 | mForceShowCompletedTodos = false; | ||
250 | mListView = new KOListViewListView(this); | 251 | mListView = new KOListViewListView(this); |
251 | mListView->addColumn(i18n("Summary")); | 252 | mListView->addColumn(i18n("Summary")); |
252 | mListView->addColumn(i18n("Start Date")); | 253 | mListView->addColumn(i18n("Start Date")); |
253 | mListView->addColumn(i18n("Start Time")); | 254 | mListView->addColumn(i18n("Start Time")); |
254 | mListView->addColumn(i18n("End Date")); | 255 | mListView->addColumn(i18n("End Date")); |
255 | mListView->addColumn(i18n("End Time")); | 256 | mListView->addColumn(i18n("End Time")); |
256 | mListView->addColumn(i18n("Alarm")); // alarm set? | 257 | mListView->addColumn(i18n("Alarm")); // alarm set? |
257 | mListView->addColumn(i18n("Recurs")); // recurs? | 258 | mListView->addColumn(i18n("Recurs")); // recurs? |
258 | mListView->addColumn(i18n("Due Date")); | 259 | mListView->addColumn(i18n("Due Date")); |
259 | mListView->addColumn(i18n("Due Time")); | 260 | mListView->addColumn(i18n("Due Time")); |
260 | mListView->addColumn(i18n("Cancelled")); | 261 | mListView->addColumn(i18n("Cancelled")); |
261 | mListView->addColumn(i18n("Categories")); | 262 | mListView->addColumn(i18n("Categories")); |
262 | mListView->addColumn(i18n("Calendar")); | 263 | mListView->addColumn(i18n("Calendar")); |
263 | 264 | ||
264 | mListView->setColumnAlignment(0,AlignLeft); | 265 | mListView->setColumnAlignment(0,AlignLeft); |
265 | mListView->setColumnAlignment(1,AlignLeft); | 266 | mListView->setColumnAlignment(1,AlignLeft); |
@@ -1034,37 +1035,47 @@ void KOListView::addTodos(QPtrList<Todo> eventList) | |||
1034 | } | 1035 | } |
1035 | if ( !mListView->currentItem() ){ | 1036 | if ( !mListView->currentItem() ){ |
1036 | updateView(); | 1037 | updateView(); |
1037 | } | 1038 | } |
1038 | } | 1039 | } |
1039 | void KOListView::addJournals(QPtrList<Journal> eventList) | 1040 | void KOListView::addJournals(QPtrList<Journal> eventList) |
1040 | { | 1041 | { |
1041 | Journal *ev; | 1042 | Journal *ev; |
1042 | for(ev = eventList.first(); ev; ev = eventList.next()) { | 1043 | for(ev = eventList.first(); ev; ev = eventList.next()) { |
1043 | addIncidence(ev); | 1044 | addIncidence(ev); |
1044 | } | 1045 | } |
1045 | if ( !mListView->currentItem() ){ | 1046 | if ( !mListView->currentItem() ){ |
1046 | updateView(); | 1047 | updateView(); |
1047 | } | 1048 | } |
1048 | } | 1049 | } |
1049 | 1050 | ||
1051 | void KOListView::showCompletedTodos() | ||
1052 | { | ||
1053 | mForceShowCompletedTodos = true; | ||
1054 | } | ||
1050 | void KOListView::addIncidence(Incidence *incidence) | 1055 | void KOListView::addIncidence(Incidence *incidence) |
1051 | { | 1056 | { |
1052 | if ( mUidDict.find( incidence->uid() ) ) return; | 1057 | if ( mUidDict.find( incidence->uid() ) ) return; |
1053 | 1058 | ||
1054 | // mListView->setFont ( KOPrefs::instance()->mListViewFont ); | 1059 | // mListView->setFont ( KOPrefs::instance()->mListViewFont ); |
1060 | if ( incidence->typeID() == todoID ) { | ||
1061 | if ( ! mForceShowCompletedTodos ) { | ||
1062 | if ( !KOPrefs::instance()->mShowCompletedTodo && ((Todo*)incidence)->isCompleted() ) | ||
1063 | return; | ||
1064 | } | ||
1065 | } | ||
1055 | mUidDict.insert( incidence->uid(), incidence ); | 1066 | mUidDict.insert( incidence->uid(), incidence ); |
1056 | KOListViewItem *item = new KOListViewItem( incidence, mListView ); | 1067 | KOListViewItem *item = new KOListViewItem( incidence, mListView ); |
1057 | ListItemVisitor v(item, mStartDate ); | 1068 | ListItemVisitor v(item, mStartDate ); |
1058 | if (incidence->accept(v)) { | 1069 | if (incidence->accept(v)) { |
1059 | return; | 1070 | return; |
1060 | } | 1071 | } |
1061 | else delete item; | 1072 | else delete item; |
1062 | } | 1073 | } |
1063 | 1074 | ||
1064 | void KOListView::showEvents(QPtrList<Event> eventList) | 1075 | void KOListView::showEvents(QPtrList<Event> eventList) |
1065 | { | 1076 | { |
1066 | clear(); | 1077 | clear(); |
1067 | 1078 | ||
1068 | addEvents(eventList); | 1079 | addEvents(eventList); |
1069 | 1080 | ||
1070 | // After new creation of list view no events are selected. | 1081 | // After new creation of list view no events are selected. |
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index d384af0..bcef0f0 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h | |||
@@ -250,32 +250,33 @@ class KOListView : public KOEventView | |||
250 | 250 | ||
251 | void showDates(bool show); | 251 | void showDates(bool show); |
252 | Incidence* currentItem(); | 252 | Incidence* currentItem(); |
253 | void addTodos(QPtrList<Todo> eventList); | 253 | void addTodos(QPtrList<Todo> eventList); |
254 | void addJournals(QPtrList<Journal> eventList); | 254 | void addJournals(QPtrList<Journal> eventList); |
255 | virtual void printPreview(CalPrinter *calPrinter, | 255 | virtual void printPreview(CalPrinter *calPrinter, |
256 | const QDate &, const QDate &); | 256 | const QDate &, const QDate &); |
257 | 257 | ||
258 | void readSettings(KConfig *config, QString setting = "KOListView Layout"); | 258 | void readSettings(KConfig *config, QString setting = "KOListView Layout"); |
259 | void writeSettings(KConfig *config, QString setting = "KOListView Layout"); | 259 | void writeSettings(KConfig *config, QString setting = "KOListView Layout"); |
260 | void updateList(); | 260 | void updateList(); |
261 | void clearList(); | 261 | void clearList(); |
262 | void setStartDate(const QDate &start); | 262 | void setStartDate(const QDate &start); |
263 | int count(); | 263 | int count(); |
264 | QString getWhatsThisText(QPoint p); | 264 | QString getWhatsThisText(QPoint p); |
265 | QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents = true, bool includeTodos = true , bool includeJournals = true, bool onlyDueTodos = false ); | 265 | QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents = true, bool includeTodos = true , bool includeJournals = true, bool onlyDueTodos = false ); |
266 | void showCompletedTodos(); | ||
266 | signals: | 267 | signals: |
267 | void signalNewEvent(); | 268 | void signalNewEvent(); |
268 | void beamIncidenceList(QPtrList<Incidence>); | 269 | void beamIncidenceList(QPtrList<Incidence>); |
269 | 270 | ||
270 | public slots: | 271 | public slots: |
271 | void hideAll(); | 272 | void hideAll(); |
272 | void printList(); | 273 | void printList(); |
273 | void resetFocus(); | 274 | void resetFocus(); |
274 | virtual void updateView(); | 275 | virtual void updateView(); |
275 | virtual void showDates(const QDate &start, const QDate &end); | 276 | virtual void showDates(const QDate &start, const QDate &end); |
276 | virtual void showEvents(QPtrList<Event> eventList); | 277 | virtual void showEvents(QPtrList<Event> eventList); |
277 | void clearSelection(); | 278 | void clearSelection(); |
278 | void allSelection(); | 279 | void allSelection(); |
279 | 280 | ||
280 | void clear(); | 281 | void clear(); |
281 | void beamDone( Ir *ir ); | 282 | void beamDone( Ir *ir ); |
@@ -295,27 +296,28 @@ class KOListView : public KOEventView | |||
295 | 296 | ||
296 | void defaultItemAction(QListViewItem *item); | 297 | void defaultItemAction(QListViewItem *item); |
297 | void popupMenu(QListViewItem *item,const QPoint &,int); | 298 | void popupMenu(QListViewItem *item,const QPoint &,int); |
298 | void setCalendar( int c ); | 299 | void setCalendar( int c ); |
299 | void populateCalPopup(); | 300 | void populateCalPopup(); |
300 | 301 | ||
301 | protected slots: | 302 | protected slots: |
302 | void processSelectionChange(QListViewItem *); | 303 | void processSelectionChange(QListViewItem *); |
303 | 304 | ||
304 | protected: | 305 | protected: |
305 | void writeToFile( bool iCal ); | 306 | void writeToFile( bool iCal ); |
306 | void addEvents(QPtrList<Event> eventList); | 307 | void addEvents(QPtrList<Event> eventList); |
307 | void addIncidence(Incidence *); | 308 | void addIncidence(Incidence *); |
308 | KOListViewItem *getItemForEvent(Incidence *event); | 309 | KOListViewItem *getItemForEvent(Incidence *event); |
309 | 310 | ||
310 | private: | 311 | private: |
312 | bool mForceShowCompletedTodos; | ||
311 | QPopupMenu* mCalPopup; | 313 | QPopupMenu* mCalPopup; |
312 | KOListViewWhatsThis *mKOListViewWhatsThis; | 314 | KOListViewWhatsThis *mKOListViewWhatsThis; |
313 | KOListViewListView *mListView; | 315 | KOListViewListView *mListView; |
314 | KOEventPopupMenu *mPopupMenu; | 316 | KOEventPopupMenu *mPopupMenu; |
315 | KOListViewItem *mActiveItem; | 317 | KOListViewItem *mActiveItem; |
316 | QDict<Incidence> mUidDict; | 318 | QDict<Incidence> mUidDict; |
317 | QDate mStartDate; | 319 | QDate mStartDate; |
318 | void keyPressEvent ( QKeyEvent * ) ; | 320 | void keyPressEvent ( QKeyEvent * ) ; |
319 | }; | 321 | }; |
320 | 322 | ||
321 | #endif | 323 | #endif |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index bba49f0..a8de297 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -125,32 +125,33 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
125 | 125 | ||
126 | QWidget *rangeWidget = new QWidget(topFrame); | 126 | QWidget *rangeWidget = new QWidget(topFrame); |
127 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); | 127 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); |
128 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); | 128 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |
129 | mStartDate = new KDateEdit(rangeWidget); | 129 | mStartDate = new KDateEdit(rangeWidget); |
130 | rangeLayout->addWidget(mStartDate); | 130 | rangeLayout->addWidget(mStartDate); |
131 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); | 131 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); |
132 | mEndDate = new KDateEdit(rangeWidget); | 132 | mEndDate = new KDateEdit(rangeWidget); |
133 | mEndDate->setDate(QDate::currentDate().addDays(365)); | 133 | mEndDate->setDate(QDate::currentDate().addDays(365)); |
134 | rangeLayout->addWidget(mEndDate); | 134 | rangeLayout->addWidget(mEndDate); |
135 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); | 135 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); |
136 | rangeLayout->addWidget( (QWidget*)wt ); | 136 | rangeLayout->addWidget( (QWidget*)wt ); |
137 | layout->addWidget(rangeWidget); | 137 | layout->addWidget(rangeWidget); |
138 | // Results list view | 138 | // Results list view |
139 | listView = new KOListView(mCalendar,topFrame); | 139 | listView = new KOListView(mCalendar,topFrame); |
140 | layout->addWidget(listView); | 140 | layout->addWidget(listView); |
141 | listView->showCompletedTodos(); | ||
141 | //layout->setStretchFactor( listView, 333 ); | 142 | //layout->setStretchFactor( listView, 333 ); |
142 | //listView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Expanding) ); | 143 | //listView->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Expanding) ); |
143 | //listView->setMaximumHeight( 50 ); | 144 | //listView->setMaximumHeight( 50 ); |
144 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); | 145 | listView->readSettings(KOGlobals::config(),"SearchListView Layout"); |
145 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); | 146 | connect(searchEdit,SIGNAL(scrollDOWN()),SLOT(setFocusToList())); |
146 | 147 | ||
147 | setCaption( i18n("KO/Pi Find: ")); | 148 | setCaption( i18n("KO/Pi Find: ")); |
148 | #ifdef DESKTOP_VERSION | 149 | #ifdef DESKTOP_VERSION |
149 | OkButton = new QPushButton( i18n("Close"), this ); | 150 | OkButton = new QPushButton( i18n("Close"), this ); |
150 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); | 151 | connect(OkButton,SIGNAL(clicked()),SLOT(hide())); |
151 | #endif | 152 | #endif |
152 | } | 153 | } |
153 | 154 | ||
154 | SearchDialog::~SearchDialog() | 155 | SearchDialog::~SearchDialog() |
155 | { | 156 | { |
156 | 157 | ||