summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp4
-rw-r--r--core/pim/datebook/dateentryimpl.cpp2
-rw-r--r--core/pim/datebook/timepicker.cpp1
3 files changed, 5 insertions, 2 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
@@ -209,8 +209,9 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
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() );
@@ -229,14 +230,12 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
else if ( monthAction->isOn() )
viewMonth();
}
else if (msg == "editEvent(int)") {
- /* Not yet working...
int uid;
stream >> uid;
Event e=db->getEvent(uid);
editEvent(e);
- */
}
}
DateBook::~DateBook()
@@ -400,8 +399,9 @@ void DateBook::editEvent( const Event &e )
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",
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
@@ -112,10 +112,12 @@ 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) {
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
@@ -4,8 +4,9 @@
#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)