-rw-r--r-- | bin/kdepim/WhatsNew.txt | 14 | ||||
-rw-r--r-- | korganizer/kdatenavigator.cpp | 4 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 5 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 100 | ||||
-rw-r--r-- | korganizer/kodaymatrix.h | 5 |
5 files changed, 91 insertions, 37 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 6c9daad..05aa8fe 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -7,17 +7,29 @@ Oooops ... I forgot to test on the Zaurus 5500 ... | |||
7 | 7 | ||
8 | Fixed many problems of new (english) strings (and german translations) | 8 | Fixed many problems of new (english) strings (and german translations) |
9 | introduced in the latest versions, where the text was not fitting on the | 9 | introduced in the latest versions, where the text was not fitting on the |
10 | 240x320 display of the Zaurus 5500. | 10 | 240x320 display of the Zaurus 5500. |
11 | 11 | ||
12 | Added a popup menu ( press pen and hold to get popup ) to the agenda view | 12 | Added a popup menu ( press pen and hold to get popup ) to the agenda view |
13 | with may useful items. | 13 | with many useful items (add event/todo, show next week, two weeks, month, journal). |
14 | 14 | ||
15 | Added items to the todolist popup menu for: | 15 | Added items to the todolist popup menu for: |
16 | Display all opened, all closed or all todos flat. | 16 | Display all opened, all closed or all todos flat. |
17 | The "flat" view makes is possible to sort all todos after ,e.g., prio or date. | 17 | The "flat" view makes is possible to sort all todos after ,e.g., prio or date. |
18 | Made the reparenting of todos on the desktop possible via Drag&Drop. | ||
19 | Fixed several bugs in setting the completed datetime for todos. | ||
20 | Added info about completed datetime of todos to the todo viewer. | ||
21 | Now displaying a completed todo (with completed datetime set) in the agenda view | ||
22 | at the time of the completion. Such that now it is possible to see in the agenda view | ||
23 | when what todo was completed. | ||
24 | Fixed behaviour of automatic setting completion of todos with sub-todos/parent todos. | ||
25 | Now the behaviour is: | ||
26 | Setting a parent to complete sets all (sub)childs to complete. | ||
27 | Setting a parent to uncomplete does not change the childs. | ||
28 | Setting a child to uncomplete sets all parent to uncomplete. | ||
29 | Setting a child to complete does not change the parents. | ||
18 | 30 | ||
19 | 31 | ||
20 | ********** VERSION 2.0.0 ************ | 32 | ********** VERSION 2.0.0 ************ |
21 | 33 | ||
22 | Stable release 2.0.0! | 34 | Stable release 2.0.0! |
23 | 35 | ||
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index b420351..f31e50a 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -222,13 +222,13 @@ void KDateNavigator::updateDates() | |||
222 | // daymatrix->repaint(); | 222 | // daymatrix->repaint(); |
223 | } | 223 | } |
224 | 224 | ||
225 | void KDateNavigator::updateDayMatrix() | 225 | void KDateNavigator::updateDayMatrix() |
226 | { | 226 | { |
227 | daymatrix->updateView(); | 227 | daymatrix->updateView(); |
228 | daymatrix->repaint(); | 228 | //daymatrix->repaint(); |
229 | } | 229 | } |
230 | 230 | ||
231 | 231 | ||
232 | void KDateNavigator::updateView() | 232 | void KDateNavigator::updateView() |
233 | { | 233 | { |
234 | 234 | ||
@@ -259,13 +259,13 @@ void KDateNavigator::updateView() | |||
259 | weeknos[i]->setText(weeknum); | 259 | weeknos[i]->setText(weeknum); |
260 | } | 260 | } |
261 | 261 | ||
262 | setUpdatesEnabled( true ); | 262 | setUpdatesEnabled( true ); |
263 | // kdDebug() << "updateView() -> repaint()" << endl; | 263 | // kdDebug() << "updateView() -> repaint()" << endl; |
264 | repaint(); | 264 | repaint(); |
265 | daymatrix->repaint(); | 265 | // daymatrix->repaint(); |
266 | } | 266 | } |
267 | 267 | ||
268 | void KDateNavigator::updateConfig() | 268 | void KDateNavigator::updateConfig() |
269 | { | 269 | { |
270 | int day; | 270 | int day; |
271 | for(int i=0; i<7; i++) { | 271 | for(int i=0; i<7; i++) { |
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 39355b4..ee9f39a 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -466,19 +466,18 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e ) | |||
466 | } | 466 | } |
467 | void KOAgendaItem::computeText() | 467 | void KOAgendaItem::computeText() |
468 | { | 468 | { |
469 | 469 | ||
470 | mDisplayedText = mIncidence->summary(); | 470 | mDisplayedText = mIncidence->summary(); |
471 | if ( (mIncidence->type() == "Todo") ) { | 471 | if ( (mIncidence->type() == "Todo") ) { |
472 | if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { | ||
472 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) | 473 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) |
473 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; | 474 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; |
474 | else if ( !(mIncidence->doesFloat())) | 475 | else if ( !(mIncidence->doesFloat())) |
475 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; | 476 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; |
476 | 477 | } | |
477 | |||
478 | |||
479 | } else { | 478 | } else { |
480 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) | 479 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) |
481 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; | 480 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; |
482 | 481 | ||
483 | if ( mAllDay ) { | 482 | if ( mAllDay ) { |
484 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { | 483 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index fc00828..060b4c4 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -105,13 +105,19 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const | |||
105 | mSelectedDaysColor = QColor("white"); | 105 | mSelectedDaysColor = QColor("white"); |
106 | mTodayMarginWidth = 2; | 106 | mTodayMarginWidth = 2; |
107 | mSelEnd = mSelStart = NOSELECTION; | 107 | mSelEnd = mSelStart = NOSELECTION; |
108 | 108 | ||
109 | setAcceptDrops(true); | 109 | setAcceptDrops(true); |
110 | //setFont( QFont("Arial", 10) ); | 110 | //setFont( QFont("Arial", 10) ); |
111 | updateView(date); | 111 | |
112 | mUpdateTimer = new QTimer( this ); | ||
113 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() )); | ||
114 | mRepaintTimer = new QTimer( this ); | ||
115 | connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() )); | ||
116 | mDayChanged = false; | ||
117 | updateView(); | ||
112 | } | 118 | } |
113 | 119 | ||
114 | QColor KODayMatrix::getShadedColor(QColor color) | 120 | QColor KODayMatrix::getShadedColor(QColor color) |
115 | { | 121 | { |
116 | QColor shaded; | 122 | QColor shaded; |
117 | int h=0; | 123 | int h=0; |
@@ -199,45 +205,30 @@ void KODayMatrix::recalculateToday() | |||
199 | } | 205 | } |
200 | 206 | ||
201 | void KODayMatrix::updateView() | 207 | void KODayMatrix::updateView() |
202 | { | 208 | { |
203 | updateView(startdate); | 209 | updateView(startdate); |
204 | } | 210 | } |
205 | 211 | void KODayMatrix::repaintViewTimed() | |
206 | void KODayMatrix::updateView(QDate actdate) | ||
207 | { | 212 | { |
208 | 213 | qDebug("KODayMatrix::repaintViewTimed "); | |
209 | // kdDebug() << "KODayMatrix::updateView() " << actdate.toString() << endl; | 214 | mRepaintTimer->stop(); |
210 | 215 | repaint(false); | |
211 | //flag to indicate if the starting day of the matrix has changed by this call | ||
212 | bool daychanged = false; | ||
213 | // if a new startdate is to be set then apply Cornelius's calculation | ||
214 | // of the first day to be shown | ||
215 | if (actdate != startdate) { | ||
216 | // reset index of selection according to shift of starting date from startdate to actdate | ||
217 | if (mSelStart != NOSELECTION) { | ||
218 | int tmp = actdate.daysTo(startdate); | ||
219 | //kdDebug() << "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl; | ||
220 | // shift selection if new one would be visible at least partly ! | ||
221 | |||
222 | if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) { | ||
223 | // nested if is required for next X display pushed from a different month - correction required | ||
224 | // otherwise, for month forward and backward, it must be avoided | ||
225 | if( mSelStart > NUMDAYS || mSelStart < 0 ) | ||
226 | mSelStart = mSelStart + tmp; | ||
227 | if( mSelEnd > NUMDAYS || mSelEnd < 0 ) | ||
228 | mSelEnd = mSelEnd + tmp; | ||
229 | } | ||
230 | } | 216 | } |
217 | void KODayMatrix::updateViewTimed() | ||
218 | { | ||
231 | 219 | ||
232 | startdate = actdate; | 220 | mUpdateTimer->stop(); |
233 | daychanged = true; | 221 | //QDate actdate = mPendingNewDate; |
234 | } | 222 | |
223 | static int iii = 0; | ||
224 | qDebug("KODayMatrix::updateView(QDate actdate) %d", ++iii ); | ||
235 | 225 | ||
236 | if (daychanged) { | 226 | if (mDayChanged) { |
237 | recalculateToday(); | 227 | recalculateToday(); |
228 | mDayChanged = false; | ||
238 | } | 229 | } |
239 | 230 | ||
240 | for(int i = 0; i < NUMDAYS; i++) { | 231 | for(int i = 0; i < NUMDAYS; i++) { |
241 | 232 | ||
242 | // if events are set for the day then remember to draw it bold | 233 | // if events are set for the day then remember to draw it bold |
243 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 234 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
@@ -266,27 +257,74 @@ void KODayMatrix::updateView(QDate actdate) | |||
266 | mHolidays[i] = holiStr; | 257 | mHolidays[i] = holiStr; |
267 | 258 | ||
268 | } else { | 259 | } else { |
269 | mHolidays[i] = QString::null; | 260 | mHolidays[i] = QString::null; |
270 | } | 261 | } |
271 | } | 262 | } |
263 | repaint(false); | ||
264 | } | ||
265 | void KODayMatrix::updateView(QDate actdate) | ||
266 | { | ||
267 | |||
268 | //flag to indicate if the starting day of the matrix has changed by this call | ||
269 | //mDayChanged = false; | ||
270 | // if a new startdate is to be set then apply Cornelius's calculation | ||
271 | // of the first day to be shown | ||
272 | if (actdate != startdate) { | ||
273 | // reset index of selection according to shift of starting date from startdate to actdate | ||
274 | if (mSelStart != NOSELECTION) { | ||
275 | int tmp = actdate.daysTo(startdate); | ||
276 | //kdDebug() << "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl; | ||
277 | // shift selection if new one would be visible at least partly ! | ||
278 | |||
279 | if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) { | ||
280 | // nested if is required for next X display pushed from a different month - correction required | ||
281 | // otherwise, for month forward and backward, it must be avoided | ||
282 | if( mSelStart > NUMDAYS || mSelStart < 0 ) | ||
283 | mSelStart = mSelStart + tmp; | ||
284 | if( mSelEnd > NUMDAYS || mSelEnd < 0 ) | ||
285 | mSelEnd = mSelEnd + tmp; | ||
286 | } | ||
287 | } | ||
288 | |||
289 | startdate = actdate; | ||
290 | mDayChanged = true; | ||
291 | } | ||
292 | qDebug("restart Timer %d", mDayChanged ); | ||
293 | static int iii = 0; | ||
294 | if ( iii < 5 ) { | ||
295 | ++iii; | ||
296 | updateViewTimed(); | ||
297 | } else { | ||
298 | if ( !isVisible() ) { | ||
299 | mUpdateTimer->start( 2000 ); | ||
300 | } else { | ||
301 | if ( mDayChanged ) { | ||
302 | mUpdateTimer->start( 250 ); | ||
303 | } else { | ||
304 | mRepaintTimer->start( 250 ); | ||
305 | mUpdateTimer->start( 2000 ); | ||
306 | } | ||
307 | } | ||
308 | } | ||
309 | |||
272 | } | 310 | } |
273 | 311 | ||
274 | const QDate& KODayMatrix::getDate(int offset) | 312 | const QDate& KODayMatrix::getDate(int offset) |
275 | { | 313 | { |
276 | if (offset < 0 || offset > NUMDAYS-1) { | 314 | if (offset < 0 || offset > NUMDAYS-1) { |
277 | kdDebug() << "Wrong offset (" << offset << ") in KODayMatrix::getDate(int)" << endl; | 315 | qDebug("Wrong offset2 "); |
278 | return days[0]; | 316 | return days[0]; |
279 | } | 317 | } |
280 | return days[offset]; | 318 | return days[offset]; |
281 | } | 319 | } |
282 | 320 | ||
283 | QString KODayMatrix::getHolidayLabel(int offset) | 321 | QString KODayMatrix::getHolidayLabel(int offset) |
284 | { | 322 | { |
285 | if (offset < 0 || offset > NUMDAYS-1) { | 323 | if (offset < 0 || offset > NUMDAYS-1) { |
286 | kdDebug() << "Wrong offset (" << offset << ") in KODayMatrix::getHolidayLabel(int)" << endl; | 324 | qDebug("Wrong offset1 "); |
287 | return 0; | 325 | return 0; |
288 | } | 326 | } |
289 | return mHolidays[offset]; | 327 | return mHolidays[offset]; |
290 | } | 328 | } |
291 | 329 | ||
292 | int KODayMatrix::getDayIndexFrom(int x, int y) | 330 | int KODayMatrix::getDayIndexFrom(int x, int y) |
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index b4eb2a8..0e9640a 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h | |||
@@ -169,12 +169,14 @@ public: | |||
169 | 169 | ||
170 | public slots: | 170 | public slots: |
171 | /** Recalculates all the flags of the days in the matrix like holidays or events | 171 | /** Recalculates all the flags of the days in the matrix like holidays or events |
172 | * on a day (Actually calls above method with the actual startdate). | 172 | * on a day (Actually calls above method with the actual startdate). |
173 | */ | 173 | */ |
174 | void updateView(); | 174 | void updateView(); |
175 | void updateViewTimed(); | ||
176 | void repaintViewTimed(); | ||
175 | 177 | ||
176 | /** | 178 | /** |
177 | * Calculate which square in the matrix should be | 179 | * Calculate which square in the matrix should be |
178 | * hilighted to indicate it's today. | 180 | * hilighted to indicate it's today. |
179 | */ | 181 | */ |
180 | void recalculateToday(); | 182 | void recalculateToday(); |
@@ -216,12 +218,15 @@ protected: | |||
216 | 218 | ||
217 | void dropEvent(QDropEvent *); | 219 | void dropEvent(QDropEvent *); |
218 | 220 | ||
219 | void resizeEvent(QResizeEvent *); | 221 | void resizeEvent(QResizeEvent *); |
220 | 222 | ||
221 | private: | 223 | private: |
224 | QTimer* mUpdateTimer; | ||
225 | QTimer* mRepaintTimer; | ||
226 | bool mDayChanged; | ||
222 | 227 | ||
223 | /** returns the index of the day located at the matrix's widget (x,y) position. | 228 | /** returns the index of the day located at the matrix's widget (x,y) position. |
224 | * | 229 | * |
225 | * @param x horizontal coordinate | 230 | * @param x horizontal coordinate |
226 | * @param y vertical coordinate | 231 | * @param y vertical coordinate |
227 | */ | 232 | */ |