4 files changed, 86 insertions, 15 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
@@ -373,64 +373,121 @@ void DateBook::view(int v, const QDate &d) {
         initMonth();
         monthAction->setOn( TRUE );
         monthView->setDate( d.year(), d.month(), d.day() );
         views->raiseWidget( monthView );
         monthView->redraw();
     }
 }
 
 void DateBook::viewDefault(const QDate &d) {
   Config config("DateBook");
   config.setGroup("Main");
   int current=config.readNumEntry("defaultview", DAY);
 
   view(current,d);
 }
 
 void DateBook::viewDay() {
   view(DAY,currentDate());
 }
 
 void DateBook::viewWeek() {
     view(WEEK,currentDate());
 }
 
 void DateBook::viewWeekLst() {
     view(WEEKLST,currentDate());
 }
 
 void DateBook::viewMonth() {
     view(MONTH,currentDate());
 }
 
+void DateBook::duplicateEvent( const Event &e )
+{
+        qWarning("Hmmm...");
+    // Alot of code duplication, as this is almost like editEvent();
+        if (syncing) {
+        QMessageBox::warning( this, tr("Calendar"),
+                              tr( "Can not edit data, currently syncing") );
+        return;
+    }
+        
+        Event dupevent;
+        dupevent.setStart(e.start());
+        dupevent.setEnd(e.end());
+        dupevent.setDescription(e.description());
+        dupevent.setLocation(e.location());
+        //      dupevent.setCategory(e.category());// how is this done??
+        dupevent.setNotes(e.notes());
+        dupevent.setAllDay(e.isAllDay());
+        dupevent.setTimeZone(e.timeZone());
+        if(e.hasAlarm()) dupevent.setAlarm(e.alarmDelay(),e.alarmSound());
+        if(e.hasRepeat()) dupevent.setRepeat(e.repeatPattern());
+        
+        // workaround added for text input.
+    QDialog editDlg( this, 0, TRUE );
+    DateEntry *entry;
+    editDlg.setCaption( tr("Duplicate Event") );
+    QVBoxLayout *vb = new QVBoxLayout( &editDlg );
+    QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
+    sv->setResizePolicy( QScrollView::AutoOneFit );
+    // KLUDGE!!!
+    sv->setHScrollBarMode( QScrollView::AlwaysOff );
+    vb->addWidget( sv );
+    entry = new DateEntry( onMonday, dupevent, ampm, &editDlg, "editor" );
+    entry->timezone->setEnabled( FALSE );
+    sv->addChild( entry );
+
+#if defined(Q_WS_QWS) || defined(_WS_QWS_)
+    editDlg.showMaximized();
+#endif
+    while (editDlg.exec() ) {
+        Event newEv = entry->event();
+        if(newEv.description().isEmpty() && newEv.notes().isEmpty() )
+            break;
+        newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
+        QString error = checkEvent(newEv);
+        if (!error.isNull()) {
+            if (QMessageBox::warning(this, "error box",
+                                     error, "Fix it", "Continue",
+                                     0, 0, 1) == 0)
+                continue;
+        }
+        db->addEvent(newEv);
+        emit newEvent();
+        break;
+    }
+}
+
 void DateBook::editEvent( const Event &e )
 {
     if (syncing) {
         QMessageBox::warning( this, tr("Calendar"),
                               tr( "Can not edit data, currently syncing") );
         return;
     }
 
     // workaround added for text input.
     QDialog editDlg( this, 0, TRUE );
     DateEntry *entry;
     editDlg.setCaption( tr("Edit Event") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     // KLUDGE!!!
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     entry = new DateEntry( onMonday, e, ampm, &editDlg, "editor" );
     entry->timezone->setEnabled( FALSE );
     sv->addChild( entry );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     editDlg.showMaximized();
 #endif
     while (editDlg.exec() ) {
         Event newEv = entry->event();
         if(newEv.description().isEmpty() && newEv.notes().isEmpty() )
             break;
         newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
         QString error = checkEvent(newEv);
         if (!error.isNull()) {
@@ -463,64 +520,66 @@ void DateBook::removeEvent( const Event &e )
         dayView->redraw();
 }
 
 void DateBook::addEvent( const Event &e )
 {
     QDate d = e.start().date();
     initDay();
     dayView->setDate( d );
 }
 
 void DateBook::showDay( int year, int month, int day )
 {
     QDate d(year, month, day);
     view(DAY,d);
 }
 
 void DateBook::initDay()
 {
     if ( !dayView ) {
         dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
         views->addWidget( dayView, DAY );
         dayView->setStartViewTime( startTime );
         dayView->setJumpToCurTime( bJumpToCurTime );
         dayView->setRowStyle( rowStyle );
         connect( this, SIGNAL( newEvent() ),
                  dayView, SLOT( redraw() ) );
         connect( dayView, SIGNAL( newEvent() ),
                  this, SLOT( fileNew() ) );
         connect( dayView, SIGNAL( removeEvent( const Event & ) ),
                  this, SLOT( removeEvent( const Event & ) ) );
         connect( dayView, SIGNAL( editEvent( const Event & ) ),
                  this, SLOT( editEvent( const Event & ) ) );
+        connect( dayView, SIGNAL( duplicateEvent( const Event & ) ),
+                 this, SLOT( duplicateEvent( const Event & ) ) );
         connect( dayView, SIGNAL( beamEvent( const Event & ) ),
                  this, SLOT( beamEvent( const Event & ) ) );
         connect( dayView, SIGNAL(sigNewEvent(const QString &)),
                  this, SLOT(slotNewEventFromKey(const QString &)) );
     }
 }
 
 void DateBook::initWeek()
 {
     if ( !weekView ) {
         weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
         weekView->setStartViewTime( startTime );
         views->addWidget( weekView, WEEK );
         connect( weekView, SIGNAL( showDate( int, int, int ) ),
                  this, SLOT( showDay( int, int, int ) ) );
         connect( this, SIGNAL( newEvent() ),
                  weekView, SLOT( redraw() ) );
     }
     //But also get it right: the year that we display can be different
     //from the year of the current date. So, first find the year
     //number of the current week.
 
     int yearNumber, totWeeks;
     calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
 
     QDate d = QDate( yearNumber, 12, 31 );
     calcWeek( d, totWeeks, yearNumber, onMonday );
 
     while ( totWeeks == 1 ) {
         d = d.addDays( -1 );
         calcWeek( d, totWeeks, yearNumber, onMonday );
     }
@@ -787,81 +846,85 @@ void DateBook::closeEvent( QCloseEvent *e )
 void DateBook::slotNewEventFromKey( const QString &str )
 {
     if (syncing) {
         QMessageBox::warning( this, tr("Calendar"),
                               tr( "Can not edit data, currently syncing") );
         return;
     }
 
     // We get to here from a key pressed in the Day View
     // So we can assume some things.  We want the string
     // passed in to be part of the description.
     QDateTime start, end;
     if ( views->visibleWidget() == dayView ) {
         dayView->selectedDates( start, end );
     } else if ( views->visibleWidget() == monthView ) {
         QDate d = monthView->selectedDate();
         start = end = d;
         start.setTime( QTime( 10, 0 ) );
         end.setTime( QTime( 12, 0 ) );
     } else if ( views->visibleWidget() == weekView ) {
         QDate d = weekView->date();
         start = end = d;
         start.setTime( QTime( 10, 0 ) );
         end.setTime( QTime( 12, 0 ) );
     } else if ( views->visibleWidget() == weekLstView ) {
         QDate d = weekLstView->date();
         start = end = d;
         start.setTime( QTime( 10, 0 ) );
         end.setTime( QTime( 12, 0 ) );
         }
     slotNewEntry(start, end, str);
 }
-void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str) {
+void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location) {
     // argh!  This really needs to be encapsulated in a class
     // or function.
     QDialog newDlg( this, 0, TRUE );
     newDlg.setCaption( DateEntryBase::tr("New Event") );
     DateEntry *e;
     QVBoxLayout *vb = new QVBoxLayout( &newDlg );
     QScrollView *sv = new QScrollView( &newDlg );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
 
     Event ev;
     ev.setDescription(  str );
     // When the new gui comes in, change this...
-    ev.setLocation( tr("(Unknown)") );
+        if(location==0) {
+                ev.setLocation( tr("(Unknown)") );
+        } else {
+                ev.setLocation(location);
+        }
     ev.setStart( start );
     ev.setEnd( end );
 
     e = new DateEntry( onMonday, ev, ampm, &newDlg );
     e->setAlarmEnabled( aPreset, presetTime, Event::Loud );
     sv->addChild( e );
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     newDlg.showMaximized();
 #endif
     while (newDlg.exec()) {
         ev = e->event();
         ev.assignUid();
         QString error = checkEvent( ev );
         if ( !error.isNull() ) {
             if ( QMessageBox::warning( this, tr("Error!"),
                                        error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 )
                 continue;
         }
         db->addEvent( ev );
         emit newEvent();
         break;
     }
 }
 
 void DateBook::setDocument( const QString &filename )
 {
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     QValueList<Event> tl = Event::readVCalendar( filename );
     for( QValueList<Event>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
         db->addEvent( *it );
     }
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
@@ -36,86 +36,87 @@ class Ir;
 
 class DateBookDBHack : public DateBookDB {
  public:
   Event eventByUID(int id);
 };
 
 class DateBook : public QMainWindow
 {
     Q_OBJECT
 
 public:
     DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~DateBook();
 
 signals:
     void newEvent();
     void signalNotFound();
     void signalWrapAround();
 
 protected:
     QDate currentDate();
     void timerEvent( QTimerEvent *e );
     void closeEvent( QCloseEvent *e );
 
     void view(int v, const QDate &d);
 
 public slots:
     void flush();
     void reload();
 
 private slots:
     void fileNew();
-    void slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str);
+    void slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location=0);
     void slotSettings();
     void newDefaultView(QAction *a);
             void slotToday();// view today
     void changeClock( bool newClock );
     void changeWeek( bool newDay );
     void appMessage(const QCString& msg, const QByteArray& data);
     // handle key events in the day view...
     void slotNewEventFromKey( const QString &str );
     void slotFind();
     void slotDoFind( const QString &, const QDate &, bool, bool, int );
 
     void viewDefault(const QDate &d);
 
     void viewDay();
     void viewWeek();
     void viewWeekLst();
     void viewMonth();
 
     void showDay( int y, int m, int d );
 
     void editEvent( const Event &e );
+    void duplicateEvent( const Event &e );
     void removeEvent( const Event &e );
 
     void receive( const QCString &msg, const QByteArray &data );
     void setDocument( const QString & );
     void beamEvent( const Event &e );
     void beamDone( Ir *ir );
 
 private:
     void addEvent( const Event &e );
     void initDay();
     void initWeek();
     void initWeekLst();
     void initMonth();
     void loadSettings();
     void saveSettings();
 
 private:
     DateBookDBHack *db;
     QWidgetStack *views;
     DateBookDay *dayView;
     DateBookWeek *weekView;
     DateBookMonth *monthView;
     DateBookWeekLst *weekLstView;
     QAction *dayAction, *weekAction, *weekLstAction, *monthAction;
     bool aPreset;    // have everything set to alarm?
     int presetTime;  // the standard time for the alarm
     int startTime;
     int rowStyle;
     bool bJumpToCurTime; //should jump to current time in dayview?
     bool ampm;
     bool onMonday;
 
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
@@ -284,64 +284,66 @@ void DateBookDay::dateChanged( int y, int m, int d )
             ts.init( QTime::currentTime().hour(), 0);
         ts.expandTo( QTime::currentTime().hour(), 0);
     } else
     {
         ts.init( startTime, 0 );
         ts.expandTo( startTime, 0 );
     }
 
     dayView()->addSelection( ts );
 
     selectedWidget = 0;
 
 }
 
 void DateBookDay::redraw()
 {
     if ( isUpdatesEnabled() )
         relayoutPage();
 }
 
 void DateBookDay::getEvents()
 {
         widgetList.clear();
 
         QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate );
         QValueListIterator<EffectiveEvent> it;
         for ( it = eventList.begin(); it != eventList.end(); ++it ) {
                 EffectiveEvent ev=*it;
                         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)
                         DateBookDayWidget* w = new DateBookDayWidget( *it, this );
                         connect( w, SIGNAL( deleteMe( const Event & ) ),
                                                 this, SIGNAL( removeEvent( const Event & ) ) );
+                        connect( w, SIGNAL( duplicateMe( const Event & ) ),
+                                                this, SIGNAL( duplicateEvent( const Event & ) ) );
                         connect( w, SIGNAL( editMe( const Event & ) ),
                                                 this, SIGNAL( editEvent( const Event & ) ) );
                         connect( w, SIGNAL( beamMe( const Event & ) ),
                                                 this, SIGNAL( beamEvent( const Event & ) ) );
                         widgetList.append( w );
                 }
     }
 
 }
 
 static int place( const DateBookDayWidget *item, bool *used, int maxn )
 {
     int place = 0;
     int start = item->event().start().hour();
     QTime e = item->event().end();
     int end = e.hour();
     if ( e.minute() < 5 )
         end--;
     if ( end < start )
         end = start;
     while ( place < maxn ) {
         bool free = TRUE;
         int s = start;
         while( s <= end ) {
             if ( used[10*s+place] ) {
                 free = FALSE;
                 break;
             }
             s++;
         }
         if ( free ) break;
         place++;
@@ -691,76 +693,79 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e )
 
     int y = 0;
     int d = 0;
 
     if ( ev.event().hasAlarm() ) {
         p.drawPixmap( width() - 16, 0, Resource::loadPixmap( "bell" ) );
         y = 20;
         d = 20;
     }
 
     if ( ev.event().hasRepeat() ) {
         p.drawPixmap( width() - 16, y, Resource::loadPixmap( "repeat" ) );
         d = 20;
         y += 20;
     }
 
     QSimpleRichText rt( text, font() );
     rt.setWidth( geom.width() - d - 6 );
     rt.draw( &p, 7, 0, e->region(), colorGroup() );
 }
 
 void DateBookDayWidget::mousePressEvent( QMouseEvent *e )
 {
         DateBookDayWidget *item;
 
         item = dateBook->getSelectedWidget();
         if (item) item->update();
 
         dateBook->setSelectedWidget(this);
         update();
         dateBook->repaint();
 
-    QPopupMenu m;
-    m.insertItem( tr( "Edit" ), 1 );
-    m.insertItem( tr( "Delete" ), 2 );
-    if(Ir::supported()) m.insertItem( tr( "Beam" ), 3 );
-    int r = m.exec( e->globalPos() );
-    if ( r == 1 ) {
-        emit editMe( ev.event() );
-    } else if ( r == 2 ) {
-        emit deleteMe( ev.event() );
-    } else if ( r == 3 ) {
-        emit beamMe( ev.event() );
-    }
+        QPopupMenu m;
+        m.insertItem( tr( "Edit" ), 1 );
+        m.insertItem( tr( "Duplicate" ), 4 );
+        m.insertItem( tr( "Delete" ), 2 );
+        if(Ir::supported()) m.insertItem( tr( "Beam" ), 3 );
+        int r = m.exec( e->globalPos() );
+        if ( r == 1 ) {
+                emit editMe( ev.event() );
+        } else if ( r == 2 ) {
+                emit deleteMe( ev.event() );
+        } else if ( r == 3 ) {
+                emit beamMe( ev.event() );
+        } else if ( r == 4 ) {
+                emit duplicateMe( ev.event() );
+        }
 }
 
 void DateBookDayWidget::setGeometry( const QRect &r )
 {
     geom = r;
     setFixedSize( r.width()+1, r.height()+1 );
     dateBook->dayView()->moveChild( this, r.x(), r.y()-1 );
     show();
 }
 
 
 //---------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------
 
 
 DateBookDayTimeMarker::DateBookDayTimeMarker( DateBookDay *db )
     : QWidget( db->dayView()->viewport() ), dateBook( db )
 {
         setBackgroundMode( PaletteBase );
 }
 
 DateBookDayTimeMarker::~DateBookDayTimeMarker()
 {
 }
 
 void DateBookDayTimeMarker::paintEvent( QPaintEvent */*e*/ )
 {
         QPainter p( this );
         p.setBrush( QColor( 255, 0, 0 ) );
 
         QPen pen;
         pen.setStyle(NoPen);
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
@@ -50,64 +50,65 @@ public slots:
 signals:
     void sigColWidthChanged();
     void sigCapturedKey( const QString &txt );
 protected slots:
     void slotChangeClock( bool );
 protected:
     virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected );
     virtual void paintFocus( QPainter *p, const QRect &cr );
 
     virtual void resizeEvent( QResizeEvent *e );
     void keyPressEvent( QKeyEvent *e );
     void initHeader();
 private:
     bool ampm;
 };
 
 class DateBookDay;
 class DateBookDayWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookDayWidget( const EffectiveEvent &e, DateBookDay *db );
     ~DateBookDayWidget();
 
     const QRect &geometry() { return geom; }
     void setGeometry( const QRect &r );
 
     const EffectiveEvent &event() const { return ev; }
 
 signals:
     void deleteMe( const Event &e );
