author | tille <tille> | 2003-05-11 19:29:27 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-11 19:29:27 (UTC) |
commit | 10de2c93dffa16f6d2f1cf72fa20008757c5ef3a (patch) (unidiff) | |
tree | 561f501cf966e1f3ee6c9ce6d76ab9c227e7708a | |
parent | 43c18630840a98aed8deb96b454957c40f0a4344 (diff) | |
download | opie-10de2c93dffa16f6d2f1cf72fa20008757c5ef3a.zip opie-10de2c93dffa16f6d2f1cf72fa20008757c5ef3a.tar.gz opie-10de2c93dffa16f6d2f1cf72fa20008757c5ef3a.tar.bz2 |
colabse applnkitem in case of new search, since it's far to slow...
... I wonder how slow osearch will be on the pda!
-rw-r--r-- | core/pim/osearch/applnksearch.cpp | 8 | ||||
-rw-r--r-- | core/pim/osearch/applnksearch.h | 2 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.h | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp index d5b2930..acf650a 100644 --- a/core/pim/osearch/applnksearch.cpp +++ b/core/pim/osearch/applnksearch.cpp | |||
@@ -40,16 +40,24 @@ int AppLnkSearch::search() | |||
40 | QList<AppLnk> appList = _apps->children(); | 40 | QList<AppLnk> appList = _apps->children(); |
41 | for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){ | 41 | for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){ |
42 | if ( (_search.match( app->name() ) != -1) | 42 | if ( (_search.match( app->name() ) != -1) |
43 | || (_search.match(app->comment()) != -1) | 43 | || (_search.match(app->comment()) != -1) |
44 | || (_search.match(app->exec()) != -1) ) { | 44 | || (_search.match(app->exec()) != -1) ) { |
45 | count++; | 45 | count++; |
46 | insertItem( app ); | 46 | insertItem( app ); |
47 | } | 47 | } |
48 | } | 48 | } |
49 | return count; | 49 | return count; |
50 | } | 50 | } |
51 | 51 | ||
52 | void AppLnkSearch::insertItem( void *rec ) | 52 | void AppLnkSearch::insertItem( void *rec ) |
53 | { | 53 | { |
54 | new AppLnkItem( this, (AppLnk*)rec ); | 54 | new AppLnkItem( this, (AppLnk*)rec ); |
55 | } | 55 | } |
56 | |||
57 | void AppLnkSearch::setSearch(QRegExp re) | ||
58 | { | ||
59 | expanded = false; | ||
60 | setOpen( false ); | ||
61 | SearchGroup::setSearch( re ); | ||
62 | } | ||
63 | |||
diff --git a/core/pim/osearch/applnksearch.h b/core/pim/osearch/applnksearch.h index d88a8ce..6bb7486 100644 --- a/core/pim/osearch/applnksearch.h +++ b/core/pim/osearch/applnksearch.h | |||
@@ -14,25 +14,25 @@ | |||
14 | #define APPLNKSEARCH_H | 14 | #define APPLNKSEARCH_H |
15 | 15 | ||
16 | #include "searchgroup.h" | 16 | #include "searchgroup.h" |
17 | 17 | ||
18 | class AppLnkSet; | 18 | class AppLnkSet; |
19 | 19 | ||
20 | /** | 20 | /** |
21 | @author Patrick S. Vogt | 21 | @author Patrick S. Vogt |
22 | */ | 22 | */ |
23 | class AppLnkSearch : public SearchGroup | 23 | class AppLnkSearch : public SearchGroup |
24 | { | 24 | { |
25 | public: | 25 | public: |
26 | AppLnkSearch(QListView* parent, QString name); | 26 | AppLnkSearch(QListView* parent, QString name); |
27 | 27 | ||
28 | ~AppLnkSearch(); | 28 | ~AppLnkSearch(); |
29 | 29 | ||
30 | protected: | 30 | virtual void setSearch(QRegExp); |
31 | virtual void load(); | 31 | virtual void load(); |
32 | virtual int search(); | 32 | virtual int search(); |
33 | virtual void insertItem( void* ); | 33 | virtual void insertItem( void* ); |
34 | 34 | ||
35 | AppLnkSet *_apps; | 35 | AppLnkSet *_apps; |
36 | }; | 36 | }; |
37 | 37 | ||
38 | #endif | 38 | #endif |
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h index ebe1193..35949f0 100644 --- a/core/pim/osearch/searchgroup.h +++ b/core/pim/osearch/searchgroup.h | |||
@@ -26,24 +26,23 @@ public: | |||
26 | SearchGroup(QListView* parent, QString name); | 26 | SearchGroup(QListView* parent, QString name); |
27 | 27 | ||
28 | ~SearchGroup(); | 28 | ~SearchGroup(); |
29 | 29 | ||
30 | virtual void expand(); | 30 | virtual void expand(); |
31 | virtual void setSearch(QString); | 31 | virtual void setSearch(QString); |
32 | virtual void setSearch(QRegExp); | 32 | virtual void setSearch(QRegExp); |
33 | virtual int rtti() { return Searchgroup;} | 33 | virtual int rtti() { return Searchgroup;} |
34 | 34 | ||
35 | 35 | ||
36 | 36 | ||
37 | protected: | 37 | protected: |
38 | QRegExp _search; | 38 | QRegExp _search; |
39 | virtual void load() = 0; | 39 | virtual void load() = 0; |
40 | virtual int search() = 0; | 40 | virtual int search() = 0; |
41 | virtual void insertItem( void* ) = 0; | 41 | virtual void insertItem( void* ) = 0; |
42 | private: | ||
43 | void clearList(); | 42 | void clearList(); |
44 | QString _name; | 43 | QString _name; |
45 | bool expanded; | 44 | bool expanded; |
46 | bool loaded; | 45 | bool loaded; |
47 | }; | 46 | }; |
48 | 47 | ||
49 | #endif | 48 | #endif |