Alarm Bugfix. Added connection to KM. Cleaned up main.

1 files changed, 28 insertions, 3 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index bf98ad4..c3c3d47 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -446,24 +446,26 @@ void CalendarView::init()
     mDateFrame->setCaption( i18n( "Pick a date to display"));
     mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() );
  
     connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate)));
  
     mEventEditor = mDialogManager->getEventEditor();  
     mTodoEditor = mDialogManager->getTodoEditor();  
    
     mFlagEditDescription = false; 
 
     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 );
     connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString &  ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString &  ) ) );
     mAlarmDialog->setServerNotification( false );
     mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime );
 }
 
 
 CalendarView::~CalendarView()
 {
     // kdDebug() << "~CalendarView()" << endl;
@@ -482,27 +484,32 @@ void CalendarView::timerAlarm()
 }
 
 void CalendarView::suspendAlarm()
 {
     //qDebug(" CalendarView::suspendAlarm() ");
     computeAlarm(mSuspendAlarmNotification );
 
 }
 
 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 )
 {
 
  QString mess = msg; 
     QString  mAlarmMessage = mess.mid( 9 ); 
     QString filename =  MainWindow::resourcePath();
     filename += "koalarm.wav";
     QString tempfilename;
     if ( mess.left( 13 )  == "suspend_alarm") {  
         bool error = false;
         int len = mess.mid( 13 ).find("+++");
@@ -595,30 +602,48 @@ void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti  )
 
 }
 
 void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti  )
 {
     //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
         AlarmServer::addAlarm ( qdt,"koalarm", noti.latin1() );
 #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 &noti  )
 {
     //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
         AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() );
 #endif   
         return;
     }
     mAlarmTimer->stop();
 }
 void CalendarView::selectWeekNum ( int num  )