+    void duplicateMe( const Event &e );
     void editMe( const Event &e );
     void beamMe( const Event &e );
 
 protected:
     void paintEvent( QPaintEvent *e );
     void mousePressEvent( QMouseEvent *e );
 
 private:
     /**
      * Sets the text for an all day Event
      * All day events have no time associated
      */
     void setAllDayText( QString& text );
 
     /**
      * Sets the EventText
      * it got a start and an end Time
      */
     void setEventText( QString& text );
     const EffectiveEvent ev;
     DateBookDay *dateBook;
     QString text;
     QRect geom;
 };
 
 //Marker for current time in the dayview
 class DateBookDayTimeMarker : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookDayTimeMarker( DateBookDay *db );
@@ -146,60 +147,61 @@ class WidgetListClass : public QList<DateBookDayWidget>
         }
 
 
 };
 
 class DateBookDay : public QVBox
 {
     Q_OBJECT
 
 public:
     DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,
                  QWidget *parent, const char *name );
     void selectedDates( QDateTime &start, QDateTime &end );
     QDate date() const;
     DateBookDayView *dayView() const { return view; }
     void setStartViewTime( int startHere );
     int startViewTime() const;
     void setSelectedWidget( DateBookDayWidget * );
     DateBookDayWidget * getSelectedWidget( void );
     void setJumpToCurTime( bool bJump );
     void setRowStyle( int style );
 
 public slots:
     void setDate( int y, int m, int d );
     void setDate( QDate );
     void redraw();
     void slotWeekChanged( bool bStartOnMonday );
             void updateView();//updates TimeMarker and DayWidget-colors
 
 signals:
     void removeEvent( const Event& );
     void editEvent( const Event& );
+    void duplicateEvent( const Event& );
     void beamEvent( const Event& );
     void newEvent();
     void sigNewEvent( const QString & );
 
 protected slots:
     void keyPressEvent(QKeyEvent *);
 
 private slots:
     void dateChanged( int y, int m, int d );
     void slotColWidthChanged() { relayoutPage(); };
 
 private:
     void getEvents();
     void relayoutPage( bool fromResize = false );
     DateBookDayWidget *intersects( const DateBookDayWidget *item, const QRect &geom );
     QDate currDate;
     DateBookDayView *view;
     DateBookDayHeader *header;
     DateBookDB *db;
             WidgetListClass widgetList;//reimplemented QList for sorting widgets by height
     int startTime;
             bool jumpToCurTime;//should we jump to current time in dayview?
     int rowStyle;
     DateBookDayWidget *selectedWidget; //actual selected widget (obviously)
             DateBookDayTimeMarker *timeMarker;//marker for current time
 };
 
 #endif