summaryrefslogtreecommitdiff
path: root/libopie2/opiepim
Unidiff
Diffstat (limited to 'libopie2/opiepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/oevent.cpp20
-rw-r--r--libopie2/opiepim/otodo.cpp12
2 files changed, 23 insertions, 9 deletions
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index cda12f9..2b138c0 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -203,34 +203,44 @@ void OEvent::setAllDay( bool allDay ) {
203 data->isAllDay = allDay; 203 data->isAllDay = allDay;
204 if (allDay ) data->timezone = "UTC"; 204 if (allDay ) data->timezone = "UTC";
205} 205}
206void OEvent::setTimeZone( const QString& tz ) { 206void OEvent::setTimeZone( const QString& tz ) {
207 changeOrModify(); 207 changeOrModify();
208 data->timezone = tz; 208 data->timezone = tz;
209} 209}
210QString OEvent::timeZone()const { 210QString OEvent::timeZone()const {
211 if (data->isAllDay ) return QString::fromLatin1("UTC"); 211 if (data->isAllDay ) return QString::fromLatin1("UTC");
212 return data->timezone; 212 return data->timezone;
213} 213}
214bool OEvent::match( const QRegExp& re )const { 214bool OEvent::match( const QRegExp& re )const {
215 if ( re.match( data->description ) != -1 ) 215 if ( re.match( data->description ) != -1 ){
216 setLastHitField( DatebookDescription );
216 return true; 217 return true;
217 if ( re.match( data->note ) != -1 ) 218 }
219 if ( re.match( data->note ) != -1 ){
220 setLastHitField( Note );
218 return true; 221 return true;
219 if ( re.match( data->location ) != -1 ) 222 }
223 if ( re.match( data->location ) != -1 ){
224 setLastHitField( Location );
220 return true; 225 return true;
221 if ( re.match( data->start.toString() ) != -1 ) 226 }
227 if ( re.match( data->start.toString() ) != -1 ){
228 setLastHitField( StartDateTime );
222 return true; 229 return true;
223 if ( re.match( data->end.toString() ) != -1 ) 230 }
231 if ( re.match( data->end.toString() ) != -1 ){
232 setLastHitField( EndDateTime );
224 return true; 233 return true;
234 }
225 return false; 235 return false;
226} 236}
227QString OEvent::toRichText()const { 237QString OEvent::toRichText()const {
228 QString text; 238 QString text;
229 if ( !description().isEmpty() ) { 239 if ( !description().isEmpty() ) {
230 text += "<b>" + QObject::tr( "Description:") + "</b><br>"; 240 text += "<b>" + QObject::tr( "Description:") + "</b><br>";
231 text += Qtopia::escapeString(description() ). 241 text += Qtopia::escapeString(description() ).
232 replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; 242 replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
233 } 243 }
234 if ( startDateTime().isValid() ) { 244 if ( startDateTime().isValid() ) {
235 text += "<b>" + QObject::tr( "Start:") + "</b> "; 245 text += "<b>" + QObject::tr( "Start:") + "</b> ";
236 text += Qtopia::escapeString(startDateTime().toString() ). 246 text += Qtopia::escapeString(startDateTime().toString() ).
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index a29d88e..e087a00 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -96,31 +96,35 @@ OTodo::OTodo(bool completed, int priority,
96 96
97 data->date = date; 97 data->date = date;
98 data->isCompleted = completed; 98 data->isCompleted = completed;
99 data->hasDate = hasDate; 99 data->hasDate = hasDate;
100 data->priority = priority; 100 data->priority = priority;
101 data->sum = summary; 101 data->sum = summary;
102 data->prog = progress; 102 data->prog = progress;
103 data->desc = Qtopia::simplifyMultiLineSpace(description ); 103 data->desc = Qtopia::simplifyMultiLineSpace(description );
104} 104}
105bool OTodo::match( const QRegExp &regExp )const 105bool OTodo::match( const QRegExp &regExp )const
106{ 106{
107 if( QString::number( data->priority ).find( regExp ) != -1 ){ 107 if( QString::number( data->priority ).find( regExp ) != -1 ){
108 return true; 108 setLastHitField( Priority );
109 return true;
109 }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){ 110 }else if( data->hasDate && data->date.toString().find( regExp) != -1 ){
110 return true; 111 setLastHitField( HasDate );
112 return true;
111 }else if(data->desc.find( regExp ) != -1 ){ 113 }else if(data->desc.find( regExp ) != -1 ){
112 return true; 114 setLastHitField( Description );
115 return true;
113 }else if(data->sum.find( regExp ) != -1 ) { 116 }else if(data->sum.find( regExp ) != -1 ) {
114 return true; 117 setLastHitField( Summary );
118 return true;
115 } 119 }
116 return false; 120 return false;
117} 121}
118bool OTodo::isCompleted() const 122bool OTodo::isCompleted() const
119{ 123{
120 return data->isCompleted; 124 return data->isCompleted;
121} 125}
122bool OTodo::hasDueDate() const 126bool OTodo::hasDueDate() const
123{ 127{
124 return data->hasDate; 128 return data->hasDate;
125} 129}
126bool OTodo::hasStartDate()const { 130bool OTodo::hasStartDate()const {