From 1da48d95d970233f0d1ea9a7fba5c98cfcf24798 Mon Sep 17 00:00:00 2001 From: zautrix Date: Sat, 03 Jul 2004 16:49:55 +0000 Subject: Alarm Bugfix. Added connection to KM. Cleaned up main. --- diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bf98ad4..c3c3d47 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -455,6 +455,8 @@ void CalendarView::init() mSuspendTimer = new QTimer( this ); mAlarmTimer = new QTimer( this ); + mRecheckAlarmTimer = new QTimer( this ); + connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); mAlarmDialog = new AlarmDialog( this ); @@ -491,9 +493,14 @@ void CalendarView::suspendAlarm() void CalendarView::startAlarm( QString mess , QString filename) { mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); + QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) ); } +void CalendarView::checkNextTimerAlarm() +{ + mCalendar->checkAlarmForIncidence( 0, true ); +} void CalendarView::computeAlarm( QString msg ) { @@ -604,12 +611,30 @@ void CalendarView::addAlarm(const QDateTime &qdt, const QString ¬i ) #endif return; } + int maxSec; + //maxSec = 5; //testing only + maxSec = 86400+3600; // one day+1hour mAlarmNotification = noti; - int ms = QDateTime::currentDateTime().secsTo( qdt )*1000; - //qDebug("Alarm timer started with secs: %d ", ms/1000); - mAlarmTimer->start( ms , true ); + int sec = QDateTime::currentDateTime().secsTo( qdt ); + if ( sec > maxSec ) { + mRecheckAlarmTimer->start( maxSec * 1000 ); + // qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec ); + return; + } else { + mRecheckAlarmTimer->stop(); + } + //qDebug("Alarm timer started with secs: %d ", sec); + mAlarmTimer->start( sec *1000 , true ); } +// called by mRecheckAlarmTimer to get next alarm +// we need this, because a QTimer has only a max range of 25 days +void CalendarView::recheckTimerAlarm() +{ + mAlarmTimer->stop(); + mRecheckAlarmTimer->stop(); + mCalendar->checkAlarmForIncidence( 0, true ); +} void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) { //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index e7aa351..fda02f7 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -171,7 +171,8 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser public slots: - + void recheckTimerAlarm(); + void checkNextTimerAlarm(); void addAlarm(const QDateTime &qdt, const QString ¬i ); void addSuspendAlarm(const QDateTime &qdt, const QString ¬i ); void removeAlarm(const QDateTime &qdt, const QString ¬i ); @@ -474,6 +475,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser QString mSuspendAlarmNotification; QTimer* mSuspendTimer; QTimer* mAlarmTimer; + QTimer* mRecheckAlarmTimer; void computeAlarm( QString ); void startAlarm( QString, QString ); void setSyncEventsReadOnly(); diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index bac66d3..1f69700 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -50,6 +50,10 @@ #include #define size count #endif +#ifndef DESKTOP_VERSION +#include +#endif + KOEventViewer::KOEventViewer(QWidget *parent,const char *name) : QTextBrowser(parent,name) { @@ -63,34 +67,46 @@ KOEventViewer::~KOEventViewer() void KOEventViewer::setSource(const QString& n) { - KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); - KABC::AddressBook::Iterator it; - for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { - // LR I do not understand, why the uid string is different on zaurus and desktop + + if ( n.left(3) == "uid" ) { + KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); + KABC::AddressBook::Iterator it; + for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { + // LR I do not understand, why the uid string is different on zaurus and desktop #ifdef DESKTOP_VERSION - QString uid = "uid://"+(*it).uid(); + QString uid = "uid://"+(*it).uid(); #else - QString uid = "uid:"+(*it).uid(); + QString uid = "uid:"+(*it).uid(); #endif - //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); - if (n == uid ) { - //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); - QDialog dia( this,"dia123", true ); - dia.setCaption( i18n("Details of attendee") ); - QVBoxLayout lay ( &dia ); - KPIM::AddresseeView av ( &dia ); - av.setAddressee( (*it) ); - lay.addWidget( &av ); - if ( QApplication::desktop()->width() < 480 ) - dia.resize( 220, 240); - else { - dia.resize( 400,400); + //qDebug("for *%s* +%s+ ", n.latin1(), uid.latin1()); + if (n == uid ) { + //qDebug("found %s ",(*it).mobileHomePhone().latin1() ); + QDialog dia( this,"dia123", true ); + dia.setCaption( i18n("Details of attendee") ); + QVBoxLayout lay ( &dia ); + KPIM::AddresseeView av ( &dia ); + av.setAddressee( (*it) ); + lay.addWidget( &av ); + if ( QApplication::desktop()->width() < 480 ) + dia.resize( 220, 240); + else { + dia.resize( 400,400); + } + dia.exec(); + break; + } } - dia.exec(); - break; - } - } + return; + } + if ( n.left(6) == "mailto" ) { + // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1()); +#ifndef DESKTOP_VERSION + QCopEnvelope e("QPE/Application/kmpi", "newMail(QString)" ); + e << n.mid(7); +#endif + + } #ifndef KORG_NODCOP @@ -170,6 +186,7 @@ void KOEventViewer::setColorMode( int m ) } void KOEventViewer::appendEvent(Event *event, int mode ) { + mMailSubject = ""; mCurrentIncidence = event; bool shortDate = KOPrefs::instance()->mShortDateInViewer; topLevelWidget()->setCaption(i18n("Event Viewer")); @@ -193,15 +210,18 @@ void KOEventViewer::appendEvent(Event *event, int mode ) if ( mColorMode ) mText += ""; } + mMailSubject += i18n( "Meeting " )+ event->summary(); if (event->cancelled ()) { mText +=""; addTag("i",i18n("This event has been cancelled!")); mText.append("
"); mText += ""; + mMailSubject += i18n("(cancelled)"); } if (!event->location().isEmpty()) { addTag("b",i18n("Location: ")); mText.append(event->location()+"
"); + mMailSubject += i18n(" at ") + event->location(); } if (event->doesFloat()) { if (event->isMultiDay()) { @@ -238,10 +258,16 @@ void KOEventViewer::appendEvent(Event *event, int mode ) next = event->recurrence()->getNextDate( start.addDays( - 1 ) ); addTag("p",i18n("Next recurrence is on:") ); addTag("p", KGlobal::locale()->formatDate( next, shortDate )); + QDateTime nextdt = QDateTime( next, event->dtStart().time()); + mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( nextdt, true ); + } else { addTag("p",i18n("Last recurrence was on:") ); addTag("p", KGlobal::locale()->formatDate( next, shortDate )); } + } else { + mMailSubject += i18n(" - " )+event->dtStartStr( true ); + } @@ -274,6 +300,7 @@ void KOEventViewer::appendEvent(Event *event, int mode ) void KOEventViewer::appendTodo(Todo *event, int mode ) { + mMailSubject = ""; mCurrentIncidence = event; topLevelWidget()->setCaption(i18n("Todo Viewer")); bool shortDate = KOPrefs::instance()->mShortDateInViewer; @@ -295,19 +322,23 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) if ( mColorMode ) mText += ""; } + mMailSubject += i18n( "Todo " )+ event->summary(); if (event->cancelled ()) { mText +=""; addTag("i",i18n("This todo has been cancelled!")); mText.append("
"); mText += ""; + mMailSubject += i18n("(cancelled)"); } if (!event->location().isEmpty()) { addTag("b",i18n("Location: ")); mText.append(event->location()+"
"); + mMailSubject += i18n(" at ") + event->location(); } if (event->hasDueDate()) { mText.append(i18n("

Due on: %1

").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); + mMailSubject += i18n(" - " )+event->dtDueStr( true ); } addTag("b",i18n("Access: ")); mText.append(event->secrecyStr()+"
"); @@ -405,9 +436,10 @@ void KOEventViewer::formatAttendees(Incidence *event) mText += "\n"; #endif + if (!a->email().isEmpty()) { if (iconPath) { - mText += "name() +" "+ "<" + a->email() + ">" + "\">"; + mText += "name() +" <" + a->email() + ">:" + mMailSubject + "\">"; mText += ""; mText += "\n"; } diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 74f1135..0cd3f33 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -65,6 +65,7 @@ class KOEventViewer : public QTextBrowser { bool mSyncMode; QString mText; + QString mMailSubject; Incidence* mCurrentIncidence; signals: void launchaddressbook(QString uid); diff --git a/korganizer/main.cpp b/korganizer/main.cpp index a357988..69ef294 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -53,38 +53,16 @@ int main( int argc, char **argv ) } if ( ! exitHelp ) { KGlobal::setAppName( "korganizer" ); - - - QString fileName ; + QString fileName ; #ifndef DESKTOP_VERSION - QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName(); - KStandardDirs::setAppDir( appdir ); - fileName = getenv("QPEDIR"); KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/"); #else - -#ifndef _WIN32_ - fileName = qApp->applicationDirPath () + "/kdepim/korganizer/"; -#else - fileName = qApp->applicationDirPath () + "\\kdepim\\korganizer\\"; -#endif - - KGlobal::iconLoader()->setIconPath(fileName); - - QString appdir = QDir::homeDirPath(); - //appdir = "C:\\"; - if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) - appdir += "korganizer"; - else - appdir += "/korganizer"; - KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); - // qDebug(" %s ",KStandardDirs::appDir().latin1() ); + fileName = qApp->applicationDirPath () + "/kdepim/korganizer/"; + KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); #endif - QDir app_dir; - if ( !app_dir.exists(KStandardDirs::appDir()) ) - app_dir.mkdir (KStandardDirs::appDir()); - MainWindow m; + KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "korganizer"))); + MainWindow m; #ifndef DESKTOP_VERSION QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); a.showMainWidget(&m ); -- cgit v0.9.0.2