Fixed reload after sync- bug

4 files changed, 25 insertions, 65 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 32d2838..7bc906d 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -1,26 +1,28 @@
 Stuff todo:
 
 Urgent:
-- Syncing: abtable not reloaded after sync.
+
+- Font menu is invisible using german translation
 
 Important:
 
 - Finishing of new View functions (List, Phonebook...)
 - Reload if contacts were changed externally
 - "What's this" should be added
 - The names of the countries are sorted by there english names, only..
   Even if they are translated.. :S
 - Store last settings of combo-boxes
 
 Less important:
 
 - Find widget should be replaced by something like 
   qpdf has.
 -  The picker (alphabetical sort widget) should be
    placed verticaly or horizontally (configurable)
 
 
-Should be Fixed:
+Should be Fixed (not absolute sure, need validation):
 - "Nonenglish" translation bug has to be fixed.
 
-Fixed:
\ No newline at end of file
+Fixed:
+- Syncing: abtable not reloaded after sync.
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 70c070f..91a7171 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -377,225 +377,228 @@ QString AbTable::findContactContact( const OContact &entry, int /* row */ )
 		case Qtopia::BusinessStreet:
 			value = entry.businessStreet();
 			break;
 		case Qtopia::BusinessZip:
 			value = entry.businessZip();
 			break;
 		case Qtopia::BusinessCountry:
 			value = entry.businessCountry();
 			break;
 		case Qtopia::BusinessWebPage:
 			value = entry.businessWebpage();
 			break;
 		case Qtopia::JobTitle:
 			value = entry.jobTitle();
 			break;
 		case Qtopia::Department:
 			value = entry.department();
 			break;
 		case Qtopia::Office:
 			value = entry.office();
 			break;
 		case Qtopia::BusinessPhone:
 			value = entry.businessPhone();
 			break;
 		case Qtopia::BusinessFax:
 			value = entry.businessFax();
 			break;
 		case Qtopia::BusinessMobile:
 			value = entry.businessMobile();
 			break;
 		case Qtopia::BusinessPager:
 			value = entry.businessPager();
 			break;
 		case Qtopia::Profession:
 			value = entry.profession();
 			break;
 		case Qtopia::Assistant:
 			value = entry.assistant();
 			break;
 		case Qtopia::Manager:
 			value = entry.manager();
 			break;
 		case Qtopia::Spouse:
 			value = entry.spouse();
 			break;
 		case Qtopia::Gender:
 			value = entry.gender();
 			break;
 		case Qtopia::Birthday:
 			value = entry.birthday();
 			break;
 		case Qtopia::Anniversary:
 			value = entry.anniversary();
 			break;
 		case Qtopia::Nickname:
 			value = entry.nickname();
 			break;
 		case Qtopia::Children:
 			value = entry.children();
 			break;
 		case Qtopia::Notes:
 			value = entry.notes();
 			break;
 		}
 		if ( !value.isEmpty() )
 			break;
 	}
 	return value;
 }
 
 void AbTable::addEntry( const OContact &newCnt )
 {
 	int row = numRows();
 	
 	setNumRows( row + 1 );
 	insertIntoTable( newCnt, row );
 	
 	qWarning("abtable:AddContact");
 	m_contactdb.add ( newCnt );
 	
 	setCurrentCell( row, 0 );
 	// updateVisible();
 }
 
 void AbTable::resizeRows() {
 	/*
 	  if (numRows()) {
 	  for (int i = 0; i < numRows(); i++) {
 	  setRowHeight( i, size );
 	  }
 	  }
 	  updateVisible();
 	*/
 }
 
 
-bool AbTable::save( const QString& /* fn */ )
+bool AbTable::save()
 {
 	//     QTime t;
 	//     t.start();
 	qWarning("abtable:Save data");
-	m_contactdb.save();
-	
-	return true;
+
+	return m_contactdb.save();
 }
 
-void AbTable::load( const QString& /* fn */ )
+void AbTable::load()
 {
 	setSorting( false );
 	setUpdatesEnabled( FALSE );
 	
 	qWarning("abtable:Load data");
 	
 	OContactAccess::List list  = m_contactdb.allRecords();
 	OContactAccess::List::Iterator it;
 	setNumRows( list.count() );
 	int row = 0;
 	for ( it = list.begin(); it != list.end(); ++it )
 		insertIntoTable( *it, row++ );
 	
-	resort();
-	
 	setUpdatesEnabled( TRUE );
-	
+
 	setSorting( true );
-	//resort();
+	resort();
 }
 
 
+void AbTable::reload()
+{
+	m_contactdb.reload();
+	load();
+}
+
 void AbTable::realignTable( int row )
 {
 	QTableItem *ti1,
 		*ti2;
 	int totalRows = numRows();
 	for ( int curr = row; curr < totalRows - 1; curr++ ) {
 		// the same info from the todo list still applies, but I
 		// don't think it is _too_ bad.
 		ti1 = item( curr + 1, 0 );
 		ti2 = item( curr + 1, 1 );
 		takeItem( ti1 );
 		takeItem( ti2 );
 		setItem( curr, 0, ti1 );
 		setItem( curr, 1, ti2 );
 	}
 	setNumRows( totalRows - 1 );
 	resort();
 }
 
 // Add contact into table.
 void AbTable::insertIntoTable( const OContact &cnt, int row )
 {
 	QString strName,
 		strContact;
 	
 	strName = findContactName( cnt );
 	strContact = findContactContact( cnt, row );
 	
 	AbTableItem *ati;
 	ati = new AbTableItem( this, QTableItem::Never, strName, strContact);
 	contactList.insert( ati, cnt );
 	setItem( row, 0, ati );
 	ati = new AbTableItem( this, QTableItem::Never, strContact, strName);
 	setItem( row, 1, ati );
 	
 	//### cannot do this; table only has two columns at this point
 	//    setItem( row, 2, new AbPickItem( this ) );
 	
 	// resort at some point?
 }
 
 
 // Replace or add an entry
 void AbTable::journalFreeReplace( const OContact &cnt, int row )
 {
 	QString strName,
 		strContact;
 	AbTableItem *ati = 0l;
 	
 	strName = findContactName( cnt );
 	strContact = findContactContact( cnt, row );
 	ati = static_cast<AbTableItem*>(item(row, 0));
 	
 	// Replace element if found in row "row"
 	// or add this element if not.
 	if ( ati != 0 ) { // replace
 		// :SX db access -> replace
 		qWarning ("Replace Contact in DB ! UID: %d", contactList[ati].uid() );
 		m_contactdb.replace ( cnt );
 		
 		contactList.remove( ati );
 		ati->setItem( strName, strContact );
 		contactList.insert( ati, cnt );
 		
 		ati = static_cast<AbTableItem*>(item(row, 1));
 		ati->setItem( strContact, strName );
 		
 	}else{ // add
 		int myrows = numRows();
 		setNumRows( myrows + 1 );
 		insertIntoTable( cnt, myrows );
 		// gets deleted when returning -- Why ? (se)
 		// :SX db access -> add
 		qWarning ("Are you sure to add to database ? -> Currently disabled !!");
 		// m_contactdb.add( cnt );
 	}
 }
 
 // Remove entry
 void AbTable::journalFreeRemove( int row )
 {
 	AbTableItem *ati;
 	ati = static_cast<AbTableItem*>(item(row, 0));
 	if ( !ati )
 		return;
 	
 	// :SX db access -> remove
 	qWarning ("Remove Contact from DB ! UID: %d",contactList[ati].uid() );
 	m_contactdb.remove( contactList[ati].uid() );
 	
 	contactList.remove( ati ); 
 	
 	realignTable( row );
 
 }
 
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index 84aef1e..80c3ca0 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -1,153 +1,154 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef ABTABLE_H
 #define ABTABLE_H
 
 #include <qpe/categories.h>
 #include <opie/ocontact.h>
 
 #include <qmap.h>
 #include <qtable.h>
 #include <qstringlist.h>
 #include <qcombobox.h>
 
 #include <opie/ocontactaccess.h>
 
 class AbTableItem : public QTableItem
 {
 public:
     AbTableItem( QTable *t, EditType et, const QString &s,
 		 const QString &secondSortKey);
     QString entryKey() const;
     void setEntryKey( const QString & k );
     virtual int alignment() const;
     virtual QString key() const;
     void setItem( const QString &txt, const QString &secondKey );
 
 private:
     QString sortKey;
 };
 
 class AbPickItem : public QTableItem
 {
 public:
     AbPickItem( QTable *t );
 
     QWidget *createEditor() const;
     void setContentFromEditor( QWidget *w );
 
 private:
     QGuardedPtr<QComboBox> cb;
 };
 
 class AbTable : public QTable
 {
     Q_OBJECT
 
 public:
     AbTable( const QValueList<int> *ordered, QWidget *parent, const char *name=0 );
     ~AbTable();
     // NEW
     void addEntry( const OContact &newContact );
     OContact currentEntry();
     void replaceCurrentEntry( const OContact &newContact );
 
     void init();
 
     void deleteCurrentEntry();
     void clear();
     void clearFindRow() { currFindRow = -2; }
     void loadFields();
     void refresh();
-    bool save( const QString &fn );
-    void load( const QString &fn );
+    bool save();
+    void load();
+    void reload();
 
     // addresspicker mode
     void setChoiceNames( const QStringList& list);
     QStringList choiceNames() const;
     void setChoiceSelection(int index, const QStringList& list);
     QStringList choiceSelection(int index) const;
     void setShowCategory( const QString &b, const QString &c );
     void setShowByLetter( char c );
     QString showCategory() const;
     QStringList categories();
 
     void resizeRows();
 
     void show();
     void setPaintingEnabled( bool e );
 
     QString showBook() const;
 
 public slots:
     void slotDoFind( const QString &str, bool caseSensitive, bool backwards,
                      int category );
 signals:
     void empty( bool );
     void details();
     void signalNotFound();
     void signalWrapAround();
 
 protected:
     virtual void keyPressEvent( QKeyEvent *e );
 
 //     int rowHeight( int ) const;
 //     int rowPos( int row ) const;
 //     virtual int rowAt( int pos ) const;
 
 
 protected slots:
     void moveTo( char );
     virtual void columnClicked( int col );
     void itemClicked(int,int col);
     void rowHeightChanged( int row );
 
 private:
     void loadFile( const QString &strFile, bool journalFile );
     void fitColumns();
     void resort();
     void updateJournal( const OContact &contact, OContact::journal_action action,
 			int row = -1 );
     void insertIntoTable( const OContact &contact, int row );
     QString findContactName( const OContact &entry );
     QString findContactContact( const OContact &entry, int row );
     void journalFreeReplace( const OContact &cnt, int row );
     void journalFreeRemove( int row );
     void realignTable( int );
     void updateVisible();
     int lastSortCol;
     bool asc;
     char showChar;
     QMap<AbTableItem*, OContact> contactList;
     const QValueList<int> *intFields;
     int currFindRow;
     QString showCat;
     QStringList choicenames;
     bool enablePainting;
     Categories mCat;
 
     QString showBk;
     bool columnVisible;
 
     OContactAccess m_contactdb;
 
 };
 #endif // ABTABLE_H
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 2eb9ddf..93581e8 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -1,333 +1,302 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** OContact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "contacteditor.h"
 #include "ablabel.h"
 #include "abtable.h"
 #include "addresssettings.h"
 #include "addressbook.h"
 
 
 #include <opie/ofileselector.h>
 #include <opie/ofiledialog.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <opie/ocontact.h>
 
 #ifndef MAKE_FOR_SHARP_ROM
 #include <qpe/finddialog.h>
 #endif
 
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qaction.h>
 #include <qdialog.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qlayout.h>
 #include <qpe/qpemenubar.h>
 #include <qmessagebox.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qpe/qpetoolbar.h>
 #include <qstringlist.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <qdatetime.h>
 
 #include "picker.h"
