1 files changed, 16 insertions, 12 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index c01be9b..5132f98 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -117,76 +117,76 @@
 #include "searchdialog.h"
 #include "mainwindow.h"
 
 #include "calendarview.h"
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h> 
 #endif
 #ifndef _WIN32_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #else
 #include <qprocess.h>
 #endif
 
 #ifdef DESKTOP_VERSION
 #include <kabc/stdaddressbook.h>
 #endif
 using namespace KOrg;
 using namespace KCal;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 
 
 MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) 
 
 {
     mAlarms = alarms;
     setBackgroundColor( QColor( 86, 153, 205 ) );
     QString mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
 #ifdef DESKTOP_VERSION
-    mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h1>";
-#else
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>";
+#else
+    mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h3>";
 #endif
     //  mText += "<img src=\"";
     //   mText += ipath;
     //   mText += "\">";
     //mEventDate = QDate::currentDate();
 #ifdef DESKTOP_VERSION
-    mText += "<font color=\"#FFFFFF\"> <em>" +  i18n("You missed the alarms for the following events or todos:")+"</em></font></h1>";
-#else
     mText += "<font color=\"#FFFFFF\"> <em>" +  i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>";
+#else
+    mText += "<font color=\"#FFFFFF\"> <em>" +  i18n("You missed the alarms for the following events or todos:")+"</em></font></h3>";
 #endif
     mText += "</td></tr>\n<tr  bgcolor=\"#FF997D\"><td>";
 
     Incidence * inc = getNextInc( start );
     int time = 0;
     mText += "<table>";
     while ( inc ) {
         QDateTime dt ;
         QString tempText = "<a ";
         bool ok;
         dt = inc->getNextOccurence( start, &ok );
         if ( !ok ) continue;
         if ( inc->type() == "Event" ) {
             tempText += "href=\"event:";
         } else if ( inc->type() == "Todo" ) {
             tempText += "href=\"todo:";
         }
         tempText += inc->uid() + "\">"; 
         if ( inc->type() == "Todo" )
             tempText += i18n("Todo: ");
         if ( inc->summary().length() > 0 )
             tempText += inc->summary();
         else
             tempText += i18n("-no summary-"); 
         QString timestr;
         if (!inc->doesFloat())
                 timestr = KGlobal::locale()->formatDateTime( dt, KOPrefs::instance()->mShortDateInViewer) +": ";
             else
                 timestr = KGlobal::locale()->formatDate( dt.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
         if ( dt.date() == QDate::currentDate() && time == 0 ) {
             time = 1;
             mText +="</table>";
@@ -621,74 +621,78 @@ CalendarView::~CalendarView()
     delete mStorage;
     delete mDateFrame ;
     delete beamDialog;
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 void CalendarView::checkAlarms()
 {
     KConfig *config = KOGlobals::config();
     config->setGroup( "AppRun" );
     QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
     int secs = config->readNumEntry( "LatestProgramStop" ) - 30;
     secs -= ( 3600 * 24*3 ); // debug only
     QDateTime latest = dt.addSecs ( secs );
     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() );
             }
         }
         inL = el.next();
     }
     if ( al.count() ) {
-        QDialog dia ( this, "huhu", true );
-        dia.setCaption( i18n("KO/Pi: Missing alarm notification!") );
-        QVBoxLayout* lay = new QVBoxLayout( &dia );
-        lay->setSpacing( 3 );
-        lay->setMargin( 3 );
-        MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( &dia, al, latest );
+        QDialog* dia = new QDialog( this, "huhu", false );
+        dia->setCaption( i18n("KO/Pi: Missing alarm notification!") );
+        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 ); 
-        dia.resize(240,240);
-        dia.exec();
+        int si = 220;
+        if ( QApplication::desktop()->width() > 470 )
+            si = 400;
+        dia->resize(si,si/2);
+        dia->setBackgroundColor( QColor( 255, 255, 255 ) );
+        dia->show();
 
     }
 }
 void CalendarView::showDay( QDate d )
 {
     dateNavigator()->blockSignals( true );
     dateNavigator()->selectDate( d );
     dateNavigator()->blockSignals( false );
     mViewManager->showDayView();
     //dateNavigator()->selectDate( d );
 }
 void CalendarView::timerAlarm()
 {
     //qDebug("CalendarView::timerAlarm() ");
     computeAlarm(mAlarmNotification );
 }
 
 void CalendarView::suspendAlarm()
 {
     //qDebug(" CalendarView::suspendAlarm() ");
     computeAlarm(mSuspendAlarmNotification );
 
 }
 
 void  CalendarView::startAlarm( QString mess , QString filename)
 {
 
     topLevelWidget()->showNormal();
     topLevelWidget()->setActiveWindow();
     topLevelWidget()->raise(); 
 
     mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );