-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 | |||
@@ -146,18 +146,18 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden | |||
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 | ||
@@ -630,7 +630,7 @@ void CalendarView::checkAlarms() | |||
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(); |
@@ -650,16 +650,20 @@ void CalendarView::checkAlarms() | |||
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 | } |