summaryrefslogtreecommitdiff
authorhakan <hakan>2002-03-29 16:34:24 (UTC)
committer hakan <hakan>2002-03-29 16:34:24 (UTC)
commitdee656e9bf63cc44f906375d5b24cd953a945a8f (patch) (side-by-side diff)
tree5277eb78d25bd3b55dd3196dc8eff926d0e3ba4d
parent3a1684894efb2106f957469b94350abf754a404e (diff)
downloadopie-dee656e9bf63cc44f906375d5b24cd953a945a8f.zip
opie-dee656e9bf63cc44f906375d5b24cd953a945a8f.tar.gz
opie-dee656e9bf63cc44f906375d5b24cd953a945a8f.tar.bz2
Clicking an event will now bring it up in the datebook dateentry editor
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/main.cpp3
-rw-r--r--core/pim/today/today.cpp9
2 files changed, 8 insertions, 4 deletions
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp
index 552db7c..72c0a2e 100644
--- a/core/pim/today/main.cpp
+++ b/core/pim/today/main.cpp
@@ -7,27 +7,30 @@
* copyright : (c) 2002 by Maximilian Reiß
* email : max.reiss@gmx.de
*
*/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "today.h"
#include <qpe/qpeapplication.h>
+QPEApplication *todayApp;
+
int main( int argc, char ** argv )
{
QPEApplication a(argc, argv);
+ todayApp=&a;
Today t;
t.setCaption( Today::tr("Today") );
a.showMainWidget(&t);
return a.exec();
}
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index aef0a9b..66a4152 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -13,32 +13,33 @@
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "today.h"
#include <qpe/timestring.h>
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qprocess.h>
#include <qpe/resource.h>
#include <qpe/contact.h>
#include <qpe/global.h>
+#include <qpe/qpeapplication.h>
#include <qdir.h>
#include <qfile.h>
#include <qdatetime.h>
#include <qtextstream.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qpushbutton.h>
#include <qlabel.h>
#include <qtimer.h>
#include <qpixmap.h>
#include <qfileinfo.h>
#include <qlayout.h>
#include <qtl.h>
//#include <iostream.h>
@@ -393,41 +394,41 @@ void Today::getTodo() {
}
TodoField->setText(tr(output));
}
/*
* 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();
- //Dissabled for now as uid's not working properly
- /*
- while(!QCopChannel::isRegistered("QPE/Datebook")) sleep(1);
+ 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");