author | tille <tille> | 2003-05-08 12:16:38 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-08 12:16:38 (UTC) |
commit | 763d7d7da84682fb87a631a997e93c08f5abde61 (patch) (unidiff) | |
tree | 9cfeb731b793e3634fa751a6b6ffce63609f24a2 /core/pim | |
parent | 9e08dd00a96ffb4141da9f4ce2df0b871b334691 (diff) | |
download | opie-763d7d7da84682fb87a631a997e93c08f5abde61.zip opie-763d7d7da84682fb87a631a997e93c08f5abde61.tar.gz opie-763d7d7da84682fb87a631a997e93c08f5abde61.tar.bz2 |
this needs the new libopie patch...
-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/contactitem.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 16 | ||||
-rw-r--r-- | core/pim/osearch/eventitem.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/todoitem.cpp | 16 | ||||
-rw-r--r-- | core/pim/osearch/todoitem.h | 3 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 14 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.h | 2 |
8 files changed, 43 insertions, 18 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp index 4b0bd9c..c5b1ae7 100644 --- a/core/pim/osearch/adresssearch.cpp +++ b/core/pim/osearch/adresssearch.cpp | |||
@@ -37,10 +37,6 @@ void AdressSearch::expand() | |||
37 | if (!_contacts) _contacts = new OContactAccess("osearch"); | 37 | if (!_contacts) _contacts = new OContactAccess("osearch"); |
38 | ORecordList<OContact> results = _contacts->matchRegexp(_search); | 38 | ORecordList<OContact> results = _contacts->matchRegexp(_search); |
39 | for (uint i = 0; i < results.count(); i++) { | 39 | for (uint i = 0; i < results.count(); i++) { |
40 | // qDebug("i=%i",i); | ||
41 | // OContact rec = results[i]; | ||
42 | // qDebug("fullname %s",rec.fullName().latin1()); | ||
43 | //(( new OListViewItem( this, rec.fullName() ); | ||
44 | new ContactItem( this, new OContact( results[i] )); | 40 | new ContactItem( this, new OContact( results[i] )); |
45 | } | 41 | } |
46 | } | 42 | } |
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp index 36e4f00..86879aa 100644 --- a/core/pim/osearch/contactitem.cpp +++ b/core/pim/osearch/contactitem.cpp | |||
@@ -18,7 +18,7 @@ ContactItem::ContactItem(OListViewItem* parent, OContact *contact) | |||
18 | : ResultItem(parent) | 18 | : ResultItem(parent) |
19 | { | 19 | { |
20 | _contact = contact; | 20 | _contact = contact; |
21 | setText(0, _contact->fullName()); | 21 | setText(0, _contact->toShortText()); |
22 | } | 22 | } |
23 | 23 | ||
24 | 24 | ||
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index 85c55c2..e60a3b1 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -37,23 +37,27 @@ void DatebookSearch::expand() | |||
37 | _dates = new ODateBookAccess(); | 37 | _dates = new ODateBookAccess(); |
38 | _dates->load(); | 38 | _dates->load(); |
39 | } | 39 | } |
40 | 40 | #define LIPBOPIE_SEARCH | |
41 | #ifdef LIPBOPIE_SEARCH | ||
42 | ORecordList<OEvent> results = _dates->matchRegexp(_search); | ||
43 | for (uint i = 0; i < results.count(); i++) { | ||
44 | new EventItem( this, new OEvent( results[i] )); | ||
45 | } | ||
46 | #else | ||
41 | ORecordList<OEvent> list = _dates->allRecords(); | 47 | ORecordList<OEvent> list = _dates->allRecords(); |
42 | QArray<int> m_currentQuery( list.count() ); | 48 | QArray<int> m_currentQuery( list.count() ); |
43 | for( uint i=0; i<list.count(); i++ ){ | 49 | for( uint i=0; i<list.count(); i++ ){ |
44 | 50 | //qDebug("datebook: %s",list[i].description().latin1() ); | |
45 | if ( | 51 | if ( |
46 | ( list[i].description().contains( _search ) ) || | 52 | ( list[i].description().contains( _search ) ) || |
47 | ( list[i].note().contains( _search ) ) || | 53 | ( list[i].note().contains( _search ) ) || |
48 | ( list[i].location().contains( _search ) ) | 54 | ( list[i].location().contains( _search ) ) |
49 | // ( _search.find( list[i].description(), 0 ) > 0 ) || | ||
50 | // ( _search.find( list[i].note(), 0 ) > 0 ) || | ||
51 | // ( _search.find( list[i].location(), 0 ) > 0 ) | ||
52 | ){ | 55 | ){ |
56 | //qDebug("FOUND"); | ||
53 | new EventItem( this, new OEvent( list[i] ) ); | 57 | new EventItem( this, new OEvent( list[i] ) ); |
54 | // new OListViewItem( this, list[i].description() ); | ||
55 | } | 58 | } |
56 | 59 | ||
57 | } | 60 | } |
61 | #endif | ||
58 | } | 62 | } |
59 | 63 | ||
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp index 516a274..bf5b2b9 100644 --- a/core/pim/osearch/eventitem.cpp +++ b/core/pim/osearch/eventitem.cpp | |||
@@ -19,7 +19,7 @@ EventItem::EventItem(OListViewItem* parent, OEvent *event) | |||
19 | : ResultItem(parent) | 19 | : ResultItem(parent) |
20 | { | 20 | { |
21 | _event = event; | 21 | _event = event; |
22 | setText(0, _event->description() ); | 22 | setText(0, _event->toShortText() ); |
23 | } | 23 | } |
24 | 24 | ||
25 | 25 | ||
@@ -37,4 +37,4 @@ void EventItem::editItem() | |||
37 | { | 37 | { |
38 | QCopEnvelope e("QPE/Application/datebook", "editEvent(int)"); | 38 | QCopEnvelope e("QPE/Application/datebook", "editEvent(int)"); |
39 | e << _event->uid(); | 39 | e << _event->uid(); |
40 | } \ No newline at end of file | 40 | } |
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp index 422a6d8..4ea4586 100644 --- a/core/pim/osearch/todoitem.cpp +++ b/core/pim/osearch/todoitem.cpp | |||
@@ -13,12 +13,13 @@ | |||
13 | #include "todoitem.h" | 13 | #include "todoitem.h" |
14 | 14 | ||
15 | #include <opie/otodo.h> | 15 | #include <opie/otodo.h> |
16 | #include <qpe/qcopenvelope_qws.h> | ||
16 | 17 | ||
17 | TodoItem::TodoItem(OListViewItem* parent, OTodo *todo) | 18 | TodoItem::TodoItem(OListViewItem* parent, OTodo *todo) |
18 | : ResultItem(parent) | 19 | : ResultItem(parent) |
19 | { | 20 | { |
20 | _todo = todo; | 21 | _todo = todo; |
21 | setText( 0, todo->summary() ); | 22 | setText( 0, todo->toShortText() ); |
22 | } | 23 | } |
23 | 24 | ||
24 | 25 | ||
@@ -38,3 +39,16 @@ QString TodoItem::toRichText() | |||
38 | return _todo->toRichText(); | 39 | return _todo->toRichText(); |
39 | } | 40 | } |
40 | 41 | ||
42 | void TodoItem::showItem() | ||
43 | { | ||
44 | //QCopEnvelope e("QPE/Todolist", "show(int)"); | ||
45 | qDebug("calling todolist for %i",_todo->uid()); | ||
46 | QCopEnvelope e("QPE/Todolist", "show(int)"); | ||
47 | e << _todo->uid(); | ||
48 | } | ||
49 | |||
50 | void TodoItem::editItem() | ||
51 | { | ||
52 | QCopEnvelope e("QPE/Todolist", "edit(int)"); | ||
53 | e << _todo->uid(); | ||
54 | } | ||
diff --git a/core/pim/osearch/todoitem.h b/core/pim/osearch/todoitem.h index 1196c68..6f34915 100644 --- a/core/pim/osearch/todoitem.h +++ b/core/pim/osearch/todoitem.h | |||
@@ -26,8 +26,9 @@ public: | |||
26 | ~TodoItem(); | 26 | ~TodoItem(); |
27 | 27 | ||
28 | virtual void expand(); | 28 | virtual void expand(); |
29 | //virtual int rtti() { return Result;} | ||
30 | virtual QString toRichText(); | 29 | virtual QString toRichText(); |
30 | virtual void showItem(); | ||
31 | virtual void editItem(); | ||
31 | 32 | ||
32 | private: | 33 | private: |
33 | OTodo *_todo; | 34 | OTodo *_todo; |
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp index e34c384..82fae8d 100644 --- a/core/pim/osearch/todosearch.cpp +++ b/core/pim/osearch/todosearch.cpp | |||
@@ -35,18 +35,28 @@ TodoSearch::~TodoSearch() | |||
35 | void TodoSearch::expand() | 35 | void TodoSearch::expand() |
36 | { | 36 | { |
37 | SearchGroup::expand(); | 37 | SearchGroup::expand(); |
38 | if (!_todos){ | 38 | if (_search.isEmpty()) return; |
39 | |||
40 | if (!_todos){ | ||
39 | _todos = new OTodoAccess(); | 41 | _todos = new OTodoAccess(); |
40 | _todos->load(); | 42 | _todos->load(); |
41 | } | 43 | } |
44 | |||
45 | ORecordList<OTodo> results = _todos->matchRegexp(_search); | ||
46 | for (uint i = 0; i < results.count(); i++) { | ||
47 | new TodoItem( this, new OTodo( results[i] )); | ||
48 | } | ||
49 | /* | ||
42 | ORecordList<OTodo> list = _todos->allRecords(); | 50 | ORecordList<OTodo> list = _todos->allRecords(); |
43 | QArray<int> m_currentQuery( list.count() ); | 51 | QArray<int> m_currentQuery( list.count() ); |
44 | for( uint i=0; i<list.count(); i++ ){ | 52 | for( uint i=0; i<list.count(); i++ ){ |
53 | // qDebug("todo: %s",list[i].summary().latin1() ); | ||
45 | if ( list[i].match( _search ) ){ | 54 | if ( list[i].match( _search ) ){ |
55 | // qDebug("FOUND"); | ||
46 | new TodoItem( this, new OTodo( list[i] ) ); | 56 | new TodoItem( this, new OTodo( list[i] ) ); |
47 | } | 57 | } |
48 | 58 | ||
49 | } | 59 | }*/ |
50 | 60 | ||
51 | } | 61 | } |
52 | 62 | ||
diff --git a/core/pim/osearch/todosearch.h b/core/pim/osearch/todosearch.h index 33c1064..856be1f 100644 --- a/core/pim/osearch/todosearch.h +++ b/core/pim/osearch/todosearch.h | |||
@@ -13,7 +13,7 @@ | |||
13 | #ifndef TODOSEARCH_H | 13 | #ifndef TODOSEARCH_H |
14 | #define TODOSEARCH_H | 14 | #define TODOSEARCH_H |
15 | 15 | ||
16 | #include "filesearch.h" | 16 | #include "searchgroup.h" |
17 | 17 | ||
18 | class OTodoAccess; | 18 | class OTodoAccess; |
19 | 19 | ||