summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp18
-rw-r--r--core/pim/today/today.h1
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
@@ -400,74 +400,78 @@ void Today::getTodo() {
// not the overdues, we allready got them, and not if we are
// over the maxlines
if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) {
tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>";
ammount++;
}
}
}
if (count > 0) {
if( count == 1 ) {
output = tr("There is <b> 1</b> active task: <br>" );
} else {
output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
}
output += tmpout;
} else {
output = tr("No active tasks");
}
TodoField->setText(tr(output));
}
+
+void Today::startAddressbook() {
+ QCopEnvelope e("QPE/System", "execute(QString)");
+ e << QString("addressbook");
+}
+
+extern QPEApplication *todayApp;
+
/*
* launch addressbook (personal card)
*/
void Today::editCard() {
- QCopEnvelope w("QPE/System", "execute(QString)");
- w << QString("addressbook");
- // while( !QCopChannel::isRegistered("QPE/Addressbook"))
+ startAddressbook();
+
+ while( !QCopChannel::isRegistered("QPE/Addressbook")) todayApp->processEvents();
QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()");
}
/*
* launches datebook
*/
void Today::startDatebook() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("datebook");
}
/*
* starts the edit dialog as known from datebook
*/
-
-
-extern QPEApplication *todayApp;
-
void Today::editEvent(const Event &e) {
startDatebook();
while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents();
QCopEnvelope env("QPE/Datebook", "editEvent(int)");
env << e.uid();
}
/*
* launches todolist
*/
void Today::startTodo() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("todolist");
}
/*
* launch opiemail
*/
void Today::startMail() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("opiemail");
//Right now start both, maybe decide which to rum via config file ..
QCopEnvelope f("QPE/System", "execute(QString)");
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
@@ -25,48 +25,49 @@
#include <qpe/event.h>
#include <opie/tododb.h>
#include <opie/oclickablelabel.h>
#include <qdatetime.h>
#include <qlist.h>
#include "todayconfig.h"
#include "todaybase.h"
class QVBoxLayout;
class Today : public TodayBase {
Q_OBJECT
public:
Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Today();
private slots:
void startConfig();
void startTodo();
void startDatebook();
+ void startAddressbook();
void startMail();
void editCard();
void draw();
void editEvent(const Event &e);
private:
void init();
void getDates();
void getTodo();
void getMail();
void autoStart();
bool checkIfModified();
void setOwnerField();
void setOwnerField(QString &string);
private slots:
void channelReceived(const QCString &msg, const QByteArray & data);
private:
DateBookDB *db;
ToDoDB *todo;
todayconfig *conf;
QWidget* AllDateBookEvents;
//Config cfg;
int MAX_LINES_TASK;
int MAX_CHAR_CLIP;