-static QString addressbookOldXMLFilename()
-{
-	QString filename = QPEApplication::documentDir() + "addressbook.xml";
-	return filename;
-}
-
-static QString addressbookXMLFilename()
-{
-	QString filename = Global::applicationFileName("addressbook",
-						       "addressbook.xml");
-	return filename;
-}
 
 static QString addressbookPersonalVCardName()
 {
 	QString filename = Global::applicationFileName("addressbook",
 						       "businesscard.vcf");
 	return filename;
 }
 
 
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 				      WFlags f )
 	: QMainWindow( parent, name, f ),
 	  abEditor(0),
 	  bAbEditFirstTime(TRUE),
 	  syncing(FALSE)
 {
 	isLoading = true;
 
 	initFields();
 	
 	setCaption( tr("Contacts") );
 	setIcon( Resource::loadPixmap( "AddressBook" ) );
 	
 	setToolBarsMovable( FALSE );
 	
 	// Create Toolbars
 	
 	QPEToolBar *bar = new QPEToolBar( this );
 	bar->setHorizontalStretchable( TRUE );
 	
 	QPEMenuBar *mbList = new QPEMenuBar( bar );
 	mbList->setMargin( 0 );
 	
 	QPopupMenu *edit = new QPopupMenu( this );
 	mbList->insertItem( tr( "Contact" ), edit );
 	
 	listTools = new QPEToolBar( this, "list operations" );
 	
 	
 	QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null,
 				  0, this, 0 );
 	actionNew = a;
 	connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) );
 	a->addTo( edit );
 	a->addTo( listTools );
 	
 	a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
 			 0, this, 0 );
 	actionEdit = a;
 	connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) );
 	a->addTo( edit );
 	a->addTo( listTools );
 	
 	a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
 			 0, this, 0 );
 	actionTrash = a;
 	connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) );
 	a->addTo( edit );
 	a->addTo( listTools );
 	
 	
 	// make it possible to go directly to businesscard via qcop call
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
 	QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
 	connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
 		 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
 #endif
 #endif
 	
 	
 	
 	
 	
 #ifndef MAKE_FOR_SHARP_ROM
 	a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
 			 QString::null, 0, this, 0 );
 	actionFind = a;
 	connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
 	a->addTo( edit );
 	a->addTo( listTools );
 #endif
 	
 	
 	a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ),
 			 QString::null, 0, this, 0 );
 	//a->setEnabled( FALSE ); we got support for it now :) zecke
 	actionMail = a;
 	connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) );
 	a->addTo( edit );
 	a->addTo( listTools );
 	
 	
 	
 	if ( Ir::supported() ) {
 		a = new QAction( tr ("Beam Entry" ), Resource::loadPixmap( "beam" ), QString::null,
 				 0, this, 0 );
 		actionBeam = a;
 		connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) );
 		a->addTo( edit );
 		a->addTo( listTools );
 	}
 	
 	edit->insertSeparator();
 	
 	a = new QAction( tr("Import vCard"), QString::null, 0, 0, 0, TRUE );
 	actionPersonal = a;
 	connect( a, SIGNAL( activated() ), this, SLOT( importvCard() ) );
 	a->addTo( edit );
 	
 	edit->insertSeparator();
 	
 	a = new QAction( tr("My Personal Details"), QString::null, 0, 0, 0, TRUE );
 	actionPersonal = a;
 	connect( a, SIGNAL( activated() ), this, SLOT( slotPersonalView() ) );
 	a->addTo( edit );
 	
 	
 	a = new QAction( tr( "Arrange Edit Fields"), QString::null, 0, 0 );
 	connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
 	a->addTo( edit );
 	
 	// Create Views
