1 files changed, 131 insertions, 60 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 3255269..cf2eddf 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -14,5 +14,5 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
-** Contact info@trolltech.com if any conditions of this licensing are
+** OContact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
@@ -96,4 +96,6 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
       syncing(FALSE)
 {
+        isLoading = true;
+
     initFields();
 
@@ -188,5 +190,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
     a->addTo( edit );
 
-
     edit->insertSeparator();
 
@@ -208,5 +209,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
     QString str = addressbookXMLFilename();
     if ( str.isNull() ) {
-  QMessageBox::warning( this, tr("Out of Space"),
+                QMessageBox::warning( 
+                                     this, 
+                                     tr("Out of Space"),
             tr("There is not enough space to create\n"
          "neccessary startup files.\n"
@@ -221,11 +224,8 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
     abList = new AbTable( &orderedFields, listContainer, "table" );
     vb->addWidget(abList);
-    abList->setHScrollBarMode( QScrollView::AlwaysOff );
-    connect( abList, SIGNAL( empty( bool ) ),
-       this, SLOT( listIsEmpty( bool ) ) );
-    connect( abList, SIGNAL( details() ),
-       this, SLOT( slotListView() ) );
-    connect( abList, SIGNAL(currentChanged(int,int)),
-       this, SLOT(slotUpdateToolbar()) );
+        // abList->setHScrollBarMode( QScrollView::AlwaysOff );
+        connect( abList, SIGNAL( empty( bool ) ), this, SLOT( listIsEmpty( bool ) ) );
+        connect( abList, SIGNAL( details() ), this, SLOT( slotListView() ) );
+        connect( abList, SIGNAL(currentChanged(int,int)), this, SLOT(slotUpdateToolbar()) );
 
     mView = 0;
@@ -246,5 +246,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
     mbList->insertItem( tr("View"), catMenu );
-    setCentralWidget( listContainer );
+        // setCentralWidget( listContainer );
 
     fontMenu = new QPopupMenu(this);
@@ -264,4 +264,8 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
     //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
+
+        abList->setCurrentCell( 0, 0 );
+        
+        isLoading = false;
 }
 
@@ -283,5 +287,6 @@ void AddressbookWindow::slotSetFont( int size ) {
       abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
       currentFont = new QFont (abList->font());
-      abList->resizeRows(currentFont->pixelSize() + 7);
+                // abList->resizeRows(currentFont->pixelSize() + 7);
+                abList->resizeRows();
       break;
     case 1:
@@ -291,5 +296,6 @@ void AddressbookWindow::slotSetFont( int size ) {
       abList->setFont( *defaultFont );
       currentFont = new QFont (abList->font());
-      abList->resizeRows(currentFont->pixelSize() + 7);
+                // abList->resizeRows(currentFont->pixelSize() + 7);
+                abList->resizeRows();
       break;
     case 2:
@@ -299,5 +305,6 @@ void AddressbookWindow::slotSetFont( int size ) {
       abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
       currentFont = new QFont (abList->font());
-      abList->resizeRows(currentFont->pixelSize() + 7);
+                //abList->resizeRows(currentFont->pixelSize() + 7);
+                abList->resizeRows();
       break;
   }
@@ -315,8 +322,9 @@ void AddressbookWindow::importvCard() {
 void AddressbookWindow::setDocument( const QString &filename )
 {
-    if ( filename.find(".vcf") != int(filename.length()) - 4 ) return;
+        if ( filename.find(".vcf") != int(filename.length()) - 4 ) 
+                return;
 
-    QValueList<Contact> cl = Contact::readVCard( filename );
-    for( QValueList<Contact>::Iterator it = cl.begin(); it != cl.end(); ++it ) {
+        QValueList<OContact> cl = OContact::readVCard( filename );
+        for( QValueList<OContact>::Iterator it = cl.begin(); it != cl.end(); ++it ) {
 //  QString msg = tr("You received a vCard for\n%1.\nDo You want to add it to your\naddressbook?")
 //          .arg( (*it).fullName() );
@@ -348,5 +356,5 @@ AddressbookWindow::~AddressbookWindow()
 void AddressbookWindow::slotUpdateToolbar()
 {
-    Contact ce = abList->currentEntry();
+        OContact ce = abList->currentEntry();
     actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
 }
@@ -354,9 +362,22 @@ void AddressbookWindow::slotUpdateToolbar()
 void AddressbookWindow::showList()
 {
-    if ( mView ) mView->hide();
+        bool visiblemView;
+        
+         visiblemView = false;
+        if ( mView ) {
+                mView->hide();
+                visiblemView = true;
+        }
     setCentralWidget( listContainer );
     listContainer->show();
     // update our focues... (or use a stack widget!);
     abList->setFocus();
+        
+         // This makes sure we are scrolled all the way to the left
+         abList->setContentsPos( 0, abList->contentsY() );
+        
+         //if ( visiblemView && abList->showBook() == "Cards" ) 
+                //abList->setShowCategory( abList->showBook(), abList->showCategory() );
+
 }
 
@@ -373,5 +394,5 @@ void AddressbookWindow::showView()
 void AddressbookWindow::slotListNew()
 {
-    Contact cnt;
+        OContact cnt;
     if( !syncing ) {
   if ( abEditor )
@@ -380,5 +401,5 @@ void AddressbookWindow::slotListNew()
   editEntry( NewEntry );
     } else {
-  QMessageBox::warning(this, tr("Contacts"),
+                QMessageBox::warning(this, tr("OContacts"),
            tr("Can not edit data, currently syncing"));
     }
@@ -395,5 +416,5 @@ void AddressbookWindow::slotListDelete()
 {
     if(!syncing) {
-  Contact tmpEntry = abList->currentEntry();
+                OContact tmpEntry = abList->currentEntry();
 
   // get a name, do the best we can...
@@ -442,5 +463,5 @@ void AddressbookWindow::slotViewEdit()
 void AddressbookWindow::writeMail()
 {
-    Contact c = abList->currentEntry();
+        OContact c = abList->currentEntry();
     QString name = c.fileAs();
     QString email = c.defaultEmail();
@@ -449,7 +470,4 @@ void AddressbookWindow::writeMail()
 }
 
-
-
-
 static const char * beamfile = "/tmp/obex/contact.vcf";
 
@@ -457,15 +475,15 @@ void AddressbookWindow::slotBeam()
 {
     QString filename;
-    Contact c;
+        OContact c;
     if ( actionPersonal->isOn() ) {
   filename = addressbookPersonalVCardName();
   if (!QFile::exists(filename))
       return; // can't beam a non-existent file
-  c = Contact::readVCard( filename )[0];
+                c = OContact::readVCard( filename )[0];
     } else {
   unlink( beamfile ); // delete if exists
   c = abList->currentEntry();
   mkdir("/tmp/obex/", 0755);
-  Contact::writeVCard( beamfile, c );
+                OContact::writeVCard( beamfile, c );
   filename = beamfile;
     }
@@ -523,5 +541,5 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
         stream >> name >> email;
 
-  Contact cnt;
+                OContact cnt;
   QString fn, mn, ln;
   parseName( name, &fn, &mn, &ln );
@@ -582,7 +600,7 @@ void AddressbookWindow::editPersonal()
 {
     QString filename = addressbookPersonalVCardName();
-    Contact me;
+        OContact me;
     if (QFile::exists(filename))
-  me = Contact::readVCard( filename )[0];
+                me = OContact::readVCard( filename )[0];
     if (bAbEditFirstTime) {
   abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields,
@@ -600,7 +618,7 @@ void AddressbookWindow::editPersonal()
     if ( abEditor->exec() ) {
   setFocus();
-  Contact new_personal = abEditor->entry();
+                OContact new_personal = abEditor->entry();
   QString fname = addressbookPersonalVCardName();
-  Contact::writeVCard( fname, new_personal );
+                OContact::writeVCard( fname, new_personal );
   abView()->init(new_personal);
   abView()->sync();
@@ -634,7 +652,7 @@ void AddressbookWindow::slotPersonalView()
     setCaption( tr("Contacts - My Personal Details") );
     QString filename = addressbookPersonalVCardName();
-    Contact me;
+        OContact me;
     if (QFile::exists(filename))
-  me = Contact::readVCard( filename )[0];
+                me = OContact::readVCard( filename )[0];
 
     abView()->init( me );
@@ -648,5 +666,5 @@ void AddressbookWindow::slotPersonalView()
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
-    Contact entry;
+        OContact entry;
     if ( bAbEditFirstTime ) {
   abEditor = new ContactEditor( entry, &orderedFields, &slOrderedFields,
@@ -667,9 +685,9 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
   setFocus();
   if ( entryMode == NewEntry ) {
-      Contact insertEntry = abEditor->entry();
+                        OContact insertEntry = abEditor->entry();
       insertEntry.assignUid();
       abList->addEntry( insertEntry );
   } else {
-      Contact replaceEntry = abEditor->entry();
+                        OContact replaceEntry = abEditor->entry();
       if ( !replaceEntry.isValidUid() )
     replaceEntry.assignUid();
@@ -725,4 +743,5 @@ void AddressbookWindow::closeEvent( QCloseEvent *e )
     }
 //################## shouldn't always save
+        // True, but the database handles this automatically ! (se)
     if ( save() )
   e->accept();
@@ -793,12 +812,11 @@ void AddressbookWindow::initFields()
     // Call the contact functions that correspond to these old functions...
 
-    QStringList xmlFields = Contact::fields();
-    QStringList visibleFields = Contact::trfields();
+        QStringList xmlFields = OContact::fields();
+        QStringList visibleFields = OContact::trfields();
     xmlFields.remove( "Title" );
     visibleFields.remove( tr("Name Title") );
     visibleFields.remove( tr("Notes") );
 
-    int i,
-  version;
+        int i, version;
     Config cfg( "AddressBook" );
     QString zn;
@@ -884,5 +902,5 @@ AbLabel *AddressbookWindow::abView()
     if ( !mView ) {
       mView = new AbLabel( this, "viewer" );
-      mView->init( Contact()  );
+                mView->init( OContact()  );
       connect( mView, SIGNAL( okPressed() ), this, SLOT( slotListView() ) );
     }
@@ -912,21 +930,51 @@ void AddressbookWindow::slotFind()
 void AddressbookWindow::slotSetCategory( int c )
 {
+        
+        QString cat, book;
+        
     if ( c <= 0 )
   return;
-    for ( unsigned int i = 1; i < catMenu->count(); i++ )
+        
+        // Checkmark Book Menu Item Selected 
+        if ( c < 6 )
+                for ( unsigned int i = 1; i < 6; i++ )
   catMenu->setItemChecked( i, c == (int)i );
-    if ( c == 1 ) {
-  abList->setShowCategory( QString::null );
-  setCaption( tr("Contacts") + " - " + tr ( "All" ) );
-    } else if ( c == (int)catMenu->count() ) {
-  abList->setShowCategory( tr( "Unfiled" ) );
-  setCaption( tr("Contacts") + " - " + tr( "Unfiled" ) );
-    } else {
-  QString cat = abList->categories()[c - 2];
-  abList->setShowCategory( cat );
-  setCaption( tr("Contacts") + " - " + cat );
+        
+        // Checkmark Category Menu Item Selected 
+        else
+                for ( unsigned int i = 6; i < catMenu->count(); i++ )
+                        catMenu->setItemChecked( i, c == (int)i );
+        
+        for ( unsigned int i = 1; i < catMenu->count(); i++ ) {
+                if (catMenu->isItemChecked( i )) {
+                        if ( i == 1 ) // default List view
+                                book = QString::null;
+                        else if ( i == 2 )
+                                book = "Phone";
+                        else if ( i == 3 )
+                                book = "Company";
+                        else if ( i == 4 )
+                                book = "Email";
+                        else if ( i == 5 )
+                                book = "Cards";
+                        else if ( i == 6 ) // default All Categories
+                                cat = QString::null;
+                        else if ( i == (unsigned int)catMenu->count() ) // last menu option will be Unfiled
+                                cat = "Unfiled";
+                        else
+                                cat = abList->categories()[i - 7];
     }
 }
 
+        abList->setShowCategory( book, cat );
+        
+        if ( book.isEmpty() )
+                book = "List";
+        if ( cat.isEmpty() )
+                cat = "All";
+        
+        setCaption( tr( "Contacts" ) + " - " + tr( book ) + " - " + tr( cat ) );
+}
+
 void AddressbookWindow::slotSetLetter( char c ) {
 
@@ -939,8 +987,15 @@ void AddressbookWindow::populateCategories()
     catMenu->clear();
 
-    int id,
-  rememberId;
+        int id, rememberId;
     id = 1;
     rememberId = 0;
+        
+        catMenu->insertItem( tr( "List" ), id++ );
+        catMenu->insertItem( tr( "Phone Book" ), id++ );
+        catMenu->insertItem( tr( "Company Book" ), id++ );
+        catMenu->insertItem( tr( "Email Book" ), id++ );
+        catMenu->insertItem( tr( "Cards" ), id++ );
+        catMenu->insertSeparator();
+        
     catMenu->insertItem( tr( "All" ), id++ );
     QStringList categories = abList->categories();
@@ -953,7 +1008,23 @@ void AddressbookWindow::populateCategories()
   ++id;
     }
-    if ( abList->showCategory().isEmpty() )
-  slotSetCategory( 1 );
-    else
+
+        if ( abList->showBook().isEmpty() ) {
+                catMenu->setItemChecked( 1, true );
+        } else if ( abList->showBook() == "Phone" ) {
+                catMenu->setItemChecked( 2, true );
+        } else if ( abList->showBook() == "Company" ) {
+                catMenu->setItemChecked( 3, true );
+        } else if ( abList->showBook() == "Email" ) {
+                catMenu->setItemChecked( 4, true );
+        } else if ( abList->showBook() == "Cards" ) {
+                catMenu->setItemChecked( 5, true );
+        }
+        
+        if ( abList->showCategory().isEmpty() ) {
+                slotSetCategory( 6 );
+        }
+        else {
   slotSetCategory( rememberId );
 }
+}
+