Editing an event will no longer clears it's uid

3 files changed, 9 insertions, 6 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 2deb96f..97c305c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -207,12 +207,13 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
              this, SLOT(receive(const QCString&, const QByteArray&)) );
     channel = new QCopChannel( "QPE/Datebook", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
              this, SLOT(receive(const QCString&, const QByteArray&)) );
+    qDebug("olle\n"); 
 #endif
 #endif
     
     qDebug("done t=%d", t.elapsed() );
 
 }
@@ -227,18 +228,16 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
         else if ( weekAction->isOn() )
             viewWeek();
         else if ( monthAction->isOn() )
             viewMonth();
     }
     else if (msg == "editEvent(int)") {
-      /* Not yet working...
-      int uid;
-      stream >> uid;
-      Event e=db->getEvent(uid);
-      editEvent(e);
-      */
+        int uid;
+        stream >> uid;
+        Event e=db->getEvent(uid);
+        editEvent(e);
     }
 }
 
 DateBook::~DateBook()
 {
 }
@@ -398,12 +397,13 @@ void DateBook::editEvent( const Event &e )
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     editDlg.showMaximized();
 #endif
     while (editDlg.exec() ) {
         Event newEv = entry->event();
+        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;
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 1c43363..e563db0 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -110,14 +110,16 @@ DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock,
 void DateEntry::setDates( const QDateTime& s, const QDateTime& e )
 {
     startDate = s.date();
     endDate = e.date();
     startTime = s.time();
     endTime = e.time();
+
     startDateChanged( s.date().year(), s.date().month(), s.date().day() );
     endDateChanged( e.date().year(), e.date().month(), e.date().day() );
+
     updateTimeEdit(true,true);
 }
 
 void DateEntry::updateTimeEdit(bool s, bool e) {
 
     // Comboboxes
diff --git a/core/pim/datebook/timepicker.cpp b/core/pim/datebook/timepicker.cpp
index 5f08a05..9097e1b 100644
--- a/core/pim/datebook/timepicker.cpp
+++ b/core/pim/datebook/timepicker.cpp
@@ -2,12 +2,13 @@
 
 #include <qbuttongroup.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 #include "clickablelabel.h"
 #include <qstring.h>
+#include <stdio.h>
 
 TimePicker::TimePicker(QWidget* parent = 0, const char* name = 0, 
                        WFlags fl = 0) :
   QWidget(parent,name,fl)
 {
   QVBoxLayout *vbox=new QVBoxLayout(this);