-	
-	// This is safe to call without checking to see if it exists...
-	// not to mention it also does the necessary stuff for the
-	// journaling...
-	QString str = addressbookXMLFilename();
-	if ( str.isNull() ) {
-		QMessageBox::warning( 
-				     this, 
-				     tr("Out of Space"),
-				     tr("There is not enough space to create\n"
-					"neccessary startup files.\n"
-					"\nFree up some space before\nentering data!")
-				     );
-	}
-	
 	listContainer = new QWidget( this );
 	
 	QVBoxLayout *vb = new QVBoxLayout( listContainer );
 	
 	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()) );
 	
 	mView = 0;
 	
-	abList->load( addressbookXMLFilename() );
-	if ( QFile::exists(addressbookOldXMLFilename()) ) {
-		abList->load( addressbookOldXMLFilename() );
-		QFile::remove(addressbookOldXMLFilename());
-	}
+	abList->load();
 	
 	pLabel = new LetterPicker( listContainer );
 	connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
 	vb->addWidget(pLabel);
 	catMenu = new QPopupMenu( this );
 	catMenu->setCheckable( TRUE );
 	connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
 	populateCategories();
 	
 	mbList->insertItem( tr("View"), catMenu );
 	// setCentralWidget( listContainer );
 	
 	fontMenu = new QPopupMenu(this);
 	fontMenu->setCheckable( true );
 	connect( fontMenu, SIGNAL(activated(int)), this, SLOT(slotSetFont(int)));
 	
 	fontMenu->insertItem(tr( "Small" ), 0);
 	fontMenu->insertItem(tr( "Normal" ), 1);
 	fontMenu->insertItem(tr( "Large" ), 2);
 	
 	defaultFont = new QFont( abList->font() );
 	
 	slotSetFont(startFontSize);
 	
 	mbList->insertItem( tr("Font"), fontMenu);
 	setCentralWidget(listContainer);
 	
 	//    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 
 	abList->setCurrentCell( 0, 0 );
 	
 	isLoading = false;
 }
 
 
 void AddressbookWindow::slotSetFont( int size ) {
 	
 	if (size > 2 || size < 0)
 		size = 1;
 	
 	startFontSize = size;
 	
 	QFont *currentFont;
 	
 	switch (size) {
 	case 0:
 		fontMenu->setItemChecked(0, true);
 		fontMenu->setItemChecked(1, false);
 		fontMenu->setItemChecked(2, false);
 		abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
 		currentFont = new QFont (abList->font());
 		// abList->resizeRows(currentFont->pixelSize() + 7);
 		abList->resizeRows();
 		break;
 	case 1:
 		fontMenu->setItemChecked(0, false);
 		fontMenu->setItemChecked(1, true);
 		fontMenu->setItemChecked(2, false);
 		abList->setFont( *defaultFont );
 		currentFont = new QFont (abList->font());
 		// abList->resizeRows(currentFont->pixelSize() + 7);
 		abList->resizeRows();
 		break;
 	case 2:
 		fontMenu->setItemChecked(0, false);
 		fontMenu->setItemChecked(1, false);
 		fontMenu->setItemChecked(2, true);
 		abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
 		currentFont = new QFont (abList->font());
 		//abList->resizeRows(currentFont->pixelSize() + 7);
 		abList->resizeRows();
 		break;
 	}
 }
 
 
 
 void AddressbookWindow::importvCard() {
         QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
         if(!str.isEmpty() )
 		setDocument((const QString&) str );
 	
 }
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
 	if ( filename.find(".vcf") != int(filename.length()) - 4 ) 
 		return;
 	
 	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() );
 		//  if ( QMessageBox::information( this, tr("received contact"), msg, QMessageBox::Ok, QMessageBox::Cancel ) ==
 		//       QMessageBox::Ok ) {
 		abList->addEntry( *it );
