author | umopapisdn <umopapisdn> | 2003-03-24 09:06:06 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-03-24 09:06:06 (UTC) |
commit | fea2436fef9e7096b31840e7170a23280f3d6e39 (patch) (unidiff) | |
tree | 83bcaeafa071242e4b1d5df76409ff41d9900eac /core/pim | |
parent | 4a0041efd5cc7e08063c09b02858fcd9c2b59880 (diff) | |
download | opie-fea2436fef9e7096b31840e7170a23280f3d6e39.zip opie-fea2436fef9e7096b31840e7170a23280f3d6e39.tar.gz opie-fea2436fef9e7096b31840e7170a23280f3d6e39.tar.bz2 |
New feature: In dayview it's now possible to duplicate an event (and immediatly change some parameters for the duplicate).
-rw-r--r-- | core/pim/datebook/datebook.cpp | 65 | ||||
-rw-r--r-- | core/pim/datebook/datebook.h | 3 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.cpp | 5 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.h | 2 |
4 files changed, 73 insertions, 2 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index fa509d9..47be523 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -399,12 +399,69 @@ void DateBook::viewWeekLst() { | |||
399 | } | 399 | } |
400 | 400 | ||
401 | void DateBook::viewMonth() { | 401 | void DateBook::viewMonth() { |
402 | view(MONTH,currentDate()); | 402 | view(MONTH,currentDate()); |
403 | } | 403 | } |
404 | 404 | ||
405 | void DateBook::duplicateEvent( const Event &e ) | ||
406 | { | ||
407 | qWarning("Hmmm..."); | ||
408 | // Alot of code duplication, as this is almost like editEvent(); | ||
409 | if (syncing) { | ||
410 | QMessageBox::warning( this, tr("Calendar"), | ||
411 | tr( "Can not edit data, currently syncing") ); | ||
412 | return; | ||
413 | } | ||
414 | |||
415 | Event dupevent; | ||
416 | dupevent.setStart(e.start()); | ||
417 | dupevent.setEnd(e.end()); | ||
418 | dupevent.setDescription(e.description()); | ||
419 | dupevent.setLocation(e.location()); | ||
420 | // dupevent.setCategory(e.category());// how is this done?? | ||
421 | dupevent.setNotes(e.notes()); | ||
422 | dupevent.setAllDay(e.isAllDay()); | ||
423 | dupevent.setTimeZone(e.timeZone()); | ||
424 | if(e.hasAlarm()) dupevent.setAlarm(e.alarmDelay(),e.alarmSound()); | ||
425 | if(e.hasRepeat()) dupevent.setRepeat(e.repeatPattern()); | ||
426 | |||
427 | // workaround added for text input. | ||
428 | QDialog editDlg( this, 0, TRUE ); | ||
429 | DateEntry *entry; | ||
430 | editDlg.setCaption( tr("Duplicate Event") ); | ||
431 | QVBoxLayout *vb = new QVBoxLayout( &editDlg ); | ||
432 | QScrollView *sv = new QScrollView( &editDlg, "scrollview" ); | ||
433 | sv->setResizePolicy( QScrollView::AutoOneFit ); | ||
434 | // KLUDGE!!! | ||
435 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); | ||
436 | vb->addWidget( sv ); | ||
437 | entry = new DateEntry( onMonday, dupevent, ampm, &editDlg, "editor" ); | ||
438 | entry->timezone->setEnabled( FALSE ); | ||
439 | sv->addChild( entry ); | ||
440 | |||
441 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | ||
442 | editDlg.showMaximized(); | ||
443 | #endif | ||
444 | while (editDlg.exec() ) { | ||
445 | Event newEv = entry->event(); | ||
446 | if(newEv.description().isEmpty() && newEv.notes().isEmpty() ) | ||
447 | break; | ||
448 | newEv.setUid(e.uid()); // FIXME: Hack not to clear uid | ||
449 | QString error = checkEvent(newEv); | ||
450 | if (!error.isNull()) { | ||
451 | if (QMessageBox::warning(this, "error box", | ||
452 | error, "Fix it", "Continue", | ||
453 | 0, 0, 1) == 0) | ||
454 | continue; | ||
455 | } | ||
456 | db->addEvent(newEv); | ||
457 | emit newEvent(); | ||
458 | break; | ||
459 | } | ||
460 | } | ||
461 | |||
405 | void DateBook::editEvent( const Event &e ) | 462 | void DateBook::editEvent( const Event &e ) |
406 | { | 463 | { |
407 | if (syncing) { | 464 | if (syncing) { |
408 | QMessageBox::warning( this, tr("Calendar"), | 465 | QMessageBox::warning( this, tr("Calendar"), |
409 | tr( "Can not edit data, currently syncing") ); | 466 | tr( "Can not edit data, currently syncing") ); |
410 | return; | 467 | return; |
@@ -489,12 +546,14 @@ void DateBook::initDay() | |||
489 | connect( dayView, SIGNAL( newEvent() ), | 546 | connect( dayView, SIGNAL( newEvent() ), |
490 | this, SLOT( fileNew() ) ); | 547 | this, SLOT( fileNew() ) ); |
491 | connect( dayView, SIGNAL( removeEvent( const Event & ) ), | 548 | connect( dayView, SIGNAL( removeEvent( const Event & ) ), |
492 | this, SLOT( removeEvent( const Event & ) ) ); | 549 | this, SLOT( removeEvent( const Event & ) ) ); |
493 | connect( dayView, SIGNAL( editEvent( const Event & ) ), | 550 | connect( dayView, SIGNAL( editEvent( const Event & ) ), |
494 | this, SLOT( editEvent( const Event & ) ) ); | 551 | this, SLOT( editEvent( const Event & ) ) ); |
552 | connect( dayView, SIGNAL( duplicateEvent( const Event & ) ), | ||
553 | this, SLOT( duplicateEvent( const Event & ) ) ); | ||
495 | connect( dayView, SIGNAL( beamEvent( const Event & ) ), | 554 | connect( dayView, SIGNAL( beamEvent( const Event & ) ), |
496 | this, SLOT( beamEvent( const Event & ) ) ); | 555 | this, SLOT( beamEvent( const Event & ) ) ); |
497 | connect( dayView, SIGNAL(sigNewEvent(const QString &)), | 556 | connect( dayView, SIGNAL(sigNewEvent(const QString &)), |
498 | this, SLOT(slotNewEventFromKey(const QString &)) ); | 557 | this, SLOT(slotNewEventFromKey(const QString &)) ); |
499 | } | 558 | } |
500 | } | 559 | } |
@@ -813,13 +872,13 @@ void DateBook::slotNewEventFromKey( const QString &str ) | |||
813 | start = end = d; | 872 | start = end = d; |
814 | start.setTime( QTime( 10, 0 ) ); | 873 | start.setTime( QTime( 10, 0 ) ); |
815 | end.setTime( QTime( 12, 0 ) ); | 874 | end.setTime( QTime( 12, 0 ) ); |
816 | } | 875 | } |
817 | slotNewEntry(start, end, str); | 876 | slotNewEntry(start, end, str); |
818 | } | 877 | } |
819 | void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str) { | 878 | void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location) { |
820 | // argh! This really needs to be encapsulated in a class | 879 | // argh! This really needs to be encapsulated in a class |
821 | // or function. | 880 | // or function. |
822 | QDialog newDlg( this, 0, TRUE ); | 881 | QDialog newDlg( this, 0, TRUE ); |
823 | newDlg.setCaption( DateEntryBase::tr("New Event") ); | 882 | newDlg.setCaption( DateEntryBase::tr("New Event") ); |
824 | DateEntry *e; | 883 | DateEntry *e; |
825 | QVBoxLayout *vb = new QVBoxLayout( &newDlg ); | 884 | QVBoxLayout *vb = new QVBoxLayout( &newDlg ); |
@@ -829,13 +888,17 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const | |||
829 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); | 888 | sv->setHScrollBarMode( QScrollView::AlwaysOff ); |
830 | vb->addWidget( sv ); | 889 | vb->addWidget( sv ); |
831 | 890 | ||
832 | Event ev; | 891 | Event ev; |
833 | ev.setDescription( str ); | 892 | ev.setDescription( str ); |
834 | // When the new gui comes in, change this... | 893 | // When the new gui comes in, change this... |
894 | if(location==0) { | ||
835 | ev.setLocation( tr("(Unknown)") ); | 895 | ev.setLocation( tr("(Unknown)") ); |
896 | } else { | ||
897 | ev.setLocation(location); | ||
898 | } | ||
836 | ev.setStart( start ); | 899 | ev.setStart( start ); |
837 | ev.setEnd( end ); | 900 | ev.setEnd( end ); |
838 | 901 | ||
839 | e = new DateEntry( onMonday, ev, ampm, &newDlg ); | 902 | e = new DateEntry( onMonday, ev, ampm, &newDlg ); |
840 | e->setAlarmEnabled( aPreset, presetTime, Event::Loud ); | 903 | e->setAlarmEnabled( aPreset, presetTime, Event::Loud ); |
841 | sv->addChild( e ); | 904 | sv->addChild( e ); |
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h index ba8f97e..623862b 100644 --- a/core/pim/datebook/datebook.h +++ b/core/pim/datebook/datebook.h | |||
@@ -62,13 +62,13 @@ protected: | |||
62 | public slots: | 62 | public slots: |
63 | void flush(); | 63 | void flush(); |
64 | void reload(); | 64 | void reload(); |
65 | 65 | ||
66 | private slots: | 66 | private slots: |
67 | void fileNew(); | 67 | void fileNew(); |
68 | void slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str); | 68 | void slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location=0); |
69 | void slotSettings(); | 69 | void slotSettings(); |
70 | void newDefaultView(QAction *a); | 70 | void newDefaultView(QAction *a); |
71 | void slotToday();// view today | 71 | void slotToday();// view today |
72 | void changeClock( bool newClock ); | 72 | void changeClock( bool newClock ); |
73 | void changeWeek( bool newDay ); | 73 | void changeWeek( bool newDay ); |
74 | void appMessage(const QCString& msg, const QByteArray& data); | 74 | void appMessage(const QCString& msg, const QByteArray& data); |
@@ -84,12 +84,13 @@ private slots: | |||
84 | void viewWeekLst(); | 84 | void viewWeekLst(); |
85 | void viewMonth(); | 85 | void viewMonth(); |
86 | 86 | ||
87 | void showDay( int y, int m, int d ); | 87 | void showDay( int y, int m, int d ); |
88 | 88 | ||
89 | void editEvent( const Event &e ); | 89 | void editEvent( const Event &e ); |
90 | void duplicateEvent( const Event &e ); | ||
90 | void removeEvent( const Event &e ); | 91 | void removeEvent( const Event &e ); |
91 | 92 | ||
92 | void receive( const QCString &msg, const QByteArray &data ); | 93 | void receive( const QCString &msg, const QByteArray &data ); |
93 | void setDocument( const QString & ); | 94 | void setDocument( const QString & ); |
94 | void beamEvent( const Event &e ); | 95 | void beamEvent( const Event &e ); |
95 | void beamDone( Ir *ir ); | 96 | void beamDone( Ir *ir ); |
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 | |||
@@ -310,12 +310,14 @@ void DateBookDay::getEvents() | |||
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 | } |
@@ -719,21 +721,24 @@ void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) | |||
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 ); |
727 | m.insertItem( tr( "Duplicate" ), 4 ); | ||
725 | m.insertItem( tr( "Delete" ), 2 ); | 728 | m.insertItem( tr( "Delete" ), 2 ); |
726 | if(Ir::supported()) m.insertItem( tr( "Beam" ), 3 ); | 729 | if(Ir::supported()) m.insertItem( tr( "Beam" ), 3 ); |
727 | int r = m.exec( e->globalPos() ); | 730 | int r = m.exec( e->globalPos() ); |
728 | if ( r == 1 ) { | 731 | if ( r == 1 ) { |
729 | emit editMe( ev.event() ); | 732 | emit editMe( ev.event() ); |
730 | } else if ( r == 2 ) { | 733 | } else if ( r == 2 ) { |
731 | emit deleteMe( ev.event() ); | 734 | emit deleteMe( ev.event() ); |
732 | } else if ( r == 3 ) { | 735 | } else if ( r == 3 ) { |
733 | emit beamMe( ev.event() ); | 736 | emit beamMe( ev.event() ); |
737 | } else if ( r == 4 ) { | ||
738 | emit duplicateMe( ev.event() ); | ||
734 | } | 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; |
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h index db1cd04..2faf24e 100644 --- a/core/pim/datebook/datebookday.h +++ b/core/pim/datebook/datebookday.h | |||
@@ -76,12 +76,13 @@ public: | |||
76 | void setGeometry( const QRect &r ); | 76 | void setGeometry( const QRect &r ); |
77 | 77 | ||
78 | const EffectiveEvent &event() const { return ev; } | 78 | const EffectiveEvent &event() const { return ev; } |
79 | 79 | ||
80 | signals: | 80 | signals: |
81 | void deleteMe( const Event &e ); | 81 | void deleteMe( const Event &e ); |
82 | void duplicateMe( const Event &e ); | ||
82 | void editMe( const Event &e ); | 83 | void editMe( const Event &e ); |
83 | void beamMe( const Event &e ); | 84 | void beamMe( const Event &e ); |
84 | 85 | ||
85 | protected: | 86 | protected: |
86 | void paintEvent( QPaintEvent *e ); | 87 | void paintEvent( QPaintEvent *e ); |
87 | void mousePressEvent( QMouseEvent *e ); | 88 | void mousePressEvent( QMouseEvent *e ); |
@@ -172,12 +173,13 @@ public slots: | |||
172 | void slotWeekChanged( bool bStartOnMonday ); | 173 | void slotWeekChanged( bool bStartOnMonday ); |
173 | void updateView();//updates TimeMarker and DayWidget-colors | 174 | void updateView();//updates TimeMarker and DayWidget-colors |
174 | 175 | ||
175 | signals: | 176 | signals: |
176 | void removeEvent( const Event& ); | 177 | void removeEvent( const Event& ); |
177 | void editEvent( const Event& ); | 178 | void editEvent( const Event& ); |
179 | void duplicateEvent( const Event& ); | ||
178 | void beamEvent( const Event& ); | 180 | void beamEvent( const Event& ); |
179 | void newEvent(); | 181 | void newEvent(); |
180 | void sigNewEvent( const QString & ); | 182 | void sigNewEvent( const QString & ); |
181 | 183 | ||
182 | protected slots: | 184 | protected slots: |
183 | void keyPressEvent(QKeyEvent *); | 185 | void keyPressEvent(QKeyEvent *); |