-rw-r--r-- | core/pim/datebook/datebook.cpp | 12 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.cpp | 1 |
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 | |||
@@ -210,6 +210,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
210 | channel = new QCopChannel( "QPE/Datebook", this ); | 210 | channel = new QCopChannel( "QPE/Datebook", this ); |
211 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | 211 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), |
212 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 212 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
213 | qDebug("olle\n"); | ||
213 | #endif | 214 | #endif |
214 | #endif | 215 | #endif |
215 | 216 | ||
@@ -230,12 +231,10 @@ void DateBook::receive( const QCString &msg, const QByteArray &data ) | |||
230 | viewMonth(); | 231 | viewMonth(); |
231 | } | 232 | } |
232 | else if (msg == "editEvent(int)") { | 233 | else if (msg == "editEvent(int)") { |
233 | /* Not yet working... | 234 | int uid; |
234 | int uid; | 235 | stream >> uid; |
235 | stream >> uid; | 236 | Event e=db->getEvent(uid); |
236 | Event e=db->getEvent(uid); | 237 | editEvent(e); |
237 | editEvent(e); | ||
238 | */ | ||
239 | } | 238 | } |
240 | } | 239 | } |
241 | 240 | ||
@@ -401,6 +400,7 @@ void DateBook::editEvent( const Event &e ) | |||
401 | #endif | 400 | #endif |
402 | while (editDlg.exec() ) { | 401 | while (editDlg.exec() ) { |
403 | Event newEv = entry->event(); | 402 | Event newEv = entry->event(); |
403 | newEv.setUid(e.uid()); // FIXME: Hack not to clear uid | ||
404 | QString error = checkEvent(newEv); | 404 | QString error = checkEvent(newEv); |
405 | if (!error.isNull()) { | 405 | if (!error.isNull()) { |
406 | if (QMessageBox::warning(this, "error box", | 406 | if (QMessageBox::warning(this, "error box", |
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 | |||
@@ -113,8 +113,10 @@ void DateEntry::setDates( const QDateTime& s, const QDateTime& e ) | |||
113 | endDate = e.date(); | 113 | endDate = e.date(); |
114 | startTime = s.time(); | 114 | startTime = s.time(); |
115 | endTime = e.time(); | 115 | endTime = e.time(); |
116 | |||
116 | startDateChanged( s.date().year(), s.date().month(), s.date().day() ); | 117 | startDateChanged( s.date().year(), s.date().month(), s.date().day() ); |
117 | endDateChanged( e.date().year(), e.date().month(), e.date().day() ); | 118 | endDateChanged( e.date().year(), e.date().month(), e.date().day() ); |
119 | |||
118 | updateTimeEdit(true,true); | 120 | updateTimeEdit(true,true); |
119 | } | 121 | } |
120 | 122 | ||
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 | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <qlayout.h> | 5 | #include <qlayout.h> |
6 | #include "clickablelabel.h" | 6 | #include "clickablelabel.h" |
7 | #include <qstring.h> | 7 | #include <qstring.h> |
8 | #include <stdio.h> | ||
8 | 9 | ||
9 | TimePicker::TimePicker(QWidget* parent = 0, const char* name = 0, | 10 | TimePicker::TimePicker(QWidget* parent = 0, const char* name = 0, |
10 | WFlags fl = 0) : | 11 | WFlags fl = 0) : |