author | zautrix <zautrix> | 2005-06-04 09:25:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-04 09:25:09 (UTC) |
commit | d40cf5135c640506011334364274b8ee5df9998b (patch) (side-by-side diff) | |
tree | 56895a78e170856ff641dfa13f2f6eb4cc2b3488 /korganizer | |
parent | 0e0ac7a92ac2fe052b3e72d49e505a078b05e7f3 (diff) | |
download | kdepimpi-d40cf5135c640506011334364274b8ee5df9998b.zip kdepimpi-d40cf5135c640506011334364274b8ee5df9998b.tar.gz kdepimpi-d40cf5135c640506011334364274b8ee5df9998b.tar.bz2 |
fix
-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 @@ -202,24 +202,28 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden } mText +="<tr><td><b>"; mText += timestr; mText += "</b></td><td>"; mText += tempText; mText += "</td></tr>\n"; inc = getNextInc( start ); } mText +="</table>"; setText( mText ); } +MissedAlarmTextBrowser::~MissedAlarmTextBrowser() +{ + //qDebug("delete MissedAlarmTextBrowser::~MissedAlarmTextBrowser() "); +} 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; @@ -635,32 +639,32 @@ void CalendarView::checkAlarms() qDebug("KO: Last termination on %s ", latest.toString().latin1()); QPtrList<Incidence> el = mCalendar->rawIncidences(); QPtrList<Incidence> 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() ); + //qDebug("found missed alarm: %s ", inL->summary().latin1() ); } } inL = el.next(); } if ( al.count() ) { - QDialog* dia = new QDialog( this, "huhu", false ); - dia->setCaption( i18n("KO/Pi: Missing alarm notification!") ); + QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); + dia->setCaption( i18n("KO/Pi: Missing alarms!") ); QVBoxLayout* lay = new QVBoxLayout( dia ); lay->setSpacing( 0 ); lay->setMargin( 0 ); MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); lay->addWidget( matb ); int si = 220; if ( QApplication::desktop()->width() > 470 ) si = 400; dia->resize(si,si/2); dia->setBackgroundColor( QColor( 255, 255, 255 ) ); dia->show(); diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 1eca905..084b6db 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -79,24 +79,25 @@ using namespace KCal; @short main calendar view widget @author Cornelius Schumacher */ #include <qtextbrowser.h> #include <qtextcodec.h> class MissedAlarmTextBrowser : public QTextBrowser { Q_OBJECT public: MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); + ~MissedAlarmTextBrowser(); void setSource(const QString & n); private: Incidence * getNextInc(QDateTime start ); QPtrList<Incidence> mAlarms; signals: void showIncidence( QString uid); }; class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface { diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 1320231..63053a5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -363,26 +363,29 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : #ifndef DESKTOP_VERSION connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); #endif #ifndef DESKTOP_VERSION infrared = 0; #endif updateFilterToolbar(); updateWeek( mView->startDate() ); connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), SLOT( updateWeekNum( const KCal::DateList & ) ) ); mBRdisabled = false; //toggleBeamReceive(); - - QTimer::singleShot( 1000, mView, SLOT ( checkAlarms() )); + int tiint= 3000; +#ifndef DESKTOP_VERSION + tiint = 5000; +#endif + QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() )); } MainWindow::~MainWindow() { //qDebug("MainWindow::~MainWindow() "); //save toolbar location delete mCalendar; delete mSyncManager; #ifndef DESKTOP_VERSION if ( infrared ) delete infrared; #endif |