-rw-r--r-- | core/pim/today/today.cpp | 18 | ||||
-rw-r--r-- | core/pim/today/today.h | 1 |
2 files changed, 12 insertions, 7 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 9e9d31f..ad1ec90 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -418,20 +418,28 @@ void Today::getTodo() { | |||
418 | output = tr("No active tasks"); | 418 | output = tr("No active tasks"); |
419 | } | 419 | } |
420 | 420 | ||
421 | TodoField->setText(tr(output)); | 421 | TodoField->setText(tr(output)); |
422 | } | 422 | } |
423 | 423 | ||
424 | |||
425 | void Today::startAddressbook() { | ||
426 | QCopEnvelope e("QPE/System", "execute(QString)"); | ||
427 | e << QString("addressbook"); | ||
428 | } | ||
429 | |||
430 | extern QPEApplication *todayApp; | ||
431 | |||
424 | /* | 432 | /* |
425 | * launch addressbook (personal card) | 433 | * launch addressbook (personal card) |
426 | */ | 434 | */ |
427 | void Today::editCard() { | 435 | void Today::editCard() { |
428 | QCopEnvelope w("QPE/System", "execute(QString)"); | ||
429 | w << QString("addressbook"); | ||
430 | 436 | ||
431 | // while( !QCopChannel::isRegistered("QPE/Addressbook")) | 437 | startAddressbook(); |
438 | |||
439 | while( !QCopChannel::isRegistered("QPE/Addressbook")) todayApp->processEvents(); | ||
432 | QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()"); | 440 | QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()"); |
433 | } | 441 | } |
434 | 442 | ||
435 | /* | 443 | /* |
436 | * launches datebook | 444 | * launches datebook |
437 | */ | 445 | */ |
@@ -440,16 +448,12 @@ void Today::startDatebook() { | |||
440 | e << QString("datebook"); | 448 | e << QString("datebook"); |
441 | } | 449 | } |
442 | 450 | ||
443 | /* | 451 | /* |
444 | * starts the edit dialog as known from datebook | 452 | * starts the edit dialog as known from datebook |
445 | */ | 453 | */ |
446 | |||
447 | |||
448 | extern QPEApplication *todayApp; | ||
449 | |||
450 | void Today::editEvent(const Event &e) { | 454 | void Today::editEvent(const Event &e) { |
451 | startDatebook(); | 455 | startDatebook(); |
452 | 456 | ||
453 | while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents(); | 457 | while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents(); |
454 | QCopEnvelope env("QPE/Datebook", "editEvent(int)"); | 458 | QCopEnvelope env("QPE/Datebook", "editEvent(int)"); |
455 | env << e.uid(); | 459 | env << e.uid(); |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 54f31cc..f28c029 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -43,12 +43,13 @@ class Today : public TodayBase { | |||
43 | ~Today(); | 43 | ~Today(); |
44 | 44 | ||
45 | private slots: | 45 | private slots: |
46 | void startConfig(); | 46 | void startConfig(); |
47 | void startTodo(); | 47 | void startTodo(); |
48 | void startDatebook(); | 48 | void startDatebook(); |
49 | void startAddressbook(); | ||
49 | void startMail(); | 50 | void startMail(); |
50 | void editCard(); | 51 | void editCard(); |
51 | void draw(); | 52 | void draw(); |
52 | void editEvent(const Event &e); | 53 | void editEvent(const Event &e); |
53 | private: | 54 | private: |
54 | void init(); | 55 | void init(); |