summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/ic_family.pngbin0 -> 7865 bytes
-rw-r--r--bin/kdepim/korganizer/ic_female.pngbin0 -> 6234 bytes
-rw-r--r--bin/kdepim/korganizer/ic_kids.pngbin0 -> 9039 bytes
-rw-r--r--bin/kdepim/korganizer/ic_male.pngbin0 -> 6440 bytes
-rw-r--r--bin/kdepim/korganizer/ic_penguin.pngbin0 -> 5343 bytes
-rw-r--r--korganizer/calendarview.cpp40
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 42166ab..608b73b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -143,5 +143,5 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden
{
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>";
@@ -160,9 +160,9 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden
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 ;
@@ -188,16 +188,23 @@ MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Inciden
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>";
@@ -635,5 +642,5 @@ void CalendarView::checkAlarms()
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());
@@ -663,8 +670,15 @@ void CalendarView::checkAlarms()
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();