From 858b047efb5627824438cb3877e7bec0cebb3751 Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 03 Jun 2005 23:10:45 +0000 Subject: fixxx --- diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 41868d9..cc8102c 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1370,8 +1370,8 @@ { "Comment for todo:","Kommentar zum Todo:" }, { "Stop+note","Stop+Notiz" }, { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, -{ "","" }, -{ "","" }, +{ "KO/Pi: Missing alarm notification!","KO/Pi: Benachrichtigung über verpasste Alarme!" }, +{ "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, { "","" }, { "","" }, { "","" }, diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 503ef12..36db9c4 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -138,6 +138,124 @@ extern int globalFlagBlockAgenda; extern int globalFlagBlockStartup; +MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList alarms,QDateTime start ) : QTextBrowser(parent) + +{ + mAlarms = alarms; + setBackgroundColor( QColor( 86, 153, 205 ) ); + QString mText = "\n"; + //mText += "\n\n\n

"; +#ifdef DESKTOP_VERSION + mText += "

"; +#else + mText += "

"; +#endif + // mText += ""; + //mEventDate = QDate::currentDate(); +#ifdef DESKTOP_VERSION + mText += " " + i18n("You missed the alarms for the following events or todos:")+"

"; +#else + mText += " " + i18n("You missed the alarms for the following events or todos:")+""; +#endif + mText += "
"; + + Incidence * inc = getNextInc( start ); + int time = 0; + mText += ""; + while ( inc ) { + QDateTime dt ; + QString tempText = "getNextOccurence( start, &ok ); + if ( !ok ) continue; + if ( inc->type() == "Event" ) { + tempText += "href=\"event:"; + } else if ( inc->type() == "Todo" ) { + tempText += "href=\"todo:"; + } + tempText += inc->uid() + "\">"; + if ( inc->type() == "Todo" ) + tempText += i18n("Todo: "); + if ( inc->summary().length() > 0 ) + tempText += inc->summary(); + else + tempText += i18n("-no summary-"); + QString timestr; + if (!inc->doesFloat()) + timestr = KGlobal::locale()->formatDateTime( dt, KOPrefs::instance()->mShortDateInViewer) +": "; + else + timestr = KGlobal::locale()->formatDate( dt.date() , KOPrefs::instance()->mShortDateInViewer) +": "; + if ( dt.date() == QDate::currentDate() && time == 0 ) { + time = 1; + mText +="
"; + mText += "
"; + mText += ""; + + } + if ( dt.date() > QDate::currentDate() && time != 2 ) { + time = 2; + mText +="
"; + mText += "
"; + mText += ""; + } + mText +="\n"; + inc = getNextInc( start ); + } + mText +="
"; + mText += timestr; + mText += ""; + mText += tempText; + mText += "
"; + setText( mText ); +} + +Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) +{ + QDateTime dt ; + Incidence * retInc; + Incidence * inc = mAlarms.first(); + if ( inc == 0 ) + return 0; + bool ok; + dt = inc->getNextOccurence( start, &ok ); + if ( ! ok ) return 0; + QDateTime dtn ; + retInc = inc; + inc = mAlarms.next(); + while ( inc ) { + dtn = inc->getNextOccurence( start, &ok ); + if ( ! ok ) return 0; + if ( dtn < dt ) { + dt = dtn; + retInc = inc; + } + inc = mAlarms.next(); + } + mAlarms.remove( retInc ); + return retInc; + +} +void MissedAlarmTextBrowser::setSource(const QString & n) +{ + if (n.startsWith("event:")) { +#ifdef DESKTOP_VERSION + emit showIncidence(n.mid(8)); +#else + emit showIncidence(n.mid(6)); +#endif + return; + } else if (n.startsWith("todo:")) { +#ifdef DESKTOP_VERSION + emit showIncidence(n.mid(7)); +#else + emit showIncidence(n.mid(5)); +#endif + return; + } +} + class KOBeamPrefs : public QDialog { @@ -506,7 +624,45 @@ CalendarView::~CalendarView() delete mEventViewerDialog; //kdDebug() << "~CalendarView() done" << endl; } +void CalendarView::checkAlarms() +{ + KConfig *config = KOGlobals::config(); + config->setGroup( "AppRun" ); + QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); + int secs = config->readNumEntry( "LatestProgramStop" ) - 30; + //secs -= ( 3600 * 24*3 ); // debug only + QDateTime latest = dt.addSecs ( secs ); + qDebug("KO: Last termination on %s ", latest.toString().latin1()); + QPtrList el = mCalendar->rawIncidences(); + QPtrList al; + Incidence* inL = el.first(); + while ( inL ) { + bool ok = false; + int offset = 0; + QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; + if ( ok ) { + //qDebug("OK %s",next.toString().latin1()); + if ( next < QDateTime::currentDateTime() ) { + al.append( inL ); + qDebug("found missed alarm: %s ", inL->summary().latin1() ); + } + } + inL = el.next(); + } + if ( al.count() ) { + QDialog dia ( this, "huhu", true ); + dia.setCaption( i18n("KO/Pi: Missing alarm notification!") ); + QVBoxLayout* lay = new QVBoxLayout( &dia ); + lay->setSpacing( 3 ); + lay->setMargin( 3 ); + MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( &dia, al, latest ); + connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); + lay->addWidget( matb ); + dia.resize(240,240); + dia.exec(); + } +} void CalendarView::showDay( QDate d ) { dateNavigator()->blockSignals( true ); @@ -1969,7 +2125,9 @@ void CalendarView::writeSettings() KOPrefs::instance()->writeConfig(); writeFilterSettings(config); - + config->setGroup( "AppRun" ); + QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); + config->writeEntry( "LatestProgramStop", dt.secsTo( QDateTime::currentDateTime() ) ); config->setGroup( "Views" ); config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() ); @@ -3921,7 +4079,12 @@ void CalendarView::deleteIncidence() deleteIncidence(incidence); } } - +void CalendarView::showIncidence(QString uid) +{ + Incidence *inc = mCalendar->incidence( uid ); + if ( inc ) + showIncidence( inc ); +} void CalendarView::showIncidence(Incidence *incidence) { mViewerCallerIsSearchDialog = false; diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 05a34b4..1eca905 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -80,6 +80,24 @@ using namespace KCal; @short main calendar view widget @author Cornelius Schumacher */ + +#include +#include + +class MissedAlarmTextBrowser : public QTextBrowser { + Q_OBJECT + public: + MissedAlarmTextBrowser(QWidget *parent, QPtrList alarms ,QDateTime start); + void setSource(const QString & n); + + private: + Incidence * getNextInc(QDateTime start ); + QPtrList mAlarms; + signals: + void showIncidence( QString uid); +}; + + class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface { Q_OBJECT @@ -176,6 +194,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser public slots: + void checkAlarms(); void slotprintSelInc(); void showNextAlarms(); void showOpenError(); @@ -240,6 +259,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser /** Create a read-only viewer dialog for the supplied incidence. It calls the correct showXXX method*/ void showIncidence(Incidence *); + void showIncidence(QString uid); /** Create an editor for the supplied incidence. It calls the correct editXXX method*/ void editIncidence(Incidence *); /** Delete the supplied incidence. It calls the correct deleteXXX method*/ diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 8fe9999..5aaf360 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -477,8 +477,10 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : SLOT (cloneTodo())); mItemPopupMenu->insertItem( i18n("Move..."), this, SLOT (moveTodo())); +#ifndef DESKTOP_VERSION mItemPopupMenu->insertItem( i18n("Beam..."), this, SLOT (beamTodo())); +#endif mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this, SLOT (cancelTodo())); mItemPopupMenu->insertSeparator(); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 94d7293..1320231 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -372,6 +372,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : SLOT( updateWeekNum( const KCal::DateList & ) ) ); mBRdisabled = false; //toggleBeamReceive(); + + QTimer::singleShot( 1000, mView, SLOT ( checkAlarms() )); } MainWindow::~MainWindow() { @@ -797,6 +799,8 @@ void MainWindow::initActions() mToggleFilter, SLOT( setEnabled ( bool ) ) ); connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), mToggleAllday, SLOT( setEnabled ( bool ) ) ); + // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), + // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); viewMenu->insertSeparator(); icon = loadPixmap( pathString + "picker" ); diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index e75df70..bc76c0b 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -306,7 +306,7 @@ void CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted computeNextAlarm = true; } else { if ( ! deleted ) { - nextA = incidence->getNextAlarmDateTime(& ok, &offset ) ; + nextA = incidence->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; if ( ok ) { if ( nextA < mNextAlarmDateTime ) { deRegisterAlarm(); @@ -421,7 +421,7 @@ QDateTime CalendarLocal::nextAlarm( int daysTo ) int offset; mNextAlarmIncidence = 0; for( e = mEventList.first(); e; e = mEventList.next() ) { - next = e->getNextAlarmDateTime(& ok, &offset ) ; + next = e->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; if ( ok ) { if ( next < nextA ) { nextA = next; @@ -434,7 +434,7 @@ QDateTime CalendarLocal::nextAlarm( int daysTo ) } Todo *t; for( t = mTodoList.first(); t; t = mTodoList.next() ) { - next = t->getNextAlarmDateTime(& ok, &offset ) ; + next = t->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; if ( ok ) { if ( next < nextA ) { nextA = next; diff --git a/libkcal/event.cpp b/libkcal/event.cpp index de8dceb..9b99855 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp @@ -171,11 +171,11 @@ void Event::setDuration(int seconds) setHasEndDate(false); Incidence::setDuration(seconds); } -QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset ) const +QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const { bool yes; - QDateTime incidenceStart = getNextOccurence( QDateTime::currentDateTime(), &yes ); + QDateTime incidenceStart = getNextOccurence( start_dt, &yes ); if ( ! yes || cancelled() ) { *ok = false; return QDateTime (); @@ -209,7 +209,7 @@ QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset ) const } } if ( enabled ) { - if ( alarmStart > QDateTime::currentDateTime() ) { + if ( alarmStart > start_dt ) { *ok = true; * offset = off; return alarmStart; diff --git a/libkcal/event.h b/libkcal/event.h index 3bc8adc..8729956 100644 --- a/libkcal/event.h +++ b/libkcal/event.h @@ -42,7 +42,7 @@ class Event : public Incidence QCString type() const { return "Event"; } Incidence *clone(); - QDateTime getNextAlarmDateTime( bool * ok, int * offset ) const; + QDateTime getNextAlarmDateTime( bool * ok, int * offset ,QDateTime start_dt ) const; /** for setting an event's ending date/time with a QDateTime. */ void setDtEnd(const QDateTime &dtEnd); diff --git a/libkcal/incidence.h b/libkcal/incidence.h index ebd50d0..aa51e84 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h @@ -114,7 +114,7 @@ class Incidence : public IncidenceBase virtual Incidence *clone() = 0; virtual void cloneRelations( Incidence * ); - virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset ) const = 0; + virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const = 0; void setReadOnly( bool ); /** diff --git a/libkcal/journal.cpp b/libkcal/journal.cpp index 351fb32..859161f 100644 --- a/libkcal/journal.cpp +++ b/libkcal/journal.cpp @@ -42,7 +42,7 @@ bool KCal::operator==( const Journal& j1, const Journal& j2 ) } -QDateTime Journal::getNextAlarmDateTime( bool * ok, int * offset ) const +QDateTime Journal::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const { *ok = false; return QDateTime (); diff --git a/libkcal/journal.h b/libkcal/journal.h index cb90c7a..2c1d7ea 100644 --- a/libkcal/journal.h +++ b/libkcal/journal.h @@ -39,7 +39,7 @@ class Journal : public Incidence QCString type() const { return "Journal"; } Incidence *clone(); - QDateTime getNextAlarmDateTime( bool * ok, int * offset ) const; + QDateTime getNextAlarmDateTime( bool * ok, int * offset ,QDateTime start_dt ) const; private: bool accept(Visitor &v) { return v.visit(this); } }; diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index d7431c7..473247a 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -515,7 +515,7 @@ void Todo::setPercentComplete(int v) mHasCompletedDate = false; updated(); } -QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const +QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const { if ( isCompleted() || ! hasDueDate() || cancelled() ) { *ok = false; @@ -551,7 +551,7 @@ QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset ) const } } if ( enabled ) { - if ( alarmStart > QDateTime::currentDateTime() ) { + if ( alarmStart > start_dt ) { *ok = true; * offset = off; return alarmStart; diff --git a/libkcal/todo.h b/libkcal/todo.h index a5354ce..ab8fdf1 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h @@ -44,7 +44,7 @@ namespace KCal { /** Return an exact copy of this todo. */ Incidence *clone(); - QDateTime getNextAlarmDateTime( bool * ok, int * offset ) const; + QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const; /** for setting the todo's due date/time with a QDateTime. */ void setDtDue(const QDateTime &dtDue); -- cgit v0.9.0.2