summaryrefslogtreecommitdiff
path: root/core/pim/addressbook
Unidiff
Diffstat (limited to 'core/pim/addressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ablabel.cpp14
-rw-r--r--core/pim/addressbook/ablabel.h14
-rw-r--r--core/pim/addressbook/abtable.cpp85
-rw-r--r--core/pim/addressbook/abtable.h23
-rw-r--r--core/pim/addressbook/abview.cpp38
-rw-r--r--core/pim/addressbook/abview.h31
-rw-r--r--core/pim/addressbook/addressbook.cpp58
-rw-r--r--core/pim/addressbook/addressbook.pro2
-rw-r--r--core/pim/addressbook/config.in2
-rw-r--r--core/pim/addressbook/configdlg.cpp38
-rw-r--r--core/pim/addressbook/contacteditor.cpp327
-rw-r--r--core/pim/addressbook/contacteditor.h16
-rw-r--r--core/pim/addressbook/main.cpp4
-rw-r--r--core/pim/addressbook/opie-addressbook.control2
14 files changed, 328 insertions, 326 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 076e2e0..70a66a0 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -33,5 +33,5 @@ AbLabel::~AbLabel()
33} 33}
34 34
35void AbLabel::setContacts( const OContactAccess::List& viewList ) 35void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList )
36{ 36{
37 m_viewList = viewList; 37 m_viewList = viewList;
@@ -49,5 +49,5 @@ void AbLabel::setContacts( const OContactAccess::List& viewList )
49int AbLabel::currentEntry_UID() 49int AbLabel::currentEntry_UID()
50{ 50{
51 OContact contact = currentEntry(); 51 Opie::OPimContact contact = currentEntry();
52 52
53 if ( contact.isEmpty() ) 53 if ( contact.isEmpty() )
@@ -57,10 +57,10 @@ int AbLabel::currentEntry_UID()
57} 57}
58 58
59OContact AbLabel::currentEntry() 59Opie::OPimContact AbLabel::currentEntry()
60{ 60{
61 if ( ! m_empty ) 61 if ( ! m_empty )
62 return ( *m_itCurContact ); 62 return ( *m_itCurContact );
63 else 63 else
64 return OContact(); 64 return Opie::OPimContact();
65} 65}
66 66
@@ -110,5 +110,5 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
110 else { 110 else {
111 --m_itCurContact; 111 --m_itCurContact;
112 if ( *m_itCurContact != OContact() ) 112 if ( *m_itCurContact != Opie::OPimContact() )
113 sync(); 113 sync();
114 else 114 else
@@ -119,5 +119,5 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
119 case Qt::Key_Down: 119 case Qt::Key_Down:
120 qWarning( "DOWN.."); 120 qWarning( "DOWN..");
121 // qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); 121 // qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight());
122 // qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value() 122 // qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value()
123 // , verticalScrollBar()->maxValue() ); 123 // , verticalScrollBar()->maxValue() );
@@ -127,5 +127,5 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
127 else { 127 else {
128 ++m_itCurContact; 128 ++m_itCurContact;
129 if ( *m_itCurContact != OContact() ) 129 if ( *m_itCurContact != Opie::OPimContact() )
130 sync(); 130 sync();
131 else 131 else
diff --git a/core/pim/addressbook/ablabel.h b/core/pim/addressbook/ablabel.h
index 80336dc..8d7f2ac 100644
--- a/core/pim/addressbook/ablabel.h
+++ b/core/pim/addressbook/ablabel.h
@@ -21,8 +21,8 @@
21#define ABLABEL_H 21#define ABLABEL_H
22 22
23#include <opie/ocontact.h> 23#include <opie2/opimcontact.h>
24#include <qtextview.h> 24#include <opie2/ocontactaccess.h>
25 25
26#include <opie/ocontactaccess.h> 26#include <qtextview.h>
27 27
28class AbLabel : public QTextView 28class AbLabel : public QTextView
@@ -35,5 +35,5 @@ public:
35 35
36 // Set the contacts 36 // Set the contacts
37 void setContacts( const OContactAccess::List& viewList ); 37 void setContacts( const Opie::OPimContactAccess::List& viewList );
38 38
39 // Selects a contact 39 // Selects a contact
@@ -44,5 +44,5 @@ public:
44 44
45 // 45 //
46 OContact currentEntry(); 46 Opie::OPimContact currentEntry();
47 47
48signals: 48signals:
@@ -54,6 +54,6 @@ protected:
54 54
55private: 55private:
56 OContactAccess::List m_viewList; 56 Opie::OPimContactAccess::List m_viewList;
57 OContactAccess::List::Iterator m_itCurContact; 57 Opie::OPimContactAccess::List::Iterator m_itCurContact;
58 58
59 bool m_empty; 59 bool m_empty;
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 29f4383..cd77b13 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -21,10 +21,9 @@
21 21
22 22
23#include <opie2/opimrecordlist.h>
24
23#include <qpe/timestring.h> 25#include <qpe/timestring.h>
24#include <qpe/resource.h> 26#include <qpe/resource.h>
25 27
26#include <opie/orecordlist.h>
27
28
29#include "abtable.h" 28#include "abtable.h"
30 29
@@ -40,5 +39,5 @@
40/*! 39/*!
41 \class AbTableItem abtable.h 40 \class AbTableItem abtable.h
42 41
43 \brief QTableItem based class for showing a field of an entry 42 \brief QTableItem based class for showing a field of an entry
44*/ 43*/
@@ -67,5 +66,5 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey )
67 setText( txt ); 66 setText( txt );
68 sortKey = Qtopia::buildSortKey( txt, secondKey ); 67 sortKey = Qtopia::buildSortKey( txt, secondKey );
69 68
70 // sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower(); 69 // sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
71} 70}
@@ -73,5 +72,5 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey )
73/*! 72/*!
74 \class AbPickItem abtable.h 73 \class AbPickItem abtable.h
75 74
76 \brief QTableItem based class for showing slection of an entry 75 \brief QTableItem based class for showing slection of an entry
77*/ 76*/
@@ -110,5 +109,5 @@ void AbPickItem::setContentFromEditor( QWidget *w )
110/*! 109/*!
111 \class AbTable abtable.h 110 \class AbTable abtable.h
112 111
113 \brief QTable based class for showing a list of entries 112 \brief QTable based class for showing a list of entries
114*/ 113*/
@@ -144,5 +143,5 @@ void AbTable::init()
144 setNumRows( 0 ); 143 setNumRows( 0 );
145 setNumCols( 2 ); 144 setNumCols( 2 );
146 145
147 horizontalHeader()->setLabel( 0, tr( "Full Name" )); 146 horizontalHeader()->setLabel( 0, tr( "Full Name" ));
148 horizontalHeader()->setLabel( 1, tr( "Contact" )); 147 horizontalHeader()->setLabel( 1, tr( "Contact" ));
@@ -152,5 +151,5 @@ void AbTable::init()
152} 151}
153 152
154void AbTable::setContacts( const OContactAccess::List& viewList ) 153void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
155{ 154{
156 qWarning("AbTable::setContacts()"); 155 qWarning("AbTable::setContacts()");
@@ -161,11 +160,11 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
161 setSorting( false ); 160 setSorting( false );
162 setPaintingEnabled( FALSE ); 161 setPaintingEnabled( FALSE );
163 162
164 OContactAccess::List::Iterator it; 163 Opie::OPimContactAccess::List::Iterator it;
165 setNumRows( m_viewList.count() ); 164 setNumRows( m_viewList.count() );
166 //int row = 0; 165 //int row = 0;
167 // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it ) 166 // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
168 // insertIntoTable( *it, row++ ); 167 // insertIntoTable( *it, row++ );
169 168
170 // setSorting( true ); 169 // setSorting( true );
171 170
@@ -188,5 +187,5 @@ bool AbTable::selectContact( int UID )
188 qWarning( "AbTable::selectContact( %d )", UID ); 187 qWarning( "AbTable::selectContact( %d )", UID );
189 int rows = numRows(); 188 int rows = numRows();
190 OContact* foundContact = 0l; 189 Opie::OPimContact* foundContact = 0l;
191 bool found = false; 190 bool found = false;
192 191
@@ -214,13 +213,13 @@ bool AbTable::selectContact( int UID )
214 213
215#if 0 214#if 0
216void AbTable::insertIntoTable( const OContact& cnt, int row ) 215void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
217{ 216{
218 qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row ); 217 qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row );
219 QString strName; 218 QString strName;
220 ContactItem contactItem; 219 ContactItem contactItem;
221 220
222 strName = findContactName( cnt ); 221 strName = findContactName( cnt );
223 contactItem = findContactContact( cnt, row ); 222 contactItem = findContactContact( cnt, row );
224 223
225 AbTableItem *ati; 224 AbTableItem *ati;
226 ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value ); 225 ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value );
@@ -231,8 +230,8 @@ void AbTable::insertIntoTable( const OContact& cnt, int row )
231 ati->setPixmap( contactItem.icon ); 230 ati->setPixmap( contactItem.icon );
232 setItem( row, 1, ati ); 231 setItem( row, 1, ati );
233 232
234 //### cannot do this; table only has two columns at this point 233 //### cannot do this; table only has two columns at this point
235 // setItem( row, 2, new AbPickItem( this ) ); 234 // setItem( row, 2, new AbPickItem( this ) );
236 235
237} 236}
238#endif 237#endif
@@ -243,8 +242,8 @@ void AbTable::columnClicked( int col )
243 if ( !sorting() ) 242 if ( !sorting() )
244 return; 243 return;
245 244
246 if ( lastSortCol == -1 ) 245 if ( lastSortCol == -1 )
247 lastSortCol = col; 246 lastSortCol = col;
248 247
249 if ( col == lastSortCol ) { 248 if ( col == lastSortCol ) {
250 asc = !asc; 249 asc = !asc;
@@ -273,6 +272,6 @@ void AbTable::resort()
273} 272}
274 273
275OContact AbTable::currentEntry() 274Opie::OPimContact AbTable::currentEntry()
276 { 275{
277 return m_viewList[currentRow()]; 276 return m_viewList[currentRow()];
278} 277}
@@ -332,8 +331,8 @@ void AbTable::keyPressEvent( QKeyEvent *e )
332{ 331{
333 char key = toupper( e->ascii() ); 332 char key = toupper( e->ascii() );
334 333
335 if ( key >= 'A' && key <= 'Z' ) 334 if ( key >= 'A' && key <= 'Z' )
336 moveTo( key ); 335 moveTo( key );
337 336
338 //qWarning("Received key .."); 337 //qWarning("Received key ..");
339 switch( e->key() ) { 338 switch( e->key() ) {
@@ -354,5 +353,5 @@ void AbTable::keyPressEvent( QKeyEvent *e )
354 QTable::keyPressEvent( e ); 353 QTable::keyPressEvent( e );
355 } 354 }
356 355
357} 356}
358 357
@@ -360,5 +359,5 @@ void AbTable::moveTo( char c )
360{ 359{
361 qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" ); 360 qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
362 361
363#if 0 362#if 0
364 int rows = numRows(); 363 int rows = numRows();
@@ -395,5 +394,5 @@ void AbTable::moveTo( char c )
395#if 0 394#if 0
396// Useless.. Nobody uses it .. (se) 395// Useless.. Nobody uses it .. (se)
397QString AbTable::findContactName( const OContact &entry ) 396QString AbTable::findContactName( const Opie::OPimContact &entry )
398{ 397{
399 // We use the fileAs, then company, defaultEmail 398 // We use the fileAs, then company, defaultEmail
@@ -476,15 +475,15 @@ void AbTable::fitColumns()
476{ 475{
477 qWarning( "void AbTable::fitColumns()" ); 476 qWarning( "void AbTable::fitColumns()" );
478 int contentsWidth = visibleWidth() / 2; 477 int contentsWidth = visibleWidth() / 2;
479 // Fix to better value 478 // Fix to better value
480 // contentsWidth = 130; 479 // contentsWidth = 130;
481 480
482 setPaintingEnabled( FALSE ); 481 setPaintingEnabled( FALSE );
483 482
484 if ( columnVisible == false ){ 483 if ( columnVisible == false ){
485 showColumn(0); 484 showColumn(0);
486 columnVisible = true; 485 columnVisible = true;
487 } 486 }
488 487
489 //qWarning("Width: %d", contentsWidth); 488 //qWarning("Width: %d", contentsWidth);
490 489
@@ -548,13 +547,13 @@ QStringList AbTable::choiceSelection(int /*index*/) const
548 QStringList r; 547 QStringList r;
549 /* ###### 548 /* ######
550 549
551 QString selname = choicenames.at(index); 550 QString selname = choicenames.at(index);
552 for (each row) { 551 for (each row) {
553 OContact *c = contactForRow(row); 552 Opie::OPimContact *c = contactForRow(row);
554 if ( text(row,2) == selname ) { 553 if ( text(row,2) == selname ) {
555 r.append(c->email); 554 r.append(c->email);
556 } 555 }
557 } 556 }
558 557
559 */ 558 */
560 return r; 559 return r;
@@ -570,7 +569,7 @@ void AbTable::updateVisible()
570 row, 569 row,
571 selectedRow = 0; 570 selectedRow = 0;
572 571
573 visible = 0; 572 visible = 0;
574 573
575 setPaintingEnabled( FALSE ); 574 setPaintingEnabled( FALSE );
576 575
@@ -593,5 +592,5 @@ void AbTable::updateVisible()
593 if ( !visible ) 592 if ( !visible )
594 setCurrentCell( -1, 0 ); 593 setCurrentCell( -1, 0 );
595 594
596 setPaintingEnabled( TRUE ); 595 setPaintingEnabled( TRUE );
597} 596}
@@ -632,5 +631,5 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool )
632 //qWarning( "Paint row: %d", row ); 631 //qWarning( "Paint row: %d", row );
633 632
634 OContact act_contact = m_viewList[row]; 633 Opie::OPimContact act_contact = m_viewList[row];
635 634
636 // Paint alternating background bars 635 // Paint alternating background bars
@@ -654,5 +653,5 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool )
654 653
655 switch( col ){ 654 switch( col ){
656 case 0: 655 case 0:
657 p->drawText( x + marg,2 + fm.ascent(), nameText ); 656 p->drawText( x + marg,2 + fm.ascent(), nameText );
658 break; 657 break;
@@ -662,9 +661,9 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool )
662 QPixmap contactPic = contactItem.icon; /* pixmap( row, col ); */ 661 QPixmap contactPic = contactItem.icon; /* pixmap( row, col ); */
663 QString contactText = contactItem.value; 662 QString contactText = contactItem.value;
664 663
665 if ( !contactPic.isNull() ) 664 if ( !contactPic.isNull() )
666 { 665 {
667 p->drawPixmap( x + marg, y, contactPic ); 666 p->drawPixmap( x + marg, y, contactPic );
668 p->drawText( x + marg + contactPic.width() 667 p->drawText( x + marg + contactPic.width()
669 + 4,2 + fm.ascent(), contactText ); 668 + 4,2 + fm.ascent(), contactText );
670 } 669 }
@@ -685,5 +684,5 @@ void AbTable::rowHeightChanged( int row )
685 QTable::rowHeightChanged( row ); 684 QTable::rowHeightChanged( row );
686} 685}
687ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ ) 686ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
688{ 687{
689 688
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index b9ebe27..927a5a9 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -23,7 +23,8 @@
23#define ABTABLE_H 23#define ABTABLE_H
24 24
25#include <opie2/opimcontact.h>
26#include <opie2/ocontactaccess.h>
27
25#include <qpe/categories.h> 28#include <qpe/categories.h>
26#include <opie/ocontact.h>
27#include <opie/ocontactaccess.h>
28 29
29#include <qmap.h> 30#include <qmap.h>
@@ -31,5 +32,5 @@
31#include <qstringlist.h> 32#include <qstringlist.h>
32#include <qcombobox.h> 33#include <qcombobox.h>
33#include <qpixmap.h> 34#include <qpixmap.h>
34 35
35#if 0 36#if 0
@@ -84,5 +85,5 @@ public:
84 85
85 // Set the contacts shown in the table 86 // Set the contacts shown in the table
86 void setContacts( const OContactAccess::List& viewList ); 87 void setContacts( const Opie::OPimContactAccess::List& viewList );
87 88
88 // Set the list for primary contacts 89 // Set the list for primary contacts
@@ -91,12 +92,12 @@ public:
91 // Selects a contact of a specific UID 92 // Selects a contact of a specific UID
92 bool selectContact( int UID ); 93 bool selectContact( int UID );
93 94
94 // Get the current selected entry 95 // Get the current selected entry
95 OContact currentEntry(); 96 Opie::OPimContact currentEntry();
96 97
97 // Get the UID of the current selected Entry 98 // Get the UID of the current selected Entry
98 int currentEntry_UID(); 99 int currentEntry_UID();
99 100
100 // QString findContactName( const OContact &entry ); 101 // QString findContactName( const Opie::OPimContact &entry );
101 102
102 void init(); 103 void init();
@@ -136,6 +137,6 @@ protected slots:
136 137
137private: 138private:
138 // void insertIntoTable( const OContact &cnt, int row ); 139 // void insertIntoTable( const Opie::OPimContact &cnt, int row );
139 ContactItem findContactContact( const OContact &entry, int row ); 140 ContactItem findContactContact( const Opie::OPimContact &entry, int row );
140 void fitColumns(); 141 void fitColumns();
141 void resizeRows(); 142 void resizeRows();
@@ -146,5 +147,5 @@ private:
146 int lastSortCol; 147 int lastSortCol;
147 bool asc; 148 bool asc;
148 // QMap<AbTableItem*, OContact> contactList; 149 // QMap<AbTableItem*, Opie::OPimContact> contactList;
149 QValueList<int> intFields; 150 QValueList<int> intFields;
150 QStringList choicenames; 151 QStringList choicenames;
@@ -153,5 +154,5 @@ private:
153 int countNested; 154 int countNested;
154 155
155 OContactAccess::List m_viewList; 156 Opie::OPimContactAccess::List m_viewList;
156 157
157}; 158};
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 8d61582..aa242b7 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -17,9 +17,9 @@
17#include "abview.h" 17#include "abview.h"
18 18
19#include <qlayout.h> 19#include <opie2/ocontactaccessbackend_vcard.h>
20 20
21#include <qpe/global.h> 21#include <qpe/global.h>
22 22
23#include <opie/ocontactaccessbackend_vcard.h> 23#include <qlayout.h>
24 24
25#include <assert.h> 25#include <assert.h>
@@ -54,5 +54,5 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
54 qWarning("AbView::c'tor"); 54 qWarning("AbView::c'tor");
55 // Load default database and handle syncing myself.. ! 55 // Load default database and handle syncing myself.. !
56 m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ); 56 m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
57 m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available 57 m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
58 mCat.load( categoryFileName() ); 58 mCat.load( categoryFileName() );
@@ -105,5 +105,5 @@ void AbView::setView( Views view )
105} 105}
106 106
107void AbView::addEntry( const OContact &newContact ) 107void AbView::addEntry( const Opie::OPimContact &newContact )
108{ 108{
109 qWarning("abview:AddContact"); 109 qWarning("abview:AddContact");
@@ -119,5 +119,5 @@ void AbView::removeEntry( const int UID )
119} 119}
120 120
121void AbView::replaceEntry( const OContact &contact ) 121void AbView::replaceEntry( const Opie::OPimContact &contact )
122{ 122{
123 qWarning("abview:ReplaceContact"); 123 qWarning("abview:ReplaceContact");
@@ -127,7 +127,7 @@ void AbView::replaceEntry( const OContact &contact )
127} 127}
128 128
129OContact AbView::currentEntry() 129Opie::OPimContact AbView::currentEntry()
130{ 130{
131 OContact currentContact; 131 Opie::OPimContact currentContact;
132 132
133 switch ( (int) m_curr_View ) { 133 switch ( (int) m_curr_View ) {
@@ -158,5 +158,5 @@ void AbView::load()
158 158
159 if ( m_inPersonal ) 159 if ( m_inPersonal )
160 // VCard Backend does not sort.. 160 // VCard Backend does not sort..
161 m_list = m_contactdb->allRecords(); 161 m_list = m_contactdb->allRecords();
162 else{ 162 else{
@@ -229,12 +229,12 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
229 assert( mode < AbConfig::LASTELEMENT ); 229 assert( mode < AbConfig::LASTELEMENT );
230 230
231 OContact query; 231 Opie::OPimContact query;
232 if ( c == 0 ){ 232 if ( c == 0 ){
233 load(); 233 load();
234 return; 234 return;
235 }else{ 235 }else{
236 // If the current Backend is unable to solve the query, we will 236 // If the current Backend is unable to solve the query, we will
237 // ignore the request .. 237 // ignore the request ..
238 if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){ 238 if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){
239 return; 239 return;
240 } 240 }
@@ -252,5 +252,5 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
252 return; 252 return;
253 } 253 }
254 m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase ); 254 m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
255 if ( m_curr_category != -1 ) 255 if ( m_curr_category != -1 )
256 clearForCategory(); 256 clearForCategory();
@@ -290,7 +290,7 @@ void AbView::showPersonal( bool personal )
290 m_storedDB = m_contactdb; 290 m_storedDB = m_contactdb;
291 291
292 OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 292 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
293 addressbookPersonalVCardName() ); 293 addressbookPersonalVCardName() );
294 m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); 294 m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
295 295
296 m_inPersonal = true; 296 m_inPersonal = true;
@@ -319,5 +319,5 @@ void AbView::setCurrentUid( int uid ){
319 319
320 m_curr_Contact = uid; 320 m_curr_Contact = uid;
321 updateView( true ); //true: Don't modificate the UID ! 321 updateView( true ); //true: Don't modificate the UID !
322} 322}
323 323
@@ -402,8 +402,8 @@ void AbView::slotSwitch(){
402void AbView::clearForCategory() 402void AbView::clearForCategory()
403{ 403{
404 OContactAccess::List::Iterator it; 404 Opie::OPimContactAccess::List::Iterator it;
405 // Now remove all contacts with wrong category if any category selected 405 // Now remove all contacts with wrong category if any category selected
406 406
407 OContactAccess::List allList = m_list; 407 Opie::OPimContactAccess::List allList = m_list;
408 if ( m_curr_category != -1 ){ 408 if ( m_curr_category != -1 ){
409 for ( it = allList.begin(); it != allList.end(); ++it ){ 409 for ( it = allList.begin(); it != allList.end(); ++it ){
@@ -417,7 +417,7 @@ void AbView::clearForCategory()
417} 417}
418 418
419bool AbView::contactCompare( const OContact &cnt, int category ) 419bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
420{ 420{
421 //qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category); 421 //qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category);
422 422
423 bool returnMe; 423 bool returnMe;
diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h
index 49bb4be..b8c8a08 100644
--- a/core/pim/addressbook/abview.h
+++ b/core/pim/addressbook/abview.h
@@ -2,10 +2,11 @@
2#define _ABVIEW_H_ 2#define _ABVIEW_H_
3 3
4#include <qwidget.h> 4#include <opie2/opimcontact.h>
5#include <qwidgetstack.h> 5#include <opie2/ocontactaccess.h>
6 6
7#include <qpe/categories.h> 7#include <qpe/categories.h>
8#include <opie/ocontact.h> 8
9#include <opie/ocontactaccess.h> 9#include <qwidget.h>
10#include <qwidgetstack.h>
10 11
11#include "contacteditor.h" 12#include "contacteditor.h"
@@ -38,8 +39,8 @@ public:
38 39
39 // Add Entry and put to current 40 // Add Entry and put to current
40 void addEntry( const OContact &newContact ); 41 void addEntry( const Opie::OPimContact &newContact );
41 void removeEntry( const int UID ); 42 void removeEntry( const int UID );
42 void replaceEntry( const OContact &contact ); 43 void replaceEntry( const Opie::OPimContact &contact );
43 OContact currentEntry(); 44 Opie::OPimContact currentEntry();
44 45
45 void inSearch() { m_inSearch = true; } 46 void inSearch() { m_inSearch = true; }
@@ -55,13 +56,13 @@ signals:
55 56
56public slots: 57public slots:
57 void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 58 void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
58 bool backwards, QString category = QString::null ); 59 bool backwards, QString category = QString::null );
59 void slotSwitch(); 60 void slotSwitch();
60 61
61private: 62private:
62 void updateListinViews(); 63 void updateListinViews();
63 void updateView( bool newdata = false ); 64 void updateView( bool newdata = false );
64 void clearForCategory(); 65 void clearForCategory();
65 bool contactCompare( const OContact &cnt, int category ); 66 bool contactCompare( const Opie::OPimContact &cnt, int category );
66 void parseName( const QString& name, QString *first, QString *middle, 67 void parseName( const QString& name, QString *first, QString *middle,
67 QString * last ); 68 QString * last );
@@ -74,8 +75,8 @@ private:
74 Views m_prev_View; 75 Views m_prev_View;
75 int m_curr_Contact; 76 int m_curr_Contact;
76 77
77 OContactAccess* m_contactdb; 78 Opie::OPimContactAccess* m_contactdb;
78 OContactAccess* m_storedDB; 79 Opie::OPimContactAccess* m_storedDB;
79 OContactAccess::List m_list; 80 Opie::OPimContactAccess::List m_list;
80 81
81 QWidgetStack* m_viewStack; 82 QWidgetStack* m_viewStack;
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 8a5f9d5..9ae66d1 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -24,8 +24,8 @@
24 24
25 25
26#include <opie/ofileselector.h> 26#include <opie2/ofileselector.h>
27#include <opie/ofiledialog.h> 27#include <opie2/ofiledialog.h>
28#include <opie/ocontact.h> 28#include <opie2/opimcontact.h>
29#include <opie/ocontactaccessbackend_vcard.h> 29#include <opie2/ocontactaccessbackend_vcard.h>
30 30
31#include <qpe/resource.h> 31#include <qpe/resource.h>
@@ -318,5 +318,5 @@ void AddressbookWindow::slotSetFont( int size )
318 318
319void AddressbookWindow::importvCard() { 319void AddressbookWindow::importvCard() {
320 QString str = 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 );
@@ -327,12 +327,12 @@ void AddressbookWindow::exportvCard()
327{ 327{
328 qWarning(" void AddressbookWindow::exportvCard()"); 328 qWarning(" void AddressbookWindow::exportvCard()");
329 QString filename = 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 qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 );
332 OContact curCont = m_abView->currentEntry(); 332 Opie::OPimContact curCont = m_abView->currentEntry();
333 if ( !curCont.isEmpty() ){ 333 if ( !curCont.isEmpty() ){
334 OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 334 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
335 filename ); 335 filename );
336 OContactAccess* access = new OContactAccess ( "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 );
@@ -372,8 +372,8 @@ void AddressbookWindow::setDocument( const QString &filename )
372 } 372 }
373 373
374 OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 374 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
375 filename ); 375 filename );
376 OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); 376 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
377 OContactAccess::List allList = access->allRecords(); 377 Opie::OPimContactAccess::List allList = access->allRecords();
378 qWarning( "Found number of contacts in File: %d", allList.count() ); 378 qWarning( "Found number of contacts in File: %d", allList.count() );
379 379
@@ -385,5 +385,5 @@ void AddressbookWindow::setDocument( const QString &filename )
385 385
386 bool doAsk = true; 386 bool doAsk = true;
387 OContactAccess::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 qWarning("Adding Contact from: %s", (*it).fullName().latin1() );
@@ -434,5 +434,5 @@ AddressbookWindow::~AddressbookWindow()
434void AddressbookWindow::slotUpdateToolbar() 434void AddressbookWindow::slotUpdateToolbar()
435{ 435{
436 OContact ce = m_abView->currentEntry(); 436 Opie::OPimContact ce = m_abView->currentEntry();
437 actionMail->setEnabled( !ce.defaultEmail().isEmpty() ); 437 actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
438} 438}
@@ -440,5 +440,5 @@ void AddressbookWindow::slotUpdateToolbar()
440void AddressbookWindow::slotListNew() 440void AddressbookWindow::slotListNew()
441{ 441{
442 OContact cnt; 442 Opie::OPimContact cnt;
443 if( !syncing ) { 443 if( !syncing ) {
444 editEntry( NewEntry ); 444 editEntry( NewEntry );
@@ -459,5 +459,5 @@ void AddressbookWindow::slotListDelete()
459{ 459{
460 if(!syncing) { 460 if(!syncing) {
461 OContact tmpEntry = m_abView ->currentEntry(); 461 Opie::OPimContact tmpEntry = m_abView ->currentEntry();
462 462
463 // get a name, do the best we can... 463 // get a name, do the best we can...
@@ -526,5 +526,5 @@ void AddressbookWindow::slotViewEdit()
526void AddressbookWindow::writeMail() 526void AddressbookWindow::writeMail()
527{ 527{
528 OContact 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();
@@ -566,14 +566,14 @@ void AddressbookWindow::slotBeam()
566{ 566{
567 QString beamFilename; 567 QString beamFilename;
568 OContact c; 568 Opie::OPimContact c;
569 if ( actionPersonal->isOn() ) { 569 if ( actionPersonal->isOn() ) {
570 beamFilename = addressbookPersonalVCardName(); 570 beamFilename = addressbookPersonalVCardName();
571 if ( !QFile::exists( beamFilename ) ) 571 if ( !QFile::exists( beamFilename ) )
572 return; // can't beam a non-existent file 572 return; // can't beam a non-existent file
573 OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 573 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
574 beamFilename ); 574 beamFilename );
575 OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); 575 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
576 OContactAccess::List allList = access->allRecords(); 576 Opie::OPimContactAccess::List allList = access->allRecords();
577 OContactAccess::List::Iterator it = allList.begin(); // Just take first 577 Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first
578 c = *it; 578 c = *it;
579 579
@@ -583,7 +583,7 @@ void AddressbookWindow::slotBeam()
583 mkdir("/tmp/obex/", 0755); 583 mkdir("/tmp/obex/", 0755);
584 c = m_abView -> currentEntry(); 584 c = m_abView -> currentEntry();
585 OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 585 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
586 beamfile ); 586 beamfile );
587 OContactAccess* access = new OContactAccess ( "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();
@@ -653,5 +653,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
653 stream >> name >> email; 653 stream >> name >> email;
654 654
655 OContact 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 );
@@ -723,5 +723,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
723void AddressbookWindow::editEntry( EntryMode entryMode ) 723void AddressbookWindow::editEntry( EntryMode entryMode )
724{ 724{
725 OContact entry; 725 Opie::OPimContact entry;
726 if ( !abEditor ) { 726 if ( !abEditor ) {
727 abEditor = new ContactEditor( entry, this, "editor" ); 727 abEditor = new ContactEditor( entry, this, "editor" );
@@ -739,10 +739,10 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
739 setFocus(); 739 setFocus();
740 if ( entryMode == NewEntry ) { 740 if ( entryMode == NewEntry ) {
741 OContact insertEntry = abEditor->entry(); 741 Opie::OPimContact insertEntry = abEditor->entry();
742 insertEntry.assignUid(); 742 insertEntry.assignUid();
743 m_abView -> addEntry( insertEntry ); 743 m_abView -> addEntry( insertEntry );
744 m_abView -> setCurrentUid( insertEntry.uid() ); 744 m_abView -> setCurrentUid( insertEntry.uid() );
745 } else { 745 } else {
746 OContact replEntry = abEditor->entry(); 746 Opie::OPimContact replEntry = abEditor->entry();
747 747
748 if ( !replEntry.isValidUid() ) 748 if ( !replEntry.isValidUid() )
@@ -758,5 +758,5 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
758void AddressbookWindow::editPersonal() 758void AddressbookWindow::editPersonal()
759{ 759{
760 OContact entry; 760 Opie::OPimContact entry;
761 761
762 // Switch to personal view if not selected 762 // Switch to personal view if not selected
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index afd3b92..05f02c3 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -24,5 +24,5 @@ TARGET = addressbook
24INCLUDEPATH += $(OPIEDIR)/include 24INCLUDEPATH += $(OPIEDIR)/include
25 DEPENDPATH+= $(OPIEDIR)/include 25 DEPENDPATH+= $(OPIEDIR)/include
26LIBS += -lqpe -lopie 26LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2
27 27
28include ( $(OPIEDIR)/include.pro ) 28include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in
index 3377763..7ecf14c 100644
--- a/core/pim/addressbook/config.in
+++ b/core/pim/addressbook/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-addressbook (a simple addressbook)" 2 boolean "opie-addressbook (a simple addressbook)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index dee0f11..6c98b5d 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,4 +1,9 @@
1#include "configdlg.h" 1#include "configdlg.h"
2 2
3#include <opie2/opimcontact.h>
4#include "opie2/opimcontactfields.h"
5
6#include <qpe/resource.h>
7
3#include <qcheckbox.h> 8#include <qcheckbox.h>
4#include <qradiobutton.h> 9#include <qradiobutton.h>
@@ -6,13 +11,8 @@
6#include <qpushbutton.h> 11#include <qpushbutton.h>
7 12
8#include <qpe/resource.h>
9
10#include <opie/ocontact.h>
11#include "opie/ocontactfields.h"
12
13ConfigDlg::ConfigDlg( QWidget *parent, const char *name): 13ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
14 ConfigDlg_Base(parent, name, true ) 14 ConfigDlg_Base(parent, name, true )
15{ 15{
16 contFields = OContactFields::trfields(); 16 contFields = Opie::OPimContactFields::trfields();
17 17
18 // We add all Fields into the Listbox 18 // We add all Fields into the Listbox
@@ -22,5 +22,5 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
22 22
23 // Reset Widget Flags: This was not changeable by designer :( 23 // Reset Widget Flags: This was not changeable by designer :(
24 setWFlags ( WStyle_ContextHelp ); 24 setWFlags ( WStyle_ContextHelp );
25 25
26 // Set Pics to Buttons and Tabs 26 // Set Pics to Buttons and Tabs
@@ -29,9 +29,9 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
29 m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) ); 29 m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
30 m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) ); 30 m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
31 31
32 32
33 // Get the translation maps between Field ID and translated strings 33 // Get the translation maps between Field ID and translated strings
34 m_mapStrToID = OContactFields::trFieldsToId(); 34 m_mapStrToID = Opie::OPimContactFields::trFieldsToId();
35 m_mapIDToStr = OContactFields::idToTrFields(); 35 m_mapIDToStr = Opie::OPimContactFields::idToTrFields();
36 36
37 connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) ); 37 connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
@@ -77,5 +77,5 @@ void ConfigDlg::slotItemAdd()
77 qWarning("ADding %s", item.latin1()); 77 qWarning("ADding %s", item.latin1());
78 fieldListBox->insertItem( item ); 78 fieldListBox->insertItem( item );
79 } 79 }
80} 80}
81 81
@@ -87,10 +87,10 @@ void ConfigDlg::slotItemRemove()
87 if ( i > 0 ) { 87 if ( i > 0 ) {
88 fieldListBox->removeItem( i ); 88 fieldListBox->removeItem( i );
89 } 89 }
90} 90}
91 91
92void ConfigDlg::setConfig( const AbConfig& cnf ) 92void ConfigDlg::setConfig( const AbConfig& cnf )
93{ 93{
94 m_config = cnf; 94 m_config = cnf;
95 95
96 m_useRegExp->setChecked( m_config.useRegExp() ); 96 m_useRegExp->setChecked( m_config.useRegExp() );
@@ -106,10 +106,10 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
106 m_largeFont->setChecked( false ); 106 m_largeFont->setChecked( false );
107 break; 107 break;
108 case 1: 108 case 1:
109 m_smallFont->setChecked( false ); 109 m_smallFont->setChecked( false );
110 m_normalFont->setChecked( true ); 110 m_normalFont->setChecked( true );
111 m_largeFont->setChecked( false ); 111 m_largeFont->setChecked( false );
112 break; 112 break;
113 case 2: 113 case 2:
114 m_smallFont->setChecked( false ); 114 m_smallFont->setChecked( false );
115 m_normalFont->setChecked( false ); 115 m_normalFont->setChecked( false );
@@ -125,7 +125,7 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
125 m_moveBars->setChecked( !m_config.fixedBars() ); 125 m_moveBars->setChecked( !m_config.fixedBars() );
126} 126}
127 127
128AbConfig ConfigDlg::getConfig() 128AbConfig ConfigDlg::getConfig()
129{ 129{
130 m_config.setUseRegExp( m_useRegExp->isOn() ); 130 m_config.setUseRegExp( m_useRegExp->isOn() );
131 m_config.setUseWildCards( m_useWildCard->isOn() ); 131 m_config.setUseWildCards( m_useWildCard->isOn() );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 8acf570..534666d 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -22,8 +22,9 @@
22#include "contacteditor.h" 22#include "contacteditor.h"
23 23
24#include <opie2/opimcontact.h>
25
24#include <qpe/categoryselect.h> 26#include <qpe/categoryselect.h>
25#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
26#include <qpe/qpedialog.h> 28#include <qpe/qpedialog.h>
27#include <opie/ocontact.h>
28#include <qpe/resource.h> 29#include <qpe/resource.h>
29 30
@@ -34,6 +35,6 @@
34#include <qmultilineedit.h> 35#include <qmultilineedit.h>
35#include <qtoolbutton.h> 36#include <qtoolbutton.h>
36#include <qlistbox.h> 37#include <qlistbox.h>
37#include <qmessagebox.h> 38#include <qmessagebox.h>
38#include <qwhatsthis.h> 39#include <qwhatsthis.h>
39 40
@@ -52,5 +53,5 @@ void parseEmailTo( const QString &strDefaultEmail,
52 const QString &strOtherEmail, QString &strBack ); 53 const QString &strOtherEmail, QString &strBack );
53 54
54 ContactEditor::ContactEditor(const OContact &entry, 55 ContactEditor::ContactEditor(const Opie::OPimContact &entry,
55 QWidget *parent, 56 QWidget *parent,
56 const char *name, 57 const char *name,
@@ -78,5 +79,5 @@ ContactEditor::~ContactEditor() {
78void ContactEditor::init() { 79void ContactEditor::init() {
79 qWarning("init() START"); 80 qWarning("init() START");
80 81
81 uint i = 0; 82 uint i = 0;
82 83
@@ -88,8 +89,8 @@ void ContactEditor::init() {
88 } 89 }
89 90
90 trlChooserNames = OContactFields::trphonefields( false ); 91 trlChooserNames = Opie::OPimContactFields::trphonefields( false );
91 slChooserNames = OContactFields::untrphonefields( false ); 92 slChooserNames = Opie::OPimContactFields::untrphonefields( false );
92 slDynamicEntries = OContactFields::untrdetailsfields( false ); 93 slDynamicEntries = Opie::OPimContactFields::untrdetailsfields( false );
93 trlDynamicEntries = OContactFields::trdetailsfields( false ); 94 trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false );
94 95
95 // Ok, we have to remove elements from the list of dynamic entries 96 // Ok, we have to remove elements from the list of dynamic entries
@@ -102,5 +103,5 @@ void ContactEditor::init() {
102 // The same with translated fields.. But I will 103 // The same with translated fields.. But I will
103 // use the translation map to avoid mismatches.. 104 // use the translation map to avoid mismatches..
104 QMap<int, QString> translMap = OContactFields::idToTrFields(); 105 QMap<int, QString> translMap = Opie::OPimContactFields::idToTrFields();
105 trlDynamicEntries.remove( translMap[Qtopia::Anniversary] ); 106 trlDynamicEntries.remove( translMap[Qtopia::Anniversary] );
106 trlDynamicEntries.remove( translMap[Qtopia::Birthday] ); 107 trlDynamicEntries.remove( translMap[Qtopia::Birthday] );
@@ -165,5 +166,5 @@ void ContactEditor::init() {
165 gl->addWidget( txtOrganization, 3, 1 ); 166 gl->addWidget( txtOrganization, 3, 1 );
166 167
167 // Chooser 1 168 // Chooser 1
168 cmbChooserField1 = new QComboBox( FALSE, container ); 169 cmbChooserField1 = new QComboBox( FALSE, container );
169 QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) ); 170 QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) );
@@ -530,5 +531,5 @@ void ContactEditor::init() {
530 birthdayButton->setPopupDelay(0); 531 birthdayButton->setPopupDelay(0);
531 532
532 QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 533 QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
533 tr( "Delete" ), 534 tr( "Delete" ),
534 hBox, 0 ); 535 hBox, 0 );
@@ -555,5 +556,5 @@ void ContactEditor::init() {
555 anniversaryButton->setPopupDelay(0); 556 anniversaryButton->setPopupDelay(0);
556 557
557 deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 558 deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
558 tr( "Delete" ), 559 tr( "Delete" ),
559 hBox, 0 ); 560 hBox, 0 );
@@ -579,9 +580,9 @@ void ContactEditor::init() {
579 // Create Labels and lineedit fields for every dynamic entry 580 // Create Labels and lineedit fields for every dynamic entry
580 QStringList::ConstIterator it = slDynamicEntries.begin(); 581 QStringList::ConstIterator it = slDynamicEntries.begin();
581 QMap<QString, int> mapStrToID = OContactFields::untrFieldsToId(); 582 QMap<QString, int> mapStrToID = Opie::OPimContactFields::untrFieldsToId();
582 QMap<int, QString> mapIdToStr = OContactFields::idToTrFields(); 583 QMap<int, QString> mapIdToStr = Opie::OPimContactFields::idToTrFields();
583 for (i = counter; it != slDynamicEntries.end(); i++, ++it ) { 584 for (i = counter; it != slDynamicEntries.end(); i++, ++it ) {
584 585
585 if (((*it) == "Anniversary") || 586 if (((*it) == "Anniversary") ||
586 ((*it) == "Birthday")|| ((*it) == "Gender")) continue; 587 ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
587 588
@@ -645,9 +646,9 @@ void ContactEditor::init() {
645 connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) ); 646 connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
646 647
647 connect( txtFullName, SIGNAL(textChanged(const QString&)), 648 connect( txtFullName, SIGNAL(textChanged(const QString&)),
648 this, SLOT(slotFullNameChange(const QString&)) ); 649 this, SLOT(slotFullNameChange(const QString&)) );
649 connect( txtSuffix, SIGNAL(textChanged(const QString&)), 650 connect( txtSuffix, SIGNAL(textChanged(const QString&)),
650 this, SLOT(slotSuffixChange(const QString&)) ); 651 this, SLOT(slotSuffixChange(const QString&)) );
651 connect( txtOrganization, SIGNAL(textChanged(const QString&)), 652 connect( txtOrganization, SIGNAL(textChanged(const QString&)),
652 this, SLOT(slotOrganizationChange(const QString&)) ); 653 this, SLOT(slotOrganizationChange(const QString&)) );
653 connect( txtChooserField1, SIGNAL(textChanged(const QString&)), 654 connect( txtChooserField1, SIGNAL(textChanged(const QString&)),
@@ -701,13 +702,13 @@ void ContactEditor::defaultEmailChanged(int i){
701} 702}
702 703
703void ContactEditor::populateDefaultEmailCmb(){ 704void ContactEditor::populateDefaultEmailCmb(){
704 705
705 // if the default-email combo was not selected and therfore not created 706 // if the default-email combo was not selected and therfore not created
706 // we get a lot of trouble.. Therfore create an invisible one.. 707 // we get a lot of trouble.. Therfore create an invisible one..
707 if ( !cmbDefaultEmail ){ 708 if ( !cmbDefaultEmail ){
708 cmbDefaultEmail = new QComboBox(this); 709 cmbDefaultEmail = new QComboBox(this);
709 cmbDefaultEmail -> hide(); 710 cmbDefaultEmail -> hide();
710 } 711 }
711 cmbDefaultEmail->clear(); 712 cmbDefaultEmail->clear();
712 cmbDefaultEmail->insertStringList( emails ); 713 cmbDefaultEmail->insertStringList( emails );
713 // cmbDefaultEmail->show(); 714 // cmbDefaultEmail->show();
@@ -725,5 +726,5 @@ void ContactEditor::populateDefaultEmailCmb(){
725 } 726 }
726 } 727 }
727 728
728 // If the current default email is not found in the list, we choose the 729 // If the current default email is not found in the list, we choose the
729 // first one.. 730 // first one..
@@ -742,10 +743,10 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
742 contactfields.setFieldOrder( widgetPos-1, index ); 743 contactfields.setFieldOrder( widgetPos-1, index );
743 744
744 // Create and connect combobox for selecting the default email 745 // Create and connect combobox for selecting the default email
745 if ( type == "Default Email"){ 746 if ( type == "Default Email"){
746 qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition); 747 qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
747 748
748 // More than one default-email chooser is not allowed ! 749 // More than one default-email chooser is not allowed !
749 if ( ( defaultEmailChooserPosition != -1 ) && 750 if ( ( defaultEmailChooserPosition != -1 ) &&
750 defaultEmailChooserPosition != widgetPos && !initializing){ 751 defaultEmailChooserPosition != widgetPos && !initializing){
751 chooserError( widgetPos ); 752 chooserError( widgetPos );
@@ -754,5 +755,5 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
754 755
755 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); 756 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
756 if ( cmbo ){ 757 if ( cmbo ){
757 inputStack->raiseWidget( TextField ); 758 inputStack->raiseWidget( TextField );
758 inputStack -> removeWidget( cmbo ); 759 inputStack -> removeWidget( cmbo );
@@ -769,10 +770,10 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
769 770
770 connect( cmbo,SIGNAL( activated(int) ), 771 connect( cmbo,SIGNAL( activated(int) ),
771 SLOT( defaultEmailChanged(int) ) ); 772 SLOT( defaultEmailChanged(int) ) );
772 773
773 // Set current default email 774 // Set current default email
774 populateDefaultEmailCmb(); 775 populateDefaultEmailCmb();
775 776
776 777
777 } else { 778 } else {
778 // Something else was selected: Hide combo.. 779 // Something else was selected: Hide combo..
@@ -782,5 +783,5 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
782 } 783 }
783 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); 784 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
784 if ( cmbo ){ 785 if ( cmbo ){
785 inputStack->raiseWidget( TextField ); 786 inputStack->raiseWidget( TextField );
786 inputStack -> removeWidget( cmbo ); 787 inputStack -> removeWidget( cmbo );
@@ -802,5 +803,5 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
802void ContactEditor::chooserError( int index ) 803void ContactEditor::chooserError( int index )
803{ 804{
804 qWarning("ContactEditor::chooserError( %d )", index); 805 qWarning("ContactEditor::chooserError( %d )", index);
805 QMessageBox::warning( this, "Chooser Error", 806 QMessageBox::warning( this, "Chooser Error",
806 "Multiple selection of this\n" 807 "Multiple selection of this\n"
@@ -811,5 +812,5 @@ void ContactEditor::chooserError( int index )
811 812
812 // Reset the selected Chooser. Unfortunately the chooser 813 // Reset the selected Chooser. Unfortunately the chooser
813 // generates no signal, therfore we have to 814 // generates no signal, therfore we have to
814 // call the cmbChooserChange function manually.. 815 // call the cmbChooserChange function manually..
815 switch( index ){ 816 switch( index ){
@@ -818,13 +819,13 @@ void ContactEditor::chooserError( int index )
818 slotCmbChooser1Change( 0 ); 819 slotCmbChooser1Change( 0 );
819 break; 820 break;
820 case 2: 821 case 2:
821 cmbChooserField2 -> setCurrentItem( 0 ); 822 cmbChooserField2 -> setCurrentItem( 0 );
822 slotCmbChooser2Change( 0 ); 823 slotCmbChooser2Change( 0 );
823 break; 824 break;
824 case 3: 825 case 3:
825 cmbChooserField3 -> setCurrentItem( 0 ); 826 cmbChooserField3 -> setCurrentItem( 0 );
826 slotCmbChooser3Change( 0 ); 827 slotCmbChooser3Change( 0 );
827 break; 828 break;
828 case 4: 829 case 4:
829 cmbChooserField4 -> setCurrentItem( 0 ); 830 cmbChooserField4 -> setCurrentItem( 0 );
830 slotCmbChooser4Change( 0 ); 831 slotCmbChooser4Change( 0 );
@@ -834,5 +835,5 @@ void ContactEditor::chooserError( int index )
834 835
835// Called when something was changed in a textfield (shouldn't it called textchanged? (se)) 836// Called when something was changed in a textfield (shouldn't it called textchanged? (se))
836void ContactEditor::chooserChange( const QString &textChanged, int index, 837void ContactEditor::chooserChange( const QString &textChanged, int index,
837 QLineEdit* , int widgetPos ) { 838 QLineEdit* , int widgetPos ) {
838 839
@@ -841,5 +842,5 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
841 type.latin1(),textChanged.latin1(), index, widgetPos ); 842 type.latin1(),textChanged.latin1(), index, widgetPos );
842 843
843 if ( type == "Default Email"){ 844 if ( type == "Default Email"){
844 qWarning ("??? Wozu??: %s", textChanged.latin1()); 845 qWarning ("??? Wozu??: %s", textChanged.latin1());
845 defaultEmail = textChanged; 846 defaultEmail = textChanged;
@@ -855,5 +856,5 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
855 populateDefaultEmailCmb(); 856 populateDefaultEmailCmb();
856 } 857 }
857 858
858 slChooserValues[index] = textChanged; 859 slChooserValues[index] = textChanged;
859 860
@@ -949,5 +950,5 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
949 qWarning("ContactEditor::slotCmbChooser1Change( %d )", index); 950 qWarning("ContactEditor::slotCmbChooser1Change( %d )", index);
950 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ 951 if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
951 952
952 txtChooserField1->setText( slChooserValues[index] ); 953 txtChooserField1->setText( slChooserValues[index] );
953 txtChooserField1->setFocus(); 954 txtChooserField1->setFocus();
@@ -1050,10 +1051,10 @@ void ContactEditor::slotSuffixChange( const QString& ) {
1050void ContactEditor::slotOrganizationChange( const QString &textChanged ){ 1051void ContactEditor::slotOrganizationChange( const QString &textChanged ){
1051 qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() ); 1052 qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() );
1052 // Special handling for storing Companies: 1053 // Special handling for storing Companies:
1053 // If no Fullname is given, we store the Company-Name as lastname 1054 // If no Fullname is given, we store the Company-Name as lastname
1054 // to handle it like a person.. 1055 // to handle it like a person..
1055 if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) ) 1056 if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) )
1056 txtFullName->setText( textChanged ); 1057 txtFullName->setText( textChanged );
1057 1058
1058} 1059}
1059 1060
@@ -1138,5 +1139,5 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1138 1139
1139 // A comma (",") separates the lastname from one or 1140 // A comma (",") separates the lastname from one or
1140 // many first names. Thus, remove the lastname from the 1141 // many first names. Thus, remove the lastname from the
1141 // String and parse the firstnames. 1142 // String and parse the firstnames.
1142 1143
@@ -1155,10 +1156,10 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1155 for ( ; it != allFirstNames.end(); ++it ) 1156 for ( ; it != allFirstNames.end(); ++it )
1156 allSecondNames.append( *it ); 1157 allSecondNames.append( *it );
1157 1158
1158 strMiddleName = allSecondNames.join(" "); 1159 strMiddleName = allSecondNames.join(" ");
1159 1160
1160 } else { 1161 } else {
1161 1162
1162 // No comma separator used: We use the first word as firstname, the 1163 // No comma separator used: We use the first word as firstname, the
1163 // last as second/lastname and everything in the middle as middlename 1164 // last as second/lastname and everything in the middle as middlename
1164 1165
@@ -1169,8 +1170,8 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1169 for ( ; it != --allNames.end(); ++it ) 1170 for ( ; it != --allNames.end(); ++it )
1170 allSecondNames.append( *it ); 1171 allSecondNames.append( *it );
1171 1172
1172 strMiddleName = allSecondNames.join(" "); 1173 strMiddleName = allSecondNames.join(" ");
1173 strLastName = *(--allNames.end()); 1174 strLastName = *(--allNames.end());
1174 1175
1175 } 1176 }
1176 1177
@@ -1186,26 +1187,26 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1186 case NAME_FL: 1187 case NAME_FL:
1187 return strFirstName + " " + strLastName; 1188 return strFirstName + " " + strLastName;
1188 1189
1189 case NAME_LF: 1190 case NAME_LF:
1190 return strLastName + ", " + strFirstName; 1191 return strLastName + ", " + strFirstName;
1191 1192
1192 case NAME_LFM: 1193 case NAME_LFM:
1193 return strLastName + ", " + strFirstName + " " + strMiddleName; 1194 return strLastName + ", " + strFirstName + " " + strMiddleName;
1194 1195
1195 case NAME_FML: 1196 case NAME_FML:
1196 return strFirstName + " " + strMiddleName + " " + strLastName ; 1197 return strFirstName + " " + strMiddleName + " " + strLastName ;
1197 1198
1198 case NAME_F: 1199 case NAME_F:
1199 return strFirstName; 1200 return strFirstName;
1200 1201
1201 case NAME_M: 1202 case NAME_M:
1202 return strMiddleName; 1203 return strMiddleName;
1203 1204
1204 case NAME_L: 1205 case NAME_L:
1205 return strLastName; 1206 return strLastName;
1206 1207
1207 case NAME_S: 1208 case NAME_S:
1208 return txtSuffix->text(); 1209 return txtSuffix->text();
1209 1210
1210 } 1211 }
1211 return QString::null; 1212 return QString::null;
@@ -1214,19 +1215,19 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
1214void ContactEditor::cleanupFields() { 1215void ContactEditor::cleanupFields() {
1215 QStringList::Iterator it = slChooserValues.begin(); 1216 QStringList::Iterator it = slChooserValues.begin();
1216 1217
1217 for ( int i = 0; it != slChooserValues.end(); i++, ++it ) { 1218 for ( int i = 0; it != slChooserValues.end(); i++, ++it ) {
1218 (*it) = ""; 1219 (*it) = "";
1219 } 1220 }
1220 1221
1221 for ( int i = 0; i < 7; i++ ) { 1222 for ( int i = 0; i < 7; i++ ) {
1222 slHomeAddress[i] = ""; 1223 slHomeAddress[i] = "";
1223 slBusinessAddress[i] = ""; 1224 slBusinessAddress[i] = "";
1224 } 1225 }
1225 1226
1226 QListIterator<QLineEdit> itLV( listValue ); 1227 QListIterator<QLineEdit> itLV( listValue );
1227 for ( ; itLV.current(); ++itLV ) { 1228 for ( ; itLV.current(); ++itLV ) {
1228 (*itLV)->setText( "" ); 1229 (*itLV)->setText( "" );
1229 } 1230 }
1230 1231
1231 txtFirstName->setText(""); 1232 txtFirstName->setText("");
1232 txtMiddleName->setText(""); 1233 txtMiddleName->setText("");
@@ -1248,27 +1249,27 @@ void ContactEditor::cleanupFields() {
1248 txtTmp = cmbFileAs->lineEdit(); 1249 txtTmp = cmbFileAs->lineEdit();
1249 txtTmp->setText(""); 1250 txtTmp->setText("");
1250 1251
1251} 1252}
1252 1253
1253void ContactEditor::setEntry( const OContact &entry ) { 1254void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
1254 1255
1255 initializing = true; 1256 initializing = true;
1256 1257
1257 // Cleanup and activate the general Page .. 1258 // Cleanup and activate the general Page ..
1258 cleanupFields(); 1259 cleanupFields();
1259 tabMain->setCurrentPage( 0 ); 1260 tabMain->setCurrentPage( 0 );
1260 1261
1261 ent = entry; 1262 ent = entry;
1262 1263
1263 emails = QStringList(ent.emailList()); 1264 emails = QStringList(ent.emailList());
1264 defaultEmail = ent.defaultEmail(); 1265 defaultEmail = ent.defaultEmail();
1265 if (defaultEmail.isEmpty()) defaultEmail = emails[0]; 1266 if (defaultEmail.isEmpty()) defaultEmail = emails[0];
1266 qDebug("default email=%s",defaultEmail.latin1()); 1267 qDebug("default email=%s",defaultEmail.latin1());
1267 1268
1268 txtFirstName->setText( ent.firstName() ); 1269 txtFirstName->setText( ent.firstName() );
1269 txtMiddleName->setText( ent.middleName() ); 1270 txtMiddleName->setText( ent.middleName() );
1270 txtLastName->setText( ent.lastName() ); 1271 txtLastName->setText( ent.lastName() );
1271 txtSuffix->setText( ent.suffix() ); 1272 txtSuffix->setText( ent.suffix() );
1272 1273
1273 // QString *tmpString = new QString; 1274 // QString *tmpString = new QString;
1274 // *tmpString = ent.firstName() + " " + ent.middleName() + 1275 // *tmpString = ent.firstName() + " " + ent.middleName() +
@@ -1283,81 +1284,81 @@ void ContactEditor::setEntry( const OContact &entry ) {
1283 txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() ); 1284 txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() );
1284 } 1285 }
1285 1286
1286 cmbFileAs->setEditText( ent.fileAs() ); 1287 cmbFileAs->setEditText( ent.fileAs() );
1287 1288
1288 //if (hasTitle) 1289 //if (hasTitle)
1289 txtJobTitle->setText( ent.jobTitle() ); 1290 txtJobTitle->setText( ent.jobTitle() );
1290 1291
1291 //if (hasCompany) 1292 //if (hasCompany)
1292 txtOrganization->setText( ent.company() ); 1293 txtOrganization->setText( ent.company() );
1293 1294
1294 //if (hasNotes) 1295 //if (hasNotes)
1295 txtNote->setText( ent.notes() ); 1296 txtNote->setText( ent.notes() );
1296 1297
1297 //if (hasStreet) { 1298 //if (hasStreet) {
1298 slHomeAddress[0] = ent.homeStreet(); 1299 slHomeAddress[0] = ent.homeStreet();
1299 slBusinessAddress[0] = ent.businessStreet(); 1300 slBusinessAddress[0] = ent.businessStreet();
1300 //} 1301 //}
1301 1302
1302 //if (hasCity) { 1303 //if (hasCity) {
1303 slHomeAddress[3] = ent.homeCity(); 1304 slHomeAddress[3] = ent.homeCity();
1304 slBusinessAddress[3] = ent.businessCity(); 1305 slBusinessAddress[3] = ent.businessCity();
1305 //} 1306 //}
1306 1307
1307 //if (hasState) { 1308 //if (hasState) {
1308 slHomeAddress[4] = ent.homeState(); 1309 slHomeAddress[4] = ent.homeState();
1309 slBusinessAddress[4] = ent.businessState(); 1310 slBusinessAddress[4] = ent.businessState();
1310 //} 1311 //}
1311 1312
1312 //if (hasZip) { 1313 //if (hasZip) {
1313 slHomeAddress[5] = ent.homeZip(); 1314 slHomeAddress[5] = ent.homeZip();
1314 slBusinessAddress[5] = ent.businessZip(); 1315 slBusinessAddress[5] = ent.businessZip();
1315 //} 1316 //}
1316 1317
1317 //if (hasCountry) { 1318 //if (hasCountry) {
1318 slHomeAddress[6] = ent.homeCountry(); 1319 slHomeAddress[6] = ent.homeCountry();
1319 slBusinessAddress[6] = ent.businessCountry(); 1320 slBusinessAddress[6] = ent.businessCountry();
1320 //} 1321 //}
1321 1322
1322 QStringList::ConstIterator it; 1323 QStringList::ConstIterator it;
1323 QListIterator<QLineEdit> itLE( listValue ); 1324 QListIterator<QLineEdit> itLE( listValue );
1324 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { 1325 for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
1325 1326
1326 qWarning(" Filling dynamic Field: %s", (*it).latin1() ); 1327 qWarning(" Filling dynamic Field: %s", (*it).latin1() );
1327 1328
1328 if ( *it == "Department" ) 1329 if ( *it == "Department" )
1329 (*itLE)->setText( ent.department() ); 1330 (*itLE)->setText( ent.department() );
1330 1331
1331 if ( *it == "Company" ) 1332 if ( *it == "Company" )
1332 (*itLE)->setText( ent.company() ); 1333 (*itLE)->setText( ent.company() );
1333 1334
1334 if ( *it == "Office" ) 1335 if ( *it == "Office" )
1335 (*itLE)->setText( ent.office() ); 1336 (*itLE)->setText( ent.office() );
1336 1337
1337 if ( *it == "Profession" ) 1338 if ( *it == "Profession" )
1338 (*itLE)->setText( ent.profession() ); 1339 (*itLE)->setText( ent.profession() );
1339 1340
1340 if ( *it == "Assistant" ) 1341 if ( *it == "Assistant" )
1341 (*itLE)->setText( ent.assistant() ); 1342 (*itLE)->setText( ent.assistant() );
1342 1343
1343 if ( *it == "Manager" ) 1344 if ( *it == "Manager" )
1344 (*itLE)->setText( ent.manager() ); 1345 (*itLE)->setText( ent.manager() );
1345 1346
1346 if ( *it == "Spouse" ) 1347 if ( *it == "Spouse" )
1347 (*itLE)->setText( ent.spouse() ); 1348 (*itLE)->setText( ent.spouse() );
1348 1349
1349 if ( *it == "Nickname" ){ 1350 if ( *it == "Nickname" ){
1350 qWarning("**** Nichname: %s", ent.nickname().latin1() ); 1351 qWarning("**** Nichname: %s", ent.nickname().latin1() );
1351 (*itLE)->setText( ent.nickname() ); 1352 (*itLE)->setText( ent.nickname() );
1352 } 1353 }
1353 1354
1354 if ( *it == "Children" ) 1355 if ( *it == "Children" )
1355 (*itLE)->setText( ent.children() ); 1356 (*itLE)->setText( ent.children() );
1356 1357
1357 } 1358 }
1358 1359
1359 QStringList::Iterator itV; 1360 QStringList::Iterator itV;
1360 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { 1361 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1361 1362
1362 if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) ) 1363 if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) )
1363 *itV = ent.businessPhone(); 1364 *itV = ent.businessPhone();
@@ -1368,5 +1369,5 @@ void ContactEditor::setEntry( const OContact &entry ) {
1368 if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) ) 1369 if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) )
1369 *itV = ent.businessFax(); 1370 *itV = ent.businessFax();
1370 1371
1371 if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) ) 1372 if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) )
1372 *itV = ent.businessMobile(); 1373 *itV = ent.businessMobile();
@@ -1377,8 +1378,8 @@ void ContactEditor::setEntry( const OContact &entry ) {
1377 if ( *it == "Default Email" ) 1378 if ( *it == "Default Email" )
1378 *itV = ent.defaultEmail(); 1379 *itV = ent.defaultEmail();
1379 1380
1380 if ( *it == "Emails" ) 1381 if ( *it == "Emails" )
1381 *itV = ent.emailList().join(", "); // :SX 1382 *itV = ent.emailList().join(", "); // :SX
1382 1383
1383 if ( *it == "Home Phone" ) 1384 if ( *it == "Home Phone" )
1384 *itV = ent.homePhone(); 1385 *itV = ent.homePhone();
@@ -1389,5 +1390,5 @@ void ContactEditor::setEntry( const OContact &entry ) {
1389 if ( *it == "Home Fax" ) 1390 if ( *it == "Home Fax" )
1390 *itV = ent.homeFax(); 1391 *itV = ent.homeFax();
1391 1392
1392 if ( *it == "Home Mobile" ) 1393 if ( *it == "Home Mobile" )
1393 *itV = ent.homeMobile(); 1394 *itV = ent.homeMobile();
@@ -1395,8 +1396,8 @@ void ContactEditor::setEntry( const OContact &entry ) {
1395 if ( *it == "Car Phone" ) 1396 if ( *it == "Car Phone" )
1396 *itV = ent.carPhone(); 1397 *itV = ent.carPhone();
1397 1398
1398 if ( *it == "ISDN Phone" ) 1399 if ( *it == "ISDN Phone" )
1399 *itV = ent.ISDNPhone(); 1400 *itV = ent.ISDNPhone();
1400 1401
1401 if ( *it == "Other Phone" ) 1402 if ( *it == "Other Phone" )
1402 *itV = ent.otherPhone(); 1403 *itV = ent.otherPhone();
@@ -1407,17 +1408,17 @@ void ContactEditor::setEntry( const OContact &entry ) {
1407 if ( *it == "Home Pager") 1408 if ( *it == "Home Pager")
1408 *itV = ent.homePager(); 1409 *itV = ent.homePager();
1409 1410
1410 if ( *it == "AIM IM" ) 1411 if ( *it == "AIM IM" )
1411 *itV = ent.AIMIM(); 1412 *itV = ent.AIMIM();
1412 1413
1413 if ( *it == "ICQ IM" ) 1414 if ( *it == "ICQ IM" )
1414 *itV = ent.ICQIM(); 1415 *itV = ent.ICQIM();
1415 1416
1416 if ( *it == "Jabber IM" ) 1417 if ( *it == "Jabber IM" )
1417 *itV = ent.jabberIM(); 1418 *itV = ent.jabberIM();
1418 1419
1419 if ( *it == "MSN IM" ) 1420 if ( *it == "MSN IM" )
1420 *itV = ent.MSNIM(); 1421 *itV = ent.MSNIM();
1421 1422
1422 if ( *it == "Yahoo IM" ) 1423 if ( *it == "Yahoo IM" )
1423 *itV = ent.yahooIM(); 1424 *itV = ent.yahooIM();
@@ -1425,21 +1426,21 @@ void ContactEditor::setEntry( const OContact &entry ) {
1425 if ( *it == "Home Web Page" ) 1426 if ( *it == "Home Web Page" )
1426 *itV = ent.homeWebpage(); 1427 *itV = ent.homeWebpage();
1427 1428
1428 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) 1429 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
1429 *itV = ent.businessWebpage(); 1430 *itV = ent.businessWebpage();
1430 1431
1431 1432
1432 } 1433 }
1433 1434
1434 1435
1435 cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); 1436 cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
1436 1437
1437 QString gender = ent.gender(); 1438 QString gender = ent.gender();
1438 cmbGender->setCurrentItem( gender.toInt() ); 1439 cmbGender->setCurrentItem( gender.toInt() );
1439 1440
1440 txtNote->setText( ent.notes() ); 1441 txtNote->setText( ent.notes() );
1441 1442
1442 slotAddressTypeChange( cmbAddress->currentItem() ); 1443 slotAddressTypeChange( cmbAddress->currentItem() );
1443 1444
1444 // Get combo-settings from contact and set preset.. 1445 // Get combo-settings from contact and set preset..
1445 contactfields.loadFromRecord( ent ); 1446 contactfields.loadFromRecord( ent );
@@ -1454,7 +1455,7 @@ void ContactEditor::setEntry( const OContact &entry ) {
1454 slotCmbChooser4Change( cmbChooserField4->currentItem() ); 1455 slotCmbChooser4Change( cmbChooserField4->currentItem() );
1455 slotAddressTypeChange( cmbAddress->currentItem() ); 1456 slotAddressTypeChange( cmbAddress->currentItem() );
1456 1457
1457 updateDatePicker(); 1458 updateDatePicker();
1458 1459
1459 initializing = false; 1460 initializing = false;
1460} 1461}
@@ -1467,5 +1468,5 @@ void ContactEditor::updateDatePicker()
1467 } else 1468 } else
1468 birthdayButton->setText( tr ("Unknown") ); 1469 birthdayButton->setText( tr ("Unknown") );
1469 1470
1470 if ( !ent.anniversary().isNull() ){ 1471 if ( !ent.anniversary().isNull() ){
1471 anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) ); 1472 anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) );
@@ -1473,107 +1474,107 @@ void ContactEditor::updateDatePicker()
1473 } else 1474 } else
1474 anniversaryButton->setText( tr ("Unknown") ); 1475 anniversaryButton->setText( tr ("Unknown") );
1475 1476
1476} 1477}
1477 1478
1478void ContactEditor::saveEntry() { 1479void ContactEditor::saveEntry() {
1479 1480
1480 // Store current combo into contact 1481 // Store current combo into contact
1481 contactfields.saveToRecord( ent ); 1482 contactfields.saveToRecord( ent );
1482 1483
1483 txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); 1484 txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) );
1484 txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) ); 1485 txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) );
1485 txtLastName->setText( parseName( txtFullName->text(), NAME_L ) ); 1486 txtLastName->setText( parseName( txtFullName->text(), NAME_L ) );
1486 // txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); 1487 // txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) );
1487 1488
1488 ent.setFirstName( txtFirstName->text() ); 1489 ent.setFirstName( txtFirstName->text() );
1489 ent.setLastName( txtLastName->text() ); 1490 ent.setLastName( txtLastName->text() );
1490 ent.setMiddleName( txtMiddleName->text() ); 1491 ent.setMiddleName( txtMiddleName->text() );
1491 ent.setSuffix( txtSuffix->text() ); 1492 ent.setSuffix( txtSuffix->text() );
1492 1493
1493 ent.setFileAs( cmbFileAs->currentText() ); 1494 ent.setFileAs( cmbFileAs->currentText() );
1494 1495
1495 ent.setCategories( cmbCat->currentCategories() ); 1496 ent.setCategories( cmbCat->currentCategories() );
1496 1497
1497 1498
1498 //if (hasTitle) 1499 //if (hasTitle)
1499 ent.setJobTitle( txtJobTitle->text() ); 1500 ent.setJobTitle( txtJobTitle->text() );
1500 1501
1501 //if (hasCompany) 1502 //if (hasCompany)
1502 ent.setCompany( txtOrganization->text() ); 1503 ent.setCompany( txtOrganization->text() );
1503 1504
1504 //if (hasNotes) 1505 //if (hasNotes)
1505 ent.setNotes( txtNote->text() ); 1506 ent.setNotes( txtNote->text() );
1506 1507
1507 //if (hasStreet) { 1508 //if (hasStreet) {
1508 ent.setHomeStreet( slHomeAddress[0] ); 1509 ent.setHomeStreet( slHomeAddress[0] );
1509 ent.setBusinessStreet( slBusinessAddress[0] ); 1510 ent.setBusinessStreet( slBusinessAddress[0] );
1510 //} 1511 //}
1511 1512
1512 //if (hasCity) { 1513 //if (hasCity) {
1513 ent.setHomeCity( slHomeAddress[3] ); 1514 ent.setHomeCity( slHomeAddress[3] );
1514 ent.setBusinessCity( slBusinessAddress[3] ); 1515 ent.setBusinessCity( slBusinessAddress[3] );
1515 //} 1516 //}
1516 1517
1517 //if (hasState) { 1518 //if (hasState) {
1518 ent.setHomeState( slHomeAddress[4] ); 1519 ent.setHomeState( slHomeAddress[4] );
1519 ent.setBusinessState( slBusinessAddress[4] ); 1520 ent.setBusinessState( slBusinessAddress[4] );
1520 //} 1521 //}
1521 1522
1522 //if (hasZip) { 1523 //if (hasZip) {
1523 ent.setHomeZip( slHomeAddress[5] ); 1524 ent.setHomeZip( slHomeAddress[5] );
1524 ent.setBusinessZip( slBusinessAddress[5] ); 1525 ent.setBusinessZip( slBusinessAddress[5] );
1525 //} 1526 //}
1526 1527
1527 //if (hasCountry) { 1528 //if (hasCountry) {
1528 ent.setHomeCountry( slHomeAddress[6] ); 1529 ent.setHomeCountry( slHomeAddress[6] );
1529 ent.setBusinessCountry( slBusinessAddress[6] ); 1530 ent.setBusinessCountry( slBusinessAddress[6] );
1530 //} 1531 //}
1531 1532
1532 QStringList::ConstIterator it; 1533 QStringList::ConstIterator it;
1533 QListIterator<QLineEdit> itLE( listValue ); 1534 QListIterator<QLineEdit> itLE( listValue );
1534 for ( it = slDynamicEntries.begin(); itLE.current() && it != slDynamicEntries.end(); ++it, ++itLE) { 1535 for ( it = slDynamicEntries.begin(); itLE.current() && it != slDynamicEntries.end(); ++it, ++itLE) {
1535 1536
1536 if ( *it == "Department" ) 1537 if ( *it == "Department" )
1537 ent.setDepartment( (*itLE)->text() ); 1538 ent.setDepartment( (*itLE)->text() );
1538 1539
1539 if ( *it == "Company" ) 1540 if ( *it == "Company" )
1540 ent.setCompany( (*itLE)->text() ); 1541 ent.setCompany( (*itLE)->text() );
1541 1542
1542 if ( *it == "Office" ) 1543 if ( *it == "Office" )
1543 ent.setOffice( (*itLE)->text() ); 1544 ent.setOffice( (*itLE)->text() );
1544 1545
1545 if ( *it == "Profession" ) 1546 if ( *it == "Profession" )
1546 ent.setProfession( (*itLE)->text() ); 1547 ent.setProfession( (*itLE)->text() );
1547 1548
1548 if ( *it == "Assistant" ) 1549 if ( *it == "Assistant" )
1549 ent.setAssistant( (*itLE)->text() ); 1550 ent.setAssistant( (*itLE)->text() );
1550 1551
1551 if ( *it == "Manager" ) 1552 if ( *it == "Manager" )
1552 ent.setManager( (*itLE)->text() ); 1553 ent.setManager( (*itLE)->text() );
1553 1554
1554 if ( *it == "Spouse" ) 1555 if ( *it == "Spouse" )
1555 ent.setSpouse( (*itLE)->text() ); 1556 ent.setSpouse( (*itLE)->text() );
1556 1557
1557 if ( *it == "Nickname" ) 1558 if ( *it == "Nickname" )
1558 ent.setNickname( (*itLE)->text() ); 1559 ent.setNickname( (*itLE)->text() );
1559 1560
1560 if ( *it == "Children" ) 1561 if ( *it == "Children" )
1561 ent.setChildren( (*itLE)->text() ); 1562 ent.setChildren( (*itLE)->text() );
1562 1563
1563 } 1564 }
1564 1565
1565 1566
1566 QStringList::ConstIterator itV; 1567 QStringList::ConstIterator itV;
1567 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { 1568 for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
1568 1569
1569 if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) ) 1570 if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) )
1570 ent.setBusinessPhone( *itV ); 1571 ent.setBusinessPhone( *itV );
1571 1572
1572 if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) ) 1573 if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) )
1573 ent.setBusinessFax( *itV ); 1574 ent.setBusinessFax( *itV );
1574 1575
1575 if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) ) 1576 if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) )
1576 ent.setBusinessMobile( *itV ); 1577 ent.setBusinessMobile( *itV );
1577 1578
1578 if ( *it == "Emails" ){ 1579 if ( *it == "Emails" ){
1579 QString allemail; 1580 QString allemail;
@@ -1587,36 +1588,36 @@ void ContactEditor::saveEntry() {
1587 ent.setEmails( allemail ); 1588 ent.setEmails( allemail );
1588 } 1589 }
1589 1590
1590 if ( *it == "Default Email") 1591 if ( *it == "Default Email")
1591 ent.setDefaultEmail( defaultEmail /* *itV */ ); 1592 ent.setDefaultEmail( defaultEmail /* *itV */ );
1592 1593
1593 if ( *it == "Home Phone" ) 1594 if ( *it == "Home Phone" )
1594 ent.setHomePhone( *itV ); 1595 ent.setHomePhone( *itV );
1595 1596
1596 if ( *it == "Home Fax" ) 1597 if ( *it == "Home Fax" )
1597 ent.setHomeFax( *itV ); 1598 ent.setHomeFax( *itV );
1598 1599
1599 if ( *it == "Home Mobile" ) 1600 if ( *it == "Home Mobile" )
1600 ent.setHomeMobile( *itV ); 1601 ent.setHomeMobile( *itV );
1601 1602
1602 if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) ) 1603 if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) )
1603 ent.setBusinessPager( *itV ); 1604 ent.setBusinessPager( *itV );
1604 1605
1605 if ( *it == "Home Web Page" ) 1606 if ( *it == "Home Web Page" )
1606 ent.setHomeWebpage( *itV ); 1607 ent.setHomeWebpage( *itV );
1607 1608
1608 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) 1609 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
1609 ent.setBusinessWebpage( *itV ); 1610 ent.setBusinessWebpage( *itV );
1610 1611
1611 1612
1612 } 1613 }
1613 1614
1614 int gender = cmbGender->currentItem(); 1615 int gender = cmbGender->currentItem();
1615 ent.setGender( QString::number( gender ) ); 1616 ent.setGender( QString::number( gender ) );
1616 1617
1617 QString str = txtNote->text(); 1618 QString str = txtNote->text();
1618 if ( !str.isNull() ) 1619 if ( !str.isNull() )
1619 ent.setNotes( str ); 1620 ent.setNotes( str );
1620 1621
1621} 1622}
1622 1623
@@ -1699,16 +1700,16 @@ void ContactEditor::setPersonalView( bool personal )
1699{ 1700{
1700 m_personalView = personal; 1701 m_personalView = personal;
1701 1702
1702 // Currently disbled due to the fact that 1703 // Currently disbled due to the fact that
1703 // show will not work... 1704 // show will not work...
1704 return; 1705 return;
1705 1706
1706 if ( personal ){ 1707 if ( personal ){
1707 cmbCat->hide(); 1708 cmbCat->hide();
1708 labCat->hide(); 1709 labCat->hide();
1709 1710
1710 } else{ 1711 } else{
1711 cmbCat->show(); 1712 cmbCat->show();
1712 labCat->show(); 1713 labCat->show();
1713 } 1714 }
1714} 1715}
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index 72d14a9..1b86e6f 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -22,6 +22,6 @@
22#define CONTACTEDITOR_H 22#define CONTACTEDITOR_H
23 23
24#include <opie/ocontact.h> 24#include <opie2/opimcontact.h>
25#include <opie/ocontactfields.h> 25#include <opie2/opimcontactfields.h>
26 26
27#include <qpe/datebookmonth.h> 27#include <qpe/datebookmonth.h>
@@ -31,5 +31,5 @@
31#include <qmap.h> 31#include <qmap.h>
32#include <qstringlist.h> 32#include <qstringlist.h>
33#include <qwidgetstack.h> 33#include <qwidgetstack.h>
34 34
35const int NAME_LF = 0; 35const int NAME_LF = 0;
@@ -57,5 +57,5 @@ class ContactEditor : public QDialog {
57 57
58 public: 58 public:
59 ContactEditor(const OContact &entry, 59 ContactEditor(const Opie::OPimContact &entry,
60 QWidget *parent = 0, 60 QWidget *parent = 0,
61 const char *name = 0, 61 const char *name = 0,
@@ -64,10 +64,10 @@ class ContactEditor : public QDialog {
64 void setNameFocus(); 64 void setNameFocus();
65 void setPersonalView( bool personal = true ); 65 void setPersonalView( bool personal = true );
66 OContact entry() const { return ent; } 66 Opie::OPimContact entry() const { return ent; }
67 67
68 public slots: 68 public slots:
69 void slotNote(); 69 void slotNote();
70 void slotName(); 70 void slotName();
71 void setEntry(const OContact &entry); 71 void setEntry(const Opie::OPimContact &entry);
72 72
73 protected slots: 73 protected slots:
@@ -114,7 +114,7 @@ class ContactEditor : public QDialog {
114 void chooserChange( const QString&, int , QLineEdit*, int ); 114 void chooserChange( const QString&, int , QLineEdit*, int );
115 bool cmbChooserChange( int , QWidgetStack*, int ); 115 bool cmbChooserChange( int , QWidgetStack*, int );
116 OContactFields contactfields; 116 Opie::OPimContactFields contactfields;
117 117
118 OContact ent; 118 Opie::OPimContact ent;
119 119
120 QDialog *dlgNote; 120 QDialog *dlgNote;
diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp
index 47d370a..660fae6 100644
--- a/core/pim/addressbook/main.cpp
+++ b/core/pim/addressbook/main.cpp
@@ -22,6 +22,6 @@
22 22
23 23
24#include <opie/oapplicationfactory.h> 24#include <opie2/oapplicationfactory.h>
25 25
26OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) 26OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<AddressbookWindow> )
27 27
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 2d30dc5..18a3791 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -6,5 +6,5 @@ Conflicts: qpe-tkcaddressbook
6Maintainer: Stefan Eilers <eilers.stefan@epost.de> 6Maintainer: Stefan Eilers <eilers.stefan@epost.de>
7Architecture: arm 7Architecture: arm
8Depends: task-opie-minimal, libopie1, opie-pics 8Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2, libopiedb2
9Description: Contacts 9Description: Contacts
10 A simple addressbook for the Opie environment. 10 A simple addressbook for the Opie environment.