Bugfix: (bug #0000833) Duplicating an event should also duplicate the category.

1 files changed, 58 insertions, 79 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 3e18374..1bc82a5 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -409,32 +409,21 @@ void DateBook::duplicateEvent( const Event &e )
         if (syncing) {
-        QMessageBox::warning( this, tr("Calendar"),
-                              tr( "Can not edit data, currently syncing") );
-        return;
+                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());
-        
+
+                Event dupevent(e);// Make a duplicate.
+
         // 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 );
+        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 );
 
@@ -443,18 +432,13 @@ void DateBook::duplicateEvent( const Event &e )
 #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;
+        while (editDlg.exec() ) {
+                Event newEv = entry->event();
+                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;
         }
-        db->addEvent(newEv);
-        emit newEvent();
-        break;
-    }
 }
@@ -463,36 +447,32 @@ void DateBook::editEvent( const Event &e )
 {
-    if (syncing) {
-        QMessageBox::warning( this, tr("Calendar"),
-                              tr( "Can not edit data, currently syncing") );
-        return;
-    }
+        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 );
+        // 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();
+        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;
+        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;
         }
@@ -501,3 +481,3 @@ void DateBook::editEvent( const Event &e )
         break;
-    }
+        }
 }
@@ -506,7 +486,6 @@ void DateBook::removeEvent( const Event &e )
 {
-    if (syncing) {
-        QMessageBox::warning( this, tr("Calendar"),
-                              tr( "Can not edit data, currently syncing") );
-        return;
-    }
+        if (syncing) {
+                QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
+                return;
+        }