author | zautrix <zautrix> | 2004-09-09 20:39:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-09 20:39:55 (UTC) |
commit | 480ffef4859d24cc0a936377f8983fd59312d4b6 (patch) (unidiff) | |
tree | 9661e8b5e892ef653ffc2ed630dbe89acfeb4851 /kaddressbook/views | |
parent | 880518b6f1d4b06e3df45224c244d9c62f6fb7a9 (diff) | |
download | kdepimpi-480ffef4859d24cc0a936377f8983fd59312d4b6.zip kdepimpi-480ffef4859d24cc0a936377f8983fd59312d4b6.tar.gz kdepimpi-480ffef4859d24cc0a936377f8983fd59312d4b6.tar.bz2 |
Added senseful searching in Kapi
-rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 51 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookcardview.h | 2 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 47 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.h | 1 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 49 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.h | 1 |
6 files changed, 150 insertions, 1 deletions
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 239429f..49c0691 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp | |||
@@ -114,8 +114,9 @@ AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name) | |||
114 | AddresseeCardView::~AddresseeCardView() | 114 | AddresseeCardView::~AddresseeCardView() |
115 | { | 115 | { |
116 | } | 116 | } |
117 | 117 | ||
118 | |||
118 | void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e) | 119 | void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e) |
119 | { | 120 | { |
120 | #ifndef KAB_EMBEDDED | 121 | #ifndef KAB_EMBEDDED |
121 | if (QTextDrag::canDecode(e)) | 122 | if (QTextDrag::canDecode(e)) |
@@ -239,9 +240,59 @@ void KAddressBookCardView::writeConfig( KConfig *config ) | |||
239 | { | 240 | { |
240 | config->writeEntry( "ItemWidth", mCardView->itemWidth() ); | 241 | config->writeEntry( "ItemWidth", mCardView->itemWidth() ); |
241 | KAddressBookView::writeConfig( config ); | 242 | KAddressBookView::writeConfig( config ); |
242 | } | 243 | } |
244 | void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) | ||
245 | { | ||
246 | mCardView->clear(); | ||
247 | if ( s.isEmpty() || s == "*" ) { | ||
248 | refresh(); | ||
249 | return; | ||
250 | } | ||
251 | QString pattern = s.lower()+"*"; | ||
252 | QRegExp re; | ||
253 | re.setWildcard(true); // most people understand these better. | ||
254 | re.setCaseSensitive(false); | ||
255 | re.setPattern( pattern ); | ||
256 | if (!re.isValid()) | ||
257 | return; | ||
258 | mCardView->viewport()->setUpdatesEnabled( false ); | ||
259 | KABC::Addressee::List addresseeList = addressees(); | ||
260 | KABC::Addressee::List::Iterator it; | ||
261 | if ( field ) { | ||
262 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | ||
263 | #if QT_VERSION >= 300 | ||
264 | if (re.search(field->value( *it ).lower()) != -1) | ||
265 | #else | ||
266 | if (re.match(field->value( *it ).lower()) != -1) | ||
267 | #endif | ||
268 | new AddresseeCardViewItem(fields(), mShowEmptyFields, | ||
269 | addressBook(), *it, mCardView); | ||
243 | 270 | ||
271 | } | ||
272 | } else { | ||
273 | KABC::Field::List fieldList = fields(); | ||
274 | KABC::Field::List::ConstIterator fieldIt; | ||
275 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | ||
276 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | ||
277 | #if QT_VERSION >= 300 | ||
278 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | ||
279 | #else | ||
280 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | ||
281 | #endif | ||
282 | { | ||
283 | new AddresseeCardViewItem(fields(), mShowEmptyFields, | ||
284 | addressBook(), *it, mCardView); | ||
285 | continue; | ||
286 | } | ||
287 | } | ||
288 | } | ||
289 | } | ||
290 | mCardView->viewport()->setUpdatesEnabled( true ); | ||
291 | mCardView->viewport()->update(); | ||
292 | // by default nothing is selected | ||
293 | emit selected(QString::null); | ||
294 | } | ||
244 | QStringList KAddressBookCardView::selectedUids() | 295 | QStringList KAddressBookCardView::selectedUids() |
245 | { | 296 | { |
246 | QStringList uidList; | 297 | QStringList uidList; |
247 | CardViewItem *item; | 298 | CardViewItem *item; |
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h index cd70371..b8efb01 100644 --- a/kaddressbook/views/kaddressbookcardview.h +++ b/kaddressbook/views/kaddressbookcardview.h | |||
@@ -53,9 +53,9 @@ class KAddressBookCardView : public KAddressBookView | |||
53 | public: | 53 | public: |
54 | KAddressBookCardView( KABC::AddressBook *ab, QWidget *parent, | 54 | KAddressBookCardView( KABC::AddressBook *ab, QWidget *parent, |
55 | const char *name = 0 ); | 55 | const char *name = 0 ); |
56 | virtual ~KAddressBookCardView(); | 56 | virtual ~KAddressBookCardView(); |
57 | 57 | void doSearch( const QString& s,KABC::Field *field ); | |
58 | virtual QStringList selectedUids(); | 58 | virtual QStringList selectedUids(); |
59 | virtual QString type() const { return "Card"; } | 59 | virtual QString type() const { return "Card"; } |
60 | 60 | ||
61 | virtual void readConfig(KConfig *config); | 61 | virtual void readConfig(KConfig *config); |
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 50ff285..78d63b0 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp | |||
@@ -95,8 +95,9 @@ AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name) | |||
95 | AddresseeIconView::~AddresseeIconView() | 95 | AddresseeIconView::~AddresseeIconView() |
96 | { | 96 | { |
97 | } | 97 | } |
98 | 98 | ||
99 | |||
99 | void AddresseeIconView::itemDropped(QDropEvent *e, | 100 | void AddresseeIconView::itemDropped(QDropEvent *e, |
100 | const QValueList<QIconDragItem> &) | 101 | const QValueList<QIconDragItem> &) |
101 | { | 102 | { |
102 | emit addresseeDropped(e); | 103 | emit addresseeDropped(e); |
@@ -231,9 +232,55 @@ void KAddressBookIconView::readConfig(KConfig *config) | |||
231 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), | 232 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), |
232 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 233 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
233 | 234 | ||
234 | } | 235 | } |
236 | void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field ) | ||
237 | { | ||
238 | mIconView->clear(); | ||
239 | mIconList.clear(); | ||
240 | if ( s.isEmpty() || s == "*" ) { | ||
241 | refresh(); | ||
242 | return; | ||
243 | } | ||
244 | QString pattern = s.lower()+"*"; | ||
245 | QRegExp re; | ||
246 | re.setWildcard(true); // most people understand these better. | ||
247 | re.setCaseSensitive(false); | ||
248 | re.setPattern( pattern ); | ||
249 | if (!re.isValid()) | ||
250 | return; | ||
251 | KABC::Addressee::List addresseeList = addressees(); | ||
252 | KABC::Addressee::List::Iterator it; | ||
253 | if ( field ) { | ||
254 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | ||
255 | #if QT_VERSION >= 300 | ||
256 | if (re.search(field->value( *it ).lower()) != -1) | ||
257 | #else | ||
258 | if (re.match(field->value( *it ).lower()) != -1) | ||
259 | #endif | ||
260 | mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); | ||
261 | |||
235 | 262 | ||
263 | } | ||
264 | } else { | ||
265 | KABC::Field::List fieldList = fields(); | ||
266 | KABC::Field::List::ConstIterator fieldIt; | ||
267 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | ||
268 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | ||
269 | #if QT_VERSION >= 300 | ||
270 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | ||
271 | #else | ||
272 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | ||
273 | #endif | ||
274 | { | ||
275 | mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); | ||
276 | continue; | ||
277 | } | ||
278 | } | ||
279 | } | ||
280 | } | ||
281 | mIconView->arrangeItemsInGrid( true ); | ||
282 | } | ||
236 | QStringList KAddressBookIconView::selectedUids() | 283 | QStringList KAddressBookIconView::selectedUids() |
237 | { | 284 | { |
238 | QStringList uidList; | 285 | QStringList uidList; |
239 | QIconViewItem *item; | 286 | QIconViewItem *item; |
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index 3afada3..963ee7c 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h | |||
@@ -57,8 +57,9 @@ class KAddressBookIconView : public KAddressBookView | |||
57 | virtual ~KAddressBookIconView(); | 57 | virtual ~KAddressBookIconView(); |
58 | 58 | ||
59 | virtual QStringList selectedUids(); | 59 | virtual QStringList selectedUids(); |
60 | virtual QString type() const { return "Icon"; } | 60 | virtual QString type() const { return "Icon"; } |
61 | void doSearch( const QString& s ,KABC::Field *field ); | ||
61 | 62 | ||
62 | virtual void readConfig(KConfig *config); | 63 | virtual void readConfig(KConfig *config); |
63 | 64 | ||
64 | public slots: | 65 | public slots: |
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index ab11e2a..12f7c27 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -111,8 +111,57 @@ void KAddressBookTableView::reconstructListView() | |||
111 | mainLayout->activate(); | 111 | mainLayout->activate(); |
112 | mListView->show(); | 112 | mListView->show(); |
113 | } | 113 | } |
114 | 114 | ||
115 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) | ||
116 | { | ||
117 | mListView->clear(); | ||
118 | if ( s.isEmpty() || s == "*" ) { | ||
119 | refresh(); | ||
120 | return; | ||
121 | } | ||
122 | QString pattern = s.lower()+"*"; | ||
123 | QRegExp re; | ||
124 | re.setWildcard(true); // most people understand these better. | ||
125 | re.setCaseSensitive(false); | ||
126 | re.setPattern( pattern ); | ||
127 | if (!re.isValid()) | ||
128 | return; | ||
129 | KABC::Addressee::List addresseeList = addressees(); | ||
130 | KABC::Addressee::List::Iterator it; | ||
131 | if ( field ) { | ||
132 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | ||
133 | #if QT_VERSION >= 300 | ||
134 | if (re.search(field->value( *it ).lower()) != -1) | ||
135 | #else | ||
136 | if (re.match(field->value( *it ).lower()) != -1) | ||
137 | #endif | ||
138 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | ||
139 | |||
140 | } | ||
141 | } else { | ||
142 | KABC::Field::List fieldList = fields(); | ||
143 | KABC::Field::List::ConstIterator fieldIt; | ||
144 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | ||
145 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | ||
146 | #if QT_VERSION >= 300 | ||
147 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | ||
148 | #else | ||
149 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | ||
150 | #endif | ||
151 | { | ||
152 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | ||
153 | continue; | ||
154 | } | ||
155 | } | ||
156 | } | ||
157 | } | ||
158 | // Sometimes the background pixmap gets messed up when we add lots | ||
159 | // of items. | ||
160 | mListView->repaint(); | ||
161 | emit selected(QString::null); | ||
162 | |||
163 | } | ||
115 | void KAddressBookTableView::writeConfig(KConfig *config) | 164 | void KAddressBookTableView::writeConfig(KConfig *config) |
116 | { | 165 | { |
117 | KAddressBookView::writeConfig(config); | 166 | KAddressBookView::writeConfig(config); |
118 | 167 | ||
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index bb991bc..ecfe7a1 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h | |||
@@ -61,8 +61,9 @@ friend class ContactListView; | |||
61 | virtual void setSelected(QString uid = QString::null, bool selected = false); | 61 | virtual void setSelected(QString uid = QString::null, bool selected = false); |
62 | virtual void readConfig(KConfig *config); | 62 | virtual void readConfig(KConfig *config); |
63 | virtual void writeConfig(KConfig *config); | 63 | virtual void writeConfig(KConfig *config); |
64 | virtual QString type() const { return "Table"; } | 64 | virtual QString type() const { return "Table"; } |
65 | void doSearch( const QString& s ,KABC::Field *field ); | ||
65 | 66 | ||
66 | public slots: | 67 | public slots: |
67 | virtual void reconstructListView(); | 68 | virtual void reconstructListView(); |
68 | 69 | ||