@@ -616,265 +585,250 @@ void AddressbookWindow::editPersonal()
 	// fix the foxus...
 	abEditor->setNameFocus();
 	if ( abEditor->exec() ) {
 		setFocus();
 		OContact new_personal = abEditor->entry();
 		QString fname = addressbookPersonalVCardName();
 		OContact::writeVCard( fname, new_personal );
 		abView()->init(new_personal);
 		abView()->sync();
 	}
 	abEditor->setCaption( tr("Edit Address") );
 }
 
 void AddressbookWindow::slotPersonalView()
 {
 	if (!actionPersonal->isOn()) {
 		// we just turned it off
 		setCaption( tr("Contacts") );
 		actionNew->setEnabled(TRUE);
 		actionTrash->setEnabled(TRUE);
 #ifndef MAKE_FOR_SHARP_ROM
 		actionFind->setEnabled(TRUE);
 #endif
 		slotUpdateToolbar(); // maybe some of the above could be moved there
 		showList();
 		return;
 	}
 	
 	// XXX need to disable some QActions.
 	actionNew->setEnabled(FALSE);
 	actionTrash->setEnabled(FALSE);
 #ifndef MAKE_FOR_SHARP_ROM
 	actionFind->setEnabled(FALSE);
 #endif
 	actionMail->setEnabled(FALSE);
 	
 	setCaption( tr("Contacts - My Personal Details") );
 	QString filename = addressbookPersonalVCardName();
 	OContact me;
 	if (QFile::exists(filename))
 		me = OContact::readVCard( filename )[0];
 	
 	abView()->init( me );
 	abView()->sync();
 	listContainer->hide();
 	setCentralWidget( abView() );
 	mView->show();
 	mView->setFocus();
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
 	OContact entry;
 	if ( bAbEditFirstTime ) {
 		abEditor = new ContactEditor( entry, &orderedFields, &slOrderedFields,
 					      this, "editor" );
 		bAbEditFirstTime = FALSE;
 		if ( entryMode == EditEntry )
 			abEditor->setEntry( abList->currentEntry() );
 	}
 	// other things may chane the caption.
 	abEditor->setCaption( tr("Edit Address") );
 	
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	abEditor->showMaximized();
 #endif
 	// fix the foxus...
 	abEditor->setNameFocus();
 	if ( abEditor->exec() ) {
 		setFocus();
 		if ( entryMode == NewEntry ) {
 			OContact insertEntry = abEditor->entry();
 			insertEntry.assignUid();
 			abList->addEntry( insertEntry );
 		} else {
 			OContact replaceEntry = abEditor->entry();
 			if ( !replaceEntry.isValidUid() )
 				replaceEntry.assignUid();
 			abList->replaceCurrentEntry( replaceEntry );
 		}
 	}
 	populateCategories();
 	showList();
 }
 
 void AddressbookWindow::listIsEmpty( bool empty )
 {
 	if ( !empty ) {
 		deleteButton->setEnabled( TRUE );
 	}
 }
 
 void AddressbookWindow::reload()
 {
 	syncing = FALSE;
 	abList->clear();
-	abList->load( addressbookXMLFilename() );
+	abList->reload();
 }
 
 void AddressbookWindow::flush()
 {
 	syncing = TRUE;
-	abList->save( addressbookXMLFilename() );
+	abList->save();
 }
 
 
 void AddressbookWindow::closeEvent( QCloseEvent *e )
 {
 	if ( centralWidget() == mView ) {
 		if (actionPersonal->isOn()) {
 			// pretend we clicked it off
 			actionPersonal->setOn(FALSE);
 			slotPersonalView();
 		} else {
 			showList();
 		}
 		e->ignore();
 		return;
 	}
 	
 	if(syncing) {
 		/* shouldn't we save, I hear you say? well its already been set
 		   so that an edit can not occur during a sync, and we flushed
 		   at the start of the sync, so there is no need to save
 		   Saving however itself would cause problems. */
 		e->accept();
 		return;
 	}
 	//################## shouldn't always save
 	// True, but the database handles this automatically ! (se)
 	if ( save() )
 		e->accept();
 	else
 		e->ignore();
 }
 
 /*
   Returns TRUE if it is OK to exit
 */
 
 bool AddressbookWindow::save()
 {
-	QString str = addressbookXMLFilename();
-	if ( str.isNull() ) {
-		if ( QMessageBox::critical( 0, tr("Out of space"),
+	if ( !abList->save() ) {
+		if ( QMessageBox::critical( 0, tr( "Out of space" ),
 					    tr("Unable to save information.\n"
 					       "Free up some space\n"
 					       "and try again.\n"
 					       "\nQuit anyway?"),
 					    QMessageBox::Yes|QMessageBox::Escape,
 					    QMessageBox::No|QMessageBox::Default )
 		     != QMessageBox::No )
 			return TRUE;
 		else
 			return FALSE;
-	} else {
-		if ( !abList->save( str ) ) {
-			if ( QMessageBox::critical( 0, tr( "Out of space" ),
-						    tr("Unable to save information.\n"
-						       "Free up some space\n"
-						       "and try again.\n"
-						       "\nQuit anyway?"),
-						    QMessageBox::Yes|QMessageBox::Escape,
-						    QMessageBox::No|QMessageBox::Default )
-			     != QMessageBox::No )
-				return TRUE;
-			else
-				return FALSE;
-		}
 	}
 	return TRUE;
 }
 
 void AddressbookWindow::slotSettings()
 {
 	AddressSettings frmSettings( this );
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	frmSettings.showMaximized();
 #endif
 	
 	if ( frmSettings.exec() ) {
 		allFields.clear();
 		orderedFields.clear();
 		slOrderedFields.clear();
 		initFields();
 		if ( abEditor )
 			abEditor->loadFields();
 		abList->refresh();
 	}
 }
 
 
 void AddressbookWindow::initFields()
 {
 	// we really don't need the things from the configuration, anymore
 	// only thing that is important are the important categories.  So,
 	// Call the contact functions that correspond to these old functions...
 	
 	QStringList xmlFields = OContact::fields();
 	QStringList visibleFields = OContact::untrfields();
 	// QStringList trFields = OContact::trfields();
 
 	xmlFields.remove( "Title" );
 	visibleFields.remove( "Name Title" );
 	visibleFields.remove( "Notes" );
 	
 	int i, version;
 	Config cfg( "AddressBook" );
 	QString zn;
 	
 	// ### Write a function to keep this from happening again...
 	QStringList::ConstIterator it;
 	for ( i = 0, it = xmlFields.begin(); it != xmlFields.end(); ++it, i++ ) {
 		allFields.append( i + 3 );
 	}
 	
 	cfg.setGroup( "Version" );
 	version = cfg.readNumEntry( "version" );
 	i = 0;
 	startFontSize = 1;
 	
 	if ( version >= ADDRESSVERSION ) {
 		
 		cfg.setGroup( "ImportantCategory" );
 		
 		zn = cfg.readEntry( "Category" + QString::number(i), QString::null );
 		while ( !zn.isNull() ) {
 			if ( zn.contains( "Work" ) || zn.contains( "Mb" ) ) {
 				slOrderedFields.clear();
 				break;
 			}
 			slOrderedFields.append( zn );
 			zn = cfg.readEntry( "Category" + QString::number(++i), QString::null );
 		}
 		cfg.setGroup( "Font" );
 		startFontSize = cfg.readNumEntry( "fontSize", 1 );
 		
 		
 	} else {
 		QString str;
 		str = getenv("HOME");
 		str += "/Settings/AddressBook.conf";
 		QFile::remove( str );
 	}
 	
 	if ( slOrderedFields.count() > 0 ) {
 		for( QStringList::ConstIterator it = slOrderedFields.begin();
 		     it != slOrderedFields.end(); ++it ) {
 			QValueList<int>::ConstIterator itVl;
 			QStringList::ConstIterator itVis;
 			itVl = allFields.begin();
 			for ( itVis = visibleFields.begin();
 			      itVis != visibleFields.end() && itVl != allFields.end();
 			      ++itVis, ++itVl ) {
 				if ( *it == *itVis && itVl != allFields.end() ) {
 					orderedFields.append( *itVl );
 				}
 			}
 		}
 	} else {
 		QValueList<int>::ConstIterator it;
 		for ( it = allFields.begin(); it != allFields.end(); ++it )
 			orderedFields.append( *it );
 		
 		slOrderedFields = visibleFields;