Diffstat (limited to 'core/pim/datebook/datebookday.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookday.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index 42f026a..5d472a6 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp | |||
@@ -304,24 +304,26 @@ void DateBookDay::redraw() | |||
304 | void DateBookDay::getEvents() | 304 | void DateBookDay::getEvents() |
305 | { | 305 | { |
306 | widgetList.clear(); | 306 | widgetList.clear(); |
307 | 307 | ||
308 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate ); | 308 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate ); |
309 | QValueListIterator<EffectiveEvent> it; | 309 | QValueListIterator<EffectiveEvent> it; |
310 | for ( it = eventList.begin(); it != eventList.end(); ++it ) { | 310 | for ( it = eventList.begin(); it != eventList.end(); ++it ) { |
311 | EffectiveEvent ev=*it; | 311 | EffectiveEvent ev=*it; |
312 | if(!(ev.end().hour()==ev.start().hour() && ev.end().minute()==ev.start().minute())) {// Skip effective events with no duration. (i.e ending at 00:00) | 312 | if(!(ev.end().hour()==ev.start().hour() && ev.end().minute()==ev.start().minute())) {// Skip effective events with no duration. (i.e ending at 00:00) |
313 | DateBookDayWidget* w = new DateBookDayWidget( *it, this ); | 313 | DateBookDayWidget* w = new DateBookDayWidget( *it, this ); |
314 | connect( w, SIGNAL( deleteMe( const Event & ) ), | 314 | connect( w, SIGNAL( deleteMe( const Event & ) ), |
315 | this, SIGNAL( removeEvent( const Event & ) ) ); | 315 | this, SIGNAL( removeEvent( const Event & ) ) ); |
316 | connect( w, SIGNAL( duplicateMe( const Event & ) ), | ||
317 | this, SIGNAL( duplicateEvent( const Event & ) ) ); | ||
316 | connect( w, SIGNAL( editMe( const Event & ) ), | 318 | connect( w, SIGNAL( editMe( const Event & ) ), |
317 | this, SIGNAL( editEvent( const Event & ) ) ); | 319 | this, SIGNAL( editEvent( const Event & ) ) ); |
318 | connect( w, SIGNAL( beamMe( const Event & ) ), | 320 | connect( w, SIGNAL( beamMe( const Event & ) ), |
319 | this, SIGNAL( beamEvent( const Event & ) ) ); | 321 | this, SIGNAL( beamEvent( const Event & ) ) ); |
320 | widgetList.append( w ); | 322 | widgetList.append( w ); |
321 | } | 323 | } |
322 | } | 324 | } |
323 | 325 | ||
324 | } | 326 | } |
325 | 327 | ||
326 | static int place( const DateBookDayWidget *item, bool *used, int maxn ) | 328 | static int place( const DateBookDayWidget *item, bool *used, int maxn ) |
327 | { | 329 | { |
@@ -711,36 +713,39 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e ) | |||
711 | 713 | ||
712 | void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) | 714 | void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) |
713 | { | 715 | { |
714 | DateBookDayWidget *item; | 716 | DateBookDayWidget *item; |
715 | 717 | ||
716 | item = dateBook->getSelectedWidget(); | 718 | item = dateBook->getSelectedWidget(); |
717 | if (item) item->update(); | 719 | if (item) item->update(); |
718 | 720 | ||
719 | dateBook->setSelectedWidget(this); | 721 | dateBook->setSelectedWidget(this); |
720 | update(); | 722 | update(); |
721 | dateBook->repaint(); | 723 | dateBook->repaint(); |
722 | 724 | ||
723 | QPopupMenu m; | 725 | QPopupMenu m; |
724 | m.insertItem( tr( "Edit" ), 1 ); | 726 | m.insertItem( tr( "Edit" ), 1 ); |
725 | m.insertItem( tr( "Delete" ), 2 ); | 727 | m.insertItem( tr( "Duplicate" ), 4 ); |
726 | if(Ir::supported()) m.insertItem( tr( "Beam" ), 3 ); | 728 | m.insertItem( tr( "Delete" ), 2 ); |
727 | int r = m.exec( e->globalPos() ); | 729 | if(Ir::supported()) m.insertItem( tr( "Beam" ), 3 ); |
728 | if ( r == 1 ) { | 730 | int r = m.exec( e->globalPos() ); |
729 | emit editMe( ev.event() ); | 731 | if ( r == 1 ) { |
730 | } else if ( r == 2 ) { | 732 | emit editMe( ev.event() ); |
731 | emit deleteMe( ev.event() ); | 733 | } else if ( r == 2 ) { |
732 | } else if ( r == 3 ) { | 734 | emit deleteMe( ev.event() ); |
733 | emit beamMe( ev.event() ); | 735 | } else if ( r == 3 ) { |
734 | } | 736 | emit beamMe( ev.event() ); |
737 | } else if ( r == 4 ) { | ||
738 | emit duplicateMe( ev.event() ); | ||
739 | } | ||
735 | } | 740 | } |
736 | 741 | ||
737 | void DateBookDayWidget::setGeometry( const QRect &r ) | 742 | void DateBookDayWidget::setGeometry( const QRect &r ) |
738 | { | 743 | { |
739 | geom = r; | 744 | geom = r; |
740 | setFixedSize( r.width()+1, r.height()+1 ); | 745 | setFixedSize( r.width()+1, r.height()+1 ); |
741 | dateBook->dayView()->moveChild( this, r.x(), r.y()-1 ); | 746 | dateBook->dayView()->moveChild( this, r.x(), r.y()-1 ); |
742 | show(); | 747 | show(); |
743 | } | 748 | } |
744 | 749 | ||
745 | 750 | ||
746 | //--------------------------------------------------------------------------------------------- | 751 | //--------------------------------------------------------------------------------------------- |