author | zecke <zecke> | 2002-06-17 15:57:13 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-17 15:57:13 (UTC) |
commit | 97aca0c9f5f483d01c685d0d0f126ca554d3b199 (patch) (unidiff) | |
tree | 839929bc17e8e86e1a8d35e2b14e02f6343a8823 /core | |
parent | 02e724757f13f40d85136c3a14e0a3788d28236e (diff) | |
download | opie-97aca0c9f5f483d01c685d0d0f126ca554d3b199.zip opie-97aca0c9f5f483d01c685d0d0f126ca554d3b199.tar.gz opie-97aca0c9f5f483d01c685d0d0f126ca554d3b199.tar.bz2 |
tboc <tboc@gmx.de> provided a cute patch to show a red time mark
in the current day view
-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 | |||
@@ -986,4 +986,6 @@ Event DateBookDBHack::eventByUID(int uid) { | |||
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 | |||
@@ -18,4 +18,5 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qmessagebox.h> | ||
20 | 21 | ||
21 | #include "datebookday.h" | 22 | #include "datebookday.h" |
@@ -37,4 +38,6 @@ | |||
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 ) |
@@ -58,4 +61,5 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, | |||
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(); |
@@ -120,7 +124,11 @@ void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool ) | |||
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 | } |
@@ -175,4 +183,31 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday, | |||
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 | ||
@@ -203,4 +238,6 @@ 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 | ||
@@ -208,4 +245,6 @@ 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 | ||
@@ -222,4 +261,10 @@ void DateBookDay::dateChanged( int y, int m, int d ) | |||
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 | ||
@@ -247,4 +292,5 @@ void DateBookDay::getEvents() | |||
247 | widgetList.append( w ); | 292 | widgetList.append( w ); |
248 | } | 293 | } |
294 | |||
249 | } | 295 | } |
250 | 296 | ||
@@ -289,31 +335,72 @@ void DateBookDay::relayoutPage( bool 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 | ||
@@ -353,5 +440,5 @@ void DateBookDay::relayoutPage( bool fromResize ) | |||
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 ); |
@@ -360,4 +447,7 @@ void DateBookDay::relayoutPage( bool fromResize ) | |||
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; |
@@ -497,4 +587,7 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, | |||
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 | ||
@@ -506,8 +599,38 @@ 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; |
@@ -526,9 +649,18 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e ) | |||
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 ); |
@@ -552,2 +684,56 @@ void DateBookDayWidget::setGeometry( const QRect &r ) | |||
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 | |||
@@ -54,4 +54,5 @@ 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 ); |
@@ -91,4 +92,48 @@ private: | |||
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 | { |
@@ -103,4 +148,6 @@ public: | |||
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: |
@@ -109,4 +156,5 @@ public slots: | |||
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: |
@@ -132,6 +180,8 @@ private: | |||
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 | ||