1 files changed, 25 insertions, 3 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 73aa733..a330414 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3816,267 +3816,289 @@ void CalendarView::toggleExpand()
     //qDebug(" CalendarView::toggleExpand()");
     globalFlagBlockAgenda = 1;
     emit calendarViewExpanded( !mLeftFrame->isHidden() );
     globalFlagBlockAgenda = 5;
     mViewManager->raiseCurrentView( !mLeftFrame->isHidden() );
     //mViewManager->showView( 0, true );
 }
 
 void CalendarView::calendarModified( bool modified, Calendar * )
 {
     setModified( modified );
 }
 
 Todo *CalendarView::selectedTodo()
 {
     Incidence *incidence = currentSelection();
     if ( incidence && incidence->type() == "Todo" ) {
         return static_cast<Todo *>( incidence );
     }
 
     incidence = mTodoList->selectedIncidences().first();
     if ( incidence && incidence->type() == "Todo" ) {
         return static_cast<Todo *>( incidence );
     }
 
     return 0;
 }
 
 void CalendarView::dialogClosing(Incidence *in)
 {
     // mDialogList.remove(in);
 }
 
 void CalendarView::showIncidence()
 {
     mViewerCallerIsSearchDialog = false;
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         ShowIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 void CalendarView::editIncidenceDescription()
 { 
     mFlagEditDescription = true;
     editIncidence();
     mFlagEditDescription = false;
 }
 void CalendarView::editIncidence()
 {
     // qDebug("editIncidence() ");
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         EditIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 void CalendarView::deleteIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         deleteIncidence(incidence);
     }
 }
 
 void CalendarView::showIncidence(Incidence *incidence)
 {
     mViewerCallerIsSearchDialog = false;
     //qDebug("%x %x ",sender (), mDialogManager->getSearchDialog() );
     if ( sender() && mDialogManager->getSearchDialog()  ) {
         if ( sender () == mDialogManager->getSearchDialog()->listview() ) {
             mViewerCallerIsSearchDialog = true;
         }
     }
     if ( incidence ) {
         ShowIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 void CalendarView::editIncidence(Incidence *incidence)
 { 
     if ( incidence ) {
        
         EditIncidenceVisitor v;
         v.act( incidence, this );
         
     }
 }
 
 void CalendarView::deleteIncidence(Incidence *incidence)
 {
     //qDebug(" CalendarView::deleteIncidence ");
     if ( incidence ) {
         DeleteIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 
 void CalendarView::lookForOutgoingMessages()
 {
     OutgoingDialog *ogd = mDialogManager->outgoingDialog();
     ogd->loadMessages();
 }
 
 void CalendarView::lookForIncomingMessages()
 {
     IncomingDialog *icd = mDialogManager->incomingDialog();
     icd->retrieve();
 }
 
 bool  CalendarView::removeCompletedSubTodos( Todo* t )
 {
     bool deleteTodo = true;
     QPtrList<Incidence> subTodos;
     Incidence *aTodo;
     subTodos = t->relations();
     for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) {
         if (! removeCompletedSubTodos( (Todo*) aTodo ))
             deleteTodo = false;
     }
     if ( deleteTodo ) {
         if ( t->isCompleted() && !t->doesRecur()) {
             checkExternalId(  t );
             mCalendar->deleteTodo( t );
             changeTodoDisplay( t,KOGlobals::EVENTDELETED );
         }
         else
             deleteTodo = false;
     }
     return deleteTodo;
 
 }
 void CalendarView::purgeCompleted()
 {
     int result = KMessageBox::warningContinueCancel(this,
                                                     i18n("Delete all\ncompleted To-Dos?"),i18n("Purge To-Dos"),i18n("Purge"));
 
     if (result == KMessageBox::Continue) {
 
         QPtrList<Todo> todoCal;
         QPtrList<Todo> rootTodos;
         //QPtrList<Incidence> rel;
         Todo *aTodo;//, *rTodo;
         Incidence *rIncidence;
         bool childDelete = false;
         bool deletedOne = true;
         todoCal = calendar()->todos();
         for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) {
             if ( !aTodo->relatedTo() )
                 rootTodos.append( aTodo );
         }
         for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) {
             removeCompletedSubTodos( aTodo );
         }
 
         updateView();
     }
 }
 
 void CalendarView::slotCalendarChanged()
 {
    ; 
 }
 
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
     //qDebug(" alendarView::keyPressEvent ");
     e->ignore();
 }
 
 
 bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 {
     // mSyncManager = manager;
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
         qDebug("KO: SyncKDE request detected!");
     }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     return syncCalendar( filename, mode );
 }
 bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
     //mSyncManager = manager;
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     if ( resource == "sharp" )
         syncExternal( 0 );
     if ( resource == "phone" )
          syncExternal( 1 );  
     // pending setmodified
     return true;
 }
 void CalendarView::setSyncManager(KSyncManager* manager)
 {
    mSyncManager = manager;
 }
 
 void  CalendarView::removeSyncInfo( QString syncProfile) 
 {
     qDebug("KO: removeSyncInfo for profile %s ", syncProfile.latin1());
     mCalendar->removeSyncInfo( syncProfile );
 
 }
 
 void CalendarView::undo_delete()
 {
     //qDebug("undo_delete() ");
     Incidence* undo = mCalendar->undoIncidence();
     if ( !undo ) {
         KMessageBox::sorry(this,i18n("There is nothing to undo!"),
                            i18n("KO/Pi"));
         return;
     }
     if ( KMessageBox::Continue ==KMessageBox::warningContinueCancel(this,undo->summary().left(25) +
                                                        i18n("\nAre you sure you want\nto restore this?"),
                                                                     i18n("KO/Pi Confirmation"),i18n("Restore"))) {
         mCalendar->undoDeleteIncidence();
         updateView();
     }
 }
 
 void  CalendarView::slotViewerClosed()
 {
     QTimer::singleShot( 50, this, SLOT ( resetFocus() ) );
 }
 
 void CalendarView::resetFocus()
 {
     if ( mViewerCallerIsSearchDialog ) {
         if ( mDialogManager->getSearchDialog()->isVisible() ){
             mDialogManager->getSearchDialog()->raise();
             mDialogManager->getSearchDialog()->setActiveWindow();
             mDialogManager->getSearchDialog()->listview()->resetFocus(); 
         } else
             mViewerCallerIsSearchDialog = false;
     }
     if ( !mViewerCallerIsSearchDialog ) {
         //mViewManager->currentView()->setFocus();
         //qDebug("sssssssssssssssset focus ");
         topLevelWidget()->raise();
         setActiveWindow();
         //setFocus();
     }
     mViewerCallerIsSearchDialog = false;
 }
 
 void CalendarView::showNextAlarms()
 {
     QString message;
-    if ( mNextAlarmDateTime > QDateTime::currentDateTime() ) {
+    QDateTime nextAl = mCalendar->nextAlarmEventDateTime();
+    if (  nextAl.isValid() && mNextAlarmDateTime > QDateTime::currentDateTime() ) {
         QString sum = mCalendar->nextSummary();
         QDateTime nextA = mNextAlarmDateTime;
-        QDateTime nextAl = mCalendar->nextAlarmEventDateTime();
-        message = i18n("The next alarm is on:\n%1\nat: %2\n\n%3\n(%4)").arg( KGlobal::locale()->formatDate(nextA.date() , false)).arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDateTime(nextAl , false)) ;
+        QDateTime cur = QDateTime::currentDateTime();
+        int  secs = cur.secsTo( nextA );
+        int min = secs /60; 
+        int hours = min /60;
+        min = min % 60;
+        int days = hours /24;
+        hours = hours % 24;
+        
+        message = i18n("The next alarm is in:\n");
+        if ( days > 1 )
+            message += i18n("%1 days\n").arg( days );
+        else if ( days == 1 )
+            message += i18n("1 day\n");
+        if ( hours > 1 )
+            message += i18n("%1 hours\n").arg( hours );
+        else if ( hours == 1 )
+            message += i18n("1 hour\n");
+        if ( min > 1 )
+            message += i18n("%1 minutes\n").arg( min );
+        else if ( min == 1 )
+            message += i18n("1 minute\n");
+
+        message += i18n("\n(%1)\n\n%2\n(%3)\n").arg( KGlobal::locale()->formatDateTime(nextA , false)).arg(sum ).arg( KGlobal::locale()->formatDateTime(nextAl , false)) ;
     } else {
         message = i18n("There is no next alarm.");
 
     }
     KMessageBox::information( this, message);
 }