fixes

6 files changed, 27 insertions, 13 deletions

diff --git a/bin/kdepim/korganizer/ic_family.png b/bin/kdepim/korganizer/ic_family.png
new file mode 100644
index 0000000..6b0dec6
--- a/dev/null
+++ b/bin/kdepim/korganizer/ic_family.png
diff --git a/bin/kdepim/korganizer/ic_female.png b/bin/kdepim/korganizer/ic_female.png
new file mode 100644
index 0000000..74deae4
--- a/dev/null
+++ b/bin/kdepim/korganizer/ic_female.png
diff --git a/bin/kdepim/korganizer/ic_kids.png b/bin/kdepim/korganizer/ic_kids.png
new file mode 100644
index 0000000..fdbdabc
--- a/dev/null
+++ b/bin/kdepim/korganizer/ic_kids.png
diff --git a/bin/kdepim/korganizer/ic_male.png b/bin/kdepim/korganizer/ic_male.png
new file mode 100644
index 0000000..f22eaab
--- a/dev/null
+++ b/bin/kdepim/korganizer/ic_male.png
diff --git a/bin/kdepim/korganizer/ic_penguin.png b/bin/kdepim/korganizer/ic_penguin.png
new file mode 100644
index 0000000..a78da37
--- a/dev/null
+++ b/bin/kdepim/korganizer/ic_penguin.png
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 42166ab..608b73b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -137,38 +137,38 @@ 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 ) );
+    viewport()->setBackgroundColor( QColor( 255, 255, 255 ) );
     QString mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
 #ifdef DESKTOP_VERSION
     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></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>";
+    //mText += "</td></tr>\n<tr  bgcolor=\"#FF997D\"><td>";
 
     Incidence * inc = getNextInc( start );
     int time = 0;
-    mText += "<table>";
+    //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:";
@@ -182,28 +182,35 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden
             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 ) {
+        if ( dt.date() < QDate::currentDate() && time == 0 ) {
+            mText += "</td></tr>\n<tr  bgcolor=\"#FF997D\"><td>";
+            mText += "<table>";
             time = 1;
-            mText +="</table>";
+        }
+        if ( dt.date() == QDate::currentDate() && time <= 1 ) {
+            if ( time > 0 )
+                mText +="</table>";
             mText += "</td></tr>\n<tr  bgcolor=\"#FFDC64\"><td>";
             mText += "<table>";
+            time = 2;
             
         } 
-        if ( dt.date() > QDate::currentDate() && time != 2 ) {
-            time = 2;
-            mText +="</table>";
+        if ( dt.date() > QDate::currentDate() && time <= 2 ) {
+            if ( time > 0 )
+                mText +="</table>";
             mText += "</td></tr>\n<tr  bgcolor=\"#6AFF6A\"><td>";
             mText += "<table>";
+            time = 3;
         }
         mText +="<tr><td><b>";
         mText += timestr;
         mText += "</b></td><td>";
         mText += tempText;
         mText += "</td></tr>\n";
         inc = getNextInc( start );
     }
@@ -629,17 +636,17 @@ CalendarView::~CalendarView()
     //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 
+    //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;
@@ -657,20 +664,27 @@ void CalendarView::checkAlarms()
         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);
+        if ( QApplication::desktop()->width() == 480 || QApplication::desktop()->width() == 640 ) {
+            int wid = 210;
+            int x = QApplication::desktop()->width() - wid - 7;
+            int y = QApplication::desktop()->height() - wid - 70;
+            dia->setGeometry ( x,y,wid,wid);
+        } else {
+            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 );