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) (ignore 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
@@ -282,6 +282,7 @@ void KOEventViewer::appendEvent(Event *event, int mode )
topLevelWidget()->setCaption(i18n("Event Viewer"));
if ( mode == 0 ) {
addTag("h2",deTag(event->summary()));
+ formatReadOnly(event);
}
else {
if ( mColorMode == 1 ) {
@@ -296,6 +297,7 @@ void KOEventViewer::appendEvent(Event *event, int mode )
} 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>";
@@ -388,7 +390,6 @@ void KOEventViewer::appendEvent(Event *event, int mode )
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( KOPrefs::instance()->mEVshowCreated ) {
@@ -428,8 +429,10 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
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\">";
@@ -442,6 +445,7 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
} 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>";
@@ -503,7 +507,6 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( KOPrefs::instance()->mEVshowCreated ) {
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 475bb4a..cba85fa 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -315,8 +315,6 @@ void MonthViewItem::paint(QPainter *p)
#else
bool sel = selected();
#endif
-
-
int heihei = height( listBox () );
int x = 1;
if (KOPrefs::instance()->mMonthViewUsesCategoryColor)
@@ -337,7 +335,6 @@ void MonthViewItem::paint(QPainter *p)
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 );
@@ -377,7 +374,6 @@ void MonthViewItem::paint(QPainter *p)
}
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 ) {
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index d1ace4f..9359fad 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -52,6 +52,7 @@ void KIncidenceFormatter::setEvent(Event *event)
bool shortDate = true;
if ( mode == 0 ) {
addTag("h3",deTag(event->summary()));
+ formatReadOnly(event);
}
else {
if ( mColorMode == 1 ) {
@@ -66,6 +67,7 @@ void KIncidenceFormatter::setEvent(Event *event)
} 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>";
@@ -143,7 +145,6 @@ void KIncidenceFormatter::setEvent(Event *event)
// mText.append(event->secrecyStr()+"<br>");
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( mCreated ) {
@@ -178,8 +179,10 @@ 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\">";
@@ -192,6 +195,7 @@ void KIncidenceFormatter::setTodo(Todo *event )
} 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>";
@@ -247,7 +251,6 @@ void KIncidenceFormatter::setTodo(Todo *event )
addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
formatCategories(event);
- formatReadOnly(event);
formatAttendees(event);
if ( mCreated ) {
#ifdef DESKTOP_VERSION