-rw-r--r-- | korganizer/calendarview.cpp | 10 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5132f98..42166ab 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -198,32 +198,36 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden | |||
198 | time = 2; | 198 | time = 2; |
199 | mText +="</table>"; | 199 | mText +="</table>"; |
200 | mText += "</td></tr>\n<tr bgcolor=\"#6AFF6A\"><td>"; | 200 | mText += "</td></tr>\n<tr bgcolor=\"#6AFF6A\"><td>"; |
201 | mText += "<table>"; | 201 | mText += "<table>"; |
202 | } | 202 | } |
203 | mText +="<tr><td><b>"; | 203 | mText +="<tr><td><b>"; |
204 | mText += timestr; | 204 | mText += timestr; |
205 | mText += "</b></td><td>"; | 205 | mText += "</b></td><td>"; |
206 | mText += tempText; | 206 | mText += tempText; |
207 | mText += "</td></tr>\n"; | 207 | mText += "</td></tr>\n"; |
208 | inc = getNextInc( start ); | 208 | inc = getNextInc( start ); |
209 | } | 209 | } |
210 | mText +="</table>"; | 210 | mText +="</table>"; |
211 | setText( mText ); | 211 | setText( mText ); |
212 | } | 212 | } |
213 | 213 | ||
214 | MissedAlarmTextBrowser::~MissedAlarmTextBrowser() | ||
215 | { | ||
216 | //qDebug("delete MissedAlarmTextBrowser::~MissedAlarmTextBrowser() "); | ||
217 | } | ||
214 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) | 218 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) |
215 | { | 219 | { |
216 | QDateTime dt ; | 220 | QDateTime dt ; |
217 | Incidence * retInc; | 221 | Incidence * retInc; |
218 | Incidence * inc = mAlarms.first(); | 222 | Incidence * inc = mAlarms.first(); |
219 | if ( inc == 0 ) | 223 | if ( inc == 0 ) |
220 | return 0; | 224 | return 0; |
221 | bool ok; | 225 | bool ok; |
222 | dt = inc->getNextOccurence( start, &ok ); | 226 | dt = inc->getNextOccurence( start, &ok ); |
223 | if ( ! ok ) return 0; | 227 | if ( ! ok ) return 0; |
224 | QDateTime dtn ; | 228 | QDateTime dtn ; |
225 | retInc = inc; | 229 | retInc = inc; |
226 | inc = mAlarms.next(); | 230 | inc = mAlarms.next(); |
227 | while ( inc ) { | 231 | while ( inc ) { |
228 | dtn = inc->getNextOccurence( start, &ok ); | 232 | dtn = inc->getNextOccurence( start, &ok ); |
229 | if ( ! ok ) return 0; | 233 | if ( ! ok ) return 0; |
@@ -631,40 +635,40 @@ void CalendarView::checkAlarms() | |||
631 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 635 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
632 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; | 636 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; |
633 | secs -= ( 3600 * 24*3 ); // debug only | 637 | secs -= ( 3600 * 24*3 ); // debug only |
634 | QDateTime latest = dt.addSecs ( secs ); | 638 | QDateTime latest = dt.addSecs ( secs ); |
635 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); | 639 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); |
636 | QPtrList<Incidence> el = mCalendar->rawIncidences(); | 640 | QPtrList<Incidence> el = mCalendar->rawIncidences(); |
637 | QPtrList<Incidence> al; | 641 | QPtrList<Incidence> al; |
638 | Incidence* inL = el.first(); | 642 | Incidence* inL = el.first(); |
639 | while ( inL ) { | 643 | while ( inL ) { |
640 | bool ok = false; | 644 | bool ok = false; |
641 | int offset = 0; | 645 | int offset = 0; |
642 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; | 646 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; |
643 | if ( ok ) { | 647 | if ( ok ) { |
644 | //qDebug("OK %s",next.toString().latin1()); | 648 | //qDebug("OK %s",next.toString().latin1()); |
645 | if ( next < QDateTime::currentDateTime() ) { | 649 | if ( next < QDateTime::currentDateTime() ) { |
646 | al.append( inL ); | 650 | al.append( inL ); |
647 | qDebug("found missed alarm: %s ", inL->summary().latin1() ); | 651 | //qDebug("found missed alarm: %s ", inL->summary().latin1() ); |
648 | } | 652 | } |
649 | } | 653 | } |
650 | inL = el.next(); | 654 | inL = el.next(); |
651 | } | 655 | } |
652 | if ( al.count() ) { | 656 | if ( al.count() ) { |
653 | QDialog* dia = new QDialog( this, "huhu", false ); | 657 | QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); |
654 | dia->setCaption( i18n("KO/Pi: Missing alarm notification!") ); | 658 | dia->setCaption( i18n("KO/Pi: Missing alarms!") ); |
655 | QVBoxLayout* lay = new QVBoxLayout( dia ); | 659 | QVBoxLayout* lay = new QVBoxLayout( dia ); |
656 | lay->setSpacing( 0 ); | 660 | lay->setSpacing( 0 ); |
657 | lay->setMargin( 0 ); | 661 | lay->setMargin( 0 ); |
658 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); | 662 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); |
659 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); | 663 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); |
660 | lay->addWidget( matb ); | 664 | lay->addWidget( matb ); |
661 | int si = 220; | 665 | int si = 220; |
662 | if ( QApplication::desktop()->width() > 470 ) | 666 | if ( QApplication::desktop()->width() > 470 ) |
663 | si = 400; | 667 | si = 400; |
664 | dia->resize(si,si/2); | 668 | dia->resize(si,si/2); |
665 | dia->setBackgroundColor( QColor( 255, 255, 255 ) ); | 669 | dia->setBackgroundColor( QColor( 255, 255, 255 ) ); |
666 | dia->show(); | 670 | dia->show(); |
667 | 671 | ||
668 | } | 672 | } |
669 | } | 673 | } |
670 | void CalendarView::showDay( QDate d ) | 674 | void CalendarView::showDay( QDate d ) |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 1eca905..084b6db 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -75,32 +75,33 @@ using namespace KCal; | |||
75 | This is the main calendar widget. It provides the different vies on t he | 75 | This is the main calendar widget. It provides the different vies on t he |
76 | calendar data as well as the date navigator. It also handles synchronisation | 76 | calendar data as well as the date navigator. It also handles synchronisation |
77 | of the different views and controls the different dialogs like preferences, | 77 | of the different views and controls the different dialogs like preferences, |
78 | event editor, search dialog etc. | 78 | event editor, search dialog etc. |
79 | 79 | ||
80 | @short main calendar view widget | 80 | @short main calendar view widget |
81 | @author Cornelius Schumacher | 81 | @author Cornelius Schumacher |
82 | */ | 82 | */ |
83 | 83 | ||
84 | #include <qtextbrowser.h> | 84 | #include <qtextbrowser.h> |
85 | #include <qtextcodec.h> | 85 | #include <qtextcodec.h> |
86 | 86 | ||
87 | class MissedAlarmTextBrowser : public QTextBrowser { | 87 | class MissedAlarmTextBrowser : public QTextBrowser { |
88 | Q_OBJECT | 88 | Q_OBJECT |
89 | public: | 89 | public: |
90 | MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); | 90 | MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); |
91 | ~MissedAlarmTextBrowser(); | ||
91 | void setSource(const QString & n); | 92 | void setSource(const QString & n); |
92 | 93 | ||
93 | private: | 94 | private: |
94 | Incidence * getNextInc(QDateTime start ); | 95 | Incidence * getNextInc(QDateTime start ); |
95 | QPtrList<Incidence> mAlarms; | 96 | QPtrList<Incidence> mAlarms; |
96 | signals: | 97 | signals: |
97 | void showIncidence( QString uid); | 98 | void showIncidence( QString uid); |
98 | }; | 99 | }; |
99 | 100 | ||
100 | 101 | ||
101 | class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface | 102 | class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface |
102 | { | 103 | { |
103 | Q_OBJECT | 104 | Q_OBJECT |
104 | public: | 105 | public: |
105 | /** | 106 | /** |
106 | Constructs a new calendar view widget. | 107 | Constructs a new calendar view widget. |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 1320231..63053a5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -359,34 +359,37 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
359 | mView->dialogManager()->showSyncOptions(); | 359 | mView->dialogManager()->showSyncOptions(); |
360 | } | 360 | } |
361 | 361 | ||
362 | //US listen for result adressed from Ka/Pi | 362 | //US listen for result adressed from Ka/Pi |
363 | #ifndef DESKTOP_VERSION | 363 | #ifndef DESKTOP_VERSION |
364 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 364 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
365 | #endif | 365 | #endif |
366 | #ifndef DESKTOP_VERSION | 366 | #ifndef DESKTOP_VERSION |
367 | infrared = 0; | 367 | infrared = 0; |
368 | #endif | 368 | #endif |
369 | updateFilterToolbar(); | 369 | updateFilterToolbar(); |
370 | updateWeek( mView->startDate() ); | 370 | updateWeek( mView->startDate() ); |
371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
373 | mBRdisabled = false; | 373 | mBRdisabled = false; |
374 | //toggleBeamReceive(); | 374 | //toggleBeamReceive(); |
375 | 375 | int tiint= 3000; | |
376 | QTimer::singleShot( 1000, mView, SLOT ( checkAlarms() )); | 376 | #ifndef DESKTOP_VERSION |
377 | tiint = 5000; | ||
378 | #endif | ||
379 | QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() )); | ||
377 | } | 380 | } |
378 | MainWindow::~MainWindow() | 381 | MainWindow::~MainWindow() |
379 | { | 382 | { |
380 | //qDebug("MainWindow::~MainWindow() "); | 383 | //qDebug("MainWindow::~MainWindow() "); |
381 | //save toolbar location | 384 | //save toolbar location |
382 | delete mCalendar; | 385 | delete mCalendar; |
383 | delete mSyncManager; | 386 | delete mSyncManager; |
384 | #ifndef DESKTOP_VERSION | 387 | #ifndef DESKTOP_VERSION |
385 | if ( infrared ) | 388 | if ( infrared ) |
386 | delete infrared; | 389 | delete infrared; |
387 | #endif | 390 | #endif |
388 | 391 | ||
389 | 392 | ||
390 | } | 393 | } |
391 | 394 | ||
392 | void MainWindow::disableBR(bool b) | 395 | void MainWindow::disableBR(bool b) |