-rw-r--r-- | core/pim/datebook/datebook.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.cpp | 226 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.h | 52 |
3 files changed, 259 insertions, 21 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 2c2965e..c0d45c9 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -976,14 +976,16 @@ Event DateBookDBHack::eventByUID(int uid) { | |||
976 | QValueList<Event> myRepeatEvents=getRawRepeats(); | 976 | QValueList<Event> myRepeatEvents=getRawRepeats(); |
977 | 977 | ||
978 | QValueList<Event>::ConstIterator it; | 978 | QValueList<Event>::ConstIterator it; |
979 | 979 | ||
980 | for (it = myEventList.begin(); it != myEventList.end(); it++) { | 980 | for (it = myEventList.begin(); it != myEventList.end(); it++) { |
981 | if ((*it).uid() == uid) return *it; | 981 | if ((*it).uid() == uid) return *it; |
982 | } | 982 | } |
983 | for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) { | 983 | for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) { |
984 | if ((*it).uid() == uid) return *it; | 984 | if ((*it).uid() == uid) return *it; |
985 | } | 985 | } |
986 | 986 | ||
987 | qDebug("Event not found: uid=%d\n", uid); | 987 | qDebug("Event not found: uid=%d\n", uid); |
988 | Event ev; | ||
989 | return ev; // return at least | ||
988 | } | 990 | } |
989 | 991 | ||
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index 67a88e9..c15ccef 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp | |||
@@ -8,64 +8,68 @@ | |||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qmessagebox.h> | ||
20 | 21 | ||
21 | #include "datebookday.h" | 22 | #include "datebookday.h" |
22 | #include "datebookdayheaderimpl.h" | 23 | #include "datebookdayheaderimpl.h" |
23 | 24 | ||
24 | #include <qpe/datebookdb.h> | 25 | #include <qpe/datebookdb.h> |
25 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
26 | #include <qpe/event.h> | 27 | #include <qpe/event.h> |
27 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
28 | #include <qpe/timestring.h> | 29 | #include <qpe/timestring.h> |
29 | #include <qpe/qpedebug.h> | 30 | #include <qpe/qpedebug.h> |
30 | 31 | ||
31 | #include <qheader.h> | 32 | #include <qheader.h> |
32 | #include <qdatetime.h> | 33 | #include <qdatetime.h> |
33 | #include <qpainter.h> | 34 | #include <qpainter.h> |
34 | #include <qsimplerichtext.h> | 35 | #include <qsimplerichtext.h> |
35 | #include <qpopupmenu.h> | 36 | #include <qpopupmenu.h> |
36 | #include <qtextcodec.h> | 37 | #include <qtextcodec.h> |
37 | #include <qpalette.h> | 38 | #include <qpalette.h> |
38 | 39 | ||
40 | #include <qtimer.h> | ||
41 | |||
39 | DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, | 42 | DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, |
40 | const char *name ) | 43 | const char *name ) |
41 | : QTable( 24, 1, parent, name ), | 44 | : QTable( 24, 1, parent, name ), |
42 | ampm( whichClock ) | 45 | ampm( whichClock ) |
43 | { | 46 | { |
44 | enableClipper(TRUE); | 47 | enableClipper(TRUE); |
45 | setTopMargin( 0 ); | 48 | setTopMargin( 0 ); |
46 | horizontalHeader()->hide(); | 49 | horizontalHeader()->hide(); |
47 | setLeftMargin(38); | 50 | setLeftMargin(38); |
48 | setColumnStretchable( 0, TRUE ); | 51 | setColumnStretchable( 0, TRUE ); |
49 | setHScrollBarMode( QScrollView::AlwaysOff ); | 52 | setHScrollBarMode( QScrollView::AlwaysOff ); |
50 | verticalHeader()->setPalette(white); | 53 | verticalHeader()->setPalette(white); |
51 | verticalHeader()->setResizeEnabled(FALSE); | 54 | verticalHeader()->setResizeEnabled(FALSE); |
52 | setSelectionMode( Single ); | 55 | setSelectionMode( Single ); |
53 | 56 | ||
54 | // get rid of being able to edit things... | 57 | // get rid of being able to edit things... |
55 | QTableItem *tmp; | 58 | QTableItem *tmp; |
56 | int row; | 59 | int row; |
57 | for ( row = 0; row < numRows(); row++ ) { | 60 | for ( row = 0; row < numRows(); row++ ) { |
58 | tmp = new QTableItem( this, QTableItem::Never, QString::null); | 61 | tmp = new QTableItem( this, QTableItem::Never, QString::null); |
59 | setItem( row, 0, tmp ); | 62 | setItem( row, 0, tmp ); |
63 | setRowHeight( row, 40); | ||
60 | } | 64 | } |
61 | initHeader(); | 65 | initHeader(); |
62 | QObject::connect( qApp, SIGNAL(clockChanged(bool)), | 66 | QObject::connect( qApp, SIGNAL(clockChanged(bool)), |
63 | this, SLOT(slotChangeClock(bool)) ); | 67 | this, SLOT(slotChangeClock(bool)) ); |
64 | } | 68 | } |
65 | 69 | ||
66 | void DateBookDayView::initHeader() | 70 | void DateBookDayView::initHeader() |
67 | { | 71 | { |
68 | QString strTmp; | 72 | QString strTmp; |
69 | for ( int i = 0; i < 24; ++i ) { | 73 | for ( int i = 0; i < 24; ++i ) { |
70 | if ( ampm ) { | 74 | if ( ampm ) { |
71 | if ( i == 0 ) | 75 | if ( i == 0 ) |
@@ -110,27 +114,31 @@ void DateBookDayView::moveDown() | |||
110 | } | 114 | } |
111 | 115 | ||
112 | void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool ) | 116 | void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool ) |
113 | { | 117 | { |
114 | int w = cr.width(); | 118 | int w = cr.width(); |
115 | int h = cr.height(); | 119 | int h = cr.height(); |
116 | p->fillRect( 0, 0, w, h, colorGroup().brush( QColorGroup::Base ) ); | 120 | p->fillRect( 0, 0, w, h, colorGroup().brush( QColorGroup::Base ) ); |
117 | if ( showGrid() ) { | 121 | if ( showGrid() ) { |
118 | // Draw our lines | 122 | // Draw our lines |
119 | int x2 = w - 1; | 123 | int x2 = w - 1; |
120 | int y2 = h - 1; | 124 | int y2 = h - 1; |
121 | QPen pen( p->pen() ); | 125 | QPen pen( p->pen() ); |
122 | p->setPen( colorGroup().mid() ); | 126 | p->setPen( colorGroup().dark() ); |
123 | p->drawLine( x2, 0, x2, y2 ); | 127 | p->drawLine( x2, 0, x2, y2 ); |
124 | p->drawLine( 0, y2, x2, y2 ); | 128 | p->drawLine( 0, y2, x2, y2 ); |
129 | |||
130 | p->setPen( colorGroup().midlight() ); | ||
131 | p->drawLine( 0, y2 - h/2, x2, y2 - h/2); | ||
132 | |||
125 | p->setPen( pen ); | 133 | p->setPen( pen ); |
126 | } | 134 | } |
127 | } | 135 | } |
128 | 136 | ||
129 | void DateBookDayView::paintFocus( QPainter *, const QRect & ) | 137 | void DateBookDayView::paintFocus( QPainter *, const QRect & ) |
130 | { | 138 | { |
131 | } | 139 | } |
132 | 140 | ||
133 | 141 | ||
134 | void DateBookDayView::resizeEvent( QResizeEvent *e ) | 142 | void DateBookDayView::resizeEvent( QResizeEvent *e ) |
135 | { | 143 | { |
136 | QTable::resizeEvent( e ); | 144 | QTable::resizeEvent( e ); |
@@ -165,24 +173,51 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday, | |||
165 | widgetList.setAutoDelete( true ); | 173 | widgetList.setAutoDelete( true ); |
166 | header = new DateBookDayHeader( startOnMonday, this, "day header" ); | 174 | header = new DateBookDayHeader( startOnMonday, this, "day header" ); |
167 | header->setDate( currDate.year(), currDate.month(), currDate.day() ); | 175 | header->setDate( currDate.year(), currDate.month(), currDate.day() ); |
168 | view = new DateBookDayView( ampm, this, "day view" ); | 176 | view = new DateBookDayView( ampm, this, "day view" ); |
169 | connect( header, SIGNAL( dateChanged( int, int, int ) ), | 177 | connect( header, SIGNAL( dateChanged( int, int, int ) ), |
170 | this, SLOT( dateChanged( int, int, int ) ) ); | 178 | this, SLOT( dateChanged( int, int, int ) ) ); |
171 | connect( view, SIGNAL( sigColWidthChanged() ), | 179 | connect( view, SIGNAL( sigColWidthChanged() ), |
172 | this, SLOT( slotColWidthChanged() ) ); | 180 | this, SLOT( slotColWidthChanged() ) ); |
173 | connect( qApp, SIGNAL(weekChanged(bool)), | 181 | connect( qApp, SIGNAL(weekChanged(bool)), |
174 | this, SLOT(slotWeekChanged(bool)) ); | 182 | this, SLOT(slotWeekChanged(bool)) ); |
175 | connect( view, SIGNAL(sigCapturedKey(const QString &)), | 183 | connect( view, SIGNAL(sigCapturedKey(const QString &)), |
176 | this, SIGNAL(sigNewEvent(const QString&)) ); | 184 | this, SIGNAL(sigNewEvent(const QString&)) ); |
185 | |||
186 | QTimer *timer = new QTimer( this ); | ||
187 | |||
188 | connect( timer, SIGNAL(timeout()), | ||
189 | this, SLOT(updateView()) );//connect timer for updating timeMarker & daywidgetcolors | ||
190 | timer->start( 1000*60*5, FALSE ); //update every 5min | ||
191 | |||
192 | selectedWidget = 0; | ||
193 | |||
194 | timeMarker = new DateBookDayTimeMarker( this ); | ||
195 | timeMarker->setTime( QTime::currentTime() ); | ||
196 | } | ||
197 | |||
198 | void DateBookDay::updateView( void ) | ||
199 | { | ||
200 | timeMarker->setTime( QTime::currentTime() ); | ||
201 | //need to find a way to update all DateBookDayWidgets | ||
202 | } | ||
203 | |||
204 | void DateBookDay::setSelectedWidget( DateBookDayWidget *w ) | ||
205 | { | ||
206 | selectedWidget = w; | ||
207 | } | ||
208 | |||
209 | DateBookDayWidget * DateBookDay::getSelectedWidget( void ) | ||
210 | { | ||
211 | return selectedWidget; | ||
177 | } | 212 | } |
178 | 213 | ||
179 | void DateBookDay::selectedDates( QDateTime &start, QDateTime &end ) | 214 | void DateBookDay::selectedDates( QDateTime &start, QDateTime &end ) |
180 | { | 215 | { |
181 | start.setDate( currDate ); | 216 | start.setDate( currDate ); |
182 | end.setDate( currDate ); | 217 | end.setDate( currDate ); |
183 | 218 | ||
184 | int sh=99,eh=-1; | 219 | int sh=99,eh=-1; |
185 | 220 | ||
186 | int n = dayView()->numSelections(); | 221 | int n = dayView()->numSelections(); |
187 | 222 | ||
188 | for (int i=0; i<n; i++) { | 223 | for (int i=0; i<n; i++) { |
@@ -193,43 +228,53 @@ void DateBookDay::selectedDates( QDateTime &start, QDateTime &end ) | |||
193 | if (sh > 23 || eh < 1) { | 228 | if (sh > 23 || eh < 1) { |
194 | sh=8; | 229 | sh=8; |
195 | eh=9; | 230 | eh=9; |
196 | } | 231 | } |
197 | 232 | ||
198 | start.setTime( QTime( sh, 0, 0 ) ); | 233 | start.setTime( QTime( sh, 0, 0 ) ); |
199 | end.setTime( QTime( eh, 0, 0 ) ); | 234 | end.setTime( QTime( eh, 0, 0 ) ); |
200 | } | 235 | } |
201 | 236 | ||
202 | void DateBookDay::setDate( int y, int m, int d ) | 237 | void DateBookDay::setDate( int y, int m, int d ) |
203 | { | 238 | { |
204 | header->setDate( y, m, d ); | 239 | header->setDate( y, m, d ); |
240 | |||
241 | selectedWidget = 0; | ||
205 | } | 242 | } |
206 | 243 | ||
207 | void DateBookDay::setDate( QDate d) | 244 | void DateBookDay::setDate( QDate d) |
208 | { | 245 | { |
209 | header->setDate( d.year(), d.month(), d.day() ); | 246 | header->setDate( d.year(), d.month(), d.day() ); |
247 | |||
248 | selectedWidget = 0; | ||
210 | } | 249 | } |
211 | 250 | ||
212 | void DateBookDay::dateChanged( int y, int m, int d ) | 251 | void DateBookDay::dateChanged( int y, int m, int d ) |
213 | { | 252 | { |
214 | QDate date( y, m, d ); | 253 | QDate date( y, m, d ); |
215 | if ( currDate == date ) | 254 | if ( currDate == date ) |
216 | return; | 255 | return; |
217 | currDate.setYMD( y, m, d ); | 256 | currDate.setYMD( y, m, d ); |
218 | relayoutPage(); | 257 | relayoutPage(); |
219 | dayView()->clearSelection(); | 258 | dayView()->clearSelection(); |
220 | QTableSelection ts; | 259 | QTableSelection ts; |
221 | ts.init( startTime, 0 ); | 260 | ts.init( startTime, 0 ); |
222 | ts.expandTo( startTime, 0 ); | 261 | ts.expandTo( startTime, 0 ); |
223 | dayView()->addSelection( ts ); | 262 | dayView()->addSelection( ts ); |
263 | |||
264 | selectedWidget = 0; | ||
265 | |||
266 | if (this->date() == QDate::currentDate()) | ||
267 | timeMarker->show(); else timeMarker->hide(); | ||
268 | |||
224 | } | 269 | } |
225 | 270 | ||
226 | void DateBookDay::redraw() | 271 | void DateBookDay::redraw() |
227 | { | 272 | { |
228 | if ( isUpdatesEnabled() ) | 273 | if ( isUpdatesEnabled() ) |
229 | relayoutPage(); | 274 | relayoutPage(); |
230 | } | 275 | } |
231 | 276 | ||
232 | void DateBookDay::getEvents() | 277 | void DateBookDay::getEvents() |
233 | { | 278 | { |
234 | widgetList.clear(); | 279 | widgetList.clear(); |
235 | 280 | ||
@@ -237,24 +282,25 @@ void DateBookDay::getEvents() | |||
237 | currDate ); | 282 | currDate ); |
238 | QValueListIterator<EffectiveEvent> it; | 283 | QValueListIterator<EffectiveEvent> it; |
239 | for ( it = eventList.begin(); it != eventList.end(); ++it ) { | 284 | for ( it = eventList.begin(); it != eventList.end(); ++it ) { |
240 | DateBookDayWidget* w = new DateBookDayWidget( *it, this ); | 285 | DateBookDayWidget* w = new DateBookDayWidget( *it, this ); |
241 | connect( w, SIGNAL( deleteMe( const Event & ) ), | 286 | connect( w, SIGNAL( deleteMe( const Event & ) ), |
242 | this, SIGNAL( removeEvent( const Event & ) ) ); | 287 | this, SIGNAL( removeEvent( const Event & ) ) ); |
243 | connect( w, SIGNAL( editMe( const Event & ) ), | 288 | connect( w, SIGNAL( editMe( const Event & ) ), |
244 | this, SIGNAL( editEvent( const Event & ) ) ); | 289 | this, SIGNAL( editEvent( const Event & ) ) ); |
245 | connect( w, SIGNAL( beamMe( const Event & ) ), | 290 | connect( w, SIGNAL( beamMe( const Event & ) ), |
246 | this, SIGNAL( beamEvent( const Event & ) ) ); | 291 | this, SIGNAL( beamEvent( const Event & ) ) ); |
247 | widgetList.append( w ); | 292 | widgetList.append( w ); |
248 | } | 293 | } |
294 | |||
249 | } | 295 | } |
250 | 296 | ||
251 | static int place( const DateBookDayWidget *item, bool *used, int maxn ) | 297 | static int place( const DateBookDayWidget *item, bool *used, int maxn ) |
252 | { | 298 | { |
253 | int place = 0; | 299 | int place = 0; |
254 | int start = item->event().start().hour(); | 300 | int start = item->event().start().hour(); |
255 | QTime e = item->event().end(); | 301 | QTime e = item->event().end(); |
256 | int end = e.hour(); | 302 | int end = e.hour(); |
257 | if ( e.minute() < 5 ) | 303 | if ( e.minute() < 5 ) |
258 | end--; | 304 | end--; |
259 | if ( end < start ) | 305 | if ( end < start ) |
260 | end = start; | 306 | end = start; |
@@ -279,51 +325,92 @@ static int place( const DateBookDayWidget *item, bool *used, int maxn ) | |||
279 | start++; | 325 | start++; |
280 | } | 326 | } |
281 | return place; | 327 | return place; |
282 | } | 328 | } |
283 | 329 | ||
284 | 330 | ||
285 | void DateBookDay::relayoutPage( bool fromResize ) | 331 | void DateBookDay::relayoutPage( bool fromResize ) |
286 | { | 332 | { |
287 | setUpdatesEnabled( FALSE ); | 333 | setUpdatesEnabled( FALSE ); |
288 | if ( !fromResize ) | 334 | if ( !fromResize ) |
289 | getEvents(); // no need we already have them! | 335 | getEvents(); // no need we already have them! |
290 | 336 | ||
337 | widgetList.sort(); | ||
338 | //sorts the widgetList by the heights of the widget so that the tallest widgets are at the beginning | ||
339 | //this is needed for the simple algo below to work correctly, otherwise some widgets would be drawn outside the view | ||
340 | |||
291 | int wCount = widgetList.count(); | 341 | int wCount = widgetList.count(); |
292 | int wid = view->columnWidth(0)-1; | 342 | int wid = view->columnWidth(0)-1; |
343 | int wd; | ||
293 | int n = 1; | 344 | int n = 1; |
294 | 345 | ||
346 | QArray<int> anzIntersect(wCount); //this stores the number of maximal intersections of each widget | ||
347 | |||
348 | for (int i = 0; i<wCount; anzIntersect[i] = 1, i++); | ||
349 | |||
295 | if ( wCount < 20 ) { | 350 | if ( wCount < 20 ) { |
296 | for ( int i = 0; i < wCount; ) { | 351 | |
352 | QArray<QRect> geometries(wCount); | ||
353 | for (int i = 0; i < wCount; geometries[i] = widgetList.at(i)->geometry(), i++);//stores geometry for each widget in vector | ||
354 | |||
355 | for ( int i = 0; i < wCount; i++) | ||
356 | { | ||
357 | QValueList<int> intersectedWidgets; | ||
358 | |||
359 | //find all widgets intersecting with widgetList.at(i) | ||
360 | for ( int j = 0; j < wCount; j++) | ||
361 | if (i != j) | ||
362 | if (geometries[j].intersects(geometries[i])) | ||
363 | intersectedWidgets.append(j); | ||
364 | |||
365 | //for each of these intersecting widgets find out how many widgets are they intersecting with | ||
366 | for ( uint j = 0; j < intersectedWidgets.count(); j++) | ||
367 | { | ||
368 | QArray<int> inter(wCount); | ||
369 | inter[j]=1; | ||
370 | |||
371 | if (intersectedWidgets[j] != -1) | ||
372 | for ( uint k = j; k < intersectedWidgets.count(); k++) | ||
373 | if (j != k && intersectedWidgets[k] != -1) | ||
374 | if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]])) | ||
375 | { | ||
376 | inter[j]++; | ||
377 | intersectedWidgets[k] = -1; | ||
378 | } | ||
379 | if (inter[j] > anzIntersect[i]) anzIntersect[i] = inter[j] + 1; | ||
380 | } | ||
381 | |||
382 | if (anzIntersect[i] == 1 && intersectedWidgets.count()) anzIntersect[i]++; | ||
383 | } | ||
384 | |||
385 | |||
386 | for ( int i = 0; i < wCount; i++) { | ||
297 | DateBookDayWidget *w = widgetList.at(i); | 387 | DateBookDayWidget *w = widgetList.at(i); |
298 | int x = 0; | ||
299 | int xp = 0; | ||
300 | QRect geom = w->geometry(); | 388 | QRect geom = w->geometry(); |
301 | geom.setX( x ); | 389 | |
302 | geom.setWidth( wid ); | 390 | geom.setX( 0 ); |
303 | while ( xp < n && intersects( w, geom ) ) { | 391 | |
304 | x += wid; | 392 | wd = (view->columnWidth(0)-1) / anzIntersect[i] - (anzIntersect[i]>1?2:0); |
305 | xp++; | 393 | |
306 | geom.moveBy( wid, 0 ); | 394 | geom.setWidth( wd ); |
395 | |||
396 | while ( intersects( w, geom ) ) { | ||
397 | geom.moveBy( wd + 2 + 1, 0 ); | ||
307 | } | 398 | } |
308 | if ( xp >= n ) { | ||
309 | n++; | ||
310 | wid = ( view->columnWidth(0)-1 ) / n; | ||
311 | i = 0; | ||
312 | } else { | ||
313 | w->setGeometry( geom ); | 399 | w->setGeometry( geom ); |
314 | i++; | ||
315 | } | ||
316 | } | 400 | } |
401 | |||
317 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); | 402 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); |
403 | |||
404 | |||
318 | } else { | 405 | } else { |
319 | 406 | ||
320 | 407 | ||
321 | int hours[24]; | 408 | int hours[24]; |
322 | memset( hours, 0, 24*sizeof( int ) ); | 409 | memset( hours, 0, 24*sizeof( int ) ); |
323 | bool overFlow = FALSE; | 410 | bool overFlow = FALSE; |
324 | for ( int i = 0; i < wCount; i++ ) { | 411 | for ( int i = 0; i < wCount; i++ ) { |
325 | DateBookDayWidget *w = widgetList.at(i); | 412 | DateBookDayWidget *w = widgetList.at(i); |
326 | int start = w->event().start().hour(); | 413 | int start = w->event().start().hour(); |
327 | QTime e = w->event().end(); | 414 | QTime e = w->event().end(); |
328 | int end = e.hour(); | 415 | int end = e.hour(); |
329 | if ( e.minute() < 5 ) | 416 | if ( e.minute() < 5 ) |
@@ -343,31 +430,34 @@ void DateBookDay::relayoutPage( bool fromResize ) | |||
343 | n = QMAX( n, hours[i] ); | 430 | n = QMAX( n, hours[i] ); |
344 | } | 431 | } |
345 | wid = ( view->columnWidth(0)-1 ) / n; | 432 | wid = ( view->columnWidth(0)-1 ) / n; |
346 | 433 | ||
347 | bool used[24*10]; | 434 | bool used[24*10]; |
348 | memset( used, FALSE, 24*10*sizeof( bool ) ); | 435 | memset( used, FALSE, 24*10*sizeof( bool ) ); |
349 | 436 | ||
350 | for ( int i = 0; i < wCount; i++ ) { | 437 | for ( int i = 0; i < wCount; i++ ) { |
351 | DateBookDayWidget *w = widgetList.at(i); | 438 | DateBookDayWidget *w = widgetList.at(i); |
352 | int xp = place( w, used, n ); | 439 | int xp = place( w, used, n ); |
353 | if ( xp != -1 ) { | 440 | if ( xp != -1 ) { |
354 | QRect geom = w->geometry(); | 441 | QRect geom = w->geometry(); |
355 | geom.setX( xp*wid ); | 442 | geom.setX( xp*(wid+2) ); |
356 | geom.setWidth( wid ); | 443 | geom.setWidth( wid ); |
357 | w->setGeometry( geom ); | 444 | w->setGeometry( geom ); |
358 | } | 445 | } |
359 | } | 446 | } |
360 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); | 447 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); |
361 | } | 448 | } |
449 | |||
450 | timeMarker->setTime( QTime::currentTime() );//display timeMarker | ||
451 | timeMarker->raise(); //on top of all widgets | ||
362 | setUpdatesEnabled( TRUE ); | 452 | setUpdatesEnabled( TRUE ); |
363 | return; | 453 | return; |
364 | } | 454 | } |
365 | 455 | ||
366 | DateBookDayWidget *DateBookDay::intersects( const DateBookDayWidget *item, const QRect &geom ) | 456 | DateBookDayWidget *DateBookDay::intersects( const DateBookDayWidget *item, const QRect &geom ) |
367 | { | 457 | { |
368 | int i = 0; | 458 | int i = 0; |
369 | DateBookDayWidget *w = widgetList.at(i); | 459 | DateBookDayWidget *w = widgetList.at(i); |
370 | int wCount = widgetList.count(); | 460 | int wCount = widgetList.count(); |
371 | while ( i < wCount && w != item ) { | 461 | while ( i < wCount && w != item ) { |
372 | if ( w->geometry().intersects( geom ) ) { | 462 | if ( w->geometry().intersects( geom ) ) { |
373 | return w; | 463 | return w; |
@@ -487,67 +577,163 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, | |||
487 | 577 | ||
488 | QTime start = ev.start(); | 578 | QTime start = ev.start(); |
489 | QTime end = ev.end(); | 579 | QTime end = ev.end(); |
490 | int y = start.hour()*60+start.minute(); | 580 | int y = start.hour()*60+start.minute(); |
491 | int h = end.hour()*60+end.minute()-y; | 581 | int h = end.hour()*60+end.minute()-y; |
492 | int rh = dateBook->dayView()->rowHeight(0); | 582 | int rh = dateBook->dayView()->rowHeight(0); |
493 | y = y*rh/60; | 583 | y = y*rh/60; |
494 | h = h*rh/60; | 584 | h = h*rh/60; |
495 | if ( h < 3 ) | 585 | if ( h < 3 ) |
496 | h = 3; | 586 | h = 3; |
497 | geom.setY( y ); | 587 | geom.setY( y ); |
498 | geom.setHeight( h ); | 588 | geom.setHeight( h ); |
589 | geom.setX( 0 ); | ||
590 | geom.setWidth(dateBook->dayView()->columnWidth(0)-1); | ||
591 | |||
499 | } | 592 | } |
500 | 593 | ||
501 | DateBookDayWidget::~DateBookDayWidget() | 594 | DateBookDayWidget::~DateBookDayWidget() |
502 | { | 595 | { |
503 | } | 596 | } |
504 | 597 | ||
505 | void DateBookDayWidget::paintEvent( QPaintEvent *e ) | 598 | void DateBookDayWidget::paintEvent( QPaintEvent *e ) |
506 | { | 599 | { |
507 | QPainter p( this ); | 600 | QPainter p( this ); |
601 | |||
602 | if (dateBook->getSelectedWidget() == this) | ||
603 | { | ||
604 | p.setBrush( QColor( 155, 240, 230 ) ); // selected item | ||
605 | } else | ||
606 | { | ||
607 | if (dateBook->date() == QDate::currentDate()) | ||
608 | { | ||
609 | QTime curTime = QTime::currentTime(); | ||
610 | |||
611 | if (ev.end() < curTime) | ||
612 | { | ||
613 | p.setBrush( QColor( 180, 180, 180 ) ); // grey, inactive | ||
614 | } else | ||
615 | { | ||
616 | //change color in dependence of the time till the event starts | ||
617 | int duration = curTime.secsTo(ev.start()); | ||
618 | if (duration < 0) duration = 0; | ||
619 | int colChange = duration*160/86400; //86400: secs per day, 160: max color shift | ||
620 | |||
621 | p.setBrush( QColor( 200-colChange, 200-colChange, 255 ) ); //blue | ||
622 | } | ||
623 | } else | ||
624 | { | ||
625 | p.setBrush( QColor( 220, 220, 220 ) ); //light grey, inactive (not current date) | ||
626 | //perhaps make a distinction between future/past dates | ||
627 | } | ||
628 | } | ||
629 | |||
508 | p.setPen( QColor(100, 100, 100) ); | 630 | p.setPen( QColor(100, 100, 100) ); |
509 | p.setBrush( QColor( 255, 240, 230 ) ); // based on priority? | ||
510 | p.drawRect(rect()); | 631 | p.drawRect(rect()); |
511 | 632 | ||
633 | // p.drawRect(0,0, 5, height()); | ||
634 | |||
512 | int y = 0; | 635 | int y = 0; |
513 | int d = 0; | 636 | int d = 0; |
514 | 637 | ||
515 | if ( ev.event().hasAlarm() ) { | 638 | if ( ev.event().hasAlarm() ) { |
516 | p.drawPixmap( width() - 16, 0, Resource::loadPixmap( "bell" ) ); | 639 | p.drawPixmap( width() - 16, 0, Resource::loadPixmap( "bell" ) ); |
517 | y = 20; | 640 | y = 20; |
518 | d = 20; | 641 | d = 20; |
519 | } | 642 | } |
520 | 643 | ||
521 | if ( ev.event().hasRepeat() ) { | 644 | if ( ev.event().hasRepeat() ) { |
522 | p.drawPixmap( width() - 16, y, Resource::loadPixmap( "repeat" ) ); | 645 | p.drawPixmap( width() - 16, y, Resource::loadPixmap( "repeat" ) ); |
523 | d = 20; | 646 | d = 20; |
524 | } | 647 | } |
525 | 648 | ||
526 | QSimpleRichText rt( text, font() ); | 649 | QSimpleRichText rt( text, font() ); |
527 | rt.setWidth( geom.width() - d - 6 ); | 650 | rt.setWidth( geom.width() - d - 6 ); |
528 | rt.draw( &p, 3, 0, e->region(), colorGroup() ); | 651 | rt.draw( &p, 7, 0, e->region(), colorGroup() ); |
529 | } | 652 | } |
530 | 653 | ||
531 | void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) | 654 | void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) |
532 | { | 655 | { |
656 | DateBookDayWidget *item; | ||
657 | |||
658 | item = dateBook->getSelectedWidget(); | ||
659 | if (item) item->update(); | ||
660 | |||
661 | dateBook->setSelectedWidget(this); | ||
662 | update(); | ||
663 | dateBook->repaint(); | ||
664 | |||
533 | QPopupMenu m; | 665 | QPopupMenu m; |
534 | m.insertItem( tr( "Edit" ), 1 ); | 666 | m.insertItem( tr( "Edit" ), 1 ); |
535 | m.insertItem( tr( "Delete" ), 2 ); | 667 | m.insertItem( tr( "Delete" ), 2 ); |
536 | m.insertItem( tr( "Beam" ), 3 ); | 668 | m.insertItem( tr( "Beam" ), 3 ); |
537 | int r = m.exec( e->globalPos() ); | 669 | int r = m.exec( e->globalPos() ); |
538 | if ( r == 1 ) { | 670 | if ( r == 1 ) { |
539 | emit editMe( ev.event() ); | 671 | emit editMe( ev.event() ); |
540 | } else if ( r == 2 ) { | 672 | } else if ( r == 2 ) { |
541 | emit deleteMe( ev.event() ); | 673 | emit deleteMe( ev.event() ); |
542 | } else if ( r == 3 ) { | 674 | } else if ( r == 3 ) { |
543 | emit beamMe( ev.event() ); | 675 | emit beamMe( ev.event() ); |
544 | } | 676 | } |
545 | } | 677 | } |
546 | 678 | ||
547 | void DateBookDayWidget::setGeometry( const QRect &r ) | 679 | void DateBookDayWidget::setGeometry( const QRect &r ) |
548 | { | 680 | { |
549 | geom = r; | 681 | geom = r; |
550 | setFixedSize( r.width()+1, r.height()+1 ); | 682 | setFixedSize( r.width()+1, r.height()+1 ); |
551 | dateBook->dayView()->moveChild( this, r.x(), r.y()-1 ); | 683 | dateBook->dayView()->moveChild( this, r.x(), r.y()-1 ); |
552 | show(); | 684 | show(); |
553 | } | 685 | } |
686 | |||
687 | |||
688 | //--------------------------------------------------------------------------------------------- | ||
689 | //--------------------------------------------------------------------------------------------- | ||
690 | |||
691 | |||
692 | DateBookDayTimeMarker::DateBookDayTimeMarker( DateBookDay *db ) | ||
693 | : QWidget( db->dayView()->viewport() ), dateBook( db ) | ||
694 | { | ||
695 | setBackgroundMode( PaletteBase ); | ||
696 | } | ||
697 | |||
698 | DateBookDayTimeMarker::~DateBookDayTimeMarker() | ||
699 | { | ||
700 | } | ||
701 | |||
702 | void DateBookDayTimeMarker::paintEvent( QPaintEvent */*e*/ ) | ||
703 | { | ||
704 | QPainter p( this ); | ||
705 | p.setBrush( QColor( 255, 0, 0 ) ); | ||
706 | |||
707 | QPen pen; | ||
708 | pen.setStyle(NoPen); | ||
709 | |||
710 | p.setPen( pen ); | ||
711 | p.drawRect(rect()); | ||
712 | } | ||
713 | |||
714 | void DateBookDayTimeMarker::setTime( const QTime &t ) | ||
715 | { | ||
716 | int y = t.hour()*60+t.minute(); | ||
717 | int rh = dateBook->dayView()->rowHeight(0); | ||
718 | y = y*rh/60; | ||
719 | |||
720 | geom.setX( 0 ); | ||
721 | |||
722 | int x = dateBook->dayView()->columnWidth(0)-1; | ||
723 | geom.setWidth( x ); | ||
724 | |||
725 | geom.setY( y ); | ||
726 | geom.setHeight( 1 ); | ||
727 | |||
728 | setGeometry( geom ); | ||
729 | |||
730 | time = t; | ||
731 | } | ||
732 | |||
733 | void DateBookDayTimeMarker::setGeometry( const QRect &r ) | ||
734 | { | ||
735 | geom = r; | ||
736 | setFixedSize( r.width()+1, r.height()+1 ); | ||
737 | dateBook->dayView()->moveChild( this, r.x(), r.y()-1 ); | ||
738 | show(); | ||
739 | } | ||
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h index 531fded..db0f3b6 100644 --- a/core/pim/datebook/datebookday.h +++ b/core/pim/datebook/datebookday.h | |||
@@ -44,24 +44,25 @@ public: | |||
44 | public slots: | 44 | public slots: |
45 | void moveUp(); | 45 | void moveUp(); |
46 | void moveDown(); | 46 | void moveDown(); |
47 | 47 | ||
48 | signals: | 48 | signals: |
49 | void sigColWidthChanged(); | 49 | void sigColWidthChanged(); |
50 | void sigCapturedKey( const QString &txt ); | 50 | void sigCapturedKey( const QString &txt ); |
51 | protected slots: | 51 | protected slots: |
52 | void slotChangeClock( bool ); | 52 | void slotChangeClock( bool ); |
53 | protected: | 53 | protected: |
54 | virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected ); | 54 | virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected ); |
55 | virtual void paintFocus( QPainter *p, const QRect &cr ); | 55 | virtual void paintFocus( QPainter *p, const QRect &cr ); |
56 | |||
56 | virtual void resizeEvent( QResizeEvent *e ); | 57 | virtual void resizeEvent( QResizeEvent *e ); |
57 | void keyPressEvent( QKeyEvent *e ); | 58 | void keyPressEvent( QKeyEvent *e ); |
58 | void initHeader(); | 59 | void initHeader(); |
59 | private: | 60 | private: |
60 | bool ampm; | 61 | bool ampm; |
61 | }; | 62 | }; |
62 | 63 | ||
63 | class DateBookDay; | 64 | class DateBookDay; |
64 | class DateBookDayWidget : public QWidget | 65 | class DateBookDayWidget : public QWidget |
65 | { | 66 | { |
66 | Q_OBJECT | 67 | Q_OBJECT |
67 | 68 | ||
@@ -81,58 +82,107 @@ signals: | |||
81 | 82 | ||
82 | protected: | 83 | protected: |
83 | void paintEvent( QPaintEvent *e ); | 84 | void paintEvent( QPaintEvent *e ); |
84 | void mousePressEvent( QMouseEvent *e ); | 85 | void mousePressEvent( QMouseEvent *e ); |
85 | 86 | ||
86 | private: | 87 | private: |
87 | const EffectiveEvent ev; | 88 | const EffectiveEvent ev; |
88 | DateBookDay *dateBook; | 89 | DateBookDay *dateBook; |
89 | QString text; | 90 | QString text; |
90 | QRect geom; | 91 | QRect geom; |
91 | }; | 92 | }; |
92 | 93 | ||
94 | //Marker for current time in the dayview | ||
95 | class DateBookDayTimeMarker : public QWidget | ||
96 | { | ||
97 | Q_OBJECT | ||
98 | |||
99 | public: | ||
100 | DateBookDayTimeMarker( DateBookDay *db ); | ||
101 | ~DateBookDayTimeMarker(); | ||
102 | |||
103 | const QRect &geometry() { return geom; } | ||
104 | void setGeometry( const QRect &r ); | ||
105 | void setTime( const QTime &t ); | ||
106 | |||
107 | signals: | ||
108 | |||
109 | protected: | ||
110 | void paintEvent( QPaintEvent *e ); | ||
111 | |||
112 | private: | ||
113 | QRect geom; | ||
114 | QTime time; | ||
115 | DateBookDay *dateBook; | ||
116 | }; | ||
117 | |||
118 | //reimplemented the compareItems function so that it sorts DayWidgets by geometry heights | ||
119 | class WidgetListClass : public QList<DateBookDayWidget> | ||
120 | { | ||
121 | private: | ||
122 | |||
123 | int compareItems( QCollection::Item s1, QCollection::Item s2 ) | ||
124 | { | ||
125 | //hmm, don't punish me for that ;) | ||
126 | if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height()) | ||
127 | { | ||
128 | return -1; | ||
129 | } else | ||
130 | { | ||
131 | return 1; | ||
132 | } | ||
133 | } | ||
134 | |||
135 | |||
136 | }; | ||
137 | |||
93 | class DateBookDay : public QVBox | 138 | class DateBookDay : public QVBox |
94 | { | 139 | { |
95 | Q_OBJECT | 140 | Q_OBJECT |
96 | 141 | ||
97 | public: | 142 | public: |
98 | DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, | 143 | DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, |
99 | QWidget *parent, const char *name ); | 144 | QWidget *parent, const char *name ); |
100 | void selectedDates( QDateTime &start, QDateTime &end ); | 145 | void selectedDates( QDateTime &start, QDateTime &end ); |
101 | QDate date() const; | 146 | QDate date() const; |
102 | DateBookDayView *dayView() const { return view; } | 147 | DateBookDayView *dayView() const { return view; } |
103 | void setStartViewTime( int startHere ); | 148 | void setStartViewTime( int startHere ); |
104 | int startViewTime() const; | 149 | int startViewTime() const; |
150 | void setSelectedWidget( DateBookDayWidget * ); | ||
151 | DateBookDayWidget * getSelectedWidget( void ); | ||
105 | 152 | ||
106 | public slots: | 153 | public slots: |
107 | void setDate( int y, int m, int d ); | 154 | void setDate( int y, int m, int d ); |
108 | void setDate( QDate ); | 155 | void setDate( QDate ); |
109 | void redraw(); | 156 | void redraw(); |
110 | void slotWeekChanged( bool bStartOnMonday ); | 157 | void slotWeekChanged( bool bStartOnMonday ); |
158 | void updateView();//updates TimeMarker and DayWidget-colors | ||
111 | 159 | ||
112 | signals: | 160 | signals: |
113 | void removeEvent( const Event& ); | 161 | void removeEvent( const Event& ); |
114 | void editEvent( const Event& ); | 162 | void editEvent( const Event& ); |
115 | void beamEvent( const Event& ); | 163 | void beamEvent( const Event& ); |
116 | void newEvent(); | 164 | void newEvent(); |
117 | void sigNewEvent( const QString & ); | 165 | void sigNewEvent( const QString & ); |
118 | 166 | ||
119 | protected slots: | 167 | protected slots: |
120 | void keyPressEvent(QKeyEvent *); | 168 | void keyPressEvent(QKeyEvent *); |
121 | 169 | ||
122 | private slots: | 170 | private slots: |
123 | void dateChanged( int y, int m, int d ); | 171 | void dateChanged( int y, int m, int d ); |
124 | void slotColWidthChanged() { relayoutPage(); }; | 172 | void slotColWidthChanged() { relayoutPage(); }; |
125 | 173 | ||
126 | private: | 174 | private: |
127 | void getEvents(); | 175 | void getEvents(); |
128 | void relayoutPage( bool fromResize = false ); | 176 | void relayoutPage( bool fromResize = false ); |
129 | DateBookDayWidget *intersects( const DateBookDayWidget *item, const QRect &geom ); | 177 | DateBookDayWidget *intersects( const DateBookDayWidget *item, const QRect &geom ); |
130 | QDate currDate; | 178 | QDate currDate; |
131 | DateBookDayView *view; | 179 | DateBookDayView *view; |
132 | DateBookDayHeader *header; | 180 | DateBookDayHeader *header; |
133 | DateBookDB *db; | 181 | DateBookDB *db; |
134 | QList<DateBookDayWidget> widgetList; | 182 | WidgetListClass widgetList;//reimplemented QList for sorting widgets by height |
135 | int startTime; | 183 | int startTime; |
184 | DateBookDayWidget *selectedWidget; //actual selected widget (obviously) | ||
185 | DateBookDayTimeMarker *timeMarker;//marker for current time | ||
136 | }; | 186 | }; |
137 | 187 | ||
138 | #endif | 188 | #endif |