summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-15 16:20:26 (UTC)
committer zautrix <zautrix>2005-06-15 16:20:26 (UTC)
commitcba0ac17d3d505805be6aa4b4fea6f63473a1e00 (patch) (side-by-side diff)
treeb7eceb0b3181cbb2c14b753692f135bc0cd5dd0e
parent2a788f41ebeb7d8edab7010fb1a00799cb9e036d (diff)
downloadkdepimpi-cba0ac17d3d505805be6aa4b4fea6f63473a1e00.zip
kdepimpi-cba0ac17d3d505805be6aa4b4fea6f63473a1e00.tar.gz
kdepimpi-cba0ac17d3d505805be6aa4b4fea6f63473a1e00.tar.bz2
fixi
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koeventviewer.cpp9
-rw-r--r--korganizer/komonthview.cpp4
-rw-r--r--libkcal/kincidenceformatter.cpp9
3 files changed, 12 insertions, 10 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index c8c2f28..6315827 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -281,8 +281,9 @@ void KOEventViewer::appendEvent(Event *event, int mode )
bool wideScreen = ( QApplication::desktop()->width() >= 640 );
topLevelWidget()->setCaption(i18n("Event Viewer"));
if ( mode == 0 ) {
addTag("h2",deTag(event->summary()));
+ formatReadOnly(event);
}
else {
if ( mColorMode == 1 ) {
mText +="<font color=\"#00A000\">";
@@ -295,8 +296,9 @@ void KOEventViewer::appendEvent(Event *event, int mode )
addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
+ formatReadOnly(event);
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
if ( mColorMode )
mText += "</font>";
}
@@ -387,9 +389,8 @@ void KOEventViewer::appendEvent(Event *event, int mode )
addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( KOPrefs::instance()->mEVshowCreated ) {
if(wideScreen ){
@@ -427,10 +428,12 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
mCurrentIncidence = event;
topLevelWidget()->setCaption(i18n("Todo Viewer"));
bool shortDate = KOPrefs::instance()->mShortDateInViewer;
bool wideScreen = ( QApplication::desktop()->width() >= 640 );
- if (mode == 0 )
+ if (mode == 0 ) {
addTag("h2",deTag(event->summary()));
+ formatReadOnly(event);
+ }
else {
if ( mColorMode == 1 ) {
mText +="<font color=\"#00A000\">";
}
@@ -441,8 +444,9 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
+ formatReadOnly(event);
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
if ( mColorMode )
mText += "</font>";
}
@@ -502,9 +506,8 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( KOPrefs::instance()->mEVshowCreated ) {
if(wideScreen ){
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 475bb4a..cba85fa 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -314,10 +314,8 @@ void MonthViewItem::paint(QPainter *p)
bool sel = isSelected();
#else
bool sel = selected();
#endif
-
-
int heihei = height( listBox () );
int x = 1;
if (KOPrefs::instance()->mMonthViewUsesCategoryColor)
{
@@ -336,9 +334,8 @@ void MonthViewItem::paint(QPainter *p)
p->fillRect ( x, y-2,size,size+4, KOPrefs::instance()->defaultColor( mIncidence->calID() ) );
p->drawRect ( x, y-2,size,size+4);
x += size + 1;
}
-
if ( KOPrefs::instance()->mMonthShowIcons ) {
if ( mInfo ) {
p->fillRect ( x, y,size,size, Qt::darkGreen );
x += size + 1;
@@ -376,9 +373,8 @@ void MonthViewItem::paint(QPainter *p)
p->drawPolygon( pa );
}
if ( mMultiday == 1 ) {
// p->fillRect ( x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) );
-
p->drawLine ( x+1, yyy-sizeM/2, x+1, yyy+sizeM/2 );
}
if ( mMultiday == 3 ) {
// p->fillRect ( x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) );
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index d1ace4f..9359fad 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -51,8 +51,9 @@ void KIncidenceFormatter::setEvent(Event *event)
mCurrentIncidence = event;
bool shortDate = true;
if ( mode == 0 ) {
addTag("h3",deTag(event->summary()));
+ formatReadOnly(event);
}
else {
if ( mColorMode == 1 ) {
mText +="<font color=\"#00A000\">";
@@ -65,8 +66,9 @@ void KIncidenceFormatter::setEvent(Event *event)
addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
+ formatReadOnly(event);
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
if ( mColorMode )
mText += "</font>";
}
@@ -142,9 +144,8 @@ void KIncidenceFormatter::setEvent(Event *event)
addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
// mText.append(event->secrecyStr()+"<br>");
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( mCreated ) {
#ifdef DESKTOP_VERSION
@@ -177,10 +178,12 @@ void KIncidenceFormatter::setTodo(Todo *event )
{
int mode = 0;
mCurrentIncidence = event;
bool shortDate = true;
- if (mode == 0 )
+ if (mode == 0 ) {
addTag("h3",deTag(event->summary()));
+ formatReadOnly(event);
+ }
else {
if ( mColorMode == 1 ) {
mText +="<font color=\"#00A000\">";
}
@@ -191,8 +194,9 @@ void KIncidenceFormatter::setTodo(Todo *event )
addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
+ formatReadOnly(event);
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
if ( mColorMode )
mText += "</font>";
}
@@ -246,9 +250,8 @@ void KIncidenceFormatter::setTodo(Todo *event )
addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( mCreated ) {
#ifdef DESKTOP_VERSION
addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));