author | zautrix <zautrix> | 2005-06-15 16:20:26 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-15 16:20:26 (UTC) |
commit | cba0ac17d3d505805be6aa4b4fea6f63473a1e00 (patch) (unidiff) | |
tree | b7eceb0b3181cbb2c14b753692f135bc0cd5dd0e /libkcal | |
parent | 2a788f41ebeb7d8edab7010fb1a00799cb9e036d (diff) | |
download | kdepimpi-cba0ac17d3d505805be6aa4b4fea6f63473a1e00.zip kdepimpi-cba0ac17d3d505805be6aa4b4fea6f63473a1e00.tar.gz kdepimpi-cba0ac17d3d505805be6aa4b4fea6f63473a1e00.tar.bz2 |
fixi
-rw-r--r-- | libkcal/kincidenceformatter.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
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) | |||
51 | mCurrentIncidence = event; | 51 | mCurrentIncidence = event; |
52 | bool shortDate = true; | 52 | bool shortDate = true; |
53 | if ( mode == 0 ) { | 53 | if ( mode == 0 ) { |
54 | addTag("h3",deTag(event->summary())); | 54 | addTag("h3",deTag(event->summary())); |
55 | formatReadOnly(event); | ||
55 | } | 56 | } |
56 | else { | 57 | else { |
57 | if ( mColorMode == 1 ) { | 58 | if ( mColorMode == 1 ) { |
58 | mText +="<font color=\"#00A000\">"; | 59 | mText +="<font color=\"#00A000\">"; |
@@ -65,8 +66,9 @@ void KIncidenceFormatter::setEvent(Event *event) | |||
65 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); | 66 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); |
66 | } else { | 67 | } else { |
67 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); | 68 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); |
68 | } | 69 | } |
70 | formatReadOnly(event); | ||
69 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 71 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
70 | if ( mColorMode ) | 72 | if ( mColorMode ) |
71 | mText += "</font>"; | 73 | mText += "</font>"; |
72 | } | 74 | } |
@@ -142,9 +144,8 @@ void KIncidenceFormatter::setEvent(Event *event) | |||
142 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); | 144 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); |
143 | // mText.append(event->secrecyStr()+"<br>"); | 145 | // mText.append(event->secrecyStr()+"<br>"); |
144 | formatCategories(event); | 146 | formatCategories(event); |
145 | 147 | ||
146 | formatReadOnly(event); | ||
147 | formatAttendees(event); | 148 | formatAttendees(event); |
148 | 149 | ||
149 | if ( mCreated ) { | 150 | if ( mCreated ) { |
150 | #ifdef DESKTOP_VERSION | 151 | #ifdef DESKTOP_VERSION |
@@ -177,10 +178,12 @@ void KIncidenceFormatter::setTodo(Todo *event ) | |||
177 | { | 178 | { |
178 | int mode = 0; | 179 | int mode = 0; |
179 | mCurrentIncidence = event; | 180 | mCurrentIncidence = event; |
180 | bool shortDate = true; | 181 | bool shortDate = true; |
181 | if (mode == 0 ) | 182 | if (mode == 0 ) { |
182 | addTag("h3",deTag(event->summary())); | 183 | addTag("h3",deTag(event->summary())); |
184 | formatReadOnly(event); | ||
185 | } | ||
183 | else { | 186 | else { |
184 | if ( mColorMode == 1 ) { | 187 | if ( mColorMode == 1 ) { |
185 | mText +="<font color=\"#00A000\">"; | 188 | mText +="<font color=\"#00A000\">"; |
186 | } | 189 | } |
@@ -191,8 +194,9 @@ void KIncidenceFormatter::setTodo(Todo *event ) | |||
191 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); | 194 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); |
192 | } else { | 195 | } else { |
193 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); | 196 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); |
194 | } | 197 | } |
198 | formatReadOnly(event); | ||
195 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 199 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
196 | if ( mColorMode ) | 200 | if ( mColorMode ) |
197 | mText += "</font>"; | 201 | mText += "</font>"; |
198 | } | 202 | } |
@@ -246,9 +250,8 @@ void KIncidenceFormatter::setTodo(Todo *event ) | |||
246 | 250 | ||
247 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); | 251 | addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() ); |
248 | formatCategories(event); | 252 | formatCategories(event); |
249 | 253 | ||
250 | formatReadOnly(event); | ||
251 | formatAttendees(event); | 254 | formatAttendees(event); |
252 | if ( mCreated ) { | 255 | if ( mCreated ) { |
253 | #ifdef DESKTOP_VERSION | 256 | #ifdef DESKTOP_VERSION |
254 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 257 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); |