-rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 20 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookcardview.h | 2 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 17 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.h | 2 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 18 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.h | 2 |
6 files changed, 57 insertions, 4 deletions
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 4babf67..a7bf6c9 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp | |||
@@ -1,77 +1,78 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> | 3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qdragobject.h> | 24 | #include <qdragobject.h> |
25 | #include <qevent.h> | 25 | #include <qevent.h> |
26 | #include <qiconview.h> | 26 | #include <qiconview.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <qregexp.h> | 29 | #include <qregexp.h> |
30 | #include <qapplication.h> | ||
30 | 31 | ||
31 | #include <kabc/addressbook.h> | 32 | #include <kabc/addressbook.h> |
32 | #include <kabc/addressee.h> | 33 | #include <kabc/addressee.h> |
33 | #include <kconfig.h> | 34 | #include <kconfig.h> |
34 | #include <kdebug.h> | 35 | #include <kdebug.h> |
35 | #include <klocale.h> | 36 | #include <klocale.h> |
36 | 37 | ||
37 | #include "kabprefs.h" | 38 | #include "kabprefs.h" |
38 | #include "viewmanager.h" | 39 | #include "viewmanager.h" |
39 | 40 | ||
40 | #include "kaddressbookcardview.h" | 41 | #include "kaddressbookcardview.h" |
41 | 42 | ||
42 | #ifndef KAB_EMBEDDED | 43 | #ifndef KAB_EMBEDDED |
43 | extern "C" { | 44 | extern "C" { |
44 | void *init_libkaddrbk_cardview() | 45 | void *init_libkaddrbk_cardview() |
45 | { | 46 | { |
46 | return ( new CardViewFactory ); | 47 | return ( new CardViewFactory ); |
47 | } | 48 | } |
48 | } | 49 | } |
49 | #endif //KAB_EMBEDDED | 50 | #endif //KAB_EMBEDDED |
50 | 51 | ||
51 | //////////////////////////////// | 52 | //////////////////////////////// |
52 | // AddresseeCardViewItem (internal class) | 53 | // AddresseeCardViewItem (internal class) |
53 | class AddresseeCardViewItem : public CardViewItem | 54 | class AddresseeCardViewItem : public CardViewItem |
54 | { | 55 | { |
55 | public: | 56 | public: |
56 | AddresseeCardViewItem(const KABC::Field::List &fields, | 57 | AddresseeCardViewItem(const KABC::Field::List &fields, |
57 | bool showEmptyFields, | 58 | bool showEmptyFields, |
58 | KABC::AddressBook *doc, const KABC::Addressee &a, | 59 | KABC::AddressBook *doc, const KABC::Addressee &a, |
59 | CardView *parent) | 60 | CardView *parent) |
60 | : CardViewItem(parent, a.formattedName()), | 61 | : CardViewItem(parent, a.formattedName()), |
61 | mFields( fields ), mShowEmptyFields(showEmptyFields), | 62 | mFields( fields ), mShowEmptyFields(showEmptyFields), |
62 | mDocument(doc), mAddressee(a) | 63 | mDocument(doc), mAddressee(a) |
63 | { | 64 | { |
64 | if ( mFields.isEmpty() ) { | 65 | if ( mFields.isEmpty() ) { |
65 | mFields = KABC::Field::defaultFields(); | 66 | mFields = KABC::Field::defaultFields(); |
66 | } | 67 | } |
67 | refresh(); | 68 | refresh(); |
68 | } | 69 | } |
69 | 70 | ||
70 | const KABC::Addressee &addressee() const { return mAddressee; } | 71 | const KABC::Addressee &addressee() const { return mAddressee; } |
71 | 72 | ||
72 | void refresh() | 73 | void refresh() |
73 | { | 74 | { |
74 | // Update our addressee, since it may have changed elsewhere | 75 | // Update our addressee, since it may have changed elsewhere |
75 | mAddressee = mDocument->findByUid(mAddressee.uid()); | 76 | mAddressee = mDocument->findByUid(mAddressee.uid()); |
76 | 77 | ||
77 | if (!mAddressee.isEmpty()) | 78 | if (!mAddressee.isEmpty()) |
@@ -124,96 +125,107 @@ void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e) | |||
124 | e->accept(); | 125 | e->accept(); |
125 | #else //KAB_EMBEDDED | 126 | #else //KAB_EMBEDDED |
126 | qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented"); | 127 | qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented"); |
127 | #endif //KAB_EMBEDDED | 128 | #endif //KAB_EMBEDDED |
128 | } | 129 | } |
129 | 130 | ||
130 | void AddresseeCardView::dropEvent(QDropEvent *e) | 131 | void AddresseeCardView::dropEvent(QDropEvent *e) |
131 | { | 132 | { |
132 | emit addresseeDropped(e); | 133 | emit addresseeDropped(e); |
133 | } | 134 | } |
134 | 135 | ||
135 | void AddresseeCardView::startDrag() | 136 | void AddresseeCardView::startDrag() |
136 | { | 137 | { |
137 | emit startAddresseeDrag(); | 138 | emit startAddresseeDrag(); |
138 | } | 139 | } |
139 | 140 | ||
140 | 141 | ||
141 | /////////////////////////////// | 142 | /////////////////////////////// |
142 | // KAddressBookCardView | 143 | // KAddressBookCardView |
143 | 144 | ||
144 | KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab, | 145 | KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab, |
145 | QWidget *parent, const char *name ) | 146 | QWidget *parent, const char *name ) |
146 | : KAddressBookView( ab, parent, name ) | 147 | : KAddressBookView( ab, parent, name ) |
147 | { | 148 | { |
148 | mShowEmptyFields = false; | 149 | mShowEmptyFields = false; |
149 | 150 | ||
150 | // Init the GUI | 151 | // Init the GUI |
151 | QVBoxLayout *layout = new QVBoxLayout(viewWidget()); | 152 | QVBoxLayout *layout = new QVBoxLayout(viewWidget()); |
152 | 153 | ||
153 | mCardView = new AddresseeCardView(viewWidget(), "mCardView"); | 154 | mCardView = new AddresseeCardView(viewWidget(), "mCardView"); |
154 | mCardView->setSelectionMode(CardView::Extended); | 155 | mCardView->setSelectionMode(CardView::Extended); |
155 | layout->addWidget(mCardView); | 156 | layout->addWidget(mCardView); |
156 | 157 | ||
157 | // Connect up the signals | 158 | // Connect up the signals |
158 | connect(mCardView, SIGNAL(executed(CardViewItem *)), | 159 | connect(mCardView, SIGNAL(executed(CardViewItem *)), |
159 | this, SLOT(addresseeExecuted(CardViewItem *))); | 160 | this, SLOT(addresseeExecuted(CardViewItem *))); |
160 | connect(mCardView, SIGNAL(selectionChanged()), | 161 | connect(mCardView, SIGNAL(selectionChanged()), |
161 | this, SLOT(addresseeSelected())); | 162 | this, SLOT(addresseeSelected())); |
162 | connect(mCardView, SIGNAL(addresseeDropped(QDropEvent*)), | 163 | connect(mCardView, SIGNAL(addresseeDropped(QDropEvent*)), |
163 | this, SIGNAL(dropped(QDropEvent*))); | 164 | this, SIGNAL(dropped(QDropEvent*))); |
164 | connect(mCardView, SIGNAL(startAddresseeDrag()), | 165 | connect(mCardView, SIGNAL(startAddresseeDrag()), |
165 | this, SIGNAL(startDrag())); | 166 | this, SIGNAL(startDrag())); |
166 | } | 167 | } |
167 | 168 | ||
168 | KAddressBookCardView::~KAddressBookCardView() | 169 | KAddressBookCardView::~KAddressBookCardView() |
169 | { | 170 | { |
170 | } | 171 | } |
171 | 172 | ||
173 | void KAddressBookCardView::scrollUP() | ||
174 | { | ||
175 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); | ||
176 | QApplication::postEvent( mCardView, ev ); | ||
177 | |||
178 | } | ||
179 | void KAddressBookCardView::scrollDOWN() | ||
180 | { | ||
181 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); | ||
182 | QApplication::postEvent( mCardView, ev ); | ||
183 | } | ||
172 | void KAddressBookCardView::readConfig(KConfig *config) | 184 | void KAddressBookCardView::readConfig(KConfig *config) |
173 | { | 185 | { |
174 | KAddressBookView::readConfig(config); | 186 | KAddressBookView::readConfig(config); |
175 | 187 | ||
176 | // costum colors? | 188 | // costum colors? |
177 | if ( config->readBoolEntry( "EnableCustomColors", false ) ) | 189 | if ( config->readBoolEntry( "EnableCustomColors", false ) ) |
178 | { | 190 | { |
179 | QPalette p( mCardView->palette() ); | 191 | QPalette p( mCardView->palette() ); |
180 | QColor c = p.color(QPalette::Normal, QColorGroup::Base ); | 192 | QColor c = p.color(QPalette::Normal, QColorGroup::Base ); |
181 | p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); | 193 | p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); |
182 | c = p.color(QPalette::Normal, QColorGroup::Text ); | 194 | c = p.color(QPalette::Normal, QColorGroup::Text ); |
183 | p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); | 195 | p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); |
184 | c = p.color(QPalette::Normal, QColorGroup::Button ); | 196 | c = p.color(QPalette::Normal, QColorGroup::Button ); |
185 | p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); | 197 | p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); |
186 | c = p.color(QPalette::Normal, QColorGroup::ButtonText ); | 198 | c = p.color(QPalette::Normal, QColorGroup::ButtonText ); |
187 | p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); | 199 | p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); |
188 | c = p.color(QPalette::Normal, QColorGroup::Highlight ); | 200 | c = p.color(QPalette::Normal, QColorGroup::Highlight ); |
189 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); | 201 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); |
190 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); | 202 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); |
191 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); | 203 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); |
192 | mCardView->viewport()->setPalette( p ); | 204 | mCardView->viewport()->setPalette( p ); |
193 | } | 205 | } |
194 | else | 206 | else |
195 | { | 207 | { |
196 | // needed if turned off during a session. | 208 | // needed if turned off during a session. |
197 | mCardView->viewport()->setPalette( mCardView->palette() ); | 209 | mCardView->viewport()->setPalette( mCardView->palette() ); |
198 | } | 210 | } |
199 | 211 | ||
200 | //custom fonts? | 212 | //custom fonts? |
201 | QFont f( font() ); | 213 | QFont f( font() ); |
202 | if ( config->readBoolEntry( "EnableCustomFonts", false ) ) | 214 | if ( config->readBoolEntry( "EnableCustomFonts", false ) ) |
203 | { | 215 | { |
204 | mCardView->setFont( config->readFontEntry( "TextFont", &f) ); | 216 | mCardView->setFont( config->readFontEntry( "TextFont", &f) ); |
205 | f.setBold( true ); | 217 | f.setBold( true ); |
206 | mCardView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); | 218 | mCardView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); |
207 | } | 219 | } |
208 | else | 220 | else |
209 | { | 221 | { |
210 | mCardView->setFont( f ); | 222 | mCardView->setFont( f ); |
211 | f.setBold( true ); | 223 | f.setBold( true ); |
212 | mCardView->setHeaderFont( f ); | 224 | mCardView->setHeaderFont( f ); |
213 | } | 225 | } |
214 | 226 | ||
215 | mCardView->setDrawCardBorder(config->readBoolEntry("DrawBorder", true)); | 227 | mCardView->setDrawCardBorder(config->readBoolEntry("DrawBorder", true)); |
216 | mCardView->setDrawColSeparators(config->readBoolEntry("DrawSeparators", | 228 | mCardView->setDrawColSeparators(config->readBoolEntry("DrawSeparators", |
217 | true)); | 229 | true)); |
218 | mCardView->setDrawFieldLabels(config->readBoolEntry("DrawFieldLabels",false)); | 230 | mCardView->setDrawFieldLabels(config->readBoolEntry("DrawFieldLabels",false)); |
219 | mShowEmptyFields = config->readBoolEntry("ShowEmptyFields", false); | 231 | mShowEmptyFields = config->readBoolEntry("ShowEmptyFields", false); |
@@ -245,98 +257,102 @@ void KAddressBookCardView::writeConfig( KConfig *config ) | |||
245 | void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) | 257 | void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) |
246 | { | 258 | { |
247 | mCardView->clear(); | 259 | mCardView->clear(); |
248 | if ( s.isEmpty() || s == "*" ) { | 260 | if ( s.isEmpty() || s == "*" ) { |
249 | refresh(); | 261 | refresh(); |
250 | return; | 262 | return; |
251 | } | 263 | } |
252 | QString pattern = s.lower()+"*"; | 264 | QString pattern = s.lower()+"*"; |
253 | QRegExp re; | 265 | QRegExp re; |
254 | re.setWildcard(true); // most people understand these better. | 266 | re.setWildcard(true); // most people understand these better. |
255 | re.setCaseSensitive(false); | 267 | re.setCaseSensitive(false); |
256 | re.setPattern( pattern ); | 268 | re.setPattern( pattern ); |
257 | if (!re.isValid()) | 269 | if (!re.isValid()) |
258 | return; | 270 | return; |
259 | mCardView->viewport()->setUpdatesEnabled( false ); | 271 | mCardView->viewport()->setUpdatesEnabled( false ); |
260 | KABC::Addressee::List addresseeList = addressees(); | 272 | KABC::Addressee::List addresseeList = addressees(); |
261 | KABC::Addressee::List::Iterator it; | 273 | KABC::Addressee::List::Iterator it; |
262 | if ( field ) { | 274 | if ( field ) { |
263 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 275 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
264 | #if QT_VERSION >= 300 | 276 | #if QT_VERSION >= 300 |
265 | if (re.search(field->value( *it ).lower()) != -1) | 277 | if (re.search(field->value( *it ).lower()) != -1) |
266 | #else | 278 | #else |
267 | if (re.match(field->value( *it ).lower()) != -1) | 279 | if (re.match(field->value( *it ).lower()) != -1) |
268 | #endif | 280 | #endif |
269 | new AddresseeCardViewItem(fields(), mShowEmptyFields, | 281 | new AddresseeCardViewItem(fields(), mShowEmptyFields, |
270 | addressBook(), *it, mCardView); | 282 | addressBook(), *it, mCardView); |
271 | 283 | ||
272 | } | 284 | } |
273 | } else { | 285 | } else { |
274 | KABC::Field::List fieldList = fields(); | 286 | KABC::Field::List fieldList = fields(); |
275 | KABC::Field::List::ConstIterator fieldIt; | 287 | KABC::Field::List::ConstIterator fieldIt; |
276 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 288 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
277 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 289 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
278 | #if QT_VERSION >= 300 | 290 | #if QT_VERSION >= 300 |
279 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | 291 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) |
280 | #else | 292 | #else |
281 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | 293 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) |
282 | #endif | 294 | #endif |
283 | { | 295 | { |
284 | new AddresseeCardViewItem(fields(), mShowEmptyFields, | 296 | new AddresseeCardViewItem(fields(), mShowEmptyFields, |
285 | addressBook(), *it, mCardView); | 297 | addressBook(), *it, mCardView); |
286 | continue; | 298 | continue; |
287 | } | 299 | } |
288 | } | 300 | } |
289 | } | 301 | } |
290 | } | 302 | } |
291 | mCardView->viewport()->setUpdatesEnabled( true ); | 303 | mCardView->viewport()->setUpdatesEnabled( true ); |
292 | mCardView->viewport()->update(); | 304 | mCardView->viewport()->update(); |
293 | // by default nothing is selected | 305 | if ( mCardView->firstItem() ) { |
294 | emit selected(QString::null); | 306 | mCardView->setCurrentItem ( mCardView->firstItem() ); |
307 | mCardView->setSelected ( mCardView->firstItem() , true ); | ||
308 | } | ||
309 | else | ||
310 | emit selected(QString::null); | ||
295 | } | 311 | } |
296 | QStringList KAddressBookCardView::selectedUids() | 312 | QStringList KAddressBookCardView::selectedUids() |
297 | { | 313 | { |
298 | QStringList uidList; | 314 | QStringList uidList; |
299 | CardViewItem *item; | 315 | CardViewItem *item; |
300 | AddresseeCardViewItem *aItem; | 316 | AddresseeCardViewItem *aItem; |
301 | 317 | ||
302 | for (item = mCardView->firstItem(); item; item = item->nextItem()) | 318 | for (item = mCardView->firstItem(); item; item = item->nextItem()) |
303 | { | 319 | { |
304 | if (item->isSelected()) | 320 | if (item->isSelected()) |
305 | { | 321 | { |
306 | #ifndef KAB_EMBEDDED | 322 | #ifndef KAB_EMBEDDED |
307 | aItem = dynamic_cast<AddresseeCardViewItem*>(item); | 323 | aItem = dynamic_cast<AddresseeCardViewItem*>(item); |
308 | #else //KAB_EMBEDDED | 324 | #else //KAB_EMBEDDED |
309 | aItem = (AddresseeCardViewItem*)(item); | 325 | aItem = (AddresseeCardViewItem*)(item); |
310 | #endif //KAB_EMBEDDED | 326 | #endif //KAB_EMBEDDED |
311 | if (aItem) | 327 | if (aItem) |
312 | uidList << aItem->addressee().uid(); | 328 | uidList << aItem->addressee().uid(); |
313 | } | 329 | } |
314 | } | 330 | } |
315 | 331 | ||
316 | return uidList; | 332 | return uidList; |
317 | } | 333 | } |
318 | 334 | ||
319 | void KAddressBookCardView::refresh(QString uid) | 335 | void KAddressBookCardView::refresh(QString uid) |
320 | { | 336 | { |
321 | CardViewItem *item; | 337 | CardViewItem *item; |
322 | AddresseeCardViewItem *aItem; | 338 | AddresseeCardViewItem *aItem; |
323 | 339 | ||
324 | if (uid.isNull()) | 340 | if (uid.isNull()) |
325 | { | 341 | { |
326 | // Rebuild the view | 342 | // Rebuild the view |
327 | mCardView->viewport()->setUpdatesEnabled( false ); | 343 | mCardView->viewport()->setUpdatesEnabled( false ); |
328 | mCardView->clear(); | 344 | mCardView->clear(); |
329 | 345 | ||
330 | KABC::Addressee::List addresseeList = addressees(); | 346 | KABC::Addressee::List addresseeList = addressees(); |
331 | KABC::Addressee::List::Iterator iter; | 347 | KABC::Addressee::List::Iterator iter; |
332 | for (iter = addresseeList.begin(); iter != addresseeList.end(); ++iter) | 348 | for (iter = addresseeList.begin(); iter != addresseeList.end(); ++iter) |
333 | { | 349 | { |
334 | if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") ) | 350 | if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") ) |
335 | continue; | 351 | continue; |
336 | aItem = new AddresseeCardViewItem(fields(), mShowEmptyFields, | 352 | aItem = new AddresseeCardViewItem(fields(), mShowEmptyFields, |
337 | addressBook(), *iter, mCardView); | 353 | addressBook(), *iter, mCardView); |
338 | } | 354 | } |
339 | mCardView->viewport()->setUpdatesEnabled( true ); | 355 | mCardView->viewport()->setUpdatesEnabled( true ); |
340 | mCardView->viewport()->update(); | 356 | mCardView->viewport()->update(); |
341 | 357 | ||
342 | // by default nothing is selected | 358 | // by default nothing is selected |
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h index b8efb01..45a9781 100644 --- a/kaddressbook/views/kaddressbookcardview.h +++ b/kaddressbook/views/kaddressbookcardview.h | |||
@@ -15,96 +15,98 @@ | |||
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. | 16 | GNU General Public License for more details. |
17 | 17 | ||
18 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
19 | along with this program; if not, write to the Free Software | 19 | along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 20 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
21 | 21 | ||
22 | As a special exception, permission is given to link this program | 22 | As a special exception, permission is given to link this program |
23 | with any edition of Qt, and distribute the resulting executable, | 23 | with any edition of Qt, and distribute the resulting executable, |
24 | without including the source code for Qt in the source distribution. | 24 | without including the source code for Qt in the source distribution. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <qstring.h> | 27 | #include <qstring.h> |
28 | #ifndef KAB_EMBEDDED | 28 | #ifndef KAB_EMBEDDED |
29 | #include <kiconview.h> | 29 | #include <kiconview.h> |
30 | #else //KAB_EMBEDDED | 30 | #else //KAB_EMBEDDED |
31 | #include <klocale.h> | 31 | #include <klocale.h> |
32 | #endif //KAB_EMBEDDED | 32 | #endif //KAB_EMBEDDED |
33 | 33 | ||
34 | #include "cardview.h" | 34 | #include "cardview.h" |
35 | #include "kaddressbookview.h" | 35 | #include "kaddressbookview.h" |
36 | #include "configurecardviewdialog.h" | 36 | #include "configurecardviewdialog.h" |
37 | 37 | ||
38 | class QDragEnterEvent; | 38 | class QDragEnterEvent; |
39 | class QDragEntryEvent; | 39 | class QDragEntryEvent; |
40 | class QDropEvent; | 40 | class QDropEvent; |
41 | class KConfig; | 41 | class KConfig; |
42 | class AddresseeCardView; | 42 | class AddresseeCardView; |
43 | 43 | ||
44 | /** | 44 | /** |
45 | This view uses the CardView class to create a card view. At some | 45 | This view uses the CardView class to create a card view. At some |
46 | point in the future I think this will be the default view of | 46 | point in the future I think this will be the default view of |
47 | KAddressBook. | 47 | KAddressBook. |
48 | */ | 48 | */ |
49 | class KAddressBookCardView : public KAddressBookView | 49 | class KAddressBookCardView : public KAddressBookView |
50 | { | 50 | { |
51 | Q_OBJECT | 51 | Q_OBJECT |
52 | 52 | ||
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 | void doSearch( const QString& s,KABC::Field *field ); | 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); |
62 | virtual void writeConfig(KConfig *); | 62 | virtual void writeConfig(KConfig *); |
63 | virtual void scrollUP(); | ||
64 | virtual void scrollDOWN(); | ||
63 | 65 | ||
64 | public slots: | 66 | public slots: |
65 | void refresh(QString uid = QString::null); | 67 | void refresh(QString uid = QString::null); |
66 | void setSelected(QString uid/*US = QString::null*/, bool selected/*US = true*/); | 68 | void setSelected(QString uid/*US = QString::null*/, bool selected/*US = true*/); |
67 | //US added an additional method without parameter | 69 | //US added an additional method without parameter |
68 | void setSelected(); | 70 | void setSelected(); |
69 | 71 | ||
70 | protected slots: | 72 | protected slots: |
71 | void addresseeExecuted(CardViewItem *item); | 73 | void addresseeExecuted(CardViewItem *item); |
72 | void addresseeSelected(); | 74 | void addresseeSelected(); |
73 | 75 | ||
74 | private: | 76 | private: |
75 | AddresseeCardView *mCardView; | 77 | AddresseeCardView *mCardView; |
76 | bool mShowEmptyFields; | 78 | bool mShowEmptyFields; |
77 | }; | 79 | }; |
78 | 80 | ||
79 | class AddresseeCardView : public CardView | 81 | class AddresseeCardView : public CardView |
80 | { | 82 | { |
81 | Q_OBJECT | 83 | Q_OBJECT |
82 | public: | 84 | public: |
83 | AddresseeCardView(QWidget *parent, const char *name = 0); | 85 | AddresseeCardView(QWidget *parent, const char *name = 0); |
84 | ~AddresseeCardView(); | 86 | ~AddresseeCardView(); |
85 | 87 | ||
86 | signals: | 88 | signals: |
87 | void startAddresseeDrag(); | 89 | void startAddresseeDrag(); |
88 | void addresseeDropped(QDropEvent *); | 90 | void addresseeDropped(QDropEvent *); |
89 | 91 | ||
90 | protected: | 92 | protected: |
91 | virtual void dragEnterEvent(QDragEnterEvent *); | 93 | virtual void dragEnterEvent(QDragEnterEvent *); |
92 | virtual void dropEvent(QDropEvent *); | 94 | virtual void dropEvent(QDropEvent *); |
93 | virtual void startDrag(); | 95 | virtual void startDrag(); |
94 | }; | 96 | }; |
95 | 97 | ||
96 | 98 | ||
97 | class CardViewFactory : public ViewFactory | 99 | class CardViewFactory : public ViewFactory |
98 | { | 100 | { |
99 | public: | 101 | public: |
100 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) | 102 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) |
101 | { | 103 | { |
102 | return new KAddressBookCardView( ab, parent, name ); | 104 | return new KAddressBookCardView( ab, parent, name ); |
103 | } | 105 | } |
104 | 106 | ||
105 | QString type() const { return "Card"; } | 107 | QString type() const { return "Card"; } |
106 | 108 | ||
107 | QString description() const { return i18n( "Rolodex style cards represent contacts." ); } | 109 | QString description() const { return i18n( "Rolodex style cards represent contacts." ); } |
108 | 110 | ||
109 | ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, QWidget *parent, | 111 | ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, QWidget *parent, |
110 | const char *name = 0 ) | 112 | const char *name = 0 ) |
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index fdc0db9..f4c68b8 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp | |||
@@ -1,91 +1,92 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> | 3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef KAB_EMBEDDED | 24 | #ifndef KAB_EMBEDDED |
25 | #include <qiconview.h> | 25 | #include <qiconview.h> |
26 | #include <qstringlist.h> | 26 | #include <qstringlist.h> |
27 | 27 | ||
28 | #include <kabc/addressee.h> | 28 | #include <kabc/addressee.h> |
29 | #include <kconfig.h> | 29 | #include <kconfig.h> |
30 | #include <kdebug.h> | 30 | #include <kdebug.h> |
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kiconloader.h> | 32 | #include <kiconloader.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | 34 | ||
35 | #else //KAB_EMBEDDED | 35 | #else //KAB_EMBEDDED |
36 | #endif //KAB_EMBEDDED | 36 | #endif //KAB_EMBEDDED |
37 | 37 | ||
38 | #include <kabc/addressbook.h> | 38 | #include <kabc/addressbook.h> |
39 | #include "kabprefs.h" | 39 | #include "kabprefs.h" |
40 | #include "viewmanager.h" | 40 | #include "viewmanager.h" |
41 | #include "kaddressbookiconview.h" | 41 | #include "kaddressbookiconview.h" |
42 | #include <qlayout.h> | 42 | #include <qlayout.h> |
43 | #include <qregexp.h> | 43 | #include <qregexp.h> |
44 | #include <qapplication.h> | ||
44 | #include <kglobal.h> | 45 | #include <kglobal.h> |
45 | /*US transfered to the headerfile | 46 | /*US transfered to the headerfile |
46 | class IconViewFactory : public ViewFactory | 47 | class IconViewFactory : public ViewFactory |
47 | { | 48 | { |
48 | public: | 49 | public: |
49 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) | 50 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) |
50 | { | 51 | { |
51 | return new KAddressBookIconView( ab, parent, name ); | 52 | return new KAddressBookIconView( ab, parent, name ); |
52 | } | 53 | } |
53 | 54 | ||
54 | QString type() const { return "Icon"; } | 55 | QString type() const { return "Icon"; } |
55 | 56 | ||
56 | QString description() const { return i18n( "Icons represent contacts. Very simple view." ); } | 57 | QString description() const { return i18n( "Icons represent contacts. Very simple view." ); } |
57 | }; | 58 | }; |
58 | 59 | ||
59 | */ | 60 | */ |
60 | 61 | ||
61 | extern "C" { | 62 | extern "C" { |
62 | void *init_libkaddrbk_iconview() | 63 | void *init_libkaddrbk_iconview() |
63 | { | 64 | { |
64 | return ( new IconViewFactory ); | 65 | return ( new IconViewFactory ); |
65 | } | 66 | } |
66 | } | 67 | } |
67 | 68 | ||
68 | //////////////////////////////// | 69 | //////////////////////////////// |
69 | // AddresseeIconView (internal class) | 70 | // AddresseeIconView (internal class) |
70 | #ifndef KAB_EMBEDDED | 71 | #ifndef KAB_EMBEDDED |
71 | AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name) | 72 | AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name) |
72 | : KIconView(parent, name) | 73 | : KIconView(parent, name) |
73 | #else //KAB_EMBEDDED | 74 | #else //KAB_EMBEDDED |
74 | AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name) | 75 | AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name) |
75 | : QIconView(parent, name) | 76 | : QIconView(parent, name) |
76 | #endif //KAB_EMBEDDED | 77 | #endif //KAB_EMBEDDED |
77 | 78 | ||
78 | { | 79 | { |
79 | setSelectionMode( QIconView::Extended ); | 80 | setSelectionMode( QIconView::Extended ); |
80 | setResizeMode( QIconView::Adjust ); | 81 | setResizeMode( QIconView::Adjust ); |
81 | setWordWrapIconText( true ); | 82 | setWordWrapIconText( true ); |
82 | setGridX( 100 ); | 83 | setGridX( 100 ); |
83 | setItemsMovable(false); | 84 | setItemsMovable(false); |
84 | setSorting(true, true); | 85 | setSorting(true, true); |
85 | 86 | ||
86 | 87 | ||
87 | //US ??? setMode( KIconView::Select ); | 88 | //US ??? setMode( KIconView::Select ); |
88 | 89 | ||
89 | #ifndef KAB_EMBEDDED | 90 | #ifndef KAB_EMBEDDED |
90 | 91 | ||
91 | connect(this, SIGNAL(dropped(QDropEvent*, const QValueList<QIconDragItem>&)), | 92 | connect(this, SIGNAL(dropped(QDropEvent*, const QValueList<QIconDragItem>&)), |
@@ -166,165 +167,181 @@ class AddresseeIconViewItem : public QIconViewItem | |||
166 | icon.convertFromImage(img.smoothScale(32, 32)); | 167 | icon.convertFromImage(img.smoothScale(32, 32)); |
167 | #endif //KAB_EMBEDDED | 168 | #endif //KAB_EMBEDDED |
168 | 169 | ||
169 | } else | 170 | } else |
170 | icon = defaultIcon; | 171 | icon = defaultIcon; |
171 | 172 | ||
172 | setPixmap( icon ); | 173 | setPixmap( icon ); |
173 | } | 174 | } |
174 | 175 | ||
175 | private: | 176 | private: |
176 | KABC::Field::List mFields; | 177 | KABC::Field::List mFields; |
177 | KABC::AddressBook *mDocument; | 178 | KABC::AddressBook *mDocument; |
178 | KABC::Addressee mAddressee; | 179 | KABC::Addressee mAddressee; |
179 | }; | 180 | }; |
180 | 181 | ||
181 | /////////////////////////////// | 182 | /////////////////////////////// |
182 | // KAddressBookView | 183 | // KAddressBookView |
183 | 184 | ||
184 | KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab, | 185 | KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab, |
185 | QWidget *parent, const char *name) | 186 | QWidget *parent, const char *name) |
186 | : KAddressBookView( ab, parent, name ) | 187 | : KAddressBookView( ab, parent, name ) |
187 | { | 188 | { |
188 | // Init the GUI | 189 | // Init the GUI |
189 | QVBoxLayout *layout = new QVBoxLayout(viewWidget()); | 190 | QVBoxLayout *layout = new QVBoxLayout(viewWidget()); |
190 | 191 | ||
191 | mIconView = new AddresseeIconView(viewWidget(), "mIconView"); | 192 | mIconView = new AddresseeIconView(viewWidget(), "mIconView"); |
192 | layout->addWidget(mIconView); | 193 | layout->addWidget(mIconView); |
193 | 194 | ||
194 | // Connect up the signals | 195 | // Connect up the signals |
195 | 196 | ||
196 | //US method executed is part of KIconView | 197 | //US method executed is part of KIconView |
197 | //US connect(mIconView, SIGNAL(executed(QIconViewItem *)), | 198 | //US connect(mIconView, SIGNAL(executed(QIconViewItem *)), |
198 | //US this, SLOT(addresseeExecuted(QIconViewItem *))); | 199 | //US this, SLOT(addresseeExecuted(QIconViewItem *))); |
199 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), | 200 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), |
200 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 201 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
201 | 202 | ||
202 | connect(mIconView, SIGNAL(selectionChanged()), | 203 | connect(mIconView, SIGNAL(selectionChanged()), |
203 | this, SLOT(addresseeSelected())); | 204 | this, SLOT(addresseeSelected())); |
204 | connect(mIconView, SIGNAL(addresseeDropped(QDropEvent*)), | 205 | connect(mIconView, SIGNAL(addresseeDropped(QDropEvent*)), |
205 | this, SIGNAL(dropped(QDropEvent*))); | 206 | this, SIGNAL(dropped(QDropEvent*))); |
206 | connect(mIconView, SIGNAL(startAddresseeDrag()), | 207 | connect(mIconView, SIGNAL(startAddresseeDrag()), |
207 | this, SIGNAL(startDrag())); | 208 | this, SIGNAL(startDrag())); |
208 | } | 209 | } |
209 | 210 | ||
210 | KAddressBookIconView::~KAddressBookIconView() | 211 | KAddressBookIconView::~KAddressBookIconView() |
211 | { | 212 | { |
212 | } | 213 | } |
213 | 214 | ||
215 | void KAddressBookIconView::scrollUP() | ||
216 | { | ||
217 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); | ||
218 | QApplication::postEvent( mIconView, ev ); | ||
219 | } | ||
220 | void KAddressBookIconView::scrollDOWN() | ||
221 | { | ||
222 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); | ||
223 | QApplication::postEvent( mIconView, ev ); | ||
224 | } | ||
214 | void KAddressBookIconView::readConfig(KConfig *config) | 225 | void KAddressBookIconView::readConfig(KConfig *config) |
215 | { | 226 | { |
216 | KAddressBookView::readConfig(config); | 227 | KAddressBookView::readConfig(config); |
217 | 228 | ||
218 | //US method executed is part of KIconView | 229 | //US method executed is part of KIconView |
219 | //US disconnect(mIconView, SIGNAL(executed(QIconViewItem *)), | 230 | //US disconnect(mIconView, SIGNAL(executed(QIconViewItem *)), |
220 | //US this, SLOT(addresseeExecuted(QIconViewItem *))); | 231 | //US this, SLOT(addresseeExecuted(QIconViewItem *))); |
221 | disconnect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), | 232 | disconnect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), |
222 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 233 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
223 | 234 | ||
224 | //US method executed is part of KIconView. Use selectionChanged instead | 235 | //US method executed is part of KIconView. Use selectionChanged instead |
225 | /*US | 236 | /*US |
226 | if (KABPrefs::instance()->mHonorSingleClick) | 237 | if (KABPrefs::instance()->mHonorSingleClick) |
227 | connect(mIconView, SIGNAL(executed(QIconViewItem *)), | 238 | connect(mIconView, SIGNAL(executed(QIconViewItem *)), |
228 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 239 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
229 | else | 240 | else |
230 | connect(mIconView, SIGNAL(doubleClicked(QIconViewItem *)), | 241 | connect(mIconView, SIGNAL(doubleClicked(QIconViewItem *)), |
231 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 242 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
232 | */ | 243 | */ |
233 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), | 244 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), |
234 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 245 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
235 | 246 | ||
236 | } | 247 | } |
237 | void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field ) | 248 | void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field ) |
238 | { | 249 | { |
239 | mIconView->clear(); | 250 | mIconView->clear(); |
240 | mIconList.clear(); | 251 | mIconList.clear(); |
241 | if ( s.isEmpty() || s == "*" ) { | 252 | if ( s.isEmpty() || s == "*" ) { |
242 | refresh(); | 253 | refresh(); |
243 | return; | 254 | return; |
244 | } | 255 | } |
245 | QString pattern = s.lower()+"*"; | 256 | QString pattern = s.lower()+"*"; |
246 | QRegExp re; | 257 | QRegExp re; |
247 | re.setWildcard(true); // most people understand these better. | 258 | re.setWildcard(true); // most people understand these better. |
248 | re.setCaseSensitive(false); | 259 | re.setCaseSensitive(false); |
249 | re.setPattern( pattern ); | 260 | re.setPattern( pattern ); |
250 | if (!re.isValid()) | 261 | if (!re.isValid()) |
251 | return; | 262 | return; |
252 | KABC::Addressee::List addresseeList = addressees(); | 263 | KABC::Addressee::List addresseeList = addressees(); |
253 | KABC::Addressee::List::Iterator it; | 264 | KABC::Addressee::List::Iterator it; |
254 | if ( field ) { | 265 | if ( field ) { |
255 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 266 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
256 | #if QT_VERSION >= 300 | 267 | #if QT_VERSION >= 300 |
257 | if (re.search(field->value( *it ).lower()) != -1) | 268 | if (re.search(field->value( *it ).lower()) != -1) |
258 | #else | 269 | #else |
259 | if (re.match(field->value( *it ).lower()) != -1) | 270 | if (re.match(field->value( *it ).lower()) != -1) |
260 | #endif | 271 | #endif |
261 | mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); | 272 | mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); |
262 | 273 | ||
263 | 274 | ||
264 | } | 275 | } |
265 | } else { | 276 | } else { |
266 | KABC::Field::List fieldList = fields(); | 277 | KABC::Field::List fieldList = fields(); |
267 | KABC::Field::List::ConstIterator fieldIt; | 278 | KABC::Field::List::ConstIterator fieldIt; |
268 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 279 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
269 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 280 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
270 | #if QT_VERSION >= 300 | 281 | #if QT_VERSION >= 300 |
271 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | 282 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) |
272 | #else | 283 | #else |
273 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | 284 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) |
274 | #endif | 285 | #endif |
275 | { | 286 | { |
276 | mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); | 287 | mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); |
277 | continue; | 288 | continue; |
278 | } | 289 | } |
279 | } | 290 | } |
280 | } | 291 | } |
281 | } | 292 | } |
282 | mIconView->arrangeItemsInGrid( true ); | 293 | mIconView->arrangeItemsInGrid( true ); |
294 | if ( mIconView->firstItem() ) { | ||
295 | mIconView->setCurrentItem ( mIconView->firstItem() ); | ||
296 | mIconView->setSelected ( mIconView->firstItem() , true ); | ||
297 | } | ||
298 | else | ||
299 | emit selected(QString::null); | ||
283 | } | 300 | } |
284 | QStringList KAddressBookIconView::selectedUids() | 301 | QStringList KAddressBookIconView::selectedUids() |
285 | { | 302 | { |
286 | QStringList uidList; | 303 | QStringList uidList; |
287 | QIconViewItem *item; | 304 | QIconViewItem *item; |
288 | AddresseeIconViewItem *aItem; | 305 | AddresseeIconViewItem *aItem; |
289 | 306 | ||
290 | for (item = mIconView->firstItem(); item; item = item->nextItem()) | 307 | for (item = mIconView->firstItem(); item; item = item->nextItem()) |
291 | { | 308 | { |
292 | if (item->isSelected()) | 309 | if (item->isSelected()) |
293 | { | 310 | { |
294 | #ifndef KAB_EMBEDDED | 311 | #ifndef KAB_EMBEDDED |
295 | aItem = dynamic_cast<AddresseeIconViewItem*>(item); | 312 | aItem = dynamic_cast<AddresseeIconViewItem*>(item); |
296 | #else //KAB_EMBEDDED | 313 | #else //KAB_EMBEDDED |
297 | aItem = (AddresseeIconViewItem*)(item); | 314 | aItem = (AddresseeIconViewItem*)(item); |
298 | #endif //KAB_EMBEDDED | 315 | #endif //KAB_EMBEDDED |
299 | if (aItem) | 316 | if (aItem) |
300 | uidList << aItem->addressee().uid(); | 317 | uidList << aItem->addressee().uid(); |
301 | } | 318 | } |
302 | } | 319 | } |
303 | 320 | ||
304 | return uidList; | 321 | return uidList; |
305 | } | 322 | } |
306 | 323 | ||
307 | void KAddressBookIconView::refresh(QString uid) | 324 | void KAddressBookIconView::refresh(QString uid) |
308 | { | 325 | { |
309 | QIconViewItem *item; | 326 | QIconViewItem *item; |
310 | AddresseeIconViewItem *aItem; | 327 | AddresseeIconViewItem *aItem; |
311 | 328 | ||
312 | if ( uid.isNull() ) { | 329 | if ( uid.isNull() ) { |
313 | // Rebuild the view | 330 | // Rebuild the view |
314 | mIconView->clear(); | 331 | mIconView->clear(); |
315 | mIconList.clear(); | 332 | mIconList.clear(); |
316 | 333 | ||
317 | KABC::Addressee::List addresseeList = addressees(); | 334 | KABC::Addressee::List addresseeList = addressees(); |
318 | KABC::Addressee::List::Iterator iter; | 335 | KABC::Addressee::List::Iterator iter; |
319 | for ( iter = addresseeList.begin(); iter != addresseeList.end(); ++iter ) { | 336 | for ( iter = addresseeList.begin(); iter != addresseeList.end(); ++iter ) { |
320 | if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") ) | 337 | if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") ) |
321 | continue; | 338 | continue; |
322 | aItem = new AddresseeIconViewItem( fields(), addressBook(), *iter, mIconView ); | 339 | aItem = new AddresseeIconViewItem( fields(), addressBook(), *iter, mIconView ); |
323 | } | 340 | } |
324 | 341 | ||
325 | mIconView->arrangeItemsInGrid( true ); | 342 | mIconView->arrangeItemsInGrid( true ); |
326 | 343 | ||
327 | for ( item = mIconView->firstItem(); item; item = item->nextItem() ) | 344 | for ( item = mIconView->firstItem(); item; item = item->nextItem() ) |
328 | { | 345 | { |
329 | #ifndef KAB_EMBEDDED | 346 | #ifndef KAB_EMBEDDED |
330 | AddresseeIconViewItem* aivi = dynamic_cast<AddresseeIconViewItem*>( item ); | 347 | AddresseeIconViewItem* aivi = dynamic_cast<AddresseeIconViewItem*>( item ); |
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index 963ee7c..acfcd71 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h | |||
@@ -16,96 +16,98 @@ | |||
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef KADDRESSBOOKICONVIEW_H | 24 | #ifndef KADDRESSBOOKICONVIEW_H |
25 | #define KADDRESSBOOKICONVIEW_H | 25 | #define KADDRESSBOOKICONVIEW_H |
26 | 26 | ||
27 | #include <qstring.h> | 27 | #include <qstring.h> |
28 | #ifndef KAB_EMBEDDED | 28 | #ifndef KAB_EMBEDDED |
29 | #include <kiconview.h> | 29 | #include <kiconview.h> |
30 | #else //KAB_EMBEDDED | 30 | #else //KAB_EMBEDDED |
31 | #include <qiconview.h> | 31 | #include <qiconview.h> |
32 | #include <qptrlist.h> | 32 | #include <qptrlist.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #endif //KAB_EMBEDDED | 34 | #endif //KAB_EMBEDDED |
35 | #include "kaddressbookview.h" | 35 | #include "kaddressbookview.h" |
36 | 36 | ||
37 | class QIconViewItem; | 37 | class QIconViewItem; |
38 | class KConfig; | 38 | class KConfig; |
39 | class AddresseeIconView; | 39 | class AddresseeIconView; |
40 | class AddresseeIconViewItem; | 40 | class AddresseeIconViewItem; |
41 | class QIconDragItem; | 41 | class QIconDragItem; |
42 | class KAddressBookIconView; | 42 | class KAddressBookIconView; |
43 | 43 | ||
44 | namespace KABC { class AddressBook; } | 44 | namespace KABC { class AddressBook; } |
45 | 45 | ||
46 | /** This is an example kaddressbook view that is implemented using | 46 | /** This is an example kaddressbook view that is implemented using |
47 | * KIconView. This view is not the most useful view, but it displays | 47 | * KIconView. This view is not the most useful view, but it displays |
48 | * how simple implementing a new view can be. | 48 | * how simple implementing a new view can be. |
49 | */ | 49 | */ |
50 | class KAddressBookIconView : public KAddressBookView | 50 | class KAddressBookIconView : public KAddressBookView |
51 | { | 51 | { |
52 | Q_OBJECT | 52 | Q_OBJECT |
53 | 53 | ||
54 | public: | 54 | public: |
55 | KAddressBookIconView( KABC::AddressBook *ab, QWidget *parent, | 55 | KAddressBookIconView( KABC::AddressBook *ab, QWidget *parent, |
56 | const char *name = 0 ); | 56 | const char *name = 0 ); |
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 | void doSearch( const QString& s ,KABC::Field *field ); |
62 | 62 | ||
63 | virtual void readConfig(KConfig *config); | 63 | virtual void readConfig(KConfig *config); |
64 | virtual void scrollUP(); | ||
65 | virtual void scrollDOWN(); | ||
64 | 66 | ||
65 | public slots: | 67 | public slots: |
66 | void refresh(QString uid = QString::null); | 68 | void refresh(QString uid = QString::null); |
67 | #ifndef KAB_EMBEDDED | 69 | #ifndef KAB_EMBEDDED |
68 | //MOC_SKIP_BEGIN | 70 | //MOC_SKIP_BEGIN |
69 | void setSelected(QString uid = QString::null, bool selected = true); | 71 | void setSelected(QString uid = QString::null, bool selected = true); |
70 | //MOC_SKIP_END | 72 | //MOC_SKIP_END |
71 | #else //KAB_EMBEDDED | 73 | #else //KAB_EMBEDDED |
72 | //US my MOC do not like default parameters ??? | 74 | //US my MOC do not like default parameters ??? |
73 | void setSelected(QString uid, bool selected); | 75 | void setSelected(QString uid, bool selected); |
74 | #endif //KAB_EMBEDDED | 76 | #endif //KAB_EMBEDDED |
75 | 77 | ||
76 | protected slots: | 78 | protected slots: |
77 | void addresseeExecuted(QIconViewItem *item); | 79 | void addresseeExecuted(QIconViewItem *item); |
78 | void addresseeSelected(); | 80 | void addresseeSelected(); |
79 | 81 | ||
80 | private: | 82 | private: |
81 | AddresseeIconView *mIconView; | 83 | AddresseeIconView *mIconView; |
82 | QPtrList<AddresseeIconViewItem> mIconList; | 84 | QPtrList<AddresseeIconViewItem> mIconList; |
83 | }; | 85 | }; |
84 | 86 | ||
85 | 87 | ||
86 | #ifndef KAB_EMBEDDED | 88 | #ifndef KAB_EMBEDDED |
87 | //MOC_SKIP_BEGIN | 89 | //MOC_SKIP_BEGIN |
88 | class AddresseeIconView : public KIconView | 90 | class AddresseeIconView : public KIconView |
89 | //MOC_SKIP_END | 91 | //MOC_SKIP_END |
90 | #else //KAB_EMBEDDED | 92 | #else //KAB_EMBEDDED |
91 | class AddresseeIconView : public QIconView | 93 | class AddresseeIconView : public QIconView |
92 | #endif //KAB_EMBEDDED | 94 | #endif //KAB_EMBEDDED |
93 | { | 95 | { |
94 | Q_OBJECT | 96 | Q_OBJECT |
95 | 97 | ||
96 | public: | 98 | public: |
97 | AddresseeIconView(QWidget *parent, const char *name); | 99 | AddresseeIconView(QWidget *parent, const char *name); |
98 | ~AddresseeIconView(); | 100 | ~AddresseeIconView(); |
99 | 101 | ||
100 | signals: | 102 | signals: |
101 | void addresseeDropped(QDropEvent *); | 103 | void addresseeDropped(QDropEvent *); |
102 | void startAddresseeDrag(); | 104 | void startAddresseeDrag(); |
103 | 105 | ||
104 | protected: | 106 | protected: |
105 | virtual QDragObject *dragObject(); | 107 | virtual QDragObject *dragObject(); |
106 | 108 | ||
107 | protected slots: | 109 | protected slots: |
108 | void itemDropped(QDropEvent *, const QValueList<QIconDragItem> &); | 110 | void itemDropped(QDropEvent *, const QValueList<QIconDragItem> &); |
109 | }; | 111 | }; |
110 | 112 | ||
111 | class IconViewFactory : public ViewFactory | 113 | class IconViewFactory : public ViewFactory |
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index fbfddba..2412170 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -6,97 +6,106 @@ | |||
6 | #include <qfile.h> | 6 | #include <qfile.h> |
7 | #include <qimage.h> | 7 | #include <qimage.h> |
8 | #include <qcombobox.h> | 8 | #include <qcombobox.h> |
9 | #include <qapplication.h> | 9 | #include <qapplication.h> |
10 | #include <qdragobject.h> | 10 | #include <qdragobject.h> |
11 | #include <qevent.h> | 11 | #include <qevent.h> |
12 | #include <qurl.h> | 12 | #include <qurl.h> |
13 | #include <qpixmap.h> | 13 | #include <qpixmap.h> |
14 | 14 | ||
15 | #include <kabc/addressbook.h> | 15 | #include <kabc/addressbook.h> |
16 | #include <kapplication.h> | 16 | #include <kapplication.h> |
17 | #include <kconfig.h> | 17 | #include <kconfig.h> |
18 | #include <kcolorbutton.h> | 18 | #include <kcolorbutton.h> |
19 | #include <kdebug.h> | 19 | #include <kdebug.h> |
20 | #include <kglobal.h> | 20 | #include <kglobal.h> |
21 | #include <kiconloader.h> | 21 | #include <kiconloader.h> |
22 | #include <klineedit.h> | 22 | #include <klineedit.h> |
23 | #include <klocale.h> | 23 | #include <klocale.h> |
24 | #include <kmessagebox.h> | 24 | #include <kmessagebox.h> |
25 | #include <kurl.h> | 25 | #include <kurl.h> |
26 | #include <kurlrequester.h> | 26 | #include <kurlrequester.h> |
27 | 27 | ||
28 | //US#include "configuretableviewdialog.h" | 28 | //US#include "configuretableviewdialog.h" |
29 | #include "contactlistview.h" | 29 | #include "contactlistview.h" |
30 | #include "kabprefs.h" | 30 | #include "kabprefs.h" |
31 | #include "undocmds.h" | 31 | #include "undocmds.h" |
32 | #include "viewmanager.h" | 32 | #include "viewmanager.h" |
33 | 33 | ||
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | #include <qheader.h> | 35 | #include <qheader.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | 37 | ||
38 | #include "kaddressbooktableview.h" | 38 | #include "kaddressbooktableview.h" |
39 | 39 | ||
40 | 40 | ||
41 | KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, | 41 | KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, |
42 | QWidget *parent, const char *name ) | 42 | QWidget *parent, const char *name ) |
43 | : KAddressBookView( ab, parent, name ) | 43 | : KAddressBookView( ab, parent, name ) |
44 | { | 44 | { |
45 | mainLayout = new QVBoxLayout( viewWidget(), 2 ); | 45 | mainLayout = new QVBoxLayout( viewWidget(), 2 ); |
46 | 46 | ||
47 | // The list view will be created when the config is read. | 47 | // The list view will be created when the config is read. |
48 | mListView = 0; | 48 | mListView = 0; |
49 | } | 49 | } |
50 | 50 | ||
51 | KAddressBookTableView::~KAddressBookTableView() | 51 | KAddressBookTableView::~KAddressBookTableView() |
52 | { | 52 | { |
53 | } | 53 | } |
54 | 54 | void KAddressBookTableView::scrollUP() | |
55 | { | ||
56 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); | ||
57 | QApplication::postEvent( mListView, ev ); | ||
58 | } | ||
59 | void KAddressBookTableView::scrollDOWN() | ||
60 | { | ||
61 | QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); | ||
62 | QApplication::postEvent( mListView, ev ); | ||
63 | } | ||
55 | void KAddressBookTableView::reconstructListView() | 64 | void KAddressBookTableView::reconstructListView() |
56 | { | 65 | { |
57 | if (mListView) | 66 | if (mListView) |
58 | { | 67 | { |
59 | disconnect(mListView, SIGNAL(selectionChanged()), | 68 | disconnect(mListView, SIGNAL(selectionChanged()), |
60 | this, SLOT(addresseeSelected())); | 69 | this, SLOT(addresseeSelected())); |
61 | disconnect(mListView, SIGNAL(executed(QListViewItem*)), | 70 | disconnect(mListView, SIGNAL(executed(QListViewItem*)), |
62 | this, SLOT(addresseeExecuted(QListViewItem*))); | 71 | this, SLOT(addresseeExecuted(QListViewItem*))); |
63 | disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), | 72 | disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), |
64 | this, SLOT(addresseeExecuted(QListViewItem*))); | 73 | this, SLOT(addresseeExecuted(QListViewItem*))); |
65 | disconnect(mListView, SIGNAL(startAddresseeDrag()), this, | 74 | disconnect(mListView, SIGNAL(startAddresseeDrag()), this, |
66 | SIGNAL(startDrag())); | 75 | SIGNAL(startDrag())); |
67 | disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), | 76 | disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), |
68 | this, SLOT(addresseeExecuted(QListViewItem*))); | 77 | this, SLOT(addresseeExecuted(QListViewItem*))); |
69 | 78 | ||
70 | disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, | 79 | disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, |
71 | SIGNAL(dropped(QDropEvent*))); | 80 | SIGNAL(dropped(QDropEvent*))); |
72 | delete mListView; | 81 | delete mListView; |
73 | } | 82 | } |
74 | 83 | ||
75 | mListView = new ContactListView( this, addressBook(), viewWidget() ); | 84 | mListView = new ContactListView( this, addressBook(), viewWidget() ); |
76 | 85 | ||
77 | // Add the columns | 86 | // Add the columns |
78 | KABC::Field::List fieldList = fields(); | 87 | KABC::Field::List fieldList = fields(); |
79 | KABC::Field::List::ConstIterator it; | 88 | KABC::Field::List::ConstIterator it; |
80 | 89 | ||
81 | int c = 0; | 90 | int c = 0; |
82 | for( it = fieldList.begin(); it != fieldList.end(); ++it ) { | 91 | for( it = fieldList.begin(); it != fieldList.end(); ++it ) { |
83 | mListView->addColumn( (*it)->label() ); | 92 | mListView->addColumn( (*it)->label() ); |
84 | mListView->setColumnWidthMode(c++, QListView::Manual); | 93 | mListView->setColumnWidthMode(c++, QListView::Manual); |
85 | //US | 94 | //US |
86 | // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); | 95 | // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); |
87 | } | 96 | } |
88 | 97 | ||
89 | connect(mListView, SIGNAL(selectionChanged()), | 98 | connect(mListView, SIGNAL(selectionChanged()), |
90 | this, SLOT(addresseeSelected())); | 99 | this, SLOT(addresseeSelected())); |
91 | connect(mListView, SIGNAL(startAddresseeDrag()), this, | 100 | connect(mListView, SIGNAL(startAddresseeDrag()), this, |
92 | SIGNAL(startDrag())); | 101 | SIGNAL(startDrag())); |
93 | connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, | 102 | connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, |
94 | SIGNAL(dropped(QDropEvent*))); | 103 | SIGNAL(dropped(QDropEvent*))); |
95 | 104 | ||
96 | if (KABPrefs::instance()->mHonorSingleClick) | 105 | if (KABPrefs::instance()->mHonorSingleClick) |
97 | connect(mListView, SIGNAL(executed(QListViewItem*)), | 106 | connect(mListView, SIGNAL(executed(QListViewItem*)), |
98 | this, SLOT(addresseeExecuted(QListViewItem*))); | 107 | this, SLOT(addresseeExecuted(QListViewItem*))); |
99 | else | 108 | else |
100 | connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), | 109 | connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), |
101 | this, SLOT(addresseeExecuted(QListViewItem*))); | 110 | this, SLOT(addresseeExecuted(QListViewItem*))); |
102 | connect(mListView, SIGNAL(returnPressed(QListViewItem*)), | 111 | connect(mListView, SIGNAL(returnPressed(QListViewItem*)), |
@@ -114,97 +123,102 @@ void KAddressBookTableView::reconstructListView() | |||
114 | } | 123 | } |
115 | 124 | ||
116 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) | 125 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) |
117 | { | 126 | { |
118 | mListView->clear(); | 127 | mListView->clear(); |
119 | if ( s.isEmpty() || s == "*" ) { | 128 | if ( s.isEmpty() || s == "*" ) { |
120 | refresh(); | 129 | refresh(); |
121 | return; | 130 | return; |
122 | } | 131 | } |
123 | QString pattern = s.lower()+"*"; | 132 | QString pattern = s.lower()+"*"; |
124 | QRegExp re; | 133 | QRegExp re; |
125 | re.setWildcard(true); // most people understand these better. | 134 | re.setWildcard(true); // most people understand these better. |
126 | re.setCaseSensitive(false); | 135 | re.setCaseSensitive(false); |
127 | re.setPattern( pattern ); | 136 | re.setPattern( pattern ); |
128 | if (!re.isValid()) | 137 | if (!re.isValid()) |
129 | return; | 138 | return; |
130 | KABC::Addressee::List addresseeList = addressees(); | 139 | KABC::Addressee::List addresseeList = addressees(); |
131 | KABC::Addressee::List::Iterator it; | 140 | KABC::Addressee::List::Iterator it; |
132 | if ( field ) { | 141 | if ( field ) { |
133 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 142 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
134 | #if QT_VERSION >= 300 | 143 | #if QT_VERSION >= 300 |
135 | if (re.search(field->value( *it ).lower()) != -1) | 144 | if (re.search(field->value( *it ).lower()) != -1) |
136 | #else | 145 | #else |
137 | if (re.match(field->value( *it ).lower()) != -1) | 146 | if (re.match(field->value( *it ).lower()) != -1) |
138 | #endif | 147 | #endif |
139 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | 148 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); |
140 | 149 | ||
141 | } | 150 | } |
142 | } else { | 151 | } else { |
143 | KABC::Field::List fieldList = fields(); | 152 | KABC::Field::List fieldList = fields(); |
144 | KABC::Field::List::ConstIterator fieldIt; | 153 | KABC::Field::List::ConstIterator fieldIt; |
145 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 154 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
146 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 155 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
147 | #if QT_VERSION >= 300 | 156 | #if QT_VERSION >= 300 |
148 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | 157 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) |
149 | #else | 158 | #else |
150 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | 159 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) |
151 | #endif | 160 | #endif |
152 | { | 161 | { |
153 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | 162 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); |
154 | break; | 163 | break; |
155 | } | 164 | } |
156 | } | 165 | } |
157 | } | 166 | } |
158 | } | 167 | } |
159 | // Sometimes the background pixmap gets messed up when we add lots | 168 | // Sometimes the background pixmap gets messed up when we add lots |
160 | // of items. | 169 | // of items. |
161 | mListView->repaint(); | 170 | mListView->repaint(); |
162 | emit selected(QString::null); | 171 | if ( mListView->firstChild() ) { |
172 | mListView->setCurrentItem ( mListView->firstChild() ); | ||
173 | mListView->setSelected ( mListView->firstChild(), true ); | ||
174 | } | ||
175 | else | ||
176 | emit selected(QString::null); | ||
163 | 177 | ||
164 | } | 178 | } |
165 | void KAddressBookTableView::writeConfig(KConfig *config) | 179 | void KAddressBookTableView::writeConfig(KConfig *config) |
166 | { | 180 | { |
167 | KAddressBookView::writeConfig(config); | 181 | KAddressBookView::writeConfig(config); |
168 | 182 | ||
169 | mListView->saveLayout(config, config->group()); | 183 | mListView->saveLayout(config, config->group()); |
170 | } | 184 | } |
171 | 185 | ||
172 | void KAddressBookTableView::readConfig(KConfig *config) | 186 | void KAddressBookTableView::readConfig(KConfig *config) |
173 | { | 187 | { |
174 | KAddressBookView::readConfig( config ); | 188 | KAddressBookView::readConfig( config ); |
175 | // The config could have changed the fields, so we need to reconstruct | 189 | // The config could have changed the fields, so we need to reconstruct |
176 | // the listview. | 190 | // the listview. |
177 | reconstructListView(); | 191 | reconstructListView(); |
178 | 192 | ||
179 | // costum colors? | 193 | // costum colors? |
180 | if ( config->readBoolEntry( "EnableCustomColors", false ) ) | 194 | if ( config->readBoolEntry( "EnableCustomColors", false ) ) |
181 | { | 195 | { |
182 | QPalette p( mListView->palette() ); | 196 | QPalette p( mListView->palette() ); |
183 | QColor c = p.color(QPalette::Normal, QColorGroup::Base ); | 197 | QColor c = p.color(QPalette::Normal, QColorGroup::Base ); |
184 | p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); | 198 | p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); |
185 | c = p.color(QPalette::Normal, QColorGroup::Text ); | 199 | c = p.color(QPalette::Normal, QColorGroup::Text ); |
186 | p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); | 200 | p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); |
187 | c = p.color(QPalette::Normal, QColorGroup::Button ); | 201 | c = p.color(QPalette::Normal, QColorGroup::Button ); |
188 | p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); | 202 | p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); |
189 | c = p.color(QPalette::Normal, QColorGroup::ButtonText ); | 203 | c = p.color(QPalette::Normal, QColorGroup::ButtonText ); |
190 | p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); | 204 | p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); |
191 | c = p.color(QPalette::Normal, QColorGroup::Highlight ); | 205 | c = p.color(QPalette::Normal, QColorGroup::Highlight ); |
192 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); | 206 | p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); |
193 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); | 207 | c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); |
194 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); | 208 | p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); |
195 | #ifndef KAB_EMBEDDED | 209 | #ifndef KAB_EMBEDDED |
196 | c = KGlobalSettings::alternateBackgroundColor(); | 210 | c = KGlobalSettings::alternateBackgroundColor(); |
197 | #else //KAB_EMBEDDED | 211 | #else //KAB_EMBEDDED |
198 | c = QColor(240, 240, 240); | 212 | c = QColor(240, 240, 240); |
199 | #endif //KAB_EMBEDDED | 213 | #endif //KAB_EMBEDDED |
200 | c = config->readColorEntry ("AlternatingBackgroundColor", &c); | 214 | c = config->readColorEntry ("AlternatingBackgroundColor", &c); |
201 | mListView->setAlternateColor(c); | 215 | mListView->setAlternateColor(c); |
202 | 216 | ||
203 | 217 | ||
204 | //US mListView->viewport()->setPalette( p ); | 218 | //US mListView->viewport()->setPalette( p ); |
205 | mListView->setPalette( p ); | 219 | mListView->setPalette( p ); |
206 | } | 220 | } |
207 | else | 221 | else |
208 | { | 222 | { |
209 | // needed if turned off during a session. | 223 | // needed if turned off during a session. |
210 | //US mListView->viewport()->setPalette( mListView->palette() ); | 224 | //US mListView->viewport()->setPalette( mListView->palette() ); |
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index ecfe7a1..865f8d5 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h | |||
@@ -18,96 +18,98 @@ | |||
18 | #include <qvaluelist.h> | 18 | #include <qvaluelist.h> |
19 | 19 | ||
20 | #include "undo.h" | 20 | #include "undo.h" |
21 | 21 | ||
22 | #else //KAB_EMBEDDED | 22 | #else //KAB_EMBEDDED |
23 | #include "views/configuretableviewdialog.h" | 23 | #include "views/configuretableviewdialog.h" |
24 | #endif //KAB_EMBEDDED | 24 | #endif //KAB_EMBEDDED |
25 | 25 | ||
26 | #include "klocale.h" | 26 | #include "klocale.h" |
27 | #include "kaddressbookview.h" | 27 | #include "kaddressbookview.h" |
28 | 28 | ||
29 | class QListViewItem; | 29 | class QListViewItem; |
30 | class QListBox; | 30 | class QListBox; |
31 | class QVBoxLayout; | 31 | class QVBoxLayout; |
32 | class KConfig; | 32 | class KConfig; |
33 | 33 | ||
34 | class ContactListViewItem; | 34 | class ContactListViewItem; |
35 | class ContactListView; | 35 | class ContactListView; |
36 | 36 | ||
37 | 37 | ||
38 | namespace KABC { class AddressBook; } | 38 | namespace KABC { class AddressBook; } |
39 | 39 | ||
40 | /** | 40 | /** |
41 | * This class is the table view for kaddressbook. This view is a KListView | 41 | * This class is the table view for kaddressbook. This view is a KListView |
42 | * with multiple columns for the selected fields. | 42 | * with multiple columns for the selected fields. |
43 | * | 43 | * |
44 | * @short Table View | 44 | * @short Table View |
45 | * @author Don Sanders <dsanders@kde.org> | 45 | * @author Don Sanders <dsanders@kde.org> |
46 | * @version 0.1 | 46 | * @version 0.1 |
47 | */ | 47 | */ |
48 | class KAddressBookTableView : public KAddressBookView | 48 | class KAddressBookTableView : public KAddressBookView |
49 | { | 49 | { |
50 | friend class ContactListView; | 50 | friend class ContactListView; |
51 | 51 | ||
52 | Q_OBJECT | 52 | Q_OBJECT |
53 | 53 | ||
54 | public: | 54 | public: |
55 | KAddressBookTableView( KABC::AddressBook *ab, QWidget *parent, | 55 | KAddressBookTableView( KABC::AddressBook *ab, QWidget *parent, |
56 | const char *name = 0 ); | 56 | const char *name = 0 ); |
57 | virtual ~KAddressBookTableView(); | 57 | virtual ~KAddressBookTableView(); |
58 | 58 | ||
59 | virtual void refresh(QString uid = QString::null); | 59 | virtual void refresh(QString uid = QString::null); |
60 | virtual QStringList selectedUids(); | 60 | virtual QStringList selectedUids(); |
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 | void doSearch( const QString& s ,KABC::Field *field ); |
66 | virtual void scrollUP(); | ||
67 | virtual void scrollDOWN(); | ||
66 | 68 | ||
67 | public slots: | 69 | public slots: |
68 | virtual void reconstructListView(); | 70 | virtual void reconstructListView(); |
69 | 71 | ||
70 | protected slots: | 72 | protected slots: |
71 | /** Called whenever the user selects an addressee in the list view. | 73 | /** Called whenever the user selects an addressee in the list view. |
72 | */ | 74 | */ |
73 | void addresseeSelected(); | 75 | void addresseeSelected(); |
74 | void addresseeDeleted(); | 76 | void addresseeDeleted(); |
75 | 77 | ||
76 | /** Called whenever the user executes an addressee. In terms of the | 78 | /** Called whenever the user executes an addressee. In terms of the |
77 | * list view, this is probably a double click | 79 | * list view, this is probably a double click |
78 | */ | 80 | */ |
79 | void addresseeExecuted(QListViewItem*); | 81 | void addresseeExecuted(QListViewItem*); |
80 | 82 | ||
81 | private: | 83 | private: |
82 | QVBoxLayout *mainLayout; | 84 | QVBoxLayout *mainLayout; |
83 | ContactListView *mListView; | 85 | ContactListView *mListView; |
84 | }; | 86 | }; |
85 | 87 | ||
86 | 88 | ||
87 | class TableViewFactory : public ViewFactory | 89 | class TableViewFactory : public ViewFactory |
88 | { | 90 | { |
89 | public: | 91 | public: |
90 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) | 92 | KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) |
91 | { | 93 | { |
92 | return new KAddressBookTableView( ab, parent, name ); | 94 | return new KAddressBookTableView( ab, parent, name ); |
93 | } | 95 | } |
94 | 96 | ||
95 | QString type() const { return "Table"; } | 97 | QString type() const { return "Table"; } |
96 | 98 | ||
97 | QString description() const { return i18n( "A listing of contacts in a table. Each cell of " | 99 | QString description() const { return i18n( "A listing of contacts in a table. Each cell of " |
98 | "the table holds a field of the contact." ); } | 100 | "the table holds a field of the contact." ); } |
99 | 101 | ||
100 | ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, QWidget *parent, | 102 | ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, QWidget *parent, |
101 | const char *name = 0 ) | 103 | const char *name = 0 ) |
102 | { | 104 | { |
103 | return new ConfigureTableViewWidget( ab, parent, name ); | 105 | return new ConfigureTableViewWidget( ab, parent, name ); |
104 | } | 106 | } |
105 | }; | 107 | }; |
106 | /*US | 108 | /*US |
107 | extern "C" { | 109 | extern "C" { |
108 | void *init_libkaddrbk_tableview() | 110 | void *init_libkaddrbk_tableview() |
109 | { | 111 | { |
110 | return ( new TableViewFactory ); | 112 | return ( new TableViewFactory ); |
111 | } | 113 | } |
112 | } | 114 | } |
113 | */ | 115 | */ |