Diffstat (limited to 'core/pim/addressbook/abtable.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index cd77b13..cb57342 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp | |||
@@ -16,13 +16,13 @@ | |||
16 | ** | 16 | ** |
17 | ** Contact info@trolltech.com if any conditions of this licensing are | 17 | ** Contact info@trolltech.com if any conditions of this licensing are |
18 | ** not clear to you. | 18 | ** not clear to you. |
19 | ** | 19 | ** |
20 | **********************************************************************/ | 20 | **********************************************************************/ |
21 | 21 | ||
22 | 22 | #include <opie2/odebug.h> | |
23 | #include <opie2/opimrecordlist.h> | 23 | #include <opie2/opimrecordlist.h> |
24 | 24 | ||
25 | #include <qpe/timestring.h> | 25 | #include <qpe/timestring.h> |
26 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | 27 | ||
28 | #include "abtable.h" | 28 | #include "abtable.h" |
@@ -118,22 +118,21 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name | |||
118 | asc( TRUE ), | 118 | asc( TRUE ), |
119 | intFields( order ), | 119 | intFields( order ), |
120 | enablePainting( true ), | 120 | enablePainting( true ), |
121 | columnVisible( true ), | 121 | columnVisible( true ), |
122 | countNested( 0 ) | 122 | countNested( 0 ) |
123 | { | 123 | { |
124 | //qWarning("C'tor start"); | 124 | //Opie::Core::owarn << "C'tor start" << oendl; |
125 | |||
126 | setSelectionMode( NoSelection ); | 125 | setSelectionMode( NoSelection ); |
127 | init(); | 126 | init(); |
128 | setSorting( TRUE ); | 127 | setSorting( TRUE ); |
129 | connect( this, SIGNAL(clicked(int,int,int,const QPoint&)), | 128 | connect( this, SIGNAL(clicked(int,int,int,const QPoint&)), |
130 | this, SLOT(itemClicked(int,int)) ); | 129 | this, SLOT(itemClicked(int,int)) ); |
131 | 130 | ||
132 | // contactList.clear(); | 131 | // contactList.clear(); |
133 | //qWarning("C'tor end"); | 132 | //Opie::Core::owarn << "C'tor end" << oendl; |
134 | } | 133 | } |
135 | 134 | ||
136 | AbTable::~AbTable() | 135 | AbTable::~AbTable() |
137 | { | 136 | { |
138 | } | 137 | } |
139 | 138 | ||
@@ -149,13 +148,13 @@ void AbTable::init() | |||
149 | verticalHeader()->hide(); | 148 | verticalHeader()->hide(); |
150 | columnVisible = true; | 149 | columnVisible = true; |
151 | } | 150 | } |
152 | 151 | ||
153 | void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) | 152 | void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) |
154 | { | 153 | { |
155 | qWarning("AbTable::setContacts()"); | 154 | Opie::Core::owarn << "AbTable::setContacts()" << oendl; |
156 | 155 | ||
157 | clear(); | 156 | clear(); |
158 | m_viewList = viewList; | 157 | m_viewList = viewList; |
159 | 158 | ||
160 | setSorting( false ); | 159 | setSorting( false ); |
161 | setPaintingEnabled( FALSE ); | 160 | setPaintingEnabled( FALSE ); |
@@ -181,28 +180,28 @@ void AbTable::setOrderedList( const QValueList<int> ordered ) | |||
181 | intFields = ordered; | 180 | intFields = ordered; |
182 | } | 181 | } |
183 | 182 | ||
184 | 183 | ||
185 | bool AbTable::selectContact( int UID ) | 184 | bool AbTable::selectContact( int UID ) |
186 | { | 185 | { |
187 | qWarning( "AbTable::selectContact( %d )", UID ); | 186 | Opie::Core::owarn << "AbTable::selectContact( " << UID << " )" << oendl; |
188 | int rows = numRows(); | 187 | int rows = numRows(); |
189 | Opie::OPimContact* foundContact = 0l; | 188 | Opie::OPimContact* foundContact = 0l; |
190 | bool found = false; | 189 | bool found = false; |
191 | 190 | ||
192 | setPaintingEnabled( FALSE ); | 191 | setPaintingEnabled( FALSE ); |
193 | qWarning( "search start" ); | 192 | Opie::Core::owarn << "Search start" << oendl; |
194 | for ( int r = 0; r < rows; ++r ) { | 193 | for ( int r = 0; r < rows; ++r ) { |
195 | if ( m_viewList.uidAt( r ) == UID ){ | 194 | if ( m_viewList.uidAt( r ) == UID ){ |
196 | ensureCellVisible( r, 0 ); | 195 | ensureCellVisible( r, 0 ); |
197 | setCurrentCell( r, 0 ); | 196 | setCurrentCell( r, 0 ); |
198 | found = true; | 197 | found = true; |
199 | break; | 198 | break; |
200 | } | 199 | } |
201 | } | 200 | } |
202 | qWarning( "search end" ); | 201 | Opie::Core::owarn << "Search end" << oendl; |
203 | 202 | ||
204 | if ( !found ){ | 203 | if ( !found ){ |
205 | ensureCellVisible( 0,0 ); | 204 | ensureCellVisible( 0,0 ); |
206 | setCurrentCell( 0, 0 ); | 205 | setCurrentCell( 0, 0 ); |
207 | } | 206 | } |
208 | 207 | ||
@@ -211,13 +210,14 @@ bool AbTable::selectContact( int UID ) | |||
211 | return true; | 210 | return true; |
212 | } | 211 | } |
213 | 212 | ||
214 | #if 0 | 213 | #if 0 |
215 | void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) | 214 | void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) |
216 | { | 215 | { |
217 | qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row ); | 216 | Opie::Core::owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " |
217 | << row << " )" << oendl; | ||
218 | QString strName; | 218 | QString strName; |
219 | ContactItem contactItem; | 219 | ContactItem contactItem; |
220 | 220 | ||
221 | strName = findContactName( cnt ); | 221 | strName = findContactName( cnt ); |
222 | contactItem = findContactContact( cnt, row ); | 222 | contactItem = findContactContact( cnt, row ); |
223 | 223 | ||
@@ -254,13 +254,13 @@ void AbTable::columnClicked( int col ) | |||
254 | //QMessageBox::information( this, "resort", "columnClicked" ); | 254 | //QMessageBox::information( this, "resort", "columnClicked" ); |
255 | resort(); | 255 | resort(); |
256 | } | 256 | } |
257 | 257 | ||
258 | void AbTable::resort() | 258 | void AbTable::resort() |
259 | { | 259 | { |
260 | qWarning( "void AbTable::resort() NOT POSSIBLE !!" ); | 260 | Opie::Core::owarn << "void AbTable::resort() NOT POSSIBLE !!" << oendl; |
261 | #if 0 | 261 | #if 0 |
262 | setPaintingEnabled( FALSE ); | 262 | setPaintingEnabled( FALSE ); |
263 | if ( sorting() ) { | 263 | if ( sorting() ) { |
264 | if ( lastSortCol == -1 ) | 264 | if ( lastSortCol == -1 ) |
265 | lastSortCol = 0; | 265 | lastSortCol = 0; |
266 | sortColumn( lastSortCol, asc, TRUE ); | 266 | sortColumn( lastSortCol, asc, TRUE ); |
@@ -280,13 +280,13 @@ int AbTable::currentEntry_UID() | |||
280 | { | 280 | { |
281 | return ( currentEntry().uid() ); | 281 | return ( currentEntry().uid() ); |
282 | } | 282 | } |
283 | 283 | ||
284 | void AbTable::clear() | 284 | void AbTable::clear() |
285 | { | 285 | { |
286 | qWarning( "void AbTable::clear()" ); | 286 | Opie::Core::owarn << "void AbTable::clear()" << oendl; |
287 | // contactList.clear(); | 287 | // contactList.clear(); |
288 | 288 | ||
289 | setPaintingEnabled( FALSE ); | 289 | setPaintingEnabled( FALSE ); |
290 | for ( int r = 0; r < numRows(); ++r ) { | 290 | for ( int r = 0; r < numRows(); ++r ) { |
291 | for ( int c = 0; c < numCols(); ++c ) { | 291 | for ( int c = 0; c < numCols(); ++c ) { |
292 | if ( cellWidget( r, c ) ) | 292 | if ( cellWidget( r, c ) ) |
@@ -298,13 +298,13 @@ void AbTable::clear() | |||
298 | setPaintingEnabled( TRUE ); | 298 | setPaintingEnabled( TRUE ); |
299 | } | 299 | } |
300 | 300 | ||
301 | // Refresh updates column 2 if the contactsettings changed | 301 | // Refresh updates column 2 if the contactsettings changed |
302 | void AbTable::refresh() | 302 | void AbTable::refresh() |
303 | { | 303 | { |
304 | qWarning( "void AbTable::refresh() NOT IMPLEMENTED !!" ); | 304 | Opie::Core::owarn << "void AbTable::refresh() NOT IMPLEMENTED !!" << oendl; |
305 | 305 | ||
306 | #if 0 | 306 | #if 0 |
307 | int rows = numRows(); | 307 | int rows = numRows(); |
308 | AbTableItem *abi; | 308 | AbTableItem *abi; |
309 | ContactItem contactItem; | 309 | ContactItem contactItem; |
310 | 310 | ||
@@ -331,36 +331,36 @@ void AbTable::keyPressEvent( QKeyEvent *e ) | |||
331 | { | 331 | { |
332 | char key = toupper( e->ascii() ); | 332 | char key = toupper( e->ascii() ); |
333 | 333 | ||
334 | if ( key >= 'A' && key <= 'Z' ) | 334 | if ( key >= 'A' && key <= 'Z' ) |
335 | moveTo( key ); | 335 | moveTo( key ); |
336 | 336 | ||
337 | //qWarning("Received key .."); | 337 | // Opie::Core::owarn << "Received key .." << oendl; |
338 | switch( e->key() ) { | 338 | switch( e->key() ) { |
339 | case Qt::Key_Space: | 339 | case Qt::Key_Space: |
340 | case Qt::Key_Return: | 340 | case Qt::Key_Return: |
341 | case Qt::Key_Enter: | 341 | case Qt::Key_Enter: |
342 | emit signalSwitch(); | 342 | emit signalSwitch(); |
343 | break; | 343 | break; |
344 | // case Qt::Key_Up: | 344 | // case Qt::Key_Up: |
345 | // qWarning("a"); | 345 | // Opie::Core::owarn << "a" << oendl; |
346 | // emit signalKeyUp(); | 346 | // emit signalKeyUp(); |
347 | // break; | 347 | // break; |
348 | // case Qt::Key_Down: | 348 | // case Qt::Key_Down: |
349 | // qWarning("b"); | 349 | // Opie::Core::owarn << "b" << oendl; |
350 | // emit signalKeyDown(); | 350 | // emit signalKeyDown(); |
351 | // break; | 351 | // break; |
352 | default: | 352 | default: |
353 | QTable::keyPressEvent( e ); | 353 | QTable::keyPressEvent( e ); |
354 | } | 354 | } |
355 | 355 | ||
356 | } | 356 | } |
357 | 357 | ||
358 | void AbTable::moveTo( char c ) | 358 | void AbTable::moveTo( char c ) |
359 | { | 359 | { |
360 | qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" ); | 360 | Opie::Core::owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; |
361 | 361 | ||
362 | #if 0 | 362 | #if 0 |
363 | int rows = numRows(); | 363 | int rows = numRows(); |
364 | QString value; | 364 | QString value; |
365 | AbTableItem *abi; | 365 | AbTableItem *abi; |
366 | int r; | 366 | int r; |
@@ -420,13 +420,13 @@ void AbTable::resizeRows() { | |||
420 | */ | 420 | */ |
421 | } | 421 | } |
422 | 422 | ||
423 | 423 | ||
424 | void AbTable::realignTable() | 424 | void AbTable::realignTable() |
425 | { | 425 | { |
426 | //qWarning( "void AbTable::realignTable()" ); | 426 | //Opie::Core::owarn << "void AbTable::realignTable()" << oendl; |
427 | 427 | ||
428 | setPaintingEnabled( FALSE ); | 428 | setPaintingEnabled( FALSE ); |
429 | 429 | ||
430 | resizeRows(); | 430 | resizeRows(); |
431 | fitColumns(); | 431 | fitColumns(); |
432 | 432 | ||
@@ -470,37 +470,37 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ) | |||
470 | // } | 470 | // } |
471 | 471 | ||
472 | 472 | ||
473 | 473 | ||
474 | void AbTable::fitColumns() | 474 | void AbTable::fitColumns() |
475 | { | 475 | { |
476 | qWarning( "void AbTable::fitColumns()" ); | 476 | Opie::Core::owarn << "void AbTable::fitColumns()" << oendl; |
477 | int contentsWidth = visibleWidth() / 2; | 477 | int contentsWidth = visibleWidth() / 2; |
478 | // Fix to better value | 478 | // Fix to better value |
479 | // contentsWidth = 130; | 479 | // contentsWidth = 130; |
480 | 480 | ||
481 | setPaintingEnabled( FALSE ); | 481 | setPaintingEnabled( FALSE ); |
482 | 482 | ||
483 | if ( columnVisible == false ){ | 483 | if ( columnVisible == false ){ |
484 | showColumn(0); | 484 | showColumn(0); |
485 | columnVisible = true; | 485 | columnVisible = true; |
486 | } | 486 | } |
487 | 487 | ||
488 | //qWarning("Width: %d", contentsWidth); | 488 | //Opie::Core::owarn << "Width: " << contentsWidth << oendl; |
489 | 489 | ||
490 | setColumnWidth( 0, contentsWidth ); | 490 | setColumnWidth( 0, contentsWidth ); |
491 | adjustColumn(1); | 491 | adjustColumn(1); |
492 | if ( columnWidth(1) < contentsWidth ) | 492 | if ( columnWidth(1) < contentsWidth ) |
493 | setColumnWidth( 1, contentsWidth ); | 493 | setColumnWidth( 1, contentsWidth ); |
494 | 494 | ||
495 | setPaintingEnabled( TRUE ); | 495 | setPaintingEnabled( TRUE ); |
496 | } | 496 | } |
497 | 497 | ||
498 | void AbTable::show() | 498 | void AbTable::show() |
499 | { | 499 | { |
500 | //qWarning( "void AbTable::show()" ); | 500 | //Opie::Core::owarn << "void AbTable::show()" << oendl; |
501 | realignTable(); | 501 | realignTable(); |
502 | QTable::show(); | 502 | QTable::show(); |
503 | } | 503 | } |
504 | 504 | ||
505 | #if 0 | 505 | #if 0 |
506 | void AbTable::setChoiceNames( const QStringList& list) | 506 | void AbTable::setChoiceNames( const QStringList& list) |
@@ -518,17 +518,17 @@ void AbTable::setChoiceNames( const QStringList& list) | |||
518 | fitColumns(); | 518 | fitColumns(); |
519 | } | 519 | } |
520 | #endif | 520 | #endif |
521 | 521 | ||
522 | void AbTable::itemClicked(int,int col) | 522 | void AbTable::itemClicked(int,int col) |
523 | { | 523 | { |
524 | //qWarning( "AbTable::itemClicked(int, col:%d)", col); | 524 | //Opie::Core::owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl; |
525 | if ( col == 2 ) { | 525 | if ( col == 2 ) { |
526 | return; | 526 | return; |
527 | } else { | 527 | } else { |
528 | // qWarning ("Emitting signalSwitch()"); | 528 | //Opie::Core::owarn << "Emitting signalSwitch()" << oendl; |
529 | emit signalSwitch(); | 529 | emit signalSwitch(); |
530 | } | 530 | } |
531 | } | 531 | } |
532 | 532 | ||
533 | #if 0 | 533 | #if 0 |
534 | QStringList AbTable::choiceNames() const | 534 | QStringList AbTable::choiceNames() const |
@@ -559,13 +559,13 @@ QStringList AbTable::choiceSelection(int /*index*/) const | |||
559 | return r; | 559 | return r; |
560 | } | 560 | } |
561 | 561 | ||
562 | 562 | ||
563 | void AbTable::updateVisible() | 563 | void AbTable::updateVisible() |
564 | { | 564 | { |
565 | //qWarning("void AbTable::updateVisible()"); | 565 | //Opie::Core::owarn << "void AbTable::updateVisible()" << oendl; |
566 | 566 | ||
567 | int visible, | 567 | int visible, |
568 | totalRows, | 568 | totalRows, |
569 | row, | 569 | row, |
570 | selectedRow = 0; | 570 | selectedRow = 0; |
571 | 571 | ||
@@ -595,13 +595,14 @@ void AbTable::updateVisible() | |||
595 | setPaintingEnabled( TRUE ); | 595 | setPaintingEnabled( TRUE ); |
596 | } | 596 | } |
597 | 597 | ||
598 | 598 | ||
599 | void AbTable::setPaintingEnabled( bool e ) | 599 | void AbTable::setPaintingEnabled( bool e ) |
600 | { | 600 | { |
601 | //qWarning("IN void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested ); | 601 | //Opie::Core::owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: " |
602 | // << countNested << oendl; | ||
602 | 603 | ||
603 | if ( e ) { | 604 | if ( e ) { |
604 | if ( countNested > 0 ) | 605 | if ( countNested > 0 ) |
605 | --countNested; | 606 | --countNested; |
606 | if ( ! countNested ){ | 607 | if ( ! countNested ){ |
607 | setUpdatesEnabled( true ); | 608 | setUpdatesEnabled( true ); |
@@ -611,27 +612,29 @@ void AbTable::setPaintingEnabled( bool e ) | |||
611 | } | 612 | } |
612 | } else { | 613 | } else { |
613 | ++countNested; | 614 | ++countNested; |
614 | enablePainting = false; | 615 | enablePainting = false; |
615 | setUpdatesEnabled( false ); | 616 | setUpdatesEnabled( false ); |
616 | } | 617 | } |
617 | //qWarning("OUT void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested ); | 618 | //Opie::Core::owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: " |
619 | // << countNested << oendl; | ||
618 | } | 620 | } |
619 | 621 | ||
620 | void AbTable::viewportPaintEvent( QPaintEvent* e ) { | 622 | void AbTable::viewportPaintEvent( QPaintEvent* e ) { |
621 | //qWarning(" void AbTable::viewportPaintEvent( QPaintEvent* e ) -> %d", enablePainting); | 623 | //Opie::Core::owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> " |
624 | // << enablePainting << oendl; | ||
622 | if ( enablePainting ) | 625 | if ( enablePainting ) |
623 | QTable::viewportPaintEvent( e ); | 626 | QTable::viewportPaintEvent( e ); |
624 | } | 627 | } |
625 | 628 | ||
626 | void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) { | 629 | void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) { |
627 | const QColorGroup &cg = colorGroup(); | 630 | const QColorGroup &cg = colorGroup(); |
628 | 631 | ||
629 | p->save(); | 632 | p->save(); |
630 | 633 | ||
631 | //qWarning( "Paint row: %d", row ); | 634 | //Opie::Core::owarn << "Paint row: " << row << oendl; |
632 | 635 | ||
633 | Opie::OPimContact act_contact = m_viewList[row]; | 636 | Opie::OPimContact act_contact = m_viewList[row]; |
634 | 637 | ||
635 | // Paint alternating background bars | 638 | // Paint alternating background bars |
636 | if ( (row % 2 ) == 0 ) { | 639 | if ( (row % 2 ) == 0 ) { |
637 | p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); | 640 | p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); |