From 98721c16aa480c4a160d3492462cb8f0de783268 Mon Sep 17 00:00:00 2001 From: drw Date: Thu, 25 Mar 2004 23:40:52 +0000 Subject: libopie -> libopie2 --- (limited to 'core') 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 @@ -32,7 +32,7 @@ AbLabel::~AbLabel() { } -void AbLabel::setContacts( const OContactAccess::List& viewList ) +void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList ) { m_viewList = viewList; if (m_viewList.count() != 0){ @@ -48,7 +48,7 @@ void AbLabel::setContacts( const OContactAccess::List& viewList ) int AbLabel::currentEntry_UID() { - OContact contact = currentEntry(); + Opie::OPimContact contact = currentEntry(); if ( contact.isEmpty() ) return 0; @@ -56,12 +56,12 @@ int AbLabel::currentEntry_UID() return ( contact.uid() ); } -OContact AbLabel::currentEntry() +Opie::OPimContact AbLabel::currentEntry() { if ( ! m_empty ) return ( *m_itCurContact ); else - return OContact(); + return Opie::OPimContact(); } @@ -109,7 +109,7 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) scrollBy( 0, -(visibleHeight()-20) ); else { --m_itCurContact; - if ( *m_itCurContact != OContact() ) + if ( *m_itCurContact != Opie::OPimContact() ) sync(); else m_itCurContact = m_viewList.end(); @@ -118,7 +118,7 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) break; case Qt::Key_Down: qWarning( "DOWN.."); -// qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); +// qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); // qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value() // , verticalScrollBar()->maxValue() ); if ( ( visibleHeight() < contentsHeight() ) && @@ -126,7 +126,7 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) scrollBy( 0, visibleHeight()-20 ); else { ++m_itCurContact; - if ( *m_itCurContact != OContact() ) + if ( *m_itCurContact != Opie::OPimContact() ) sync(); else m_itCurContact = m_viewList.begin(); 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 @@ -20,10 +20,10 @@ #ifndef ABLABEL_H #define ABLABEL_H -#include -#include +#include +#include -#include +#include class AbLabel : public QTextView { @@ -34,7 +34,7 @@ public: ~AbLabel(); // Set the contacts - void setContacts( const OContactAccess::List& viewList ); + void setContacts( const Opie::OPimContactAccess::List& viewList ); // Selects a contact bool selectContact( int UID ); @@ -43,7 +43,7 @@ public: int currentEntry_UID(); // - OContact currentEntry(); + Opie::OPimContact currentEntry(); signals: void signalOkPressed(); @@ -53,8 +53,8 @@ protected: void keyPressEvent( QKeyEvent * ); private: - OContactAccess::List m_viewList; - OContactAccess::List::Iterator m_itCurContact; + Opie::OPimContactAccess::List m_viewList; + Opie::OPimContactAccess::List::Iterator m_itCurContact; 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 @@ -20,12 +20,11 @@ **********************************************************************/ +#include + #include #include -#include - - #include "abtable.h" #include @@ -39,7 +38,7 @@ /*! \class AbTableItem abtable.h - + \brief QTableItem based class for showing a field of an entry */ @@ -66,13 +65,13 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey ) { setText( txt ); sortKey = Qtopia::buildSortKey( txt, secondKey ); - + // sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower(); } /*! \class AbPickItem abtable.h - + \brief QTableItem based class for showing slection of an entry */ @@ -109,7 +108,7 @@ void AbPickItem::setContentFromEditor( QWidget *w ) /*! \class AbTable abtable.h - + \brief QTable based class for showing a list of entries */ @@ -143,7 +142,7 @@ void AbTable::init() // :SX showChar = '\0'; setNumRows( 0 ); setNumCols( 2 ); - + horizontalHeader()->setLabel( 0, tr( "Full Name" )); horizontalHeader()->setLabel( 1, tr( "Contact" )); setLeftMargin( 0 ); @@ -151,7 +150,7 @@ void AbTable::init() columnVisible = true; } -void AbTable::setContacts( const OContactAccess::List& viewList ) +void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) { qWarning("AbTable::setContacts()"); @@ -160,13 +159,13 @@ void AbTable::setContacts( const OContactAccess::List& viewList ) setSorting( false ); setPaintingEnabled( FALSE ); - - OContactAccess::List::Iterator it; + + Opie::OPimContactAccess::List::Iterator it; setNumRows( m_viewList.count() ); // int row = 0; // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it ) // insertIntoTable( *it, row++ ); - + // setSorting( true ); // resort(); @@ -187,7 +186,7 @@ bool AbTable::selectContact( int UID ) { qWarning( "AbTable::selectContact( %d )", UID ); int rows = numRows(); - OContact* foundContact = 0l; + Opie::OPimContact* foundContact = 0l; bool found = false; setPaintingEnabled( FALSE ); @@ -213,15 +212,15 @@ bool AbTable::selectContact( int UID ) } #if 0 -void AbTable::insertIntoTable( const OContact& cnt, int row ) +void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) { - qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row ); + qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row ); QString strName; ContactItem contactItem; - + strName = findContactName( cnt ); contactItem = findContactContact( cnt, row ); - + AbTableItem *ati; ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value ); contactList.insert( ati, cnt ); @@ -230,10 +229,10 @@ void AbTable::insertIntoTable( const OContact& cnt, int row ) if ( !contactItem.icon.isNull() ) ati->setPixmap( contactItem.icon ); setItem( row, 1, ati ); - + //### cannot do this; table only has two columns at this point // setItem( row, 2, new AbPickItem( this ) ); - + } #endif @@ -242,10 +241,10 @@ void AbTable::columnClicked( int col ) { if ( !sorting() ) return; - + if ( lastSortCol == -1 ) lastSortCol = col; - + if ( col == lastSortCol ) { asc = !asc; } else { @@ -272,8 +271,8 @@ void AbTable::resort() #endif } -OContact AbTable::currentEntry() -{ +Opie::OPimContact AbTable::currentEntry() +{ return m_viewList[currentRow()]; } @@ -331,10 +330,10 @@ void AbTable::refresh() void AbTable::keyPressEvent( QKeyEvent *e ) { char key = toupper( e->ascii() ); - + if ( key >= 'A' && key <= 'Z' ) moveTo( key ); - + // qWarning("Received key .."); switch( e->key() ) { case Qt::Key_Space: @@ -353,13 +352,13 @@ void AbTable::keyPressEvent( QKeyEvent *e ) default: QTable::keyPressEvent( e ); } - + } void AbTable::moveTo( char c ) { qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" ); - + #if 0 int rows = numRows(); QString value; @@ -394,7 +393,7 @@ void AbTable::moveTo( char c ) #if 0 // Useless.. Nobody uses it .. (se) -QString AbTable::findContactName( const OContact &entry ) +QString AbTable::findContactName( const Opie::OPimContact &entry ) { // We use the fileAs, then company, defaultEmail QString str; @@ -475,17 +474,17 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ) void AbTable::fitColumns() { qWarning( "void AbTable::fitColumns()" ); - int contentsWidth = visibleWidth() / 2; + int contentsWidth = visibleWidth() / 2; // Fix to better value - // contentsWidth = 130; + // contentsWidth = 130; setPaintingEnabled( FALSE ); - + if ( columnVisible == false ){ showColumn(0); columnVisible = true; } - + // qWarning("Width: %d", contentsWidth); setColumnWidth( 0, contentsWidth ); @@ -547,15 +546,15 @@ QStringList AbTable::choiceSelection(int /*index*/) const { QStringList r; /* ###### - + QString selname = choicenames.at(index); for (each row) { - OContact *c = contactForRow(row); + Opie::OPimContact *c = contactForRow(row); if ( text(row,2) == selname ) { r.append(c->email); } } - + */ return r; } @@ -569,9 +568,9 @@ void AbTable::updateVisible() totalRows, row, selectedRow = 0; - + visible = 0; - + setPaintingEnabled( FALSE ); realignTable(); @@ -592,7 +591,7 @@ void AbTable::updateVisible() if ( !visible ) setCurrentCell( -1, 0 ); - + setPaintingEnabled( TRUE ); } @@ -631,7 +630,7 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) //qWarning( "Paint row: %d", row ); - OContact act_contact = m_viewList[row]; + Opie::OPimContact act_contact = m_viewList[row]; // Paint alternating background bars if ( (row % 2 ) == 0 ) { @@ -653,7 +652,7 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) QString nameText = act_contact.fileAs(); switch( col ){ - case 0: + case 0: p->drawText( x + marg,2 + fm.ascent(), nameText ); break; case 1:{ @@ -661,11 +660,11 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) ContactItem contactItem = findContactContact( act_contact, 0 ); QPixmap contactPic = contactItem.icon; /* pixmap( row, col ); */ QString contactText = contactItem.value; - + if ( !contactPic.isNull() ) { p->drawPixmap( x + marg, y, contactPic ); - p->drawText( x + marg + contactPic.width() + p->drawText( x + marg + contactPic.width() + 4,2 + fm.ascent(), contactText ); } else @@ -684,7 +683,7 @@ void AbTable::rowHeightChanged( int row ) if ( enablePainting ) QTable::rowHeightChanged( row ); } -ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ ) +ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ ) { ContactItem item; 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 @@ -22,15 +22,16 @@ #ifndef ABTABLE_H #define ABTABLE_H +#include +#include + #include -#include -#include #include #include #include #include -#include +#include #if 0 class AbTableItem : public QTableItem @@ -83,21 +84,21 @@ public: ~AbTable(); // Set the contacts shown in the table - void setContacts( const OContactAccess::List& viewList ); + void setContacts( const Opie::OPimContactAccess::List& viewList ); // Set the list for primary contacts void setOrderedList( const QValueList ordered ); // Selects a contact of a specific UID bool selectContact( int UID ); - + // Get the current selected entry - OContact currentEntry(); + Opie::OPimContact currentEntry(); // Get the UID of the current selected Entry int currentEntry_UID(); - // QString findContactName( const OContact &entry ); + // QString findContactName( const Opie::OPimContact &entry ); void init(); void clear(); @@ -135,8 +136,8 @@ protected slots: void rowHeightChanged( int row ); private: - // void insertIntoTable( const OContact &cnt, int row ); - ContactItem findContactContact( const OContact &entry, int row ); + // void insertIntoTable( const Opie::OPimContact &cnt, int row ); + ContactItem findContactContact( const Opie::OPimContact &entry, int row ); void fitColumns(); void resizeRows(); void realignTable(); @@ -145,14 +146,14 @@ private: int lastSortCol; bool asc; - // QMap contactList; + // QMap contactList; QValueList intFields; QStringList choicenames; bool enablePainting; bool columnVisible; int countNested; - OContactAccess::List m_viewList; + Opie::OPimContactAccess::List m_viewList; }; #endif // ABTABLE_H 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 @@ -16,11 +16,11 @@ #include "abview.h" -#include +#include #include -#include +#include #include @@ -53,7 +53,7 @@ AbView::AbView ( QWidget* parent, const QValueList& ordered ): { qWarning("AbView::c'tor"); // Load default database and handle syncing myself.. ! - m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ); + m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false ); m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available mCat.load( categoryFileName() ); @@ -104,7 +104,7 @@ void AbView::setView( Views view ) load(); } -void AbView::addEntry( const OContact &newContact ) +void AbView::addEntry( const Opie::OPimContact &newContact ) { qWarning("abview:AddContact"); m_contactdb->add ( newContact ); @@ -118,7 +118,7 @@ void AbView::removeEntry( const int UID ) load(); } -void AbView::replaceEntry( const OContact &contact ) +void AbView::replaceEntry( const Opie::OPimContact &contact ) { qWarning("abview:ReplaceContact"); m_contactdb->replace( contact ); @@ -126,9 +126,9 @@ void AbView::replaceEntry( const OContact &contact ) } -OContact AbView::currentEntry() +Opie::OPimContact AbView::currentEntry() { - OContact currentContact; + Opie::OPimContact currentContact; switch ( (int) m_curr_View ) { case TableView: @@ -157,7 +157,7 @@ void AbView::load() emit signalClearLetterPicker(); if ( m_inPersonal ) - // VCard Backend does not sort.. + // VCard Backend does not sort.. m_list = m_contactdb->allRecords(); else{ m_list = m_contactdb->sorted( true, 0, 0, 0 ); @@ -228,14 +228,14 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) assert( mode < AbConfig::LASTELEMENT ); - OContact query; + Opie::OPimContact query; if ( c == 0 ){ load(); return; }else{ - // If the current Backend is unable to solve the query, we will + // If the current Backend is unable to solve the query, we will // ignore the request .. - if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){ + if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){ return; } @@ -251,7 +251,7 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) qWarning( "I will ignore it.." ); return; } - m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase ); + m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ); if ( m_curr_category != -1 ) clearForCategory(); m_curr_Contact = 0; @@ -289,9 +289,9 @@ void AbView::showPersonal( bool personal ) // to avoid unneeded load/stores. m_storedDB = m_contactdb; - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, addressbookPersonalVCardName() ); - m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); + m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); m_inPersonal = true; m_curr_View = CardView; @@ -318,7 +318,7 @@ void AbView::showPersonal( bool personal ) void AbView::setCurrentUid( int uid ){ m_curr_Contact = uid; - updateView( true ); //true: Don't modificate the UID ! + updateView( true ); //true: Don't modificate the UID ! } @@ -401,10 +401,10 @@ void AbView::slotSwitch(){ void AbView::clearForCategory() { - OContactAccess::List::Iterator it; + Opie::OPimContactAccess::List::Iterator it; // Now remove all contacts with wrong category if any category selected - OContactAccess::List allList = m_list; + Opie::OPimContactAccess::List allList = m_list; if ( m_curr_category != -1 ){ for ( it = allList.begin(); it != allList.end(); ++it ){ if ( !contactCompare( *it, m_curr_category ) ){ @@ -416,9 +416,9 @@ void AbView::clearForCategory() } -bool AbView::contactCompare( const OContact &cnt, int category ) +bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) { - // qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category); + // qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category); bool returnMe; QArray cats; 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 @@ -1,12 +1,13 @@ #ifndef _ABVIEW_H_ #define _ABVIEW_H_ -#include -#include +#include +#include #include -#include -#include + +#include +#include #include "contacteditor.h" #include "abtable.h" @@ -37,10 +38,10 @@ public: void setListOrder( const QValueList& ordered ); // Add Entry and put to current - void addEntry( const OContact &newContact ); + void addEntry( const Opie::OPimContact &newContact ); void removeEntry( const int UID ); - void replaceEntry( const OContact &contact ); - OContact currentEntry(); + void replaceEntry( const Opie::OPimContact &contact ); + Opie::OPimContact currentEntry(); void inSearch() { m_inSearch = true; } void offSearch(); @@ -54,15 +55,15 @@ signals: void signalViewSwitched ( int ); public slots: - void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, + void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, bool backwards, QString category = QString::null ); - void slotSwitch(); + void slotSwitch(); private: void updateListinViews(); - void updateView( bool newdata = false ); + void updateView( bool newdata = false ); void clearForCategory(); - bool contactCompare( const OContact &cnt, int category ); + bool contactCompare( const Opie::OPimContact &cnt, int category ); void parseName( const QString& name, QString *first, QString *middle, QString * last ); @@ -73,10 +74,10 @@ private: Views m_curr_View; Views m_prev_View; int m_curr_Contact; - - OContactAccess* m_contactdb; - OContactAccess* m_storedDB; - OContactAccess::List m_list; + + Opie::OPimContactAccess* m_contactdb; + Opie::OPimContactAccess* m_storedDB; + Opie::OPimContactAccess::List m_list; QWidgetStack* m_viewStack; AbTable* m_abTable; 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 @@ -23,10 +23,10 @@ #include "addressbook.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -317,7 +317,7 @@ void AddressbookWindow::slotSetFont( int size ) void AddressbookWindow::importvCard() { - QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this ); + QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this ); if(!str.isEmpty() ){ setDocument((const QString&) str ); } @@ -326,14 +326,14 @@ void AddressbookWindow::importvCard() { void AddressbookWindow::exportvCard() { qWarning(" void AddressbookWindow::exportvCard()"); - QString filename = OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); + QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 ); - OContact curCont = m_abView->currentEntry(); + Opie::OPimContact curCont = m_abView->currentEntry(); if ( !curCont.isEmpty() ){ - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, filename ); - OContactAccess* access = new OContactAccess ( "addressbook_exp", QString::null , vcard_backend, true ); + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true ); if ( access ){ access->add( curCont ); access->save(); @@ -371,10 +371,10 @@ void AddressbookWindow::setDocument( const QString &filename ) } } - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, filename ); - OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); - OContactAccess::List allList = access->allRecords(); + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); + Opie::OPimContactAccess::List allList = access->allRecords(); qWarning( "Found number of contacts in File: %d", allList.count() ); if ( !allList.count() ) { @@ -384,7 +384,7 @@ void AddressbookWindow::setDocument( const QString &filename ) } bool doAsk = true; - OContactAccess::List::Iterator it; + Opie::OPimContactAccess::List::Iterator it; for ( it = allList.begin(); it != allList.end(); ++it ){ qWarning("Adding Contact from: %s", (*it).fullName().latin1() ); if ( doAsk ){ @@ -433,13 +433,13 @@ AddressbookWindow::~AddressbookWindow() void AddressbookWindow::slotUpdateToolbar() { - OContact ce = m_abView->currentEntry(); + Opie::OPimContact ce = m_abView->currentEntry(); actionMail->setEnabled( !ce.defaultEmail().isEmpty() ); } void AddressbookWindow::slotListNew() { - OContact cnt; + Opie::OPimContact cnt; if( !syncing ) { editEntry( NewEntry ); } else { @@ -458,7 +458,7 @@ void AddressbookWindow::slotListNew() void AddressbookWindow::slotListDelete() { if(!syncing) { - OContact tmpEntry = m_abView ->currentEntry(); + Opie::OPimContact tmpEntry = m_abView ->currentEntry(); // get a name, do the best we can... QString strName = tmpEntry.fullName(); @@ -525,7 +525,7 @@ void AddressbookWindow::slotViewEdit() void AddressbookWindow::writeMail() { - OContact c = m_abView -> currentEntry(); + Opie::OPimContact c = m_abView -> currentEntry(); QString name = c.fileAs(); QString email = c.defaultEmail(); @@ -565,16 +565,16 @@ static const char * beamfile = "/tmp/obex/contact.vcf"; void AddressbookWindow::slotBeam() { QString beamFilename; - OContact c; + Opie::OPimContact c; if ( actionPersonal->isOn() ) { beamFilename = addressbookPersonalVCardName(); if ( !QFile::exists( beamFilename ) ) return; // can't beam a non-existent file - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, beamFilename ); - OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); - OContactAccess::List allList = access->allRecords(); - OContactAccess::List::Iterator it = allList.begin(); // Just take first + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); + Opie::OPimContactAccess::List allList = access->allRecords(); + Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first c = *it; delete access; @@ -582,9 +582,9 @@ void AddressbookWindow::slotBeam() unlink( beamfile ); // delete if exists mkdir("/tmp/obex/", 0755); c = m_abView -> currentEntry(); - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, beamfile ); - OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); + Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); access->add( c ); access->save(); delete access; @@ -652,7 +652,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) QString name, email; stream >> name >> email; - OContact cnt; + Opie::OPimContact cnt; QString fn, mn, ln; parseName( name, &fn, &mn, &ln ); // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); @@ -722,7 +722,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) void AddressbookWindow::editEntry( EntryMode entryMode ) { - OContact entry; + Opie::OPimContact entry; if ( !abEditor ) { abEditor = new ContactEditor( entry, this, "editor" ); } @@ -738,12 +738,12 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) if ( QPEApplication::execDialog( abEditor ) ) { setFocus(); if ( entryMode == NewEntry ) { - OContact insertEntry = abEditor->entry(); + Opie::OPimContact insertEntry = abEditor->entry(); insertEntry.assignUid(); m_abView -> addEntry( insertEntry ); m_abView -> setCurrentUid( insertEntry.uid() ); } else { - OContact replEntry = abEditor->entry(); + Opie::OPimContact replEntry = abEditor->entry(); if ( !replEntry.isValidUid() ) replEntry.assignUid(); @@ -757,7 +757,7 @@ void AddressbookWindow::editEntry( EntryMode entryMode ) void AddressbookWindow::editPersonal() { - OContact entry; + Opie::OPimContact entry; // Switch to personal view if not selected // but take care of the menu, too 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 @@ -23,6 +23,6 @@ INTERFACES = configdlg_base.ui TARGET = addressbook INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 include ( $(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 @@ -1,4 +1,4 @@ config ADDRESSBOOK boolean "opie-addressbook (a simple addressbook)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + 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,19 +1,19 @@ #include "configdlg.h" +#include +#include "opie2/opimcontactfields.h" + +#include + #include #include #include #include -#include - -#include -#include "opie/ocontactfields.h" - ConfigDlg::ConfigDlg( QWidget *parent, const char *name): ConfigDlg_Base(parent, name, true ) { - contFields = OContactFields::trfields(); + contFields = Opie::OPimContactFields::trfields(); // We add all Fields into the Listbox for (uint i=0; i < contFields.count(); i++) { @@ -21,18 +21,18 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): } // Reset Widget Flags: This was not changeable by designer :( - setWFlags ( WStyle_ContextHelp ); + setWFlags ( WStyle_ContextHelp ); // Set Pics to Buttons and Tabs m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) ); m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) ); m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) ); m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) ); - + // Get the translation maps between Field ID and translated strings - m_mapStrToID = OContactFields::trFieldsToId(); - m_mapIDToStr = OContactFields::idToTrFields(); + m_mapStrToID = Opie::OPimContactFields::trFieldsToId(); + m_mapIDToStr = Opie::OPimContactFields::idToTrFields(); connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) ); connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) ); @@ -76,7 +76,7 @@ void ConfigDlg::slotItemAdd() QString item = allFieldListBox->currentText(); qWarning("ADding %s", item.latin1()); fieldListBox->insertItem( item ); - } + } } void ConfigDlg::slotItemRemove() @@ -86,12 +86,12 @@ void ConfigDlg::slotItemRemove() int i = fieldListBox->currentItem(); if ( i > 0 ) { fieldListBox->removeItem( i ); - } + } } - + void ConfigDlg::setConfig( const AbConfig& cnf ) -{ - m_config = cnf; +{ + m_config = cnf; m_useRegExp->setChecked( m_config.useRegExp() ); m_useWildCard->setChecked( m_config.useWildCards() ); @@ -105,12 +105,12 @@ void ConfigDlg::setConfig( const AbConfig& cnf ) m_normalFont->setChecked( false ); m_largeFont->setChecked( false ); break; - case 1: + case 1: m_smallFont->setChecked( false ); m_normalFont->setChecked( true ); m_largeFont->setChecked( false ); break; - case 2: + case 2: m_smallFont->setChecked( false ); m_normalFont->setChecked( false ); m_largeFont->setChecked( true ); @@ -124,9 +124,9 @@ void ConfigDlg::setConfig( const AbConfig& cnf ) m_fixedBars->setChecked( m_config.fixedBars() ); m_moveBars->setChecked( !m_config.fixedBars() ); } - + AbConfig ConfigDlg::getConfig() -{ +{ m_config.setUseRegExp( m_useRegExp->isOn() ); m_config.setUseWildCards( m_useWildCard->isOn() ); m_config.setUseQtMail( m_useQtMail->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 @@ -21,10 +21,11 @@ #include "contacteditor.h" +#include + #include #include #include -#include #include #include @@ -33,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -51,7 +52,7 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail, void parseEmailTo( const QString &strDefaultEmail, const QString &strOtherEmail, QString &strBack ); -ContactEditor::ContactEditor( const OContact &entry, +ContactEditor::ContactEditor( const Opie::OPimContact &entry, QWidget *parent, const char *name, WFlags ) @@ -77,7 +78,7 @@ ContactEditor::~ContactEditor() { void ContactEditor::init() { qWarning("init() START"); - + uint i = 0; QStringList trlChooserNames; @@ -87,10 +88,10 @@ void ContactEditor::init() { slBusinessAddress.append( "" ); } - trlChooserNames = OContactFields::trphonefields( false ); - slChooserNames = OContactFields::untrphonefields( false ); - slDynamicEntries = OContactFields::untrdetailsfields( false ); - trlDynamicEntries = OContactFields::trdetailsfields( false ); + trlChooserNames = Opie::OPimContactFields::trphonefields( false ); + slChooserNames = Opie::OPimContactFields::untrphonefields( false ); + slDynamicEntries = Opie::OPimContactFields::untrdetailsfields( false ); + trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false ); // Ok, we have to remove elements from the list of dynamic entries // which are now stored in special (not dynamic) widgets.. @@ -101,7 +102,7 @@ void ContactEditor::init() { // The same with translated fields.. But I will // use the translation map to avoid mismatches.. - QMap translMap = OContactFields::idToTrFields(); + QMap translMap = Opie::OPimContactFields::idToTrFields(); trlDynamicEntries.remove( translMap[Qtopia::Anniversary] ); trlDynamicEntries.remove( translMap[Qtopia::Birthday] ); trlDynamicEntries.remove( translMap[Qtopia::Gender] ); @@ -164,7 +165,7 @@ void ContactEditor::init() { QWhatsThis::add( txtOrganization, tr( "The working place of the contact" ) ); gl->addWidget( txtOrganization, 3, 1 ); - // Chooser 1 + // Chooser 1 cmbChooserField1 = new QComboBox( FALSE, container ); QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) ); cmbChooserField1->setMaximumWidth( 90 ); @@ -529,7 +530,7 @@ void ContactEditor::init() { birthdayButton->setPopup( m1 ); birthdayButton->setPopupDelay(0); - QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), + QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), tr( "Delete" ), hBox, 0 ); @@ -554,7 +555,7 @@ void ContactEditor::init() { anniversaryButton->setPopup( m1 ); anniversaryButton->setPopupDelay(0); - deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), + deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), tr( "Delete" ), hBox, 0 ); gl->addWidget( hBox, counter , 1 ); @@ -578,11 +579,11 @@ void ContactEditor::init() { // Create Labels and lineedit fields for every dynamic entry QStringList::ConstIterator it = slDynamicEntries.begin(); - QMap mapStrToID = OContactFields::untrFieldsToId(); - QMap mapIdToStr = OContactFields::idToTrFields(); + QMap mapStrToID = Opie::OPimContactFields::untrFieldsToId(); + QMap mapIdToStr = Opie::OPimContactFields::idToTrFields(); for (i = counter; it != slDynamicEntries.end(); i++, ++it ) { - - if (((*it) == "Anniversary") || + + if (((*it) == "Anniversary") || ((*it) == "Birthday")|| ((*it) == "Gender")) continue; l = new QLabel( mapIdToStr[mapStrToID[*it]], container ); @@ -644,11 +645,11 @@ void ContactEditor::init() { connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) ); - connect( txtFullName, SIGNAL(textChanged(const QString&)), + connect( txtFullName, SIGNAL(textChanged(const QString&)), this, SLOT(slotFullNameChange(const QString&)) ); - connect( txtSuffix, SIGNAL(textChanged(const QString&)), + connect( txtSuffix, SIGNAL(textChanged(const QString&)), this, SLOT(slotSuffixChange(const QString&)) ); - connect( txtOrganization, SIGNAL(textChanged(const QString&)), + connect( txtOrganization, SIGNAL(textChanged(const QString&)), this, SLOT(slotOrganizationChange(const QString&)) ); connect( txtChooserField1, SIGNAL(textChanged(const QString&)), this, SLOT(slotChooser1Change(const QString&)) ); @@ -700,15 +701,15 @@ void ContactEditor::defaultEmailChanged(int i){ } -void ContactEditor::populateDefaultEmailCmb(){ +void ContactEditor::populateDefaultEmailCmb(){ // if the default-email combo was not selected and therfore not created // we get a lot of trouble.. Therfore create an invisible one.. if ( !cmbDefaultEmail ){ - cmbDefaultEmail = new QComboBox(this); + cmbDefaultEmail = new QComboBox(this); cmbDefaultEmail -> hide(); } - cmbDefaultEmail->clear(); + cmbDefaultEmail->clear(); cmbDefaultEmail->insertStringList( emails ); // cmbDefaultEmail->show(); @@ -724,7 +725,7 @@ void ContactEditor::populateDefaultEmailCmb(){ found = true; } } - + // If the current default email is not found in the list, we choose the // first one.. if ( !found ) @@ -741,19 +742,19 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w if ( !initializing ) contactfields.setFieldOrder( widgetPos-1, index ); - // Create and connect combobox for selecting the default email - if ( type == "Default Email"){ + // Create and connect combobox for selecting the default email + if ( type == "Default Email"){ qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition); - + // More than one default-email chooser is not allowed ! - if ( ( defaultEmailChooserPosition != -1 ) && + if ( ( defaultEmailChooserPosition != -1 ) && defaultEmailChooserPosition != widgetPos && !initializing){ chooserError( widgetPos ); return true; } QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); - if ( cmbo ){ + if ( cmbo ){ inputStack->raiseWidget( TextField ); inputStack -> removeWidget( cmbo ); delete cmbo; @@ -768,12 +769,12 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w cmbDefaultEmail = cmbo; connect( cmbo,SIGNAL( activated(int) ), - SLOT( defaultEmailChanged(int) ) ); + SLOT( defaultEmailChanged(int) ) ); // Set current default email populateDefaultEmailCmb(); - + } else { // Something else was selected: Hide combo.. qWarning(" Hiding default-email combo" ); @@ -781,7 +782,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w defaultEmailChooserPosition = -1; } QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); - if ( cmbo ){ + if ( cmbo ){ inputStack->raiseWidget( TextField ); inputStack -> removeWidget( cmbo ); cmbDefaultEmail = 0l; @@ -801,7 +802,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w // Currently accessed when we select default-email more than once ! void ContactEditor::chooserError( int index ) { - qWarning("ContactEditor::chooserError( %d )", index); + qWarning("ContactEditor::chooserError( %d )", index); QMessageBox::warning( this, "Chooser Error", "Multiple selection of this\n" "Item is not allowed !\n\n" @@ -810,22 +811,22 @@ void ContactEditor::chooserError( int index ) 0, 0 ); // Reset the selected Chooser. Unfortunately the chooser - // generates no signal, therfore we have to + // generates no signal, therfore we have to // call the cmbChooserChange function manually.. switch( index ){ case 1: cmbChooserField1 -> setCurrentItem( 0 ); slotCmbChooser1Change( 0 ); break; - case 2: + case 2: cmbChooserField2 -> setCurrentItem( 0 ); slotCmbChooser2Change( 0 ); break; - case 3: + case 3: cmbChooserField3 -> setCurrentItem( 0 ); slotCmbChooser3Change( 0 ); break; - case 4: + case 4: cmbChooserField4 -> setCurrentItem( 0 ); slotCmbChooser4Change( 0 ); break; @@ -833,14 +834,14 @@ void ContactEditor::chooserError( int index ) } // Called when something was changed in a textfield (shouldn't it called textchanged? (se)) -void ContactEditor::chooserChange( const QString &textChanged, int index, +void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit* , int widgetPos ) { QString type = slChooserNames[index]; // :SX qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i", type.latin1(),textChanged.latin1(), index, widgetPos ); - if ( type == "Default Email"){ + if ( type == "Default Email"){ qWarning ("??? Wozu??: %s", textChanged.latin1()); defaultEmail = textChanged; @@ -854,7 +855,7 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, populateDefaultEmailCmb(); } - + slChooserValues[index] = textChanged; } @@ -948,7 +949,7 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) { void ContactEditor::slotCmbChooser1Change( int index ) { qWarning("ContactEditor::slotCmbChooser1Change( %d )", index); if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ - + txtChooserField1->setText( slChooserValues[index] ); txtChooserField1->setFocus(); @@ -1049,12 +1050,12 @@ void ContactEditor::slotSuffixChange( const QString& ) { void ContactEditor::slotOrganizationChange( const QString &textChanged ){ qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() ); - // Special handling for storing Companies: + // Special handling for storing Companies: // If no Fullname is given, we store the Company-Name as lastname // to handle it like a person.. if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) ) txtFullName->setText( textChanged ); - + } void ContactEditor::accept() { @@ -1137,7 +1138,7 @@ QString ContactEditor::parseName( const QString fullName, int type ) { qWarning(" Commapos: %d", commapos ); // A comma (",") separates the lastname from one or - // many first names. Thus, remove the lastname from the + // many first names. Thus, remove the lastname from the // String and parse the firstnames. strLastName = simplifiedName.left( commapos ); @@ -1154,12 +1155,12 @@ QString ContactEditor::parseName( const QString fullName, int type ) { QStringList allSecondNames; for ( ; it != allFirstNames.end(); ++it ) allSecondNames.append( *it ); - + strMiddleName = allSecondNames.join(" "); } else { - // No comma separator used: We use the first word as firstname, the + // No comma separator used: We use the first word as firstname, the // last as second/lastname and everything in the middle as middlename QStringList allNames = QStringList::split(" ", simplifiedName); @@ -1168,10 +1169,10 @@ QString ContactEditor::parseName( const QString fullName, int type ) { QStringList allSecondNames; for ( ; it != --allNames.end(); ++it ) allSecondNames.append( *it ); - + strMiddleName = allSecondNames.join(" "); strLastName = *(--allNames.end()); - + } if ( strFirstName == strLastName ) @@ -1185,49 +1186,49 @@ QString ContactEditor::parseName( const QString fullName, int type ) { switch (type) { case NAME_FL: return strFirstName + " " + strLastName; - + case NAME_LF: return strLastName + ", " + strFirstName; - + case NAME_LFM: return strLastName + ", " + strFirstName + " " + strMiddleName; - + case NAME_FML: return strFirstName + " " + strMiddleName + " " + strLastName ; - + case NAME_F: return strFirstName; - + case NAME_M: return strMiddleName; - + case NAME_L: return strLastName; - + case NAME_S: return txtSuffix->text(); - + } return QString::null; } void ContactEditor::cleanupFields() { QStringList::Iterator it = slChooserValues.begin(); - + for ( int i = 0; it != slChooserValues.end(); i++, ++it ) { (*it) = ""; } - + for ( int i = 0; i < 7; i++ ) { slHomeAddress[i] = ""; slBusinessAddress[i] = ""; } - + QListIterator itLV( listValue ); for ( ; itLV.current(); ++itLV ) { (*itLV)->setText( "" ); - } - + } + txtFirstName->setText(""); txtMiddleName->setText(""); txtLastName->setText(""); @@ -1247,29 +1248,29 @@ void ContactEditor::cleanupFields() { txtTmp->setText(""); txtTmp = cmbFileAs->lineEdit(); txtTmp->setText(""); - + } -void ContactEditor::setEntry( const OContact &entry ) { - +void ContactEditor::setEntry( const Opie::OPimContact &entry ) { + initializing = true; - + // Cleanup and activate the general Page .. cleanupFields(); tabMain->setCurrentPage( 0 ); - + ent = entry; - + emails = QStringList(ent.emailList()); defaultEmail = ent.defaultEmail(); if (defaultEmail.isEmpty()) defaultEmail = emails[0]; qDebug("default email=%s",defaultEmail.latin1()); - + txtFirstName->setText( ent.firstName() ); txtMiddleName->setText( ent.middleName() ); txtLastName->setText( ent.lastName() ); txtSuffix->setText( ent.suffix() ); - + // QString *tmpString = new QString; // *tmpString = ent.firstName() + " " + ent.middleName() + // + " " + ent.lastName() + " " + ent.suffix(); @@ -1282,83 +1283,83 @@ void ContactEditor::setEntry( const OContact &entry ) { else txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() ); } - + cmbFileAs->setEditText( ent.fileAs() ); - + // if (hasTitle) txtJobTitle->setText( ent.jobTitle() ); - + // if (hasCompany) txtOrganization->setText( ent.company() ); - + // if (hasNotes) txtNote->setText( ent.notes() ); - + // if (hasStreet) { slHomeAddress[0] = ent.homeStreet(); slBusinessAddress[0] = ent.businessStreet(); // } - + // if (hasCity) { slHomeAddress[3] = ent.homeCity(); slBusinessAddress[3] = ent.businessCity(); //} - + //if (hasState) { slHomeAddress[4] = ent.homeState(); slBusinessAddress[4] = ent.businessState(); //} - + //if (hasZip) { slHomeAddress[5] = ent.homeZip(); slBusinessAddress[5] = ent.businessZip(); //} - + //if (hasCountry) { slHomeAddress[6] = ent.homeCountry(); slBusinessAddress[6] = ent.businessCountry(); //} - + QStringList::ConstIterator it; QListIterator itLE( listValue ); for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { - + qWarning(" Filling dynamic Field: %s", (*it).latin1() ); - + if ( *it == "Department" ) (*itLE)->setText( ent.department() ); - + if ( *it == "Company" ) (*itLE)->setText( ent.company() ); - + if ( *it == "Office" ) (*itLE)->setText( ent.office() ); - + if ( *it == "Profession" ) (*itLE)->setText( ent.profession() ); - + if ( *it == "Assistant" ) (*itLE)->setText( ent.assistant() ); - + if ( *it == "Manager" ) (*itLE)->setText( ent.manager() ); - + if ( *it == "Spouse" ) (*itLE)->setText( ent.spouse() ); - + if ( *it == "Nickname" ){ qWarning("**** Nichname: %s", ent.nickname().latin1() ); (*itLE)->setText( ent.nickname() ); } - + if ( *it == "Children" ) (*itLE)->setText( ent.children() ); - + } - + QStringList::Iterator itV; for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { - + if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) ) *itV = ent.businessPhone(); /* @@ -1367,7 +1368,7 @@ void ContactEditor::setEntry( const OContact &entry ) { */ if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) ) *itV = ent.businessFax(); - + if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) ) *itV = ent.businessMobile(); /* @@ -1376,10 +1377,10 @@ void ContactEditor::setEntry( const OContact &entry ) { */ if ( *it == "Default Email" ) *itV = ent.defaultEmail(); - + if ( *it == "Emails" ) *itV = ent.emailList().join(", "); // :SX - + if ( *it == "Home Phone" ) *itV = ent.homePhone(); /* @@ -1388,16 +1389,16 @@ void ContactEditor::setEntry( const OContact &entry ) { */ if ( *it == "Home Fax" ) *itV = ent.homeFax(); - + if ( *it == "Home Mobile" ) *itV = ent.homeMobile(); /* if ( *it == "Car Phone" ) *itV = ent.carPhone(); - + if ( *it == "ISDN Phone" ) *itV = ent.ISDNPhone(); - + if ( *it == "Other Phone" ) *itV = ent.otherPhone(); */ @@ -1406,41 +1407,41 @@ void ContactEditor::setEntry( const OContact &entry ) { /* if ( *it == "Home Pager") *itV = ent.homePager(); - + if ( *it == "AIM IM" ) *itV = ent.AIMIM(); - + if ( *it == "ICQ IM" ) *itV = ent.ICQIM(); - + if ( *it == "Jabber IM" ) *itV = ent.jabberIM(); - + if ( *it == "MSN IM" ) *itV = ent.MSNIM(); - + if ( *it == "Yahoo IM" ) *itV = ent.yahooIM(); */ if ( *it == "Home Web Page" ) *itV = ent.homeWebpage(); - + if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) *itV = ent.businessWebpage(); - - + + } - - + + cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") ); - + QString gender = ent.gender(); cmbGender->setCurrentItem( gender.toInt() ); - + txtNote->setText( ent.notes() ); - + slotAddressTypeChange( cmbAddress->currentItem() ); - + // Get combo-settings from contact and set preset.. contactfields.loadFromRecord( ent ); cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) ); @@ -1453,9 +1454,9 @@ void ContactEditor::setEntry( const OContact &entry ) { slotCmbChooser3Change( cmbChooserField3->currentItem() ); slotCmbChooser4Change( cmbChooserField4->currentItem() ); slotAddressTypeChange( cmbAddress->currentItem() ); - + updateDatePicker(); - + initializing = false; } void ContactEditor::updateDatePicker() @@ -1466,115 +1467,115 @@ void ContactEditor::updateDatePicker() birthdayPicker->setDate( ent.birthday() ); } else birthdayButton->setText( tr ("Unknown") ); - + if ( !ent.anniversary().isNull() ){ anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) ); anniversaryPicker->setDate( ent.anniversary() ); } else anniversaryButton->setText( tr ("Unknown") ); - + } void ContactEditor::saveEntry() { - + // Store current combo into contact contactfields.saveToRecord( ent ); - + txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) ); txtLastName->setText( parseName( txtFullName->text(), NAME_L ) ); // txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) ); - + ent.setFirstName( txtFirstName->text() ); ent.setLastName( txtLastName->text() ); ent.setMiddleName( txtMiddleName->text() ); ent.setSuffix( txtSuffix->text() ); - + ent.setFileAs( cmbFileAs->currentText() ); - + ent.setCategories( cmbCat->currentCategories() ); - - + + //if (hasTitle) ent.setJobTitle( txtJobTitle->text() ); - + //if (hasCompany) ent.setCompany( txtOrganization->text() ); - + // if (hasNotes) ent.setNotes( txtNote->text() ); - + //if (hasStreet) { ent.setHomeStreet( slHomeAddress[0] ); ent.setBusinessStreet( slBusinessAddress[0] ); // } - + // if (hasCity) { ent.setHomeCity( slHomeAddress[3] ); ent.setBusinessCity( slBusinessAddress[3] ); // } - + // if (hasState) { ent.setHomeState( slHomeAddress[4] ); ent.setBusinessState( slBusinessAddress[4] ); // } - + // if (hasZip) { ent.setHomeZip( slHomeAddress[5] ); ent.setBusinessZip( slBusinessAddress[5] ); // } - + // if (hasCountry) { ent.setHomeCountry( slHomeAddress[6] ); ent.setBusinessCountry( slBusinessAddress[6] ); // } - + QStringList::ConstIterator it; QListIterator itLE( listValue ); for ( it = slDynamicEntries.begin(); itLE.current() && it != slDynamicEntries.end(); ++it, ++itLE) { - + if ( *it == "Department" ) ent.setDepartment( (*itLE)->text() ); - + if ( *it == "Company" ) ent.setCompany( (*itLE)->text() ); - + if ( *it == "Office" ) ent.setOffice( (*itLE)->text() ); - + if ( *it == "Profession" ) ent.setProfession( (*itLE)->text() ); - + if ( *it == "Assistant" ) ent.setAssistant( (*itLE)->text() ); - + if ( *it == "Manager" ) ent.setManager( (*itLE)->text() ); - + if ( *it == "Spouse" ) ent.setSpouse( (*itLE)->text() ); - + if ( *it == "Nickname" ) ent.setNickname( (*itLE)->text() ); - + if ( *it == "Children" ) ent.setChildren( (*itLE)->text() ); - + } - - + + QStringList::ConstIterator itV; for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { - + if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) ) ent.setBusinessPhone( *itV ); - + if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) ) ent.setBusinessFax( *itV ); - + if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) ) ent.setBusinessMobile( *itV ); - + if ( *it == "Emails" ){ QString allemail; QString defaultmail; @@ -1586,38 +1587,38 @@ void ContactEditor::saveEntry() { } ent.setEmails( allemail ); } - + if ( *it == "Default Email") ent.setDefaultEmail( defaultEmail /* *itV */ ); - + if ( *it == "Home Phone" ) ent.setHomePhone( *itV ); - + if ( *it == "Home Fax" ) ent.setHomeFax( *itV ); - + if ( *it == "Home Mobile" ) ent.setHomeMobile( *itV ); - + if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) ) ent.setBusinessPager( *itV ); - + if ( *it == "Home Web Page" ) ent.setHomeWebpage( *itV ); - + if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) ) ent.setBusinessWebpage( *itV ); - - + + } - + int gender = cmbGender->currentItem(); ent.setGender( QString::number( gender ) ); - + QString str = txtNote->text(); if ( !str.isNull() ) ent.setNotes( str ); - + } void parseEmailFrom( const QString &txt, QString &strDefaultEmail, @@ -1698,18 +1699,18 @@ static inline bool constainsWhiteSpace( const QString &str ) void ContactEditor::setPersonalView( bool personal ) { m_personalView = personal; - + // Currently disbled due to the fact that // show will not work... return; - + if ( personal ){ cmbCat->hide(); labCat->hide(); - + } else{ cmbCat->show(); - labCat->show(); + labCat->show(); } } 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 @@ -21,8 +21,8 @@ #ifndef CONTACTEDITOR_H #define CONTACTEDITOR_H -#include -#include +#include +#include #include @@ -30,7 +30,7 @@ #include #include #include -#include +#include const int NAME_LF = 0; const int NAME_LFM = 1; @@ -56,19 +56,19 @@ class ContactEditor : public QDialog { Q_OBJECT public: - ContactEditor( const OContact &entry, + ContactEditor( const Opie::OPimContact &entry, QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); ~ContactEditor(); void setNameFocus(); void setPersonalView( bool personal = true ); - OContact entry() const { return ent; } + Opie::OPimContact entry() const { return ent; } public slots: void slotNote(); void slotName(); - void setEntry(const OContact &entry); + void setEntry(const Opie::OPimContact &entry); protected slots: void accept(); @@ -113,9 +113,9 @@ class ContactEditor : public QDialog { void populateDefaultEmailCmb(); void chooserChange( const QString&, int , QLineEdit*, int ); bool cmbChooserChange( int , QWidgetStack*, int ); - OContactFields contactfields; + Opie::OPimContactFields contactfields; - OContact ent; + Opie::OPimContact ent; QDialog *dlgNote; QDialog *dlgName; 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 @@ -21,7 +21,7 @@ #include "addressbook.h" -#include +#include -OPIE_EXPORT_APP( OApplicationFactory ) +OPIE_EXPORT_APP( Opie::Core::OApplicationFactory ) 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 @@ -5,7 +5,7 @@ Section: opie/pim Conflicts: qpe-tkcaddressbook Maintainer: Stefan Eilers Architecture: arm -Depends: task-opie-minimal, libopie1, opie-pics +Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2, libopiedb2 Description: Contacts A simple addressbook for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION -- cgit v0.9.0.2