summaryrefslogtreecommitdiff
authorhakan <hakan>2002-03-29 16:33:34 (UTC)
committer hakan <hakan>2002-03-29 16:33:34 (UTC)
commit3a1684894efb2106f957469b94350abf754a404e (patch) (side-by-side diff)
tree22e475a3dd11da80fa4f3735b479102715ba7eb3
parentd31e0363e905aae78034626896b0d6620ffbc8fc (diff)
downloadopie-3a1684894efb2106f957469b94350abf754a404e.zip
opie-3a1684894efb2106f957469b94350abf754a404e.tar.gz
opie-3a1684894efb2106f957469b94350abf754a404e.tar.bz2
Editing an event will no longer clears it's uid
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp12
-rw-r--r--core/pim/datebook/dateentryimpl.cpp2
-rw-r--r--core/pim/datebook/timepicker.cpp1
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
@@ -211,4 +211,5 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
this, SLOT(receive(const QCString&, const QByteArray&)) );
+ qDebug("olle\n");
#endif
#endif
@@ -231,10 +232,8 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
}
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);
}
}
@@ -402,4 +401,5 @@ void DateBook::editEvent( const Event &e )
while (editDlg.exec() ) {
Event newEv = entry->event();
+ newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
QString error = checkEvent(newEv);
if (!error.isNull()) {
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
@@ -114,6 +114,8 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e )
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);
}
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
@@ -6,4 +6,5 @@
#include "clickablelabel.h"
#include <qstring.h>
+#include <stdio.h>
TimePicker::TimePicker(QWidget* parent = 0, const char* name = 0,