-rw-r--r-- | libopie/pim/oevent.cpp | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp index 3ba8a52..28cf873 100644 --- a/libopie/pim/oevent.cpp +++ b/libopie/pim/oevent.cpp | |||
@@ -1,10 +1,11 @@ | |||
1 | #include <qshared.h> | 1 | #include <qshared.h> |
2 | 2 | ||
3 | #include <qpe/palmtopuidgen.h> | 3 | #include <qpe/palmtopuidgen.h> |
4 | #include <qpe/categories.h> | 4 | #include <qpe/categories.h> |
5 | #include <qpe/stringutil.h> | ||
5 | 6 | ||
6 | #include "orecur.h" | 7 | #include "orecur.h" |
7 | #include "opimresolver.h" | 8 | #include "opimresolver.h" |
8 | #include "opimnotifymanager.h" | 9 | #include "opimnotifymanager.h" |
9 | 10 | ||
10 | #include "oevent.h" | 11 | #include "oevent.h" |
@@ -207,22 +208,52 @@ void OEvent::setTimeZone( const QString& tz ) { | |||
207 | data->timezone = tz; | 208 | data->timezone = tz; |
208 | } | 209 | } |
209 | QString OEvent::timeZone()const { | 210 | QString OEvent::timeZone()const { |
210 | if (data->isAllDay ) return QString::fromLatin1("UTC"); | 211 | if (data->isAllDay ) return QString::fromLatin1("UTC"); |
211 | return data->timezone; | 212 | return data->timezone; |
212 | } | 213 | } |
213 | bool OEvent::match( const QRegExp& )const { | 214 | bool OEvent::match( const QRegExp& re )const { |
214 | // FIXME | 215 | if (data->description.contains( re ) ) |
216 | return true; | ||
217 | if ( data->note.contains( re ) ) | ||
218 | return true; | ||
219 | if ( data->location.contains( re ) ) | ||
220 | return true; | ||
221 | if ( data->start.toString().contains( re ) ) | ||
222 | return true; | ||
223 | if ( data->end.toString().contains( re ) ) | ||
224 | return true; | ||
215 | return false; | 225 | return false; |
216 | } | 226 | } |
217 | QString OEvent::toRichText()const { | 227 | QString OEvent::toRichText()const { |
218 | // FIXME | 228 | QString text; |
219 | return "OEvent test"; | 229 | if ( !description().isEmpty() ) { |
230 | text += "<b>" + QObject::tr( "Description:") + "</b><br>"; | ||
231 | text += Qtopia::escapeString(description() ). | ||
232 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | ||
233 | } | ||
234 | if ( startDateTime().isValid() ) { | ||
235 | text += "<b>" + QObject::tr( "Start:") + "</b> "; | ||
236 | text += Qtopia::escapeString(startDateTime().toString() ). | ||
237 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | ||
238 | } | ||
239 | if ( endDateTime().isValid() ) { | ||
240 | text += "<b>" + QObject::tr( "End:") + "</b> "; | ||
241 | text += Qtopia::escapeString(endDateTime().toString() ). | ||
242 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | ||
243 | } | ||
244 | if ( !note().isEmpty() ) { | ||
245 | text += "<b>" + QObject::tr( "Note:") + "</b><br>"; | ||
246 | text += note(); | ||
247 | // text += Qtopia::escapeString(note() ). | ||
248 | // replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | ||
249 | } | ||
250 | return text; | ||
220 | } | 251 | } |
221 | QString OEvent::toShortText()const { | 252 | QString OEvent::toShortText()const { |
222 | return "OEvent shotText"; | 253 | return description(); |
223 | } | 254 | } |
224 | QString OEvent::type()const { | 255 | QString OEvent::type()const { |
225 | return QString::fromLatin1("OEvent"); | 256 | return QString::fromLatin1("OEvent"); |
226 | } | 257 | } |
227 | QString OEvent::recordField( int /*id */ )const { | 258 | QString OEvent::recordField( int /*id */ )const { |
228 | return QString::null; | 259 | return QString::null; |