-rw-r--r-- | korganizer/calendarview.cpp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index c01be9b..5132f98 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -133,44 +133,44 @@ | |||
133 | #include <kabc/stdaddressbook.h> | 133 | #include <kabc/stdaddressbook.h> |
134 | #endif | 134 | #endif |
135 | using namespace KOrg; | 135 | using namespace KOrg; |
136 | using namespace KCal; | 136 | using namespace KCal; |
137 | extern int globalFlagBlockAgenda; | 137 | extern int globalFlagBlockAgenda; |
138 | extern int globalFlagBlockStartup; | 138 | extern int globalFlagBlockStartup; |
139 | 139 | ||
140 | 140 | ||
141 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) | 141 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) |
142 | 142 | ||
143 | { | 143 | { |
144 | mAlarms = alarms; | 144 | mAlarms = alarms; |
145 | setBackgroundColor( QColor( 86, 153, 205 ) ); | 145 | setBackgroundColor( QColor( 86, 153, 205 ) ); |
146 | QString mText = "<table width=\"100%\">\n"; | 146 | QString mText = "<table width=\"100%\">\n"; |
147 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; | 147 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; |
148 | #ifdef DESKTOP_VERSION | 148 | #ifdef DESKTOP_VERSION |
149 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h1>"; | ||
150 | #else | ||
151 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>"; | 149 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>"; |
150 | #else | ||
151 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h3>"; | ||
152 | #endif | 152 | #endif |
153 | // mText += "<img src=\""; | 153 | // mText += "<img src=\""; |
154 | // mText += ipath; | 154 | // mText += ipath; |
155 | // mText += "\">"; | 155 | // mText += "\">"; |
156 | //mEventDate = QDate::currentDate(); | 156 | //mEventDate = QDate::currentDate(); |
157 | #ifdef DESKTOP_VERSION | 157 | #ifdef DESKTOP_VERSION |
158 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h1>"; | ||
159 | #else | ||
160 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>"; | 158 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>"; |
159 | #else | ||
160 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h3>"; | ||
161 | #endif | 161 | #endif |
162 | mText += "</td></tr>\n<tr bgcolor=\"#FF997D\"><td>"; | 162 | mText += "</td></tr>\n<tr bgcolor=\"#FF997D\"><td>"; |
163 | 163 | ||
164 | Incidence * inc = getNextInc( start ); | 164 | Incidence * inc = getNextInc( start ); |
165 | int time = 0; | 165 | int time = 0; |
166 | mText += "<table>"; | 166 | mText += "<table>"; |
167 | while ( inc ) { | 167 | while ( inc ) { |
168 | QDateTime dt ; | 168 | QDateTime dt ; |
169 | QString tempText = "<a "; | 169 | QString tempText = "<a "; |
170 | bool ok; | 170 | bool ok; |
171 | dt = inc->getNextOccurence( start, &ok ); | 171 | dt = inc->getNextOccurence( start, &ok ); |
172 | if ( !ok ) continue; | 172 | if ( !ok ) continue; |
173 | if ( inc->type() == "Event" ) { | 173 | if ( inc->type() == "Event" ) { |
174 | tempText += "href=\"event:"; | 174 | tempText += "href=\"event:"; |
175 | } else if ( inc->type() == "Todo" ) { | 175 | } else if ( inc->type() == "Todo" ) { |
176 | tempText += "href=\"todo:"; | 176 | tempText += "href=\"todo:"; |
@@ -617,62 +617,66 @@ CalendarView::~CalendarView() | |||
617 | // kdDebug() << "~CalendarView()" << endl; | 617 | // kdDebug() << "~CalendarView()" << endl; |
618 | //qDebug("CalendarView::~CalendarView() "); | 618 | //qDebug("CalendarView::~CalendarView() "); |
619 | delete mDialogManager; | 619 | delete mDialogManager; |
620 | delete mViewManager; | 620 | delete mViewManager; |
621 | delete mStorage; | 621 | delete mStorage; |
622 | delete mDateFrame ; | 622 | delete mDateFrame ; |
623 | delete beamDialog; | 623 | delete beamDialog; |
624 | delete mEventViewerDialog; | 624 | delete mEventViewerDialog; |
625 | //kdDebug() << "~CalendarView() done" << endl; | 625 | //kdDebug() << "~CalendarView() done" << endl; |
626 | } | 626 | } |
627 | void CalendarView::checkAlarms() | 627 | void CalendarView::checkAlarms() |
628 | { | 628 | { |
629 | KConfig *config = KOGlobals::config(); | 629 | KConfig *config = KOGlobals::config(); |
630 | config->setGroup( "AppRun" ); | 630 | config->setGroup( "AppRun" ); |
631 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 631 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
632 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; | 632 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; |
633 | secs -= ( 3600 * 24*3 ); // debug only | 633 | secs -= ( 3600 * 24*3 ); // debug only |
634 | QDateTime latest = dt.addSecs ( secs ); | 634 | QDateTime latest = dt.addSecs ( secs ); |
635 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); | 635 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); |
636 | QPtrList<Incidence> el = mCalendar->rawIncidences(); | 636 | QPtrList<Incidence> el = mCalendar->rawIncidences(); |
637 | QPtrList<Incidence> al; | 637 | QPtrList<Incidence> al; |
638 | Incidence* inL = el.first(); | 638 | Incidence* inL = el.first(); |
639 | while ( inL ) { | 639 | while ( inL ) { |
640 | bool ok = false; | 640 | bool ok = false; |
641 | int offset = 0; | 641 | int offset = 0; |
642 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; | 642 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; |
643 | if ( ok ) { | 643 | if ( ok ) { |
644 | //qDebug("OK %s",next.toString().latin1()); | 644 | //qDebug("OK %s",next.toString().latin1()); |
645 | if ( next < QDateTime::currentDateTime() ) { | 645 | if ( next < QDateTime::currentDateTime() ) { |
646 | al.append( inL ); | 646 | al.append( inL ); |
647 | qDebug("found missed alarm: %s ", inL->summary().latin1() ); | 647 | qDebug("found missed alarm: %s ", inL->summary().latin1() ); |
648 | } | 648 | } |
649 | } | 649 | } |
650 | inL = el.next(); | 650 | inL = el.next(); |
651 | } | 651 | } |
652 | if ( al.count() ) { | 652 | if ( al.count() ) { |
653 | QDialog dia ( this, "huhu", true ); | 653 | QDialog* dia = new QDialog( this, "huhu", false ); |
654 | dia.setCaption( i18n("KO/Pi: Missing alarm notification!") ); | 654 | dia->setCaption( i18n("KO/Pi: Missing alarm notification!") ); |
655 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | 655 | QVBoxLayout* lay = new QVBoxLayout( dia ); |
656 | lay->setSpacing( 3 ); | 656 | lay->setSpacing( 0 ); |
657 | lay->setMargin( 3 ); | 657 | lay->setMargin( 0 ); |
658 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( &dia, al, latest ); | 658 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); |
659 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); | 659 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); |
660 | lay->addWidget( matb ); | 660 | lay->addWidget( matb ); |
661 | dia.resize(240,240); | 661 | int si = 220; |
662 | dia.exec(); | 662 | if ( QApplication::desktop()->width() > 470 ) |
663 | si = 400; | ||
664 | dia->resize(si,si/2); | ||
665 | dia->setBackgroundColor( QColor( 255, 255, 255 ) ); | ||
666 | dia->show(); | ||
663 | 667 | ||
664 | } | 668 | } |
665 | } | 669 | } |
666 | void CalendarView::showDay( QDate d ) | 670 | void CalendarView::showDay( QDate d ) |
667 | { | 671 | { |
668 | dateNavigator()->blockSignals( true ); | 672 | dateNavigator()->blockSignals( true ); |
669 | dateNavigator()->selectDate( d ); | 673 | dateNavigator()->selectDate( d ); |
670 | dateNavigator()->blockSignals( false ); | 674 | dateNavigator()->blockSignals( false ); |
671 | mViewManager->showDayView(); | 675 | mViewManager->showDayView(); |
672 | //dateNavigator()->selectDate( d ); | 676 | //dateNavigator()->selectDate( d ); |
673 | } | 677 | } |
674 | void CalendarView::timerAlarm() | 678 | void CalendarView::timerAlarm() |
675 | { | 679 | { |
676 | //qDebug("CalendarView::timerAlarm() "); | 680 | //qDebug("CalendarView::timerAlarm() "); |
677 | computeAlarm(mAlarmNotification ); | 681 | computeAlarm(mAlarmNotification ); |
678 | } | 682 | } |