summaryrefslogtreecommitdiff
authordrw <drw>2004-04-02 20:16:47 (UTC)
committer drw <drw>2004-04-02 20:16:47 (UTC)
commitb4d07df7854800fd3613034f54488c6fa27d94ee (patch) (unidiff)
treee467a97fe4fe9dd0d96dd22299195dd30227bef1
parent97bdc55663590ba430a4f322ad97aab9f4c02bf3 (diff)
downloadopie-b4d07df7854800fd3613034f54488c6fa27d94ee.zip
opie-b4d07df7854800fd3613034f54488c6fa27d94ee.tar.gz
opie-b4d07df7854800fd3613034f54488c6fa27d94ee.tar.bz2
Use ODebug (135 down...), and remove libopiedb2 from dependencies
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp18
-rw-r--r--core/pim/addressbook/abtable.cpp57
-rw-r--r--core/pim/addressbook/abview.cpp61
-rw-r--r--core/pim/addressbook/addressbook.cpp67
-rw-r--r--core/pim/addressbook/configdlg.cpp11
-rw-r--r--core/pim/addressbook/contacteditor.cpp82
-rw-r--r--core/pim/addressbook/opie-addressbook.control2
-rw-r--r--core/pim/addressbook/picker.cpp28
8 files changed, 170 insertions, 156 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 70a66a0..8216d6f 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -7,33 +7,33 @@
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "ablabel.h" 21#include "ablabel.h"
22 22
23 23#include <opie2/odebug.h>
24 24
25AbLabel::AbLabel( QWidget *parent, const char *name ): 25AbLabel::AbLabel( QWidget *parent, const char *name ):
26 QTextView( parent, name ), 26 QTextView( parent, name ),
27 m_empty( false ) 27 m_empty( false )
28{ 28{
29} 29}
30 30
31AbLabel::~AbLabel() 31AbLabel::~AbLabel()
32{ 32{
33} 33}
34 34
35void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList ) 35void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList )
36{ 36{
37 m_viewList = viewList; 37 m_viewList = viewList;
38 if (m_viewList.count() != 0){ 38 if (m_viewList.count() != 0){
39 m_empty = false; 39 m_empty = false;
@@ -82,58 +82,58 @@ bool AbLabel::selectContact( int UID )
82 82
83 83
84 84
85void AbLabel::sync() 85void AbLabel::sync()
86{ 86{
87 QString text = (*m_itCurContact).toRichText(); 87 QString text = (*m_itCurContact).toRichText();
88 setText( text ); 88 setText( text );
89} 89}
90 90
91void AbLabel::keyPressEvent( QKeyEvent *e ) 91void AbLabel::keyPressEvent( QKeyEvent *e )
92{ 92{
93 93
94 // Commonly handled keys 94 // Commonly handled keys
95 if ( !m_empty ){ 95 if ( !m_empty ){
96 switch( e->key() ) { 96 switch( e->key() ) {
97 case Qt::Key_Left: 97 case Qt::Key_Left:
98 qWarning( "Left.."); 98 Opie::Core::owarn << "Left.." << oendl;
99 case Qt::Key_Right: 99 case Qt::Key_Right:
100 qWarning( "Right.."); 100 Opie::Core::owarn << "Right.." << oendl;
101 case Qt::Key_F33: 101 case Qt::Key_F33:
102 qWarning( "OK.."); 102 Opie::Core::owarn << "OK.." << oendl;
103 emit signalOkPressed(); 103 emit signalOkPressed();
104 break; 104 break;
105 case Qt::Key_Up: 105 case Qt::Key_Up:
106 qWarning( "UP.."); 106 Opie::Core::owarn << "Up.." << oendl;
107 if ( ( visibleHeight() < contentsHeight() ) && 107 if ( ( visibleHeight() < contentsHeight() ) &&
108 ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) ) 108 ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
109 scrollBy( 0, -(visibleHeight()-20) ); 109 scrollBy( 0, -(visibleHeight()-20) );
110 else { 110 else {
111 --m_itCurContact; 111 --m_itCurContact;
112 if ( *m_itCurContact != Opie::OPimContact() ) 112 if ( *m_itCurContact != Opie::OPimContact() )
113 sync(); 113 sync();
114 else 114 else
115 m_itCurContact = m_viewList.end(); 115 m_itCurContact = m_viewList.end();
116 } 116 }
117 117
118 break; 118 break;
119 case Qt::Key_Down: 119 case Qt::Key_Down:
120 qWarning( "DOWN.."); 120 Opie::Core::owarn << "Down.." << oendl;
121 // qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); 121 // Opie::Core::owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl;
122 // qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value() 122 // Opie::Core::owarn << "Value: " << verticalScrollBar()->value()
123 // , verticalScrollBar()->maxValue() ); 123 // << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl;
124 if ( ( visibleHeight() < contentsHeight() ) && 124 if ( ( visibleHeight() < contentsHeight() ) &&
125 ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) ) 125 ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
126 scrollBy( 0, visibleHeight()-20 ); 126 scrollBy( 0, visibleHeight()-20 );
127 else { 127 else {
128 ++m_itCurContact; 128 ++m_itCurContact;
129 if ( *m_itCurContact != Opie::OPimContact() ) 129 if ( *m_itCurContact != Opie::OPimContact() )
130 sync(); 130 sync();
131 else 131 else
132 m_itCurContact = m_viewList.begin(); 132 m_itCurContact = m_viewList.begin();
133 } 133 }
134 break; 134 break;
135 case Qt::Key_Return: // fall through 135 case Qt::Key_Return: // fall through
136 case Qt::Key_Space: // fall through 136 case Qt::Key_Space: // fall through
137 case Qt::Key_Enter: // we want to switch back 137 case Qt::Key_Enter: // we want to switch back
138 emit signalOkPressed(); 138 emit signalOkPressed();
139 break; 139 break;
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
@@ -6,33 +6,33 @@
6** 6**
7** This file may be distributed and/or modified under the terms of the 7** This file may be distributed and/or modified under the terms of the
8** GNU General Public License version 2 as published by the Free Software 8** GNU General Public License version 2 as published by the Free Software
9** Foundation and appearing in the file LICENSE.GPL included in the 9** Foundation and appearing in the file LICENSE.GPL included in the
10** packaging of this file. 10** packaging of this file.
11** 11**
12** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 12** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
13** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 13** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
14** 14**
15** See http://www.trolltech.com/gpl/ for GPL licensing information. 15** See http://www.trolltech.com/gpl/ for GPL licensing information.
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"
29 29
30#include <errno.h> 30#include <errno.h>
31#include <fcntl.h> 31#include <fcntl.h>
32#include <unistd.h> 32#include <unistd.h>
33#include <stdlib.h> 33#include <stdlib.h>
34 34
35#include <ctype.h> //toupper() for key hack 35#include <ctype.h> //toupper() for key hack
36 36
37#if 0 37#if 0
38 38
@@ -108,126 +108,126 @@ void AbPickItem::setContentFromEditor( QWidget *w )
108 108
109/*! 109/*!
110 \class AbTable abtable.h 110 \class AbTable abtable.h
111 111
112 \brief QTable based class for showing a list of entries 112 \brief QTable based class for showing a list of entries
113*/ 113*/
114 114
115AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name ) 115AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
116 : QTable( parent, name ), 116 : QTable( parent, name ),
117 lastSortCol( -1 ), 117 lastSortCol( -1 ),
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
136AbTable::~AbTable() 135AbTable::~AbTable()
137{ 136{
138} 137}
139 138
140void AbTable::init() 139void AbTable::init()
141{ 140{
142 // :SX showChar = '\0'; 141 // :SX showChar = '\0';
143 setNumRows( 0 ); 142 setNumRows( 0 );
144 setNumCols( 2 ); 143 setNumCols( 2 );
145 144
146 horizontalHeader()->setLabel( 0, tr( "Full Name" )); 145 horizontalHeader()->setLabel( 0, tr( "Full Name" ));
147 horizontalHeader()->setLabel( 1, tr( "Contact" )); 146 horizontalHeader()->setLabel( 1, tr( "Contact" ));
148 setLeftMargin( 0 ); 147 setLeftMargin( 0 );
149 verticalHeader()->hide(); 148 verticalHeader()->hide();
150 columnVisible = true; 149 columnVisible = true;
151} 150}
152 151
153void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) 152void 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 );
162 161
163 Opie::OPimContactAccess::List::Iterator it; 162 Opie::OPimContactAccess::List::Iterator it;
164 setNumRows( m_viewList.count() ); 163 setNumRows( m_viewList.count() );
165 //int row = 0; 164 //int row = 0;
166 // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it ) 165 // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
167 // insertIntoTable( *it, row++ ); 166 // insertIntoTable( *it, row++ );
168 167
169 // setSorting( true ); 168 // setSorting( true );
170 169
171 // resort(); 170 // resort();
172 171
173 updateVisible(); 172 updateVisible();
174 173
175 setPaintingEnabled( TRUE ); 174 setPaintingEnabled( TRUE );
176 175
177} 176}
178 177
179void AbTable::setOrderedList( const QValueList<int> ordered ) 178void AbTable::setOrderedList( const QValueList<int> ordered )
180{ 179{
181 intFields = ordered; 180 intFields = ordered;
182} 181}
183 182
184 183
185bool AbTable::selectContact( int UID ) 184bool 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
209 setPaintingEnabled( TRUE ); 208 setPaintingEnabled( TRUE );
210 209
211 return true; 210 return true;
212} 211}
213 212
214#if 0 213#if 0
215void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) 214void 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
224 AbTableItem *ati; 224 AbTableItem *ati;
225 ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value ); 225 ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value );
226 contactList.insert( ati, cnt ); 226 contactList.insert( ati, cnt );
227 setItem( row, 0, ati ); 227 setItem( row, 0, ati );
228 ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName); 228 ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName);
229 if ( !contactItem.icon.isNull() ) 229 if ( !contactItem.icon.isNull() )
230 ati->setPixmap( contactItem.icon ); 230 ati->setPixmap( contactItem.icon );
231 setItem( row, 1, ati ); 231 setItem( row, 1, ati );
232 232
233 //### cannot do this; table only has two columns at this point 233 //### cannot do this; table only has two columns at this point
@@ -244,133 +244,133 @@ void AbTable::columnClicked( int col )
244 244
245 if ( lastSortCol == -1 ) 245 if ( lastSortCol == -1 )
246 lastSortCol = col; 246 lastSortCol = col;
247 247
248 if ( col == lastSortCol ) { 248 if ( col == lastSortCol ) {
249 asc = !asc; 249 asc = !asc;
250 } else { 250 } else {
251 lastSortCol = col; 251 lastSortCol = col;
252 asc = TRUE; 252 asc = TRUE;
253 } 253 }
254 //QMessageBox::information( this, "resort", "columnClicked" ); 254 //QMessageBox::information( this, "resort", "columnClicked" );
255 resort(); 255 resort();
256} 256}
257 257
258void AbTable::resort() 258void 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 );
267 //QMessageBox::information( this, "resort", "resort" ); 267 //QMessageBox::information( this, "resort", "resort" );
268 updateVisible(); 268 updateVisible();
269 } 269 }
270 setPaintingEnabled( TRUE ); 270 setPaintingEnabled( TRUE );
271#endif 271#endif
272} 272}
273 273
274Opie::OPimContact AbTable::currentEntry() 274Opie::OPimContact AbTable::currentEntry()
275{ 275{
276 return m_viewList[currentRow()]; 276 return m_viewList[currentRow()];
277} 277}
278 278
279int AbTable::currentEntry_UID() 279int AbTable::currentEntry_UID()
280{ 280{
281 return ( currentEntry().uid() ); 281 return ( currentEntry().uid() );
282} 282}
283 283
284void AbTable::clear() 284void 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 ) )
293 clearCellWidget( r, c ); 293 clearCellWidget( r, c );
294 clearCell( r, c ); 294 clearCell( r, c );
295 } 295 }
296 } 296 }
297 setNumRows( 0 ); 297 setNumRows( 0 );
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
302void AbTable::refresh() 302void 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
311 setPaintingEnabled( FALSE ); 311 setPaintingEnabled( FALSE );
312 for ( int r = 0; r < rows; ++r ) { 312 for ( int r = 0; r < rows; ++r ) {
313 abi = static_cast<AbTableItem*>( item(r, 0) ); 313 abi = static_cast<AbTableItem*>( item(r, 0) );
314 contactItem = findContactContact( contactList[abi], r ); 314 contactItem = findContactContact( contactList[abi], r );
315 static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() ); 315 static_cast<AbTableItem*>( item(r, 1) )->setItem( contactItem.value, abi->text() );
316 if ( !contactItem.icon.isNull() ){ 316 if ( !contactItem.icon.isNull() ){
317 static_cast<AbTableItem*>( item(r, 1) )-> 317 static_cast<AbTableItem*>( item(r, 1) )->
318 setPixmap( contactItem.icon ); 318 setPixmap( contactItem.icon );
319 }else{ 319 }else{
320 static_cast<AbTableItem*>( item(r, 1) )-> 320 static_cast<AbTableItem*>( item(r, 1) )->
321 setPixmap( QPixmap() ); 321 setPixmap( QPixmap() );
322 } 322 }
323 } 323 }
324 resort(); 324 resort();
325 setPaintingEnabled( TRUE ); 325 setPaintingEnabled( TRUE );
326 326
327#endif 327#endif
328} 328}
329 329
330void AbTable::keyPressEvent( QKeyEvent *e ) 330void 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
358void AbTable::moveTo( char c ) 358void 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;
367 if ( asc ) { 367 if ( asc ) {
368 r = 0; 368 r = 0;
369 while ( r < rows-1) { 369 while ( r < rows-1) {
370 abi = static_cast<AbTableItem*>( item(r, 0) ); 370 abi = static_cast<AbTableItem*>( item(r, 0) );
371 QChar first = abi->key()[0]; 371 QChar first = abi->key()[0];
372 //### is there a bug in QChar to char comparison??? 372 //### is there a bug in QChar to char comparison???
373 if ( first.row() || first.cell() >= c ) 373 if ( first.row() || first.cell() >= c )
374 break; 374 break;
375 r++; 375 r++;
376 } 376 }
@@ -410,33 +410,33 @@ QString AbTable::findContactName( const Opie::OPimContact &entry )
410 410
411 411
412void AbTable::resizeRows() { 412void AbTable::resizeRows() {
413 /* 413 /*
414 if (numRows()) { 414 if (numRows()) {
415 for (int i = 0; i < numRows(); i++) { 415 for (int i = 0; i < numRows(); i++) {
416 setRowHeight( i, size ); 416 setRowHeight( i, size );
417 } 417 }
418 } 418 }
419 updateVisible(); 419 updateVisible();
420 */ 420 */
421} 421}
422 422
423 423
424void AbTable::realignTable() 424void 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
433 setPaintingEnabled( TRUE ); 433 setPaintingEnabled( TRUE );
434 434
435} 435}
436 436
437 437
438 438
439 439
440#if QT_VERSION <= 230 440#if QT_VERSION <= 230
441#ifndef SINGLE_APP 441#ifndef SINGLE_APP
442void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ) 442void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
@@ -460,85 +460,85 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
460// } 460// }
461 461
462// int AbTable::rowPos( int row ) const 462// int AbTable::rowPos( int row ) const
463// { 463// {
464// return 18*row; 464// return 18*row;
465// } 465// }
466 466
467// int AbTable::rowAt( int pos ) const 467// int AbTable::rowAt( int pos ) const
468// { 468// {
469// return QMIN( pos/18, numRows()-1 ); 469// return QMIN( pos/18, numRows()-1 );
470// } 470// }
471 471
472 472
473 473
474void AbTable::fitColumns() 474void 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
498void AbTable::show() 498void 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
506void AbTable::setChoiceNames( const QStringList& list) 506void AbTable::setChoiceNames( const QStringList& list)
507{ 507{
508 choicenames = list; 508 choicenames = list;
509 if ( choicenames.isEmpty() ) { 509 if ( choicenames.isEmpty() ) {
510 // hide pick column 510 // hide pick column
511 setNumCols( 2 ); 511 setNumCols( 2 );
512 } else { 512 } else {
513 // show pick column 513 // show pick column
514 setNumCols( 3 ); 514 setNumCols( 3 );
515 setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 ); 515 setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 );
516 horizontalHeader()->setLabel( 2, tr( "Pick" )); 516 horizontalHeader()->setLabel( 2, tr( "Pick" ));
517 } 517 }
518 fitColumns(); 518 fitColumns();
519} 519}
520#endif 520#endif
521 521
522void AbTable::itemClicked(int,int col) 522void 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
534QStringList AbTable::choiceNames() const 534QStringList AbTable::choiceNames() const
535{ 535{
536 return choicenames; 536 return choicenames;
537} 537}
538 538
539#endif 539#endif
540void AbTable::setChoiceSelection( const QValueList<int>& list ) 540void AbTable::setChoiceSelection( const QValueList<int>& list )
541{ 541{
542 intFields = list; 542 intFields = list;
543} 543}
544 544
@@ -549,33 +549,33 @@ QStringList AbTable::choiceSelection(int /*index*/) const
549 549
550 QString selname = choicenames.at(index); 550 QString selname = choicenames.at(index);
551 for (each row) { 551 for (each row) {
552 Opie::OPimContact *c = contactForRow(row); 552 Opie::OPimContact *c = contactForRow(row);
553 if ( text(row,2) == selname ) { 553 if ( text(row,2) == selname ) {
554 r.append(c->email); 554 r.append(c->email);
555 } 555 }
556 } 556 }
557 557
558 */ 558 */
559 return r; 559 return r;
560} 560}
561 561
562 562
563void AbTable::updateVisible() 563void 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
572 visible = 0; 572 visible = 0;
573 573
574 setPaintingEnabled( FALSE ); 574 setPaintingEnabled( FALSE );
575 575
576 realignTable(); 576 realignTable();
577 577
578 totalRows = numRows(); 578 totalRows = numRows();
579 for ( row = 0; row < totalRows; row++ ) { 579 for ( row = 0; row < totalRows; row++ ) {
580 if ( rowHeight(row) == 0 ) { 580 if ( rowHeight(row) == 0 ) {
581 showRow( row ); 581 showRow( row );
@@ -585,63 +585,66 @@ void AbTable::updateVisible()
585 } 585 }
586 visible++; 586 visible++;
587 } 587 }
588 588
589 if ( selectedRow ) 589 if ( selectedRow )
590 setCurrentCell( selectedRow, 0 ); 590 setCurrentCell( selectedRow, 0 );
591 591
592 if ( !visible ) 592 if ( !visible )
593 setCurrentCell( -1, 0 ); 593 setCurrentCell( -1, 0 );
594 594
595 setPaintingEnabled( TRUE ); 595 setPaintingEnabled( TRUE );
596} 596}
597 597
598 598
599void AbTable::setPaintingEnabled( bool e ) 599void 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 );
608 enablePainting = true; 609 enablePainting = true;
609 rowHeightChanged( 0 ); 610 rowHeightChanged( 0 );
610 viewport()->update(); 611 viewport()->update();
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
620void AbTable::viewportPaintEvent( QPaintEvent* e ) { 622void 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
626void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) { 629void 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 ) );
638 p->setPen( QPen( cg.text() ) ); 641 p->setPen( QPen( cg.text() ) );
639 } 642 }
640 else { 643 else {
641 p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) ); 644 p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
642 p->setPen( QPen( cg.buttonText() ) ); 645 p->setPen( QPen( cg.buttonText() ) );
643 } 646 }
644 647
645 QFont f = p->font(); 648 QFont f = p->font();
646 QFontMetrics fm(f); 649 QFontMetrics fm(f);
647 650
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index aa242b7..52e5f59 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -4,32 +4,33 @@
4** This file is part of Qt Palmtop Environment. 4** This file is part of Qt Palmtop Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** 14**
15**********************************************************************/ 15**********************************************************************/
16 16
17#include "abview.h" 17#include "abview.h"
18 18
19#include <opie2/ocontactaccessbackend_vcard.h> 19#include <opie2/ocontactaccessbackend_vcard.h>
20#include <opie2/odebug.h>
20 21
21#include <qpe/global.h> 22#include <qpe/global.h>
22 23
23#include <qlayout.h> 24#include <qlayout.h>
24 25
25#include <assert.h> 26#include <assert.h>
26 27
27 28
28// Is defined in LibQPE 29// Is defined in LibQPE
29extern QString categoryFileName(); 30extern QString categoryFileName();
30 31
31QString addressbookPersonalVCardName() 32QString addressbookPersonalVCardName()
32{ 33{
33 QString filename = Global::applicationFileName("addressbook", 34 QString filename = Global::applicationFileName("addressbook",
34 "businesscard.vcf"); 35 "businesscard.vcf");
35 return filename; 36 return filename;
@@ -38,33 +39,33 @@ QString addressbookPersonalVCardName()
38 39
39AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): 40AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
40 QWidget(parent), 41 QWidget(parent),
41 mCat(0), 42 mCat(0),
42 m_inSearch( false ), 43 m_inSearch( false ),
43 m_inPersonal( false ), 44 m_inPersonal( false ),
44 m_curr_category( -1 ), 45 m_curr_category( -1 ),
45 m_curr_View( TableView ), 46 m_curr_View( TableView ),
46 m_prev_View( TableView ), 47 m_prev_View( TableView ),
47 m_curr_Contact ( 0 ), 48 m_curr_Contact ( 0 ),
48 m_contactdb ( 0l ), 49 m_contactdb ( 0l ),
49 m_storedDB ( 0l ), 50 m_storedDB ( 0l ),
50 m_viewStack( 0l ), 51 m_viewStack( 0l ),
51 m_abTable( 0l ), 52 m_abTable( 0l ),
52 m_orderedFields( ordered ) 53 m_orderedFields( ordered )
53{ 54{
54 qWarning("AbView::c'tor"); 55 Opie::Core::owarn << "AbView::c'tor" << oendl;
55 // Load default database and handle syncing myself.. ! 56 // Load default database and handle syncing myself.. !
56 m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false ); 57 m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
57 m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available 58 m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
58 mCat.load( categoryFileName() ); 59 mCat.load( categoryFileName() );
59 60
60 // Create Layout and put WidgetStack into it. 61 // Create Layout and put WidgetStack into it.
61 QVBoxLayout *vb = new QVBoxLayout( this ); 62 QVBoxLayout *vb = new QVBoxLayout( this );
62 m_viewStack = new QWidgetStack( this ); 63 m_viewStack = new QWidgetStack( this );
63 vb->addWidget( m_viewStack ); 64 vb->addWidget( m_viewStack );
64 65
65 // Creat TableView 66 // Creat TableView
66 QVBox* tableBox = new QVBox( m_viewStack ); 67 QVBox* tableBox = new QVBox( m_viewStack );
67 m_abTable = new AbTable( m_orderedFields, tableBox, "table" ); 68 m_abTable = new AbTable( m_orderedFields, tableBox, "table" );
68 m_abTable->setCurrentCell( 0, 0 ); 69 m_abTable->setCurrentCell( 0, 0 );
69 m_abTable->setFocus(); 70 m_abTable->setFocus();
70 71
@@ -86,211 +87,212 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
86} 87}
87 88
88AbView::~AbView() 89AbView::~AbView()
89{ 90{
90 m_contactdb -> save(); 91 m_contactdb -> save();
91 delete m_contactdb; 92 delete m_contactdb;
92 93
93 if ( m_storedDB ){ 94 if ( m_storedDB ){
94 m_storedDB -> save(); 95 m_storedDB -> save();
95 delete m_storedDB; 96 delete m_storedDB;
96 } 97 }
97} 98}
98 99
99 100
100void AbView::setView( Views view ) 101void AbView::setView( Views view )
101{ 102{
102 qWarning("AbView::setView( Views view )"); 103 Opie::Core::owarn << "AbView::setView( Views view )" << oendl;
103 m_curr_View = view; 104 m_curr_View = view;
104 load(); 105 load();
105} 106}
106 107
107void AbView::addEntry( const Opie::OPimContact &newContact ) 108void AbView::addEntry( const Opie::OPimContact &newContact )
108{ 109{
109 qWarning("abview:AddContact"); 110 Opie::Core::owarn << "AbView::AddContact" << oendl;
110 m_contactdb->add ( newContact ); 111 m_contactdb->add ( newContact );
111 load(); 112 load();
112 113
113} 114}
114void AbView::removeEntry( const int UID ) 115void AbView::removeEntry( const int UID )
115{ 116{
116 qWarning("abview:RemoveContact"); 117 Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
117 m_contactdb->remove( UID ); 118 m_contactdb->remove( UID );
118 load(); 119 load();
119} 120}
120 121
121void AbView::replaceEntry( const Opie::OPimContact &contact ) 122void AbView::replaceEntry( const Opie::OPimContact &contact )
122{ 123{
123 qWarning("abview:ReplaceContact"); 124 Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
124 m_contactdb->replace( contact ); 125 m_contactdb->replace( contact );
125 load(); 126 load();
126 127
127} 128}
128 129
129Opie::OPimContact AbView::currentEntry() 130Opie::OPimContact AbView::currentEntry()
130{ 131{
131 Opie::OPimContact currentContact; 132 Opie::OPimContact currentContact;
132 133
133 switch ( (int) m_curr_View ) { 134 switch ( (int) m_curr_View ) {
134 case TableView: 135 case TableView:
135 currentContact = m_abTable -> currentEntry(); 136 currentContact = m_abTable -> currentEntry();
136 break; 137 break;
137 case CardView: 138 case CardView:
138 currentContact = m_ablabel -> currentEntry(); 139 currentContact = m_ablabel -> currentEntry();
139 break; 140 break;
140 } 141 }
141 m_curr_Contact = currentContact.uid(); 142 m_curr_Contact = currentContact.uid();
142 return currentContact; 143 return currentContact;
143} 144}
144 145
145bool AbView::save() 146bool AbView::save()
146{ 147{
147 //qWarning("abView:Save data"); 148 //Opie::Core::owarn << "AbView::Save data" << oendl;
148 149
149 return m_contactdb->save(); 150 return m_contactdb->save();
150} 151}
151 152
152void AbView::load() 153void AbView::load()
153{ 154{
154 qWarning("abView:Load data"); 155 Opie::Core::owarn << "AbView::Load data" << oendl;
155 156
156 // Letter Search is stopped at this place 157 // Letter Search is stopped at this place
157 emit signalClearLetterPicker(); 158 emit signalClearLetterPicker();
158 159
159 if ( m_inPersonal ) 160 if ( m_inPersonal )
160 // VCard Backend does not sort.. 161 // VCard Backend does not sort..
161 m_list = m_contactdb->allRecords(); 162 m_list = m_contactdb->allRecords();
162 else{ 163 else{
163 m_list = m_contactdb->sorted( true, 0, 0, 0 ); 164 m_list = m_contactdb->sorted( true, 0, 0, 0 );
164 if ( m_curr_category != -1 ) 165 if ( m_curr_category != -1 )
165 clearForCategory(); 166 clearForCategory();
166 } 167 }
167 168
168 qWarning ("Number of contacts: %d", m_list.count()); 169 Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
169 170
170 updateView( true ); 171 updateView( true );
171 172
172} 173}
173 174
174void AbView::reload() 175void AbView::reload()
175{ 176{
176 qWarning( "void AbView::reload()" ); 177 Opie::Core::owarn << "AbView::::reload()" << oendl;
177 178
178 m_contactdb->reload(); 179 m_contactdb->reload();
179 load(); 180 load();
180} 181}
181 182
182void AbView::clear() 183void AbView::clear()
183{ 184{
184 // :SX 185 // :SX
185} 186}
186 187
187void AbView::setShowByCategory( const QString& cat ) 188void AbView::setShowByCategory( const QString& cat )
188{ 189{
189 qWarning("AbView::setShowCategory( const QString& cat )"); 190 Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
190 191
191 int intCat = 0; 192 int intCat = 0;
192 193
193 // All (cat == NULL) will be stored as -1 194 // All (cat == NULL) will be stored as -1
194 if ( cat.isNull() ) 195 if ( cat.isNull() )
195 intCat = -1; 196 intCat = -1;
196 else 197 else
197 intCat = mCat.id("Contacts", cat ); 198 intCat = mCat.id("Contacts", cat );
198 199
199 // Just do anything if we really change the category 200 // Just do anything if we really change the category
200 if ( intCat != m_curr_category ){ 201 if ( intCat != m_curr_category ){
201 // qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category); 202 // Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: "
203 // << m_curr_category << oendl;
202 204
203 m_curr_category = intCat; 205 m_curr_category = intCat;
204 emit signalClearLetterPicker(); 206 emit signalClearLetterPicker();
205 207
206 load(); 208 load();
207 } 209 }
208 210
209} 211}
210 212
211void AbView::setShowToView( Views view ) 213void AbView::setShowToView( Views view )
212{ 214{
213 qWarning("void AbView::setShowToView( View %d )", view); 215 Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
214 216
215 if ( m_curr_View != view ){ 217 if ( m_curr_View != view ){
216 qWarning ("Change the View (Category is: %d)", m_curr_category); 218 Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
217 m_prev_View = m_curr_View; 219 m_prev_View = m_curr_View;
218 m_curr_View = view; 220 m_curr_View = view;
219 221
220 updateView(); 222 updateView();
221 } 223 }
222 224
223} 225}
224 226
225void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) 227void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
226{ 228{
227 qWarning("void AbView::setShowByLetter( %c, %d )", c, mode ); 229 Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
228 230
229 assert( mode < AbConfig::LASTELEMENT ); 231 assert( mode < AbConfig::LASTELEMENT );
230 232
231 Opie::OPimContact query; 233 Opie::OPimContact query;
232 if ( c == 0 ){ 234 if ( c == 0 ){
233 load(); 235 load();
234 return; 236 return;
235 }else{ 237 }else{
236 // If the current Backend is unable to solve the query, we will 238 // If the current Backend is unable to solve the query, we will
237 // ignore the request .. 239 // ignore the request ..
238 if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){ 240 if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){
239 return; 241 return;
240 } 242 }
241 243
242 switch( mode ){ 244 switch( mode ){
243 case AbConfig::LastName: 245 case AbConfig::LastName:
244 query.setLastName( QString("%1*").arg(c) ); 246 query.setLastName( QString("%1*").arg(c) );
245 break; 247 break;
246 case AbConfig::FileAs: 248 case AbConfig::FileAs:
247 query.setFileAs( QString("%1*").arg(c) ); 249 query.setFileAs( QString("%1*").arg(c) );
248 break; 250 break;
249 default: 251 default:
250 qWarning( "Unknown Searchmode for AbView::setShowByLetter ! -> %d", mode ); 252 Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
251 qWarning( "I will ignore it.." ); 253 << "I will ignore it.." << oendl;
252 return; 254 return;
253 } 255 }
254 m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ); 256 m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
255 if ( m_curr_category != -1 ) 257 if ( m_curr_category != -1 )
256 clearForCategory(); 258 clearForCategory();
257 m_curr_Contact = 0; 259 m_curr_Contact = 0;
258 } 260 }
259 updateView( true ); 261 updateView( true );
260} 262}
261 263
262void AbView::setListOrder( const QValueList<int>& ordered ) 264void AbView::setListOrder( const QValueList<int>& ordered )
263{ 265{
264 m_orderedFields = ordered; 266 m_orderedFields = ordered;
265 if ( m_abTable ){ 267 if ( m_abTable ){
266 m_abTable->setOrderedList( ordered ); 268 m_abTable->setOrderedList( ordered );
267 m_abTable->refresh(); 269 m_abTable->refresh();
268 } 270 }
269 updateView(); 271 updateView();
270} 272}
271 273
272 274
273QString AbView::showCategory() const 275QString AbView::showCategory() const
274{ 276{
275 return mCat.label( "Contacts", m_curr_category ); 277 return mCat.label( "Contacts", m_curr_category );
276} 278}
277 279
278void AbView::showPersonal( bool personal ) 280void AbView::showPersonal( bool personal )
279{ 281{
280 qWarning ("void AbView::showPersonal( %d )", personal); 282 Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
281 283
282 if ( personal ){ 284 if ( personal ){
283 285
284 if ( m_inPersonal ) 286 if ( m_inPersonal )
285 return; 287 return;
286 288
287 // Now switch to vCard Backend and load data. 289 // Now switch to vCard Backend and load data.
288 // The current default backend will be stored 290 // The current default backend will be stored
289 // to avoid unneeded load/stores. 291 // to avoid unneeded load/stores.
290 m_storedDB = m_contactdb; 292 m_storedDB = m_contactdb;
291 293
292 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, 294 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
293 addressbookPersonalVCardName() ); 295 addressbookPersonalVCardName() );
294 m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); 296 m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
295 297
296 m_inPersonal = true; 298 m_inPersonal = true;
@@ -320,153 +322,154 @@ void AbView::setCurrentUid( int uid ){
320 m_curr_Contact = uid; 322 m_curr_Contact = uid;
321 updateView( true ); //true: Don't modificate the UID ! 323 updateView( true ); //true: Don't modificate the UID !
322} 324}
323 325
324 326
325QStringList AbView::categories() 327QStringList AbView::categories()
326{ 328{
327 mCat.load( categoryFileName() ); 329 mCat.load( categoryFileName() );
328 QStringList categoryList = mCat.labels( "Contacts" ); 330 QStringList categoryList = mCat.labels( "Contacts" );
329 return categoryList; 331 return categoryList;
330} 332}
331 333
332// BEGIN: Slots 334// BEGIN: Slots
333void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 335void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
334 bool , QString cat ) 336 bool , QString cat )
335{ 337{
336 //qWarning( "void AbView::slotDoFind" ); 338 //Opie::Core::owarn << "void AbView::slotDoFind" << oendl;
337 339
338 // We reloading the data: Deselect Letterpicker 340 // We reloading the data: Deselect Letterpicker
339 emit signalClearLetterPicker(); 341 emit signalClearLetterPicker();
340 342
341 // Use the current Category if nothing else selected 343 // Use the current Category if nothing else selected
342 int category = 0; 344 int category = 0;
343 345
344 if ( cat.isEmpty() ) 346 if ( cat.isEmpty() )
345 category = m_curr_category; 347 category = m_curr_category;
346 else{ 348 else{
347 category = mCat.id("Contacts", cat ); 349 category = mCat.id("Contacts", cat );
348 } 350 }
349 351
350 //qWarning ("Find in Category %d", category); 352 //Opie::Core::owarn << "Find in Category " << category << oendl;
351 353
352 QRegExp r( str ); 354 QRegExp r( str );
353 r.setCaseSensitive( caseSensitive ); 355 r.setCaseSensitive( caseSensitive );
354 r.setWildcard( !useRegExp ); 356 r.setWildcard( !useRegExp );
355 357
356 // Get all matching entries out of the database 358 // Get all matching entries out of the database
357 m_list = m_contactdb->matchRegexp( r ); 359 m_list = m_contactdb->matchRegexp( r );
358 360
359 //qWarning( "found: %d", m_list.count() ); 361 //Opie::Core::owarn << "Found: " << m_list.count() << oendl;
360 if ( m_list.count() == 0 ){ 362 if ( m_list.count() == 0 ){
361 emit signalNotFound(); 363 emit signalNotFound();
362 return; 364 return;
363 } 365 }
364 366
365 // Now remove all contacts with wrong category (if any selected) 367 // Now remove all contacts with wrong category (if any selected)
366 // This algorithm is a litte bit ineffective, but 368 // This algorithm is a litte bit ineffective, but
367 // we will not have a lot of matching entries.. 369 // we will not have a lot of matching entries..
368 if ( m_curr_category != -1 ) 370 if ( m_curr_category != -1 )
369 clearForCategory(); 371 clearForCategory();
370 372
371 // Now show all found entries 373 // Now show all found entries
372 updateView( true ); 374 updateView( true );
373} 375}
374 376
375void AbView::offSearch() 377void AbView::offSearch()
376{ 378{
377 m_inSearch = false; 379 m_inSearch = false;
378 380
379 load(); 381 load();
380} 382}
381 383
382void AbView::slotSwitch(){ 384void AbView::slotSwitch(){
383 //qWarning("AbView::slotSwitch()"); 385 //Opie::Core::owarn << "AbView::slotSwitch()" << oendl;
384 386
385 m_prev_View = m_curr_View; 387 m_prev_View = m_curr_View;
386 switch ( (int) m_curr_View ){ 388 switch ( (int) m_curr_View ){
387 case TableView: 389 case TableView:
388 qWarning("Switching to CardView"); 390 Opie::Core::owarn << "Switching to CardView" << oendl;
389 m_curr_View = CardView; 391 m_curr_View = CardView;
390 break; 392 break;
391 case CardView: 393 case CardView:
392 qWarning("Switching to TableView"); 394 Opie::Core::owarn << "Switching to TableView" << oendl;
393 m_curr_View = TableView; 395 m_curr_View = TableView;
394 break; 396 break;
395 } 397 }
396 updateView(); 398 updateView();
397 399
398} 400}
399 401
400// END: Slots 402// END: Slots
401 403
402void AbView::clearForCategory() 404void AbView::clearForCategory()
403{ 405{
404 Opie::OPimContactAccess::List::Iterator it; 406 Opie::OPimContactAccess::List::Iterator it;
405 // Now remove all contacts with wrong category if any category selected 407 // Now remove all contacts with wrong category if any category selected
406 408
407 Opie::OPimContactAccess::List allList = m_list; 409 Opie::OPimContactAccess::List allList = m_list;
408 if ( m_curr_category != -1 ){ 410 if ( m_curr_category != -1 ){
409 for ( it = allList.begin(); it != allList.end(); ++it ){ 411 for ( it = allList.begin(); it != allList.end(); ++it ){
410 if ( !contactCompare( *it, m_curr_category ) ){ 412 if ( !contactCompare( *it, m_curr_category ) ){
411 // qWarning("Removing %d", (*it).uid()); 413 //Opie::Core::owarn << "Removing " << (*it).uid() << oendl;
412 m_list.remove( (*it).uid() ); 414 m_list.remove( (*it).uid() );
413 } 415 }
414 } 416 }
415 } 417 }
416 418
417} 419}
418 420
419bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) 421bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
420{ 422{
421 //qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category); 423 //Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
424 // << category << " )" << oendl;
422 425
423 bool returnMe; 426 bool returnMe;
424 QArray<int> cats; 427 QArray<int> cats;
425 cats = cnt.categories(); 428 cats = cnt.categories();
426 429
427 //qWarning ("Number of categories: %d", cats.count() ); 430 //Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
428 431
429 returnMe = false; 432 returnMe = false;
430 if ( cats.count() == 0 && category == 0 ) 433 if ( cats.count() == 0 && category == 0 )
431 // Contacts with no category will just shown on "All" and "Unfiled" 434 // Contacts with no category will just shown on "All" and "Unfiled"
432 returnMe = true; 435 returnMe = true;
433 else { 436 else {
434 int i; 437 int i;
435 for ( i = 0; i < int(cats.count()); i++ ) { 438 for ( i = 0; i < int(cats.count()); i++ ) {
436 // qWarning("Comparing %d with %d",cats[i],category ); 439 //Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl;
437 if ( cats[i] == category ) { 440 if ( cats[i] == category ) {
438 returnMe = true; 441 returnMe = true;
439 break; 442 break;
440 } 443 }
441 } 444 }
442 } 445 }
443 //qWarning ("Return: %d", returnMe); 446 //Opie::Core::owarn << "Return: " << returnMe << oendl;
444 return returnMe; 447 return returnMe;
445} 448}
446 449
447// In Some rare cases we have to update all lists.. 450// In Some rare cases we have to update all lists..
448void AbView::updateListinViews() 451void AbView::updateListinViews()
449{ 452{
450 m_abTable -> setContacts( m_list ); 453 m_abTable -> setContacts( m_list );
451 m_ablabel -> setContacts( m_list ); 454 m_ablabel -> setContacts( m_list );
452} 455}
453 456
454void AbView::updateView( bool newdata ) 457void AbView::updateView( bool newdata )
455{ 458{
456 //qWarning("AbView::updateView()"); 459 //Opie::Core::owarn << "AbView::updateView()" << oendl;
457 460
458 if ( m_viewStack -> visibleWidget() ){ 461 if ( m_viewStack -> visibleWidget() ){
459 m_viewStack -> visibleWidget() -> clearFocus(); 462 m_viewStack -> visibleWidget() -> clearFocus();
460 } 463 }
461 464
462 // If we switching the view, we have to store some information 465 // If we switching the view, we have to store some information
463 if ( !newdata ){ 466 if ( !newdata ){
464 if ( m_list.count() ){ 467 if ( m_list.count() ){
465 switch ( (int) m_prev_View ) { 468 switch ( (int) m_prev_View ) {
466 case TableView: 469 case TableView:
467 m_curr_Contact = m_abTable -> currentEntry_UID(); 470 m_curr_Contact = m_abTable -> currentEntry_UID();
468 break; 471 break;
469 case CardView: 472 case CardView:
470 m_curr_Contact = m_ablabel -> currentEntry_UID(); 473 m_curr_Contact = m_ablabel -> currentEntry_UID();
471 break; 474 break;
472 } 475 }
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 9ae66d1..94c0a13 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -9,33 +9,33 @@
9** Foundation and appearing in the file LICENSE.GPL included in the 9** Foundation and appearing in the file LICENSE.GPL included in the
10** packaging of this file. 10** packaging of this file.
11** 11**
12** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 12** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
13** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 13** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
14** 14**
15** See http://www.trolltech.com/gpl/ for GPL licensing information. 15** See http://www.trolltech.com/gpl/ for GPL licensing information.
16** 16**
17** 17**
18**********************************************************************/ 18**********************************************************************/
19 19
20#define QTOPIA_INTERNAL_FD 20#define QTOPIA_INTERNAL_FD
21 21
22// #include "addresssettings.h" 22// #include "addresssettings.h"
23#include "addressbook.h" 23#include "addressbook.h"
24 24
25 25#include <opie2/odebug.h>
26#include <opie2/ofileselector.h> 26#include <opie2/ofileselector.h>
27#include <opie2/ofiledialog.h> 27#include <opie2/ofiledialog.h>
28#include <opie2/opimcontact.h> 28#include <opie2/opimcontact.h>
29#include <opie2/ocontactaccessbackend_vcard.h> 29#include <opie2/ocontactaccessbackend_vcard.h>
30 30
31#include <qpe/resource.h> 31#include <qpe/resource.h>
32#include <qpe/ir.h> 32#include <qpe/ir.h>
33#include <qpe/qpemessagebox.h> 33#include <qpe/qpemessagebox.h>
34#include <qmenubar.h> 34#include <qmenubar.h>
35// #include <qtoolbar.h> 35// #include <qtoolbar.h>
36// #include <qmenubar.h> 36// #include <qmenubar.h>
37#include <qpe/qpeapplication.h> 37#include <qpe/qpeapplication.h>
38 38
39#include <qaction.h> 39#include <qaction.h>
40#include <qlayout.h> 40#include <qlayout.h>
41#include <qmessagebox.h> 41#include <qmessagebox.h>
@@ -238,65 +238,65 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
238 pLabel = new LetterPicker( listContainer ); 238 pLabel = new LetterPicker( listContainer );
239 connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char))); 239 connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
240 connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) ); 240 connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) );
241 241
242 vb->addWidget( pLabel ); 242 vb->addWidget( pLabel );
243 243
244 // All Categories into view-menu.. 244 // All Categories into view-menu..
245 populateCategories(); 245 populateCategories();
246 246
247 // Fontsize 247 // Fontsize
248 defaultFont = new QFont( m_abView->font() ); 248 defaultFont = new QFont( m_abView->font() );
249 slotSetFont(m_config.fontSize()); 249 slotSetFont(m_config.fontSize());
250 m_curFontSize = m_config.fontSize(); 250 m_curFontSize = m_config.fontSize();
251 251
252 setCentralWidget(listContainer); 252 setCentralWidget(listContainer);
253 253
254 // qDebug("adressbook contrsuction: t=%d", t.elapsed() ); 254 //Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
255 connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); 255 connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
256 connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) ); 256 connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
257 connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), 257 connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
258 this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); 258 this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
259 259
260 260
261 isLoading = false; 261 isLoading = false;
262} 262}
263 263
264 264
265void AddressbookWindow::slotConfig() 265void AddressbookWindow::slotConfig()
266{ 266{
267 ConfigDlg* dlg = new ConfigDlg( this, "Config" ); 267 ConfigDlg* dlg = new ConfigDlg( this, "Config" );
268 dlg -> setConfig( m_config ); 268 dlg -> setConfig( m_config );
269 if ( QPEApplication::execDialog( dlg ) ) { 269 if ( QPEApplication::execDialog( dlg ) ) {
270 qWarning ("Config Dialog accepted!"); 270 Opie::Core::owarn << "Config Dialog accepted!" << oendl;
271 m_config = dlg -> getConfig(); 271 m_config = dlg -> getConfig();
272 if ( m_curFontSize != m_config.fontSize() ){ 272 if ( m_curFontSize != m_config.fontSize() ){
273 qWarning("Font was changed!"); 273 Opie::Core::owarn << "Font was changed!" << oendl;
274 m_curFontSize = m_config.fontSize(); 274 m_curFontSize = m_config.fontSize();
275 emit slotSetFont( m_curFontSize ); 275 emit slotSetFont( m_curFontSize );
276 } 276 }
277 m_abView -> setListOrder( m_config.orderList() ); 277 m_abView -> setListOrder( m_config.orderList() );
278 } 278 }
279 279
280 delete dlg; 280 delete dlg;
281} 281}
282 282
283 283
284void AddressbookWindow::slotSetFont( int size ) 284void AddressbookWindow::slotSetFont( int size )
285{ 285{
286 qWarning("void AddressbookWindow::slotSetFont( %d )", size); 286 Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
287 287
288 if (size > 2 || size < 0) 288 if (size > 2 || size < 0)
289 size = 1; 289 size = 1;
290 290
291 m_config.setFontSize( size ); 291 m_config.setFontSize( size );
292 292
293 QFont *currentFont; 293 QFont *currentFont;
294 294
295 switch (size) { 295 switch (size) {
296 case 0: 296 case 0:
297 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) ); 297 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
298 currentFont = new QFont (m_abView->font()); 298 currentFont = new QFont (m_abView->font());
299 // abList->resizeRows(currentFont->pixelSize() + 7); :SX 299 // abList->resizeRows(currentFont->pixelSize() + 7); :SX
300 // abList->resizeRows(); 300 // abList->resizeRows();
301 break; 301 break;
302 case 1: 302 case 1:
@@ -312,110 +312,110 @@ void AddressbookWindow::slotSetFont( int size )
312 // abList->resizeRows(); 312 // abList->resizeRows();
313 break; 313 break;
314 } 314 }
315} 315}
316 316
317 317
318 318
319void AddressbookWindow::importvCard() { 319void AddressbookWindow::importvCard() {
320 QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this ); 320 QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
321 if(!str.isEmpty() ){ 321 if(!str.isEmpty() ){
322 setDocument((const QString&) str ); 322 setDocument((const QString&) str );
323 } 323 }
324 324
325} 325}
326void AddressbookWindow::exportvCard() 326void AddressbookWindow::exportvCard()
327{ 327{
328 qWarning(" void AddressbookWindow::exportvCard()"); 328 Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl;
329 QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); 329 QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
330 if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ 330 if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){
331 qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 ); 331 Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
332 Opie::OPimContact curCont = m_abView->currentEntry(); 332 Opie::OPimContact curCont = m_abView->currentEntry();
333 if ( !curCont.isEmpty() ){ 333 if ( !curCont.isEmpty() ){
334 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, 334 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
335 filename ); 335 filename );
336 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true ); 336 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
337 if ( access ){ 337 if ( access ){
338 access->add( curCont ); 338 access->add( curCont );
339 access->save(); 339 access->save();
340 } 340 }
341 delete access; 341 delete access;
342 }else 342 }else
343 QMessageBox::critical( 0, "Export VCard", 343 QMessageBox::critical( 0, "Export VCard",
344 QString( tr( "You have to select a contact !") ) ); 344 QString( tr( "You have to select a contact !") ) );
345 345
346 }else 346 }else
347 QMessageBox::critical( 0, "Export VCard", 347 QMessageBox::critical( 0, "Export VCard",
348 QString( tr( "You have to set a filename !") ) ); 348 QString( tr( "You have to set a filename !") ) );
349} 349}
350 350
351void AddressbookWindow::setDocument( const QString &filename ) 351void AddressbookWindow::setDocument( const QString &filename )
352{ 352{
353 qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() ); 353 Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
354 354
355 if ( filename.find(".vcf") != int(filename.length()) - 4 ){ 355 if ( filename.find(".vcf") != int(filename.length()) - 4 ){
356 356
357 357
358 358
359 switch( QMessageBox::information( this, tr ( "Right file type ?" ), 359 switch( QMessageBox::information( this, tr ( "Right file type ?" ),
360 tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ), 360 tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
361 tr( "&Yes" ), tr( "&No" ), QString::null, 361 tr( "&Yes" ), tr( "&No" ), QString::null,
362 0, // Enter == button 0 362 0, // Enter == button 0
363 2 ) ) { // Escape == button 2 363 2 ) ) { // Escape == button 2
364 case 0: 364 case 0:
365 qWarning("YES clicked"); 365 Opie::Core::owarn << "YES clicked" << oendl;
366 break; 366 break;
367 case 1: 367 case 1:
368 qWarning("NO clicked"); 368 Opie::Core::owarn << "NO clicked" << oendl;
369 return; 369 return;
370 break; 370 break;
371 } 371 }
372 } 372 }
373 373
374 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, 374 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
375 filename ); 375 filename );
376 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); 376 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
377 Opie::OPimContactAccess::List allList = access->allRecords(); 377 Opie::OPimContactAccess::List allList = access->allRecords();
378 qWarning( "Found number of contacts in File: %d", allList.count() ); 378 Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl;
379 379
380 if ( !allList.count() ) { 380 if ( !allList.count() ) {
381 QMessageBox::information( this, "Import VCard", 381 QMessageBox::information( this, "Import VCard",
382 "It was impossible to import\nthe VCard.\n" 382 "It was impossible to import\nthe VCard.\n"
383 "The VCard may be corrupted!" ); 383 "The VCard may be corrupted!" );
384 } 384 }
385 385
386 bool doAsk = true; 386 bool doAsk = true;
387 Opie::OPimContactAccess::List::Iterator it; 387 Opie::OPimContactAccess::List::Iterator it;
388 for ( it = allList.begin(); it != allList.end(); ++it ){ 388 for ( it = allList.begin(); it != allList.end(); ++it ){
389 qWarning("Adding Contact from: %s", (*it).fullName().latin1() ); 389 Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl;
390 if ( doAsk ){ 390 if ( doAsk ){
391 switch( QMessageBox::information( this, tr ( "Add Contact?" ), 391 switch( QMessageBox::information( this, tr ( "Add Contact?" ),
392 tr( "Do you really want add contact for \n%1?" ) 392 tr( "Do you really want add contact for \n%1?" )
393 .arg( (*it).fullName().latin1() ), 393 .arg( (*it).fullName().latin1() ),
394 tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"), 394 tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
395 0, // Enter == button 0 395 0, // Enter == button 0
396 2 ) ) { // Escape == button 2 396 2 ) ) { // Escape == button 2
397 case 0: 397 case 0:
398 qWarning("YES clicked"); 398 Opie::Core::owarn << "YES clicked" << oendl;
399 m_abView->addEntry( *it ); 399 m_abView->addEntry( *it );
400 break; 400 break;
401 case 1: 401 case 1:
402 qWarning("NO clicked"); 402 Opie::Core::owarn << "NO clicked" << oendl;
403 break; 403 break;
404 case 2: 404 case 2:
405 qWarning("YesAll clicked"); 405 Opie::Core::owarn << "YesAll clicked" << oendl;
406 doAsk = false; 406 doAsk = false;
407 break; 407 break;
408 } 408 }
409 }else 409 }else
410 m_abView->addEntry( *it ); 410 m_abView->addEntry( *it );
411 411
412 } 412 }
413 413
414 delete access; 414 delete access;
415} 415}
416 416
417void AddressbookWindow::resizeEvent( QResizeEvent *e ) 417void AddressbookWindow::resizeEvent( QResizeEvent *e )
418{ 418{
419 QMainWindow::resizeEvent( e ); 419 QMainWindow::resizeEvent( e );
420 420
421 421
@@ -525,45 +525,45 @@ void AddressbookWindow::slotViewEdit()
525 525
526void AddressbookWindow::writeMail() 526void AddressbookWindow::writeMail()
527{ 527{
528 Opie::OPimContact c = m_abView -> currentEntry(); 528 Opie::OPimContact c = m_abView -> currentEntry();
529 QString name = c.fileAs(); 529 QString name = c.fileAs();
530 QString email = c.defaultEmail(); 530 QString email = c.defaultEmail();
531 531
532 // I prefer the OPIE-Environment variable before the 532 // I prefer the OPIE-Environment variable before the
533 // QPE-one.. 533 // QPE-one..
534 QString basepath = QString::fromLatin1( getenv("OPIEDIR") ); 534 QString basepath = QString::fromLatin1( getenv("OPIEDIR") );
535 if ( basepath.isEmpty() ) 535 if ( basepath.isEmpty() )
536 basepath = QString::fromLatin1( getenv("QPEDIR") ); 536 basepath = QString::fromLatin1( getenv("QPEDIR") );
537 537
538 // Try to access the preferred. If not possible, try to 538 // Try to access the preferred. If not possible, try to
539 // switch to the other one.. 539 // switch to the other one..
540 if ( m_config.useQtMail() ){ 540 if ( m_config.useQtMail() ){
541 qWarning ("Accessing: %s", (basepath + "/bin/qtmail").latin1()); 541 Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
542 if ( QFile::exists( basepath + "/bin/qtmail" ) ){ 542 if ( QFile::exists( basepath + "/bin/qtmail" ) ){
543 qWarning ("QCop"); 543 Opie::Core::owarn << "QCop" << oendl;
544 QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)"); 544 QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
545 e << name << email; 545 e << name << email;
546 return; 546 return;
547 } else 547 } else
548 m_config.setUseOpieMail( true ); 548 m_config.setUseOpieMail( true );
549 } 549 }
550 if ( m_config.useOpieMail() ){ 550 if ( m_config.useOpieMail() ){
551 qWarning ("Accessing: %s", (basepath + "/bin/opiemail").latin1()); 551 Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
552 if ( QFile::exists( basepath + "/bin/opiemail" ) ){ 552 if ( QFile::exists( basepath + "/bin/opiemail" ) ){
553 qWarning ("QCop"); 553 Opie::Core::owarn << "QCop" << oendl;
554 QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)"); 554 QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
555 e << name << email; 555 e << name << email;
556 return; 556 return;
557 } else 557 } else
558 m_config.setUseQtMail( true ); 558 m_config.setUseQtMail( true );
559 } 559 }
560 560
561} 561}
562 562
563static const char * beamfile = "/tmp/obex/contact.vcf"; 563static const char * beamfile = "/tmp/obex/contact.vcf";
564 564
565void AddressbookWindow::slotBeam() 565void AddressbookWindow::slotBeam()
566{ 566{
567 QString beamFilename; 567 QString beamFilename;
568 Opie::OPimContact c; 568 Opie::OPimContact c;
569 if ( actionPersonal->isOn() ) { 569 if ( actionPersonal->isOn() ) {
@@ -579,33 +579,33 @@ void AddressbookWindow::slotBeam()
579 579
580 delete access; 580 delete access;
581 } else { 581 } else {
582 unlink( beamfile ); // delete if exists 582 unlink( beamfile ); // delete if exists
583 mkdir("/tmp/obex/", 0755); 583 mkdir("/tmp/obex/", 0755);
584 c = m_abView -> currentEntry(); 584 c = m_abView -> currentEntry();
585 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, 585 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
586 beamfile ); 586 beamfile );
587 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); 587 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
588 access->add( c ); 588 access->add( c );
589 access->save(); 589 access->save();
590 delete access; 590 delete access;
591 591
592 beamFilename = beamfile; 592 beamFilename = beamfile;
593 } 593 }
594 594
595 qWarning("Beaming: %s", beamFilename.latin1() ); 595 Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
596 596
597 Ir *ir = new Ir( this ); 597 Ir *ir = new Ir( this );
598 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); 598 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
599 QString description = c.fullName(); 599 QString description = c.fullName();
600 ir->send( beamFilename, description, "text/x-vCard" ); 600 ir->send( beamFilename, description, "text/x-vCard" );
601} 601}
602 602
603void AddressbookWindow::beamDone( Ir *ir ) 603void AddressbookWindow::beamDone( Ir *ir )
604{ 604{
605 605
606 delete ir; 606 delete ir;
607 unlink( beamfile ); 607 unlink( beamfile );
608} 608}
609 609
610 610
611static void parseName( const QString& name, QString *first, QString *middle, 611static void parseName( const QString& name, QString *first, QString *middle,
@@ -626,76 +626,76 @@ static void parseName( const QString& name, QString *first, QString *middle,
626 rest = name.left( space ); 626 rest = name.left( space );
627 } 627 }
628 int space = rest.find( ' ' ); 628 int space = rest.find( ' ' );
629 if ( space <= 0 ) { 629 if ( space <= 0 ) {
630 *first = rest; 630 *first = rest;
631 } else { 631 } else {
632 *first = rest.left( space ); 632 *first = rest.left( space );
633 *middle = rest.mid( space+1 ); 633 *middle = rest.mid( space+1 );
634 } 634 }
635 635
636} 636}
637 637
638 638
639void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) 639void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
640{ 640{
641 bool needShow = FALSE; 641 bool needShow = FALSE;
642 qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() ); 642 Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl;
643 643
644 644
645 if (msg == "editPersonal()") { 645 if (msg == "editPersonal()") {
646 editPersonal(); 646 editPersonal();
647 } else if (msg == "editPersonalAndClose()") { 647 } else if (msg == "editPersonalAndClose()") {
648 editPersonal(); 648 editPersonal();
649 close(); 649 close();
650 } else if ( msg == "addContact(QString,QString)" ) { 650 } else if ( msg == "addContact(QString,QString)" ) {
651 QDataStream stream(data,IO_ReadOnly); 651 QDataStream stream(data,IO_ReadOnly);
652 QString name, email; 652 QString name, email;
653 stream >> name >> email; 653 stream >> name >> email;
654 654
655 Opie::OPimContact cnt; 655 Opie::OPimContact cnt;
656 QString fn, mn, ln; 656 QString fn, mn, ln;
657 parseName( name, &fn, &mn, &ln ); 657 parseName( name, &fn, &mn, &ln );
658 // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); 658 //Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl;
659 cnt.setFirstName( fn ); 659 cnt.setFirstName( fn );
660 cnt.setMiddleName( mn ); 660 cnt.setMiddleName( mn );
661 cnt.setLastName( ln ); 661 cnt.setLastName( ln );
662 cnt.insertEmails( email ); 662 cnt.insertEmails( email );
663 cnt.setDefaultEmail( email ); 663 cnt.setDefaultEmail( email );
664 cnt.setFileAs(); 664 cnt.setFileAs();
665 665
666 m_abView -> addEntry( cnt ); 666 m_abView -> addEntry( cnt );
667 667
668 // :SXm_abView()->init( cnt ); 668 // :SXm_abView()->init( cnt );
669 editEntry( EditEntry ); 669 editEntry( EditEntry );
670 } else if ( msg == "beamBusinessCard()" ) { 670 } else if ( msg == "beamBusinessCard()" ) {
671 QString beamFilename = addressbookPersonalVCardName(); 671 QString beamFilename = addressbookPersonalVCardName();
672 if ( !QFile::exists( beamFilename ) ) 672 if ( !QFile::exists( beamFilename ) )
673 return; // can't beam a non-existent file 673 return; // can't beam a non-existent file
674 674
675 Ir *ir = new Ir( this ); 675 Ir *ir = new Ir( this );
676 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); 676 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
677 QString description = "mycard.vcf"; 677 QString description = "mycard.vcf";
678 ir->send( beamFilename, description, "text/x-vCard" ); 678 ir->send( beamFilename, description, "text/x-vCard" );
679 } else if ( msg == "show(int)" ) { 679 } else if ( msg == "show(int)" ) {
680 raise(); 680 raise();
681 QDataStream stream(data,IO_ReadOnly); 681 QDataStream stream(data,IO_ReadOnly);
682 int uid; 682 int uid;
683 stream >> uid; 683 stream >> uid;
684 684
685 qWarning( "Showing uid: %d" , uid ); 685 Opie::Core::owarn << "Showing uid: " << uid << oendl;
686 686
687 // Deactivate Personal View.. 687 // Deactivate Personal View..
688 if ( actionPersonal->isOn() ){ 688 if ( actionPersonal->isOn() ){
689 actionPersonal->setOn( false ); 689 actionPersonal->setOn( false );
690 slotPersonalView(); 690 slotPersonalView();
691 } 691 }
692 692
693 // Reset category and show as card.. 693 // Reset category and show as card..
694 m_abView -> setShowByCategory( QString::null ); 694 m_abView -> setShowByCategory( QString::null );
695 m_abView -> setCurrentUid( uid ); 695 m_abView -> setCurrentUid( uid );
696 slotViewSwitched ( AbView::CardView ); 696 slotViewSwitched ( AbView::CardView );
697 697
698 needShow = true; 698 needShow = true;
699 699
700 700
701 } else if ( msg == "edit(int)" ) { 701 } else if ( msg == "edit(int)" ) {
@@ -749,68 +749,68 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
749 replEntry.assignUid(); 749 replEntry.assignUid();
750 750
751 m_abView -> replaceEntry( replEntry ); 751 m_abView -> replaceEntry( replEntry );
752 } 752 }
753 } 753 }
754 // populateCategories(); 754 // populateCategories();
755 755
756} 756}
757 757
758void AddressbookWindow::editPersonal() 758void AddressbookWindow::editPersonal()
759{ 759{
760 Opie::OPimContact entry; 760 Opie::OPimContact entry;
761 761
762 // Switch to personal view if not selected 762 // Switch to personal view if not selected
763 // but take care of the menu, too 763 // but take care of the menu, too
764 if ( ! actionPersonal->isOn() ){ 764 if ( ! actionPersonal->isOn() ){
765 qWarning("*** ++++"); 765 Opie::Core::owarn << "*** ++++" << oendl;
766 actionPersonal->setOn( true ); 766 actionPersonal->setOn( true );
767 slotPersonalView(); 767 slotPersonalView();
768 } 768 }
769 769
770 if ( !abEditor ) { 770 if ( !abEditor ) {
771 abEditor = new ContactEditor( entry, this, "editor" ); 771 abEditor = new ContactEditor( entry, this, "editor" );
772 } 772 }
773 773
774 abEditor->setCaption(tr("Edit My Personal Details")); 774 abEditor->setCaption(tr("Edit My Personal Details"));
775 abEditor->setPersonalView( true ); 775 abEditor->setPersonalView( true );
776 editEntry( EditEntry ); 776 editEntry( EditEntry );
777 abEditor->setPersonalView( false ); 777 abEditor->setPersonalView( false );
778 778
779} 779}
780 780
781 781
782void AddressbookWindow::slotPersonalView() 782void AddressbookWindow::slotPersonalView()
783{ 783{
784 qWarning("slotPersonalView()"); 784 Opie::Core::owarn << "slotPersonalView()" << oendl;
785 if (!actionPersonal->isOn()) { 785 if (!actionPersonal->isOn()) {
786 // we just turned it off 786 // we just turned it off
787 qWarning("slotPersonalView()-> OFF"); 787 Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl;
788 setCaption( tr("Contacts") ); 788 setCaption( tr("Contacts") );
789 actionNew->setEnabled(TRUE); 789 actionNew->setEnabled(TRUE);
790 actionTrash->setEnabled(TRUE); 790 actionTrash->setEnabled(TRUE);
791 actionFind->setEnabled(TRUE); 791 actionFind->setEnabled(TRUE);
792 actionMail->setEnabled(TRUE); 792 actionMail->setEnabled(TRUE);
793 // slotUpdateToolbar(); 793 // slotUpdateToolbar();
794 794
795 m_abView->showPersonal( false ); 795 m_abView->showPersonal( false );
796 796
797 return; 797 return;
798 } 798 }
799 799
800 qWarning("slotPersonalView()-> ON"); 800 Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
801 // XXX need to disable some QActions. 801 // XXX need to disable some QActions.
802 actionNew->setEnabled(FALSE); 802 actionNew->setEnabled(FALSE);
803 actionTrash->setEnabled(FALSE); 803 actionTrash->setEnabled(FALSE);
804 actionFind->setEnabled(FALSE); 804 actionFind->setEnabled(FALSE);
805 actionMail->setEnabled(FALSE); 805 actionMail->setEnabled(FALSE);
806 806
807 setCaption( tr("Contacts - My Personal Details") ); 807 setCaption( tr("Contacts - My Personal Details") );
808 808
809 m_abView->showPersonal( true ); 809 m_abView->showPersonal( true );
810 810
811} 811}
812 812
813 813
814void AddressbookWindow::listIsEmpty( bool empty ) 814void AddressbookWindow::listIsEmpty( bool empty )
815{ 815{
816 if ( !empty ) { 816 if ( !empty ) {
@@ -874,50 +874,51 @@ bool AddressbookWindow::save()
874 else 874 else
875 return FALSE; 875 return FALSE;
876 } 876 }
877 return TRUE; 877 return TRUE;
878} 878}
879 879
880#ifdef __DEBUG_RELEASE 880#ifdef __DEBUG_RELEASE
881void AddressbookWindow::slotSave() 881void AddressbookWindow::slotSave()
882{ 882{
883 save(); 883 save();
884} 884}
885#endif 885#endif
886 886
887 887
888void AddressbookWindow::slotNotFound() 888void AddressbookWindow::slotNotFound()
889{ 889{
890 qWarning("Got notfound signal!"); 890 Opie::Core::owarn << "Got not found signal!" << oendl;
891 QMessageBox::information( this, tr( "Not Found" ), 891 QMessageBox::information( this, tr( "Not Found" ),
892 "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" ); 892 "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
893 893
894 894
895} 895}
896void AddressbookWindow::slotWrapAround() 896void AddressbookWindow::slotWrapAround()
897{ 897{
898 qWarning("Got wrap signal!"); 898 Opie::Core::owarn << "Got wrap signal!" << oendl;
899 // if ( doNotifyWrapAround ) 899 // if ( doNotifyWrapAround )
900 // QMessageBox::information( this, tr( "End of list" ), 900 // QMessageBox::information( this, tr( "End of list" ),
901 // tr( "End of list. Wrap around now...!" ) + "\n" ); 901 // tr( "End of list. Wrap around now...!" ) + "\n" );
902 902
903} 903}
904 904
905void AddressbookWindow::slotSetCategory( int c ) 905void AddressbookWindow::slotSetCategory( int c )
906{ 906{
907 qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() ); 907 Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
908 << catMenu->count() << oendl;
908 909
909 QString cat, book; 910 QString cat, book;
910 AbView::Views view = AbView::TableView; 911 AbView::Views view = AbView::TableView;
911 912
912 if ( c <= 0 ) 913 if ( c <= 0 )
913 return; 914 return;
914 915
915 // Switch view 916 // Switch view
916 if ( c < 3 ) 917 if ( c < 3 )
917 for ( unsigned int i = 1; i < 3; i++ ){ 918 for ( unsigned int i = 1; i < 3; i++ ){
918 if ( catMenu ) 919 if ( catMenu )
919 catMenu->setItemChecked( i, c == (int)i ); 920 catMenu->setItemChecked( i, c == (int)i );
920 } 921 }
921 else 922 else
922 // Checkmark Category Menu Item Selected 923 // Checkmark Category Menu Item Selected
923 for ( unsigned int i = 3; i < catMenu->count(); i++ ) 924 for ( unsigned int i = 3; i < catMenu->count(); i++ )
@@ -926,56 +927,56 @@ void AddressbookWindow::slotSetCategory( int c )
926 // Now switch to the selected category 927 // Now switch to the selected category
927 for ( unsigned int i = 1; i < catMenu->count(); i++ ) { 928 for ( unsigned int i = 1; i < catMenu->count(); i++ ) {
928 if (catMenu->isItemChecked( i )) { 929 if (catMenu->isItemChecked( i )) {
929 if ( i == 1 ){ // default List view 930 if ( i == 1 ){ // default List view
930 book = QString::null; 931 book = QString::null;
931 view = AbView::TableView; 932 view = AbView::TableView;
932 }else if ( i == 2 ){ 933 }else if ( i == 2 ){
933 book = tr( "Cards" ); 934 book = tr( "Cards" );
934 view = AbView::CardView; 935 view = AbView::CardView;
935 // }else if ( i == 3 ){ 936 // }else if ( i == 3 ){
936 // book = tr( "Personal" ); 937 // book = tr( "Personal" );
937 // view = AbView:: PersonalView; 938 // view = AbView:: PersonalView;
938 }else if ( i == 3 ){ // default All Categories 939 }else if ( i == 3 ){ // default All Categories
939 cat = QString::null; 940 cat = QString::null;
940 }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled 941 }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
941 cat = "Unfiled"; 942 cat = "Unfiled";
942 qWarning ("Unfiled selected!"); 943 Opie::Core::owarn << "Unfiled selected!" << oendl;
943 }else{ 944 }else{
944 cat = m_abView->categories()[i - 4]; 945 cat = m_abView->categories()[i - 4];
945 } 946 }
946 } 947 }
947 } 948 }
948 949
949 // Switch to the selected View 950 // Switch to the selected View
950 slotViewSwitched( view ); 951 slotViewSwitched( view );
951 952
952 // Tell the view about the selected category 953 // Tell the view about the selected category
953 m_abView -> setShowByCategory( cat ); 954 m_abView -> setShowByCategory( cat );
954 955
955 if ( book.isEmpty() ) 956 if ( book.isEmpty() )
956 book = "List"; 957 book = "List";
957 if ( cat.isEmpty() ) 958 if ( cat.isEmpty() )
958 cat = "All"; 959 cat = "All";
959 960
960 setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) ); 961 setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) );
961} 962}
962 963
963void AddressbookWindow::slotViewSwitched( int view ) 964void AddressbookWindow::slotViewSwitched( int view )
964{ 965{
965 qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view ); 966 Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
966 int menu = 0; 967 int menu = 0;
967 968
968 // Switch to selected view 969 // Switch to selected view
969 switch ( view ){ 970 switch ( view ){
970 case AbView::TableView: 971 case AbView::TableView:
971 menu = 1; 972 menu = 1;
972 m_tableViewButton->setOn(true); 973 m_tableViewButton->setOn(true);
973 m_cardViewButton->setOn(false); 974 m_cardViewButton->setOn(false);
974 break; 975 break;
975 case AbView::CardView: 976 case AbView::CardView:
976 menu = 2; 977 menu = 2;
977 m_tableViewButton->setOn(false); 978 m_tableViewButton->setOn(false);
978 m_cardViewButton->setOn(true); 979 m_cardViewButton->setOn(true);
979 break; 980 break;
980 } 981 }
981 for ( unsigned int i = 1; i < 3; i++ ){ 982 for ( unsigned int i = 1; i < 3; i++ ){
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 6c98b5d..094dbda 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,18 +1,19 @@
1#include "configdlg.h" 1#include "configdlg.h"
2 2
3#include <opie2/odebug.h>
3#include <opie2/opimcontact.h> 4#include <opie2/opimcontact.h>
4#include "opie2/opimcontactfields.h" 5#include "opie2/opimcontactfields.h"
5 6
6#include <qpe/resource.h> 7#include <qpe/resource.h>
7 8
8#include <qcheckbox.h> 9#include <qcheckbox.h>
9#include <qradiobutton.h> 10#include <qradiobutton.h>
10#include <qlistbox.h> 11#include <qlistbox.h>
11#include <qpushbutton.h> 12#include <qpushbutton.h>
12 13
13ConfigDlg::ConfigDlg( QWidget *parent, const char *name): 14ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
14 ConfigDlg_Base(parent, name, true ) 15 ConfigDlg_Base(parent, name, true )
15{ 16{
16 contFields = Opie::OPimContactFields::trfields(); 17 contFields = Opie::OPimContactFields::trfields();
17 18
18 // We add all Fields into the Listbox 19 // We add all Fields into the Listbox
@@ -29,72 +30,72 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
29 m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) ); 30 m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
30 m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) ); 31 m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
31 32
32 33
33 // Get the translation maps between Field ID and translated strings 34 // Get the translation maps between Field ID and translated strings
34 m_mapStrToID = Opie::OPimContactFields::trFieldsToId(); 35 m_mapStrToID = Opie::OPimContactFields::trFieldsToId();
35 m_mapIDToStr = Opie::OPimContactFields::idToTrFields(); 36 m_mapIDToStr = Opie::OPimContactFields::idToTrFields();
36 37
37 connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) ); 38 connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
38 connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) ); 39 connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) );
39 connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) ); 40 connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) );
40 connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) ); 41 connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) );
41} 42}
42 43
43void ConfigDlg::slotItemUp() 44void ConfigDlg::slotItemUp()
44{ 45{
45 qWarning( "void ConfigDlg::slotItemUp()" ); 46 Opie::Core::owarn << "void ConfigDlg::slotItemUp()" << oendl;
46 47
47 int i = fieldListBox->currentItem(); 48 int i = fieldListBox->currentItem();
48 if ( i > 0 ) { 49 if ( i > 0 ) {
49 QString item = fieldListBox->currentText(); 50 QString item = fieldListBox->currentText();
50 fieldListBox->removeItem( i ); 51 fieldListBox->removeItem( i );
51 fieldListBox->insertItem( item, i-1 ); 52 fieldListBox->insertItem( item, i-1 );
52 fieldListBox->setCurrentItem( i-1 ); 53 fieldListBox->setCurrentItem( i-1 );
53 } 54 }
54 55
55} 56}
56 57
57void ConfigDlg::slotItemDown() 58void ConfigDlg::slotItemDown()
58{ 59{
59 qWarning( "void ConfigDlg::slotItemDown()" ); 60 Opie::Core::owarn << "void ConfigDlg::slotItemDown()" << oendl;
60 61
61 int i = fieldListBox->currentItem(); 62 int i = fieldListBox->currentItem();
62 if ( i < (int)fieldListBox->count() - 1 ) { 63 if ( i < (int)fieldListBox->count() - 1 ) {
63 QString item = fieldListBox->currentText(); 64 QString item = fieldListBox->currentText();
64 fieldListBox->removeItem( i ); 65 fieldListBox->removeItem( i );
65 fieldListBox->insertItem( item, i+1 ); 66 fieldListBox->insertItem( item, i+1 );
66 fieldListBox->setCurrentItem( i+1 ); 67 fieldListBox->setCurrentItem( i+1 );
67 } 68 }
68} 69}
69 70
70void ConfigDlg::slotItemAdd() 71void ConfigDlg::slotItemAdd()
71{ 72{
72 qWarning( "void ConfigDlg::slotItemAdd()" ); 73 Opie::Core::owarn << "void ConfigDlg::slotItemAdd()" << oendl;
73 74
74 int i = allFieldListBox->currentItem(); 75 int i = allFieldListBox->currentItem();
75 if ( i > 0 ) { 76 if ( i > 0 ) {
76 QString item = allFieldListBox->currentText(); 77 QString item = allFieldListBox->currentText();
77 qWarning("ADding %s", item.latin1()); 78 Opie::Core::owarn << "Adding " << item << oendl;
78 fieldListBox->insertItem( item ); 79 fieldListBox->insertItem( item );
79 } 80 }
80} 81}
81 82
82void ConfigDlg::slotItemRemove() 83void ConfigDlg::slotItemRemove()
83{ 84{
84 qWarning( "void ConfigDlg::slotItemRemove()" ); 85 Opie::Core::owarn << "void ConfigDlg::slotItemRemove()" << oendl;
85 86
86 int i = fieldListBox->currentItem(); 87 int i = fieldListBox->currentItem();
87 if ( i > 0 ) { 88 if ( i > 0 ) {
88 fieldListBox->removeItem( i ); 89 fieldListBox->removeItem( i );
89 } 90 }
90} 91}
91 92
92void ConfigDlg::setConfig( const AbConfig& cnf ) 93void ConfigDlg::setConfig( const AbConfig& cnf )
93{ 94{
94 m_config = cnf; 95 m_config = cnf;
95 96
96 m_useRegExp->setChecked( m_config.useRegExp() ); 97 m_useRegExp->setChecked( m_config.useRegExp() );
97 m_useWildCard->setChecked( m_config.useWildCards() ); 98 m_useWildCard->setChecked( m_config.useWildCards() );
98 m_useQtMail->setChecked( m_config.useQtMail() ); 99 m_useQtMail->setChecked( m_config.useQtMail() );
99 m_useOpieMail->setChecked( m_config.useOpieMail() ); 100 m_useOpieMail->setChecked( m_config.useOpieMail() );
100 m_useCaseSensitive->setChecked( m_config.beCaseSensitive() ); 101 m_useCaseSensitive->setChecked( m_config.beCaseSensitive() );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 534666d..e496387 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -8,32 +8,33 @@
8 * GNU General Public License version 2 as published by the Free Software 8 * GNU General Public License version 2 as published by the Free Software
9 * Foundation and appearing in the file LICENSE.GPL included in the pacakaging 9 * Foundation and appearing in the file LICENSE.GPL included in the pacakaging
10 * of this file. 10 * of this file.
11 * 11 *
12 * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 12 * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
13 * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 13 * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
14 * 14 *
15 * 15 *
16 * This is a rewrite of the abeditor.h file, modified to provide a more 16 * This is a rewrite of the abeditor.h file, modified to provide a more
17 * intuitive interface to TrollTech's original Address Book editor. This 17 * intuitive interface to TrollTech's original Address Book editor. This
18 * is made to operate exactly in interface with the exception of name. 18 * is made to operate exactly in interface with the exception of name.
19 * 19 *
20 */ 20 */
21 21
22#include "contacteditor.h" 22#include "contacteditor.h"
23 23
24#include <opie2/odebug.h>
24#include <opie2/opimcontact.h> 25#include <opie2/opimcontact.h>
25 26
26#include <qpe/categoryselect.h> 27#include <qpe/categoryselect.h>
27#include <qpe/qpeapplication.h> 28#include <qpe/qpeapplication.h>
28#include <qpe/qpedialog.h> 29#include <qpe/qpedialog.h>
29#include <qpe/resource.h> 30#include <qpe/resource.h>
30 31
31#include <qlabel.h> 32#include <qlabel.h>
32#include <qtabwidget.h> 33#include <qtabwidget.h>
33#include <qlayout.h> 34#include <qlayout.h>
34#include <qlineedit.h> 35#include <qlineedit.h>
35#include <qmultilineedit.h> 36#include <qmultilineedit.h>
36#include <qtoolbutton.h> 37#include <qtoolbutton.h>
37#include <qlistbox.h> 38#include <qlistbox.h>
38#include <qmessagebox.h> 39#include <qmessagebox.h>
39#include <qwhatsthis.h> 40#include <qwhatsthis.h>
@@ -64,33 +65,33 @@ ContactEditor::ContactEditor( const Opie::OPimContact &entry,
64{ 65{
65 66
66 initializing = true; 67 initializing = true;
67 68
68 init(); 69 init();
69 setEntry( entry ); 70 setEntry( entry );
70 // cmbDefaultEmail = 0; 71 // cmbDefaultEmail = 0;
71 // defaultEmailChooserPosition = -1; 72 // defaultEmailChooserPosition = -1;
72 73
73 initializing = false; 74 initializing = false;
74} 75}
75 76
76ContactEditor::~ContactEditor() { 77ContactEditor::~ContactEditor() {
77} 78}
78 79
79void ContactEditor::init() { 80void ContactEditor::init() {
80 qWarning("init() START"); 81 Opie::Core::owarn << "init() START" << oendl;
81 82
82 uint i = 0; 83 uint i = 0;
83 84
84 QStringList trlChooserNames; 85 QStringList trlChooserNames;
85 86
86 for (i = 0; i <= 6; i++) { 87 for (i = 0; i <= 6; i++) {
87 slHomeAddress.append( "" ); 88 slHomeAddress.append( "" );
88 slBusinessAddress.append( "" ); 89 slBusinessAddress.append( "" );
89 } 90 }
90 91
91 trlChooserNames = Opie::OPimContactFields::trphonefields( false ); 92 trlChooserNames = Opie::OPimContactFields::trphonefields( false );
92 slChooserNames = Opie::OPimContactFields::untrphonefields( false ); 93 slChooserNames = Opie::OPimContactFields::untrphonefields( false );
93 slDynamicEntries = Opie::OPimContactFields::untrdetailsfields( false ); 94 slDynamicEntries = Opie::OPimContactFields::untrdetailsfields( false );
94 trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false ); 95 trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false );
95 96
96 // Ok, we have to remove elements from the list of dynamic entries 97 // Ok, we have to remove elements from the list of dynamic entries
@@ -673,149 +674,151 @@ void ContactEditor::init() {
673 this, SLOT(slotCountryChange(const QString&)) ); 674 this, SLOT(slotCountryChange(const QString&)) );
674 connect( cmbChooserField1, SIGNAL(activated(int)), 675 connect( cmbChooserField1, SIGNAL(activated(int)),
675 this, SLOT(slotCmbChooser1Change(int)) ); 676 this, SLOT(slotCmbChooser1Change(int)) );
676 connect( cmbChooserField2, SIGNAL(activated(int)), 677 connect( cmbChooserField2, SIGNAL(activated(int)),
677 this, SLOT(slotCmbChooser2Change(int)) ); 678 this, SLOT(slotCmbChooser2Change(int)) );
678 connect( cmbChooserField3, SIGNAL(activated(int)), 679 connect( cmbChooserField3, SIGNAL(activated(int)),
679 this, SLOT(slotCmbChooser3Change(int)) ); 680 this, SLOT(slotCmbChooser3Change(int)) );
680 connect( cmbChooserField4, SIGNAL(activated(int)), 681 connect( cmbChooserField4, SIGNAL(activated(int)),
681 this, SLOT(slotCmbChooser4Change(int)) ); 682 this, SLOT(slotCmbChooser4Change(int)) );
682 connect( cmbAddress, SIGNAL(activated(int)), 683 connect( cmbAddress, SIGNAL(activated(int)),
683 this, SLOT(slotAddressTypeChange(int)) ); 684 this, SLOT(slotAddressTypeChange(int)) );
684 685
685 new QPEDialogListener(this); 686 new QPEDialogListener(this);
686 687
687 setPersonalView ( m_personalView ); 688 setPersonalView ( m_personalView );
688 689
689 qWarning("init() END"); 690 Opie::Core::owarn << "init() END" << oendl;
690} 691}
691 692
692void ContactEditor::defaultEmailChanged(int i){ 693void ContactEditor::defaultEmailChanged(int i){
693 qDebug("defaultEmailChanged"); 694 Opie::Core::odebug << "defaultEmailChanged" << oendl;
694 695
695 // was sollte das ? (se) 696 // was sollte das ? (se)
696 // int index = cmbChooserField1->currentItem(); 697 // int index = cmbChooserField1->currentItem();
697 // slChooserValues[index] = cmbDefaultEmail->text(i); 698 // slChooserValues[index] = cmbDefaultEmail->text(i);
698 699
699 defaultEmail = cmbDefaultEmail->text(i); 700 defaultEmail = cmbDefaultEmail->text(i);
700 qDebug ("Changed to: %s", defaultEmail.latin1()); 701 Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
701 702
702} 703}
703 704
704void ContactEditor::populateDefaultEmailCmb(){ 705void ContactEditor::populateDefaultEmailCmb(){
705 706
706 // if the default-email combo was not selected and therfore not created 707 // if the default-email combo was not selected and therfore not created
707 // we get a lot of trouble.. Therfore create an invisible one.. 708 // we get a lot of trouble.. Therfore create an invisible one..
708 if ( !cmbDefaultEmail ){ 709 if ( !cmbDefaultEmail ){
709 cmbDefaultEmail = new QComboBox(this); 710 cmbDefaultEmail = new QComboBox(this);
710 cmbDefaultEmail -> hide(); 711 cmbDefaultEmail -> hide();
711 } 712 }
712 cmbDefaultEmail->clear(); 713 cmbDefaultEmail->clear();
713 cmbDefaultEmail->insertStringList( emails ); 714 cmbDefaultEmail->insertStringList( emails );
714 // cmbDefaultEmail->show(); 715 // cmbDefaultEmail->show();
715 716
716 // Select default email in combo.. 717 // Select default email in combo..
717 bool found = false; 718 bool found = false;
718 for ( int i = 0; i < cmbDefaultEmail->count(); i++){ 719 for ( int i = 0; i < cmbDefaultEmail->count(); i++){
719 qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<", 720 Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
720 cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1()); 721 << "< defaultEmail >" << defaultEmail << "<" << oendl;
721 722
722 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){ 723 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
723 cmbDefaultEmail->setCurrentItem( i ); 724 cmbDefaultEmail->setCurrentItem( i );
724 qDebug("set"); 725 Opie::Core::odebug << "set" << oendl;
725 found = true; 726 found = true;
726 } 727 }
727 } 728 }
728 729
729 // If the current default email is not found in the list, we choose the 730 // If the current default email is not found in the list, we choose the
730 // first one.. 731 // first one..
731 if ( !found ) 732 if ( !found )
732 defaultEmail = cmbDefaultEmail->text(0); 733 defaultEmail = cmbDefaultEmail->text(0);
733} 734}
734 735
735// Called when any combobox was changed. 736// Called when any combobox was changed.
736// "true" returned if the change was chandled by this function, else it should 737// "true" returned if the change was chandled by this function, else it should
737// be handled by something else.. 738// be handled by something else..
738bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) { 739bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
739 QString type = slChooserNames[index]; 740 QString type = slChooserNames[index];
740 qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos ); 741 Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
742 << ", WidgetPos: " << widgetPos << oendl;
741 743
742 if ( !initializing ) 744 if ( !initializing )
743 contactfields.setFieldOrder( widgetPos-1, index ); 745 contactfields.setFieldOrder( widgetPos-1, index );
744 746
745 // Create and connect combobox for selecting the default email 747 // Create and connect combobox for selecting the default email
746 if ( type == "Default Email"){ 748 if ( type == "Default Email"){
747 qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition); 749 Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
750 << defaultEmailChooserPosition << ") " << oendl;
748 751
749 // More than one default-email chooser is not allowed ! 752 // More than one default-email chooser is not allowed !
750 if ( ( defaultEmailChooserPosition != -1 ) && 753 if ( ( defaultEmailChooserPosition != -1 ) &&
751 defaultEmailChooserPosition != widgetPos && !initializing){ 754 defaultEmailChooserPosition != widgetPos && !initializing){
752 chooserError( widgetPos ); 755 chooserError( widgetPos );
753 return true; 756 return true;
754 } 757 }
755 758
756 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); 759 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
757 if ( cmbo ){ 760 if ( cmbo ){
758 inputStack->raiseWidget( TextField ); 761 inputStack->raiseWidget( TextField );
759 inputStack -> removeWidget( cmbo ); 762 inputStack -> removeWidget( cmbo );
760 delete cmbo; 763 delete cmbo;
761 } 764 }
762 cmbo = new QComboBox( inputStack ); 765 cmbo = new QComboBox( inputStack );
763 cmbo -> insertStringList( emails ); 766 cmbo -> insertStringList( emails );
764 767
765 inputStack -> addWidget( cmbo, Combo ); 768 inputStack -> addWidget( cmbo, Combo );
766 inputStack -> raiseWidget( Combo ); 769 inputStack -> raiseWidget( Combo );
767 770
768 defaultEmailChooserPosition = widgetPos; 771 defaultEmailChooserPosition = widgetPos;
769 cmbDefaultEmail = cmbo; 772 cmbDefaultEmail = cmbo;
770 773
771 connect( cmbo,SIGNAL( activated(int) ), 774 connect( cmbo,SIGNAL( activated(int) ),
772 SLOT( defaultEmailChanged(int) ) ); 775 SLOT( defaultEmailChanged(int) ) );
773 776
774 // Set current default email 777 // Set current default email
775 populateDefaultEmailCmb(); 778 populateDefaultEmailCmb();
776 779
777 780
778 } else { 781 } else {
779 // Something else was selected: Hide combo.. 782 // Something else was selected: Hide combo..
780 qWarning(" Hiding default-email combo" ); 783 Opie::Core::owarn << " Hiding default-email combo" << oendl;
781 if ( defaultEmailChooserPosition == widgetPos ){ 784 if ( defaultEmailChooserPosition == widgetPos ){
782 defaultEmailChooserPosition = -1; 785 defaultEmailChooserPosition = -1;
783 } 786 }
784 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); 787 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
785 if ( cmbo ){ 788 if ( cmbo ){
786 inputStack->raiseWidget( TextField ); 789 inputStack->raiseWidget( TextField );
787 inputStack -> removeWidget( cmbo ); 790 inputStack -> removeWidget( cmbo );
788 cmbDefaultEmail = 0l; 791 cmbDefaultEmail = 0l;
789 delete cmbo; 792 delete cmbo;
790 } 793 }
791 794
792 // Caller should initialize the responsible textfield, therefore 795 // Caller should initialize the responsible textfield, therefore
793 // "false" is returned 796 // "false" is returned
794 return false; 797 return false;
795 } 798 }
796 799
797 // Everything is worked off .. 800 // Everything is worked off ..
798 return true; 801 return true;
799 802
800} 803}
801 804
802// Currently accessed when we select default-email more than once ! 805// Currently accessed when we select default-email more than once !
803void ContactEditor::chooserError( int index ) 806void ContactEditor::chooserError( int index )
804{ 807{
805 qWarning("ContactEditor::chooserError( %d )", index); 808 Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
806 QMessageBox::warning( this, "Chooser Error", 809 QMessageBox::warning( this, "Chooser Error",
807 "Multiple selection of this\n" 810 "Multiple selection of this\n"
808 "Item is not allowed !\n\n" 811 "Item is not allowed !\n\n"
809 "First deselect the previous one !", 812 "First deselect the previous one !",
810 "&OK", 0, 0, 813 "&OK", 0, 0,
811 0, 0 ); 814 0, 0 );
812 815
813 // Reset the selected Chooser. Unfortunately the chooser 816 // Reset the selected Chooser. Unfortunately the chooser
814 // generates no signal, therfore we have to 817 // generates no signal, therfore we have to
815 // call the cmbChooserChange function manually.. 818 // call the cmbChooserChange function manually..
816 switch( index ){ 819 switch( index ){
817 case 1: 820 case 1:
818 cmbChooserField1 -> setCurrentItem( 0 ); 821 cmbChooserField1 -> setCurrentItem( 0 );
819 slotCmbChooser1Change( 0 ); 822 slotCmbChooser1Change( 0 );
820 break; 823 break;
821 case 2: 824 case 2:
@@ -825,72 +828,73 @@ void ContactEditor::chooserError( int index )
825 case 3: 828 case 3:
826 cmbChooserField3 -> setCurrentItem( 0 ); 829 cmbChooserField3 -> setCurrentItem( 0 );
827 slotCmbChooser3Change( 0 ); 830 slotCmbChooser3Change( 0 );
828 break; 831 break;
829 case 4: 832 case 4:
830 cmbChooserField4 -> setCurrentItem( 0 ); 833 cmbChooserField4 -> setCurrentItem( 0 );
831 slotCmbChooser4Change( 0 ); 834 slotCmbChooser4Change( 0 );
832 break; 835 break;
833 } 836 }
834} 837}
835 838
836// Called when something was changed in a textfield (shouldn't it called textchanged? (se)) 839// Called when something was changed in a textfield (shouldn't it called textchanged? (se))
837void ContactEditor::chooserChange( const QString &textChanged, int index, 840void ContactEditor::chooserChange( const QString &textChanged, int index,
838 QLineEdit* , int widgetPos ) { 841 QLineEdit* , int widgetPos ) {
839 842
840 QString type = slChooserNames[index]; // :SX 843 QString type = slChooserNames[index]; // :SX
841 qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i", 844 Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
842 type.latin1(),textChanged.latin1(), index, widgetPos ); 845 << textChanged << "< index=" << index << ", widgetPos=" << widgetPos
846 << " )" << oendl;
843 847
844 if ( type == "Default Email"){ 848 if ( type == "Default Email"){
845 qWarning ("??? Wozu??: %s", textChanged.latin1()); 849 Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl;
846 defaultEmail = textChanged; 850 defaultEmail = textChanged;
847 851
848 populateDefaultEmailCmb(); 852 populateDefaultEmailCmb();
849 853
850 }else if (type == "Emails"){ 854 }else if (type == "Emails"){
851 qDebug("emails"); 855 Opie::Core::odebug << "emails" << oendl;
852 856
853 QString de; 857 QString de;
854 emails = QStringList::split (",", textChanged ); 858 emails = QStringList::split (",", textChanged );
855 859
856 populateDefaultEmailCmb(); 860 populateDefaultEmailCmb();
857 } 861 }
858 862
859 slChooserValues[index] = textChanged; 863 slChooserValues[index] = textChanged;
860 864
861} 865}
862 866
863void ContactEditor::slotChooser1Change( const QString &textChanged ) { 867void ContactEditor::slotChooser1Change( const QString &textChanged ) {
864 qWarning("ContactEditor::slotChooser1Change( %s )", textChanged.latin1()); 868 Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
865 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1); 869 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
866} 870}
867 871
868void ContactEditor::slotChooser2Change( const QString &textChanged ) { 872void ContactEditor::slotChooser2Change( const QString &textChanged ) {
869 qWarning("ContactEditor::slotChooser2Change( %s )", textChanged.latin1()); 873 Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
870 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2); 874 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
871 875
872} 876}
873 877
874void ContactEditor::slotChooser3Change( const QString &textChanged ) { 878void ContactEditor::slotChooser3Change( const QString &textChanged ) {
875 qWarning("ContactEditor::slotChooser3Change( %s )", textChanged.latin1()); 879 Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
876 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3); 880 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
877} 881}
878 882
879void ContactEditor::slotChooser4Change( const QString &textChanged ) { 883void ContactEditor::slotChooser4Change( const QString &textChanged ) {
880 qWarning("ContactEditor::slotChooser4Change( %s )", textChanged.latin1()); 884 Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
881 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4); 885 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
882} 886}
883 887
884void ContactEditor::slotAddressChange( const QString &textChanged ) { 888void ContactEditor::slotAddressChange( const QString &textChanged ) {
885 889
886 if ( cmbAddress->currentItem() == 0 ) { 890 if ( cmbAddress->currentItem() == 0 ) {
887 slBusinessAddress[0] = textChanged; 891 slBusinessAddress[0] = textChanged;
888 } else { 892 } else {
889 slHomeAddress[0] = textChanged; 893 slHomeAddress[0] = textChanged;
890 } 894 }
891} 895}
892 896
893void ContactEditor::slotAddress2Change( const QString &textChanged ) { 897void ContactEditor::slotAddress2Change( const QString &textChanged ) {
894 898
895 if ( cmbAddress->currentItem() == 0 ) { 899 if ( cmbAddress->currentItem() == 0 ) {
896 slBusinessAddress[1] = textChanged; 900 slBusinessAddress[1] = textChanged;
@@ -934,66 +938,66 @@ void ContactEditor::slotZipChange( const QString &textChanged ) {
934 } else { 938 } else {
935 slHomeAddress[5] = textChanged; 939 slHomeAddress[5] = textChanged;
936 } 940 }
937} 941}
938 942
939void ContactEditor::slotCountryChange( const QString &textChanged ) { 943void ContactEditor::slotCountryChange( const QString &textChanged ) {
940 944
941 if ( cmbAddress->currentItem() == 0 ) { 945 if ( cmbAddress->currentItem() == 0 ) {
942 slBusinessAddress[6] = textChanged; 946 slBusinessAddress[6] = textChanged;
943 } else { 947 } else {
944 slHomeAddress[6] = textChanged; 948 slHomeAddress[6] = textChanged;
945 } 949 }
946} 950}
947 951
948 952
949void ContactEditor::slotCmbChooser1Change( int index ) { 953void ContactEditor::slotCmbChooser1Change( int index ) {
950 qWarning("ContactEditor::slotCmbChooser1Change( %d )", index); 954 Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
951 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ 955 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
952 956
953 txtChooserField1->setText( slChooserValues[index] ); 957 txtChooserField1->setText( slChooserValues[index] );
954 txtChooserField1->setFocus(); 958 txtChooserField1->setFocus();
955 959
956 } 960 }
957 961
958} 962}
959 963
960void ContactEditor::slotCmbChooser2Change( int index ) { 964void ContactEditor::slotCmbChooser2Change( int index ) {
961 qWarning("ContactEditor::slotCmbChooser2Change( %d )", index); 965 Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
962 966
963 if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){ 967 if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
964 968
965 txtChooserField2->setText( slChooserValues[index] ); 969 txtChooserField2->setText( slChooserValues[index] );
966 txtChooserField2->setFocus(); 970 txtChooserField2->setFocus();
967 971
968 } 972 }
969} 973}
970 974
971void ContactEditor::slotCmbChooser3Change( int index ) { 975void ContactEditor::slotCmbChooser3Change( int index ) {
972 qWarning("ContactEditor::slotCmbChooser3Change( %d )", index); 976 Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
973 977
974 if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){ 978 if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
975 979
976 txtChooserField3->setText( slChooserValues[index] ); 980 txtChooserField3->setText( slChooserValues[index] );
977 txtChooserField3->setFocus(); 981 txtChooserField3->setFocus();
978 982
979 } 983 }
980} 984}
981 985
982void ContactEditor::slotCmbChooser4Change( int index ) { 986void ContactEditor::slotCmbChooser4Change( int index ) {
983 qWarning("ContactEditor::slotCmbChooser4Change( %d )", index); 987 Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
984 988
985 if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){ 989 if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
986 990
987 txtChooserField4->setText( slChooserValues[index] ); 991 txtChooserField4->setText( slChooserValues[index] );
988 txtChooserField4->setFocus(); 992 txtChooserField4->setFocus();
989 993
990 } 994 }
991} 995}
992 996
993void ContactEditor::slotAddressTypeChange( int index ) { 997void ContactEditor::slotAddressTypeChange( int index ) {
994 998
995 999
996 if ( !initializing ) 1000 if ( !initializing )
997 contactfields.setFieldOrder( 4, index ); 1001 contactfields.setFieldOrder( 4, index );
998 1002
999 1003
@@ -1012,57 +1016,57 @@ void ContactEditor::slotAddressTypeChange( int index ) {
1012 1016
1013 txtAddress->setText( slHomeAddress[0] ); 1017 txtAddress->setText( slHomeAddress[0] );
1014 //txtAddress2->setText( (*slHomeAddress)[1] ); 1018 //txtAddress2->setText( (*slHomeAddress)[1] );
1015 //txtPOBox->setText( (*slHomeAddress)[2] ); 1019 //txtPOBox->setText( (*slHomeAddress)[2] );
1016 txtCity->setText( slHomeAddress[3] ); 1020 txtCity->setText( slHomeAddress[3] );
1017 txtState->setText( slHomeAddress[4] ); 1021 txtState->setText( slHomeAddress[4] );
1018 txtZip->setText( slHomeAddress[5] ); 1022 txtZip->setText( slHomeAddress[5] );
1019 QLineEdit *txtTmp = cmbCountry->lineEdit(); 1023 QLineEdit *txtTmp = cmbCountry->lineEdit();
1020 txtTmp->setText( slHomeAddress[6] ); 1024 txtTmp->setText( slHomeAddress[6] );
1021 1025
1022 } 1026 }
1023 1027
1024} 1028}
1025 1029
1026void ContactEditor::slotFullNameChange( const QString &textChanged ) { 1030void ContactEditor::slotFullNameChange( const QString &textChanged ) {
1027 1031
1028 qWarning( "ContactEditor::slotFullNameChange( %s )", textChanged.latin1() ); 1032 Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
1029 1033
1030 int index = cmbFileAs->currentItem(); 1034 int index = cmbFileAs->currentItem();
1031 1035
1032 cmbFileAs->clear(); 1036 cmbFileAs->clear();
1033 1037
1034 cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) ); 1038 cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
1035 cmbFileAs->insertItem( parseName( textChanged, NAME_LFM ) ); 1039 cmbFileAs->insertItem( parseName( textChanged, NAME_LFM ) );
1036 cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) ); 1040 cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
1037 cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) ); 1041 cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) );
1038 if ( ! txtSuffix->text().isEmpty() ) 1042 if ( ! txtSuffix->text().isEmpty() )
1039 cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) + " " + txtSuffix->text() ); 1043 cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) + " " + txtSuffix->text() );
1040 1044
1041 cmbFileAs->setCurrentItem( index ); 1045 cmbFileAs->setCurrentItem( index );
1042 1046
1043 1047
1044} 1048}
1045 1049
1046void ContactEditor::slotSuffixChange( const QString& ) { 1050void ContactEditor::slotSuffixChange( const QString& ) {
1047 // Just want to update the FileAs combo if the suffix was changed.. 1051 // Just want to update the FileAs combo if the suffix was changed..
1048 slotFullNameChange( txtFullName->text() ); 1052 slotFullNameChange( txtFullName->text() );
1049} 1053}
1050 1054
1051void ContactEditor::slotOrganizationChange( const QString &textChanged ){ 1055void ContactEditor::slotOrganizationChange( const QString &textChanged ){
1052 qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() ); 1056 Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
1053 // Special handling for storing Companies: 1057 // Special handling for storing Companies:
1054 // If no Fullname is given, we store the Company-Name as lastname 1058 // If no Fullname is given, we store the Company-Name as lastname
1055 // to handle it like a person.. 1059 // to handle it like a person..
1056 if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) ) 1060 if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) )
1057 txtFullName->setText( textChanged ); 1061 txtFullName->setText( textChanged );
1058 1062
1059} 1063}
1060 1064
1061void ContactEditor::accept() { 1065void ContactEditor::accept() {
1062 1066
1063 if ( isEmpty() ) { 1067 if ( isEmpty() ) {
1064 cleanupFields(); 1068 cleanupFields();
1065 reject(); 1069 reject();
1066 } else { 1070 } else {
1067 saveEntry(); 1071 saveEntry();
1068 cleanupFields(); 1072 cleanupFields();
@@ -1118,46 +1122,46 @@ bool ContactEditor::isEmpty() {
1118 return false; 1122 return false;
1119 1123
1120 return true; 1124 return true;
1121 1125
1122} 1126}
1123 1127
1124QString ContactEditor::parseName( const QString fullName, int type ) { 1128QString ContactEditor::parseName( const QString fullName, int type ) {
1125 1129
1126 QString simplifiedName( fullName.simplifyWhiteSpace() ); 1130 QString simplifiedName( fullName.simplifyWhiteSpace() );
1127 QString strFirstName; 1131 QString strFirstName;
1128 QString strMiddleName; 1132 QString strMiddleName;
1129 QString strLastName; 1133 QString strLastName;
1130 QString strTitle; 1134 QString strTitle;
1131 int commapos; 1135 int commapos;
1132 bool haveLastName = false; 1136 bool haveLastName = false;
1133 1137
1134 qWarning("Fullname: %s", simplifiedName.latin1()); 1138 Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
1135 1139
1136 commapos = simplifiedName.find( ',', 0, TRUE); 1140 commapos = simplifiedName.find( ',', 0, TRUE);
1137 if ( commapos >= 0 ) { 1141 if ( commapos >= 0 ) {
1138 qWarning(" Commapos: %d", commapos ); 1142 Opie::Core::owarn << " Commapos: " << commapos << oendl;
1139 1143
1140 // A comma (",") separates the lastname from one or 1144 // A comma (",") separates the lastname from one or
1141 // many first names. Thus, remove the lastname from the 1145 // many first names. Thus, remove the lastname from the
1142 // String and parse the firstnames. 1146 // String and parse the firstnames.
1143 1147
1144 strLastName = simplifiedName.left( commapos ); 1148 strLastName = simplifiedName.left( commapos );
1145 simplifiedName= simplifiedName.mid( commapos + 1 ); 1149 simplifiedName= simplifiedName.mid( commapos + 1 );
1146 haveLastName = true; 1150 haveLastName = true;
1147 qWarning("Fullname without ',': %s", simplifiedName.latin1()); 1151 Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
1148 1152
1149 // If we have any lastname, we should now split all first names. 1153 // If we have any lastname, we should now split all first names.
1150 // The first one will be the used as first, the rest as "middle names" 1154 // The first one will be the used as first, the rest as "middle names"
1151 1155
1152 QStringList allFirstNames = QStringList::split(" ", simplifiedName); 1156 QStringList allFirstNames = QStringList::split(" ", simplifiedName);
1153 QStringList::Iterator it = allFirstNames.begin(); 1157 QStringList::Iterator it = allFirstNames.begin();
1154 strFirstName = *it++; 1158 strFirstName = *it++;
1155 QStringList allSecondNames; 1159 QStringList allSecondNames;
1156 for ( ; it != allFirstNames.end(); ++it ) 1160 for ( ; it != allFirstNames.end(); ++it )
1157 allSecondNames.append( *it ); 1161 allSecondNames.append( *it );
1158 1162
1159 strMiddleName = allSecondNames.join(" "); 1163 strMiddleName = allSecondNames.join(" ");
1160 1164
1161 } else { 1165 } else {
1162 1166
1163 // No comma separator used: We use the first word as firstname, the 1167 // No comma separator used: We use the first word as firstname, the
@@ -1165,36 +1169,36 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1165 1169
1166 QStringList allNames = QStringList::split(" ", simplifiedName); 1170 QStringList allNames = QStringList::split(" ", simplifiedName);
1167 QStringList::Iterator it = allNames.begin(); 1171 QStringList::Iterator it = allNames.begin();
1168 strFirstName = *it++; 1172 strFirstName = *it++;
1169 QStringList allSecondNames; 1173 QStringList allSecondNames;
1170 for ( ; it != --allNames.end(); ++it ) 1174 for ( ; it != --allNames.end(); ++it )
1171 allSecondNames.append( *it ); 1175 allSecondNames.append( *it );
1172 1176
1173 strMiddleName = allSecondNames.join(" "); 1177 strMiddleName = allSecondNames.join(" ");
1174 strLastName = *(--allNames.end()); 1178 strLastName = *(--allNames.end());
1175 1179
1176 } 1180 }
1177 1181
1178 if ( strFirstName == strLastName ) 1182 if ( strFirstName == strLastName )
1179 strFirstName = ""; 1183 strFirstName = "";
1180 1184
1181 qWarning(" strFirstName: %s", strFirstName.latin1()); 1185 Opie::Core::owarn << "strFirstName: " << strFirstName << oendl;
1182 qWarning(" strMiddleName: %s", strMiddleName.latin1()); 1186 Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl;
1183 qWarning(" strLastName: %s", strLastName.latin1()); 1187 Opie::Core::owarn << "strLastName: " << strLastName << oendl;
1184 qWarning(" strTitle: %s", strTitle.latin1()); 1188 Opie::Core::owarn << "strTitle: " << strTitle << oendl;
1185 1189
1186 switch (type) { 1190 switch (type) {
1187 case NAME_FL: 1191 case NAME_FL:
1188 return strFirstName + " " + strLastName; 1192 return strFirstName + " " + strLastName;
1189 1193
1190 case NAME_LF: 1194 case NAME_LF:
1191 return strLastName + ", " + strFirstName; 1195 return strLastName + ", " + strFirstName;
1192 1196
1193 case NAME_LFM: 1197 case NAME_LFM:
1194 return strLastName + ", " + strFirstName + " " + strMiddleName; 1198 return strLastName + ", " + strFirstName + " " + strMiddleName;
1195 1199
1196 case NAME_FML: 1200 case NAME_FML:
1197 return strFirstName + " " + strMiddleName + " " + strLastName ; 1201 return strFirstName + " " + strMiddleName + " " + strLastName ;
1198 1202
1199 case NAME_F: 1203 case NAME_F:
1200 return strFirstName; 1204 return strFirstName;
@@ -1251,33 +1255,33 @@ void ContactEditor::cleanupFields() {
1251 1255
1252} 1256}
1253 1257
1254void ContactEditor::setEntry( const Opie::OPimContact &entry ) { 1258void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1255 1259
1256 initializing = true; 1260 initializing = true;
1257 1261
1258 // Cleanup and activate the general Page .. 1262 // Cleanup and activate the general Page ..
1259 cleanupFields(); 1263 cleanupFields();
1260 tabMain->setCurrentPage( 0 ); 1264 tabMain->setCurrentPage( 0 );
1261 1265
1262 ent = entry; 1266 ent = entry;
1263 1267
1264 emails = QStringList(ent.emailList()); 1268 emails = QStringList(ent.emailList());
1265 defaultEmail = ent.defaultEmail(); 1269 defaultEmail = ent.defaultEmail();
1266 if (defaultEmail.isEmpty()) defaultEmail = emails[0]; 1270 if (defaultEmail.isEmpty()) defaultEmail = emails[0];
1267 qDebug("default email=%s",defaultEmail.latin1()); 1271 Opie::Core::odebug << "default email=" << defaultEmail << oendl;
1268 1272
1269 txtFirstName->setText( ent.firstName() ); 1273 txtFirstName->setText( ent.firstName() );
1270 txtMiddleName->setText( ent.middleName() ); 1274 txtMiddleName->setText( ent.middleName() );
1271 txtLastName->setText( ent.lastName() ); 1275 txtLastName->setText( ent.lastName() );
1272 txtSuffix->setText( ent.suffix() ); 1276 txtSuffix->setText( ent.suffix() );
1273 1277
1274 // QString *tmpString = new QString; 1278 // QString *tmpString = new QString;
1275 // *tmpString = ent.firstName() + " " + ent.middleName() + 1279 // *tmpString = ent.firstName() + " " + ent.middleName() +
1276 // + " " + ent.lastName() + " " + ent.suffix(); 1280 // + " " + ent.lastName() + " " + ent.suffix();
1277 //txtFullName->setText( tmpString->simplifyWhiteSpace() ); 1281 //txtFullName->setText( tmpString->simplifyWhiteSpace() );
1278 1282
1279 if ( !ent.isEmpty() ){ 1283 if ( !ent.isEmpty() ){
1280 // Lastnames with multiple words need to be protected by a comma ! 1284 // Lastnames with multiple words need to be protected by a comma !
1281 if ( ent.lastName().contains( ' ', TRUE ) ) 1285 if ( ent.lastName().contains( ' ', TRUE ) )
1282 txtFullName->setText( ent.lastName() + ", " + ent.firstName() + " " + ent.middleName() ); 1286 txtFullName->setText( ent.lastName() + ", " + ent.firstName() + " " + ent.middleName() );
1283 else 1287 else
@@ -1311,57 +1315,57 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1311 //} 1315 //}
1312 1316
1313 //if (hasZip) { 1317 //if (hasZip) {
1314 slHomeAddress[5] = ent.homeZip(); 1318 slHomeAddress[5] = ent.homeZip();
1315 slBusinessAddress[5] = ent.businessZip(); 1319 slBusinessAddress[5] = ent.businessZip();
1316 //} 1320 //}
1317 1321
1318 //if (hasCountry) { 1322 //if (hasCountry) {
1319 slHomeAddress[6] = ent.homeCountry(); 1323 slHomeAddress[6] = ent.homeCountry();
1320 slBusinessAddress[6] = ent.businessCountry(); 1324 slBusinessAddress[6] = ent.businessCountry();
1321 //} 1325 //}
1322 1326
1323 QStringList::ConstIterator it; 1327 QStringList::ConstIterator it;
1324 QListIterator<QLineEdit> itLE( listValue ); 1328 QListIterator<QLineEdit> itLE( listValue );
1325 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { 1329 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
1326 1330
1327 qWarning(" Filling dynamic Field: %s", (*it).latin1() ); 1331 Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
1328 1332
1329 if ( *it == "Department" ) 1333 if ( *it == "Department" )
1330 (*itLE)->setText( ent.department() ); 1334 (*itLE)->setText( ent.department() );
1331 1335
1332 if ( *it == "Company" ) 1336 if ( *it == "Company" )
1333 (*itLE)->setText( ent.company() ); 1337 (*itLE)->setText( ent.company() );
1334 1338
1335 if ( *it == "Office" ) 1339 if ( *it == "Office" )
1336 (*itLE)->setText( ent.office() ); 1340 (*itLE)->setText( ent.office() );
1337 1341
1338 if ( *it == "Profession" ) 1342 if ( *it == "Profession" )
1339 (*itLE)->setText( ent.profession() ); 1343 (*itLE)->setText( ent.profession() );
1340 1344
1341 if ( *it == "Assistant" ) 1345 if ( *it == "Assistant" )
1342 (*itLE)->setText( ent.assistant() ); 1346 (*itLE)->setText( ent.assistant() );
1343 1347
1344 if ( *it == "Manager" ) 1348 if ( *it == "Manager" )
1345 (*itLE)->setText( ent.manager() ); 1349 (*itLE)->setText( ent.manager() );
1346 1350
1347 if ( *it == "Spouse" ) 1351 if ( *it == "Spouse" )
1348 (*itLE)->setText( ent.spouse() ); 1352 (*itLE)->setText( ent.spouse() );
1349 1353
1350 if ( *it == "Nickname" ){ 1354 if ( *it == "Nickname" ){
1351 qWarning("**** Nichname: %s", ent.nickname().latin1() ); 1355 Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
1352 (*itLE)->setText( ent.nickname() ); 1356 (*itLE)->setText( ent.nickname() );
1353 } 1357 }
1354 1358
1355 if ( *it == "Children" ) 1359 if ( *it == "Children" )
1356 (*itLE)->setText( ent.children() ); 1360 (*itLE)->setText( ent.children() );
1357 1361
1358 } 1362 }
1359 1363
1360 QStringList::Iterator itV; 1364 QStringList::Iterator itV;
1361 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { 1365 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1362 1366
1363 if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) ) 1367 if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) )
1364 *itV = ent.businessPhone(); 1368 *itV = ent.businessPhone();
1365 /* 1369 /*
1366 if ( *it == "Business 2 Phone" ) 1370 if ( *it == "Business 2 Phone" )
1367 *itV = ent.business2Phone(); 1371 *itV = ent.business2Phone();
@@ -1568,34 +1572,34 @@ void ContactEditor::saveEntry() {
1568 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { 1572 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1569 1573
1570 if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) ) 1574 if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) )
1571 ent.setBusinessPhone( *itV ); 1575 ent.setBusinessPhone( *itV );
1572 1576
1573 if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) ) 1577 if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) )
1574 ent.setBusinessFax( *itV ); 1578 ent.setBusinessFax( *itV );
1575 1579
1576 if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) ) 1580 if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) )
1577 ent.setBusinessMobile( *itV ); 1581 ent.setBusinessMobile( *itV );
1578 1582
1579 if ( *it == "Emails" ){ 1583 if ( *it == "Emails" ){
1580 QString allemail; 1584 QString allemail;
1581 QString defaultmail; 1585 QString defaultmail;
1582 parseEmailFrom( emails.join(","), defaultmail, allemail ); 1586 parseEmailFrom( emails.join(","), defaultmail, allemail );
1583 if ( defaultEmail.isEmpty() ){ 1587 if ( defaultEmail.isEmpty() ){
1584 qWarning("Default email was not set by user!"); 1588 Opie::Core::owarn << "Default email was not set by user!" << oendl;
1585 qWarning("Using first email in list: %s", defaultmail.latin1()); 1589 Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl;
1586 ent.setDefaultEmail( defaultmail ); 1590 ent.setDefaultEmail( defaultmail );
1587 } 1591 }
1588 ent.setEmails( allemail ); 1592 ent.setEmails( allemail );
1589 } 1593 }
1590 1594
1591 if ( *it == "Default Email") 1595 if ( *it == "Default Email")
1592 ent.setDefaultEmail( defaultEmail /* *itV */ ); 1596 ent.setDefaultEmail( defaultEmail /* *itV */ );
1593 1597
1594 if ( *it == "Home Phone" ) 1598 if ( *it == "Home Phone" )
1595 ent.setHomePhone( *itV ); 1599 ent.setHomePhone( *itV );
1596 1600
1597 if ( *it == "Home Fax" ) 1601 if ( *it == "Home Fax" )
1598 ent.setHomeFax( *itV ); 1602 ent.setHomeFax( *itV );
1599 1603
1600 if ( *it == "Home Mobile" ) 1604 if ( *it == "Home Mobile" )
1601 ent.setHomeMobile( *itV ); 1605 ent.setHomeMobile( *itV );
@@ -1721,27 +1725,27 @@ void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
1721 QString dateString = TimeString::numberDateString( date ); 1725 QString dateString = TimeString::numberDateString( date );
1722 anniversaryButton->setText( dateString ); 1726 anniversaryButton->setText( dateString );
1723 ent.setAnniversary ( date ); 1727 ent.setAnniversary ( date );
1724} 1728}
1725 1729
1726void ContactEditor::slotBirthdayDateChanged( int year, int month, int day) 1730void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
1727{ 1731{
1728 QDate date; 1732 QDate date;
1729 date.setYMD( year, month, day ); 1733 date.setYMD( year, month, day );
1730 QString dateString = TimeString::numberDateString( date ); 1734 QString dateString = TimeString::numberDateString( date );
1731 birthdayButton->setText( dateString ); 1735 birthdayButton->setText( dateString );
1732 ent.setBirthday ( date ); 1736 ent.setBirthday ( date );
1733} 1737}
1734 1738
1735void ContactEditor::slotRemoveBirthday() 1739void ContactEditor::slotRemoveBirthday()
1736{ 1740{
1737 qWarning("void ContactEditor::slotRemoveBirthday()"); 1741 Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
1738 ent.setBirthday( QDate() ); 1742 ent.setBirthday( QDate() );
1739 updateDatePicker(); 1743 updateDatePicker();
1740} 1744}
1741 1745
1742void ContactEditor::slotRemoveAnniversary() 1746void ContactEditor::slotRemoveAnniversary()
1743{ 1747{
1744 qWarning("void ContactEditor::slotRemoveAnniversary()"); 1748 Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
1745 ent.setAnniversary( QDate() ); 1749 ent.setAnniversary( QDate() );
1746 updateDatePicker(); 1750 updateDatePicker();
1747} 1751}
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 18a3791..882bdf3 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -1,11 +1,11 @@
1Package: opie-addressbook 1Package: opie-addressbook
2Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop 2Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop
3Priority: optional 3Priority: optional
4Section: opie/pim 4Section: opie/pim
5Conflicts: qpe-tkcaddressbook 5Conflicts: qpe-tkcaddressbook
6Maintainer: Stefan Eilers <eilers.stefan@epost.de> 6Maintainer: Stefan Eilers <eilers.stefan@epost.de>
7Architecture: arm 7Architecture: arm
8Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2, libopiedb2 8Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2
9Description: Contacts 9Description: Contacts
10 A simple addressbook for the Opie environment. 10 A simple addressbook for the Opie environment.
11Version: $QPE_VERSION$EXTRAVERSION 11Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index 7a20591..df3d6ac 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -1,176 +1,178 @@
1#include "picker.h" 1#include "picker.h"
2 2
3#include <opie2/odebug.h>
4
3#include <qtimer.h> 5#include <qtimer.h>
4#include <qlayout.h> 6#include <qlayout.h>
5 7
6char PickerLabel::lastLetter = '\0'; 8char PickerLabel::lastLetter = '\0';
7 9
8PickerLabel::PickerLabel( QWidget *parent, const char *name ) 10PickerLabel::PickerLabel( QWidget *parent, const char *name )
9 : QLabel ( parent, name ) 11 : QLabel ( parent, name )
10{ 12{
11 currentLetter = 0; 13 currentLetter = 0;
12 //lastLetter = 0; 14 //lastLetter = 0;
13 15
14 letter1 = '\0'; 16 letter1 = '\0';
15 letter2 = '\0'; 17 letter2 = '\0';
16 letter3 = '\0'; 18 letter3 = '\0';
17 19
18 // setFont( QFont( "smallsmooth", 9 ) ); 20 // setFont( QFont( "smallsmooth", 9 ) );
19 setFont( QFont::defaultFont() ); 21 setFont( QFont::defaultFont() );
20 setTextFormat( Qt::RichText ); 22 setTextFormat( Qt::RichText );
21 23
22} 24}
23 25
24PickerLabel::~PickerLabel() 26PickerLabel::~PickerLabel()
25{ 27{
26 28
27} 29}
28 30
29void PickerLabel::setLetters( char ch1, char ch2, char ch3 ) 31void PickerLabel::setLetters( char ch1, char ch2, char ch3 )
30{ 32{
31 QString tmpStr; 33 QString tmpStr;
32 34
33 if (ch1 != '\0') 35 if (ch1 != '\0')
34 letter1 = ch1; 36 letter1 = ch1;
35 else 37 else
36 letter1 = ' '; 38 letter1 = ' ';
37 39
38 if (ch2 != '\0') 40 if (ch2 != '\0')
39 letter2 = ch2; 41 letter2 = ch2;
40 else 42 else
41 letter2 = ' '; 43 letter2 = ' ';
42 44
43 if (ch3 != '\0') 45 if (ch3 != '\0')
44 letter3 = ch3; 46 letter3 = ch3;
45 else 47 else
46 letter3 = ' '; 48 letter3 = ' ';
47 49
48 tmpStr = "<qt>"; 50 tmpStr = "<qt>";
49 tmpStr += letter1; 51 tmpStr += letter1;
50 tmpStr += letter2; 52 tmpStr += letter2;
51 tmpStr += letter3; 53 tmpStr += letter3;
52 tmpStr += "</qt>"; 54 tmpStr += "</qt>";
53 55
54 setText(tmpStr); 56 setText(tmpStr);
55 57
56 currentLetter = 0; 58 currentLetter = 0;
57 59
58} 60}
59 61
60void PickerLabel::clearLetter() 62void PickerLabel::clearLetter()
61{ 63{
62 64
63 QString tmpStr; 65 QString tmpStr;
64 66
65 tmpStr = "<qt>"; 67 tmpStr = "<qt>";
66 tmpStr += letter1; 68 tmpStr += letter1;
67 tmpStr += letter2; 69 tmpStr += letter2;
68 tmpStr += letter3; 70 tmpStr += letter3;
69 tmpStr += "</qt>"; 71 tmpStr += "</qt>";
70 72
71 setText(tmpStr); 73 setText(tmpStr);
72 74
73 currentLetter = 0; 75 currentLetter = 0;
74 76
75} 77}
76 78
77void PickerLabel::mousePressEvent( QMouseEvent* e ) 79void PickerLabel::mousePressEvent( QMouseEvent* e )
78{ 80{
79 // If one pickerlabel is was, and an other is now selected, we 81 // If one pickerlabel is was, and an other is now selected, we
80 // have to simulate the releaseevent.. Otherwise the new label 82 // have to simulate the releaseevent.. Otherwise the new label
81 // will not get a highlighted letter.. 83 // will not get a highlighted letter..
82 // Maybe there is a more intelligent solution, but this works and I am tired.. (se) 84 // Maybe there is a more intelligent solution, but this works and I am tired.. (se)
83 if ( ( currentLetter == 0 ) && ( lastLetter != '\0' ) ) mouseReleaseEvent( e ); 85 if ( ( currentLetter == 0 ) && ( lastLetter != '\0' ) ) mouseReleaseEvent( e );
84} 86}
85 87
86void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ ) 88void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
87{ 89{
88 QString tmpStr; 90 QString tmpStr;
89 91
90 if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3 && lastLetter != '\0') 92 if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3 && lastLetter != '\0')
91 QTimer::singleShot( 0, this, SLOT(emitClearSignal()) ); 93 QTimer::singleShot( 0, this, SLOT(emitClearSignal()) );
92 94
93 switch (currentLetter) { 95 switch (currentLetter) {
94 case 0: 96 case 0:
95 tmpStr = "<qt><u><b><font color=\"#FF00FF\">"; 97 tmpStr = "<qt><u><b><font color=\"#FF00FF\">";
96 tmpStr += letter1; 98 tmpStr += letter1;
97 tmpStr += "</font></b></u>"; 99 tmpStr += "</font></b></u>";
98 tmpStr += letter2; 100 tmpStr += letter2;
99 tmpStr += letter3; 101 tmpStr += letter3;
100 tmpStr += "</qt>"; 102 tmpStr += "</qt>";
101 103
102 setText(tmpStr); 104 setText(tmpStr);
103 105
104 currentLetter++; 106 currentLetter++;
105 lastLetter = letter1; 107 lastLetter = letter1;
106 emit selectedLetter( letter1 ); 108 emit selectedLetter( letter1 );
107 break; 109 break;
108 110
109 case 1: 111 case 1:
110 tmpStr = "<qt>"; 112 tmpStr = "<qt>";
111 tmpStr += letter1; 113 tmpStr += letter1;
112 tmpStr += "<u><b><font color=\"#FF00FF\">"; 114 tmpStr += "<u><b><font color=\"#FF00FF\">";
113 tmpStr += letter2; 115 tmpStr += letter2;
114 tmpStr += "</font></b></u>"; 116 tmpStr += "</font></b></u>";
115 tmpStr += letter3; 117 tmpStr += letter3;
116 tmpStr += "</qt>"; 118 tmpStr += "</qt>";
117 119
118 setText(tmpStr); 120 setText(tmpStr);
119 121
120 currentLetter++; 122 currentLetter++;
121 lastLetter = letter2; 123 lastLetter = letter2;
122 emit selectedLetter( letter2 ); 124 emit selectedLetter( letter2 );
123 break; 125 break;
124 126
125 case 2: 127 case 2:
126 tmpStr = "<qt>"; 128 tmpStr = "<qt>";
127 tmpStr += letter1; 129 tmpStr += letter1;
128 tmpStr += letter2; 130 tmpStr += letter2;
129 tmpStr += "<u><b><font color=\"#FF00FF\">"; 131 tmpStr += "<u><b><font color=\"#FF00FF\">";
130 tmpStr += letter3; 132 tmpStr += letter3;
131 tmpStr += "</font></b></u></qt>"; 133 tmpStr += "</font></b></u></qt>";
132 134
133 setText(tmpStr); 135 setText(tmpStr);
134 136
135 currentLetter++; 137 currentLetter++;
136 lastLetter = letter3; 138 lastLetter = letter3;
137 emit selectedLetter( letter3 ); 139 emit selectedLetter( letter3 );
138 break; 140 break;
139 141
140 default: 142 default:
141 clearLetter(); 143 clearLetter();
142 lastLetter = '\0'; 144 lastLetter = '\0';
143 emit selectedLetter( '\0' ); 145 emit selectedLetter( '\0' );
144 146
145 147
146 } 148 }
147} 149}
148 150
149void PickerLabel::emitClearSignal() { 151void PickerLabel::emitClearSignal() {
150 emit clearAll(); 152 emit clearAll();
151} 153}
152 154
153LetterPicker::LetterPicker( QWidget *parent, const char *name ) 155LetterPicker::LetterPicker( QWidget *parent, const char *name )
154 : QFrame( parent, name ) 156 : QFrame( parent, name )
155{ 157{
156 QHBoxLayout *l = new QHBoxLayout(this); 158 QHBoxLayout *l = new QHBoxLayout(this);
157 159
158 lblABC = new PickerLabel( this ); 160 lblABC = new PickerLabel( this );
159 l->addWidget( lblABC ); 161 l->addWidget( lblABC );
160 162
161 lblDEF = new PickerLabel( this ); 163 lblDEF = new PickerLabel( this );
162 l->addWidget( lblDEF ); 164 l->addWidget( lblDEF );
163 165
164 lblGHI = new PickerLabel( this ); 166 lblGHI = new PickerLabel( this );
165 l->addWidget( lblGHI ); 167 l->addWidget( lblGHI );
166 168
167 lblJKL = new PickerLabel( this ); 169 lblJKL = new PickerLabel( this );
168 l->addWidget( lblJKL ); 170 l->addWidget( lblJKL );
169 171
170 lblMNO = new PickerLabel( this ); 172 lblMNO = new PickerLabel( this );
171 l->addWidget( lblMNO ); 173 l->addWidget( lblMNO );
172 174
173 lblPQR = new PickerLabel( this ); 175 lblPQR = new PickerLabel( this );
174 l->addWidget( lblPQR ); 176 l->addWidget( lblPQR );
175 177
176 lblSTU = new PickerLabel( this ); 178 lblSTU = new PickerLabel( this );
@@ -224,20 +226,20 @@ QSizePolicy LetterPicker::sizePolicy () const
224 226
225void LetterPicker::clear() 227void LetterPicker::clear()
226{ 228{
227 lblABC->clearLetter(); 229 lblABC->clearLetter();
228 lblDEF->clearLetter(); 230 lblDEF->clearLetter();
229 lblGHI->clearLetter(); 231 lblGHI->clearLetter();
230 lblJKL->clearLetter(); 232 lblJKL->clearLetter();
231 lblMNO->clearLetter(); 233 lblMNO->clearLetter();
232 lblPQR->clearLetter(); 234 lblPQR->clearLetter();
233 lblSTU->clearLetter(); 235 lblSTU->clearLetter();
234 lblVWX->clearLetter(); 236 lblVWX->clearLetter();
235 lblYZ->clearLetter(); 237 lblYZ->clearLetter();
236} 238}
237 239
238void LetterPicker::newLetter( char letter ) 240void LetterPicker::newLetter( char letter )
239{ 241{
240 qWarning("LetterClicked"); 242 Opie::Core::owarn << "LetterClicked" << oendl;
241 emit letterClicked( letter ); 243 emit letterClicked( letter );
242 244
243} 245}