summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/abeditor.cpp17
-rw-r--r--core/pim/addressbook/abeditor.h8
-rw-r--r--core/pim/addressbook/ablabel.cpp2
-rw-r--r--core/pim/addressbook/ablabel.h6
-rw-r--r--core/pim/addressbook/abtable.cpp1664
-rw-r--r--core/pim/addressbook/abtable.h36
-rw-r--r--core/pim/addressbook/addressbook.cpp1493
-rw-r--r--core/pim/addressbook/addressbook.h109
-rw-r--r--core/pim/addressbook/contacteditor.cpp4
-rw-r--r--core/pim/addressbook/contacteditor.h10
10 files changed, 1612 insertions, 1737 deletions
diff --git a/core/pim/addressbook/abeditor.cpp b/core/pim/addressbook/abeditor.cpp
index 6354db9..91e8722 100644
--- a/core/pim/addressbook/abeditor.cpp
+++ b/core/pim/addressbook/abeditor.cpp
@@ -53,3 +53,3 @@ void parseEmailTo( const QString &strDefaultEmail,
-AbEditor::AbEditor( const Contact &entry, const QValueList<int> *newOrdered,
+AbEditor::AbEditor( const OContact &entry, const QValueList<int> *newOrdered,
QStringList *slNewOrdered,
@@ -184,3 +184,3 @@ void AbEditor::loadFields()
-void AbEditor::setEntry( const Contact &entry )
+void AbEditor::setEntry( const OContact &entry )
{
@@ -412,8 +412,8 @@ void AbEditor::saveEntry()
case Qtopia::Emails:
- parseEmailFrom( it.current()->text(), strDefaultEmail,
- strOtherEmail );
- ent.setDefaultEmail( strDefaultEmail );
- ent.setEmails( strOtherEmail );
- break;
-
+ parseEmailFrom( it.current()->text(), strDefaultEmail,
+ strOtherEmail );
+ ent.setDefaultEmail( strDefaultEmail );
+ ent.setEmails( strOtherEmail );
+ break;
+
// home
@@ -551,2 +551,3 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
return;
+
// find the first
diff --git a/core/pim/addressbook/abeditor.h b/core/pim/addressbook/abeditor.h
index 9ce6704..a9c1c5f 100644
--- a/core/pim/addressbook/abeditor.h
+++ b/core/pim/addressbook/abeditor.h
@@ -40,3 +40,3 @@ class AbEditor : public QDialog
public:
- AbEditor( const Contact &entry, const QValueList<int> *newOrdedValues,
+ AbEditor( const OContact &entry, const QValueList<int> *newOrdedValues,
QStringList *slNewOrdered,
@@ -46,3 +46,3 @@ public:
void setNameFocus();
- Contact entry() const { return ent; }
+ OContact entry() const { return ent; }
@@ -50,3 +50,3 @@ public slots:
void slotNote();
- void setEntry( const Contact &entry );
+ void setEntry( const OContact &entry );
@@ -65,3 +65,3 @@ private:
QMultiLineEdit *txtNote;
- Contact ent;
+ OContact ent;
QScrollView *svPage;
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 3bf3e12..cf1e39f 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -36,3 +36,3 @@ AbLabel::~AbLabel()
-void AbLabel::init( const Contact &entry )
+void AbLabel::init( const OContact &entry )
{
diff --git a/core/pim/addressbook/ablabel.h b/core/pim/addressbook/ablabel.h
index cfbd999..9086c4a 100644
--- a/core/pim/addressbook/ablabel.h
+++ b/core/pim/addressbook/ablabel.h
@@ -22,3 +22,3 @@
-#include <qpe/contact.h>
+#include <opie/ocontact.h>
#include <qtextview.h>
@@ -34,3 +34,3 @@ public:
public slots:
- void init( const Contact &entry );
+ void init( const OContact &entry );
void sync();
@@ -44,3 +44,3 @@ protected:
private:
- Contact ent;
+ OContact ent;
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 3fa1a7c..08c6d0a 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -27,2 +27,4 @@
+#include <opie/orecordlist.h>
+
#include <qasciidict.h>
@@ -31,2 +33,3 @@
#include <qregexp.h>
+#include <qmessagebox.h>
@@ -41,12 +44,3 @@
-static bool contactCompare( const Contact &cnt, const QRegExp &r, int category );
-
-//### qtmail/addresslist.cpp hardcodes this filename as well
-static QString journalFileName()
-{
- QString str = getenv("HOME");
- str +="/.abjournal";
- return str;
-}
-
+static bool contactCompare( const OContact &cnt, const QRegExp &r, int category );
@@ -55,3 +49,3 @@ static QString journalFileName()
\class AbTableItem abtable.h
-
+
\brief QTableItem based class for showing a field of an entry
@@ -61,6 +55,6 @@ AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s,
const QString &secondSortKey)
- : QTableItem( t, et, s )
+ : QTableItem( t, et, s )
{
- // sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower();
- sortKey = Qtopia::buildSortKey( s, secondSortKey );
+ // sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower();
+ sortKey = Qtopia::buildSortKey( s, secondSortKey );
}
@@ -69,3 +63,3 @@ int AbTableItem::alignment() const
{
- return AlignLeft|AlignVCenter;
+ return AlignLeft|AlignVCenter;
}
@@ -74,3 +68,3 @@ QString AbTableItem::key() const
{
- return sortKey;
+ return sortKey;
}
@@ -80,6 +74,6 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey )
{
- setText( txt );
- sortKey = Qtopia::buildSortKey( txt, secondKey );
-
- // sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
+ setText( txt );
+ sortKey = Qtopia::buildSortKey( txt, secondKey );
+
+ // sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
}
@@ -88,3 +82,3 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey )
\class AbPickItem abtable.h
-
+
\brief QTableItem based class for showing slection of an entry
@@ -93,3 +87,3 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey )
AbPickItem::AbPickItem( QTable *t ) :
- QTableItem(t, WhenCurrent, "?")
+ QTableItem(t, WhenCurrent, "?")
{
@@ -99,14 +93,14 @@ QWidget *AbPickItem::createEditor() const
{
- QComboBox* combo = new QComboBox( table()->viewport() );
- ( (AbPickItem*)this )->cb = combo;
- AbTable* t = static_cast<AbTable*>(table());
- QStringList c = t->choiceNames();
- int cur = 0;
- for (QStringList::ConstIterator it = c.begin(); it!=c.end(); ++it) {
- if ( *it == text() )
- cur = combo->count();
- combo->insertItem(*it);
- }
- combo->setCurrentItem(cur);
- return combo;
+ QComboBox* combo = new QComboBox( table()->viewport() );
+ ( (AbPickItem*)this )->cb = combo;
+ AbTable* t = static_cast<AbTable*>(table());
+ QStringList c = t->choiceNames();
+ int cur = 0;
+ for (QStringList::ConstIterator it = c.begin(); it!=c.end(); ++it) {
+ if ( *it == text() )
+ cur = combo->count();
+ combo->insertItem(*it);
+ }
+ combo->setCurrentItem(cur);
+ return combo;
}
@@ -115,6 +109,6 @@ void AbPickItem::setContentFromEditor( QWidget *w )
{
- if ( w->inherits("QComboBox") )
- setText( ( (QComboBox*)w )->currentText() );
- else
- QTableItem::setContentFromEditor( w );
+ if ( w->inherits("QComboBox") )
+ setText( ( (QComboBox*)w )->currentText() );
+ else
+ QTableItem::setContentFromEditor( w );
}
@@ -123,3 +117,3 @@ void AbPickItem::setContentFromEditor( QWidget *w )
\class AbTable abtable.h
-
+
\brief QTable based class for showing a list of entries
@@ -128,19 +122,20 @@ void AbPickItem::setContentFromEditor( QWidget *w )
AbTable::AbTable( const QValueList<int> *order, QWidget *parent, const char *name )
-// #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR
-// : QTable( 0, 0, parent, name, TRUE ),
-// #else
- : QTable( parent, name ),
-// #endif
- lastSortCol( -1 ),
- asc( TRUE ),
- intFields( order ),
- currFindRow( -2 ),
- mCat( 0 )
-{
- mCat.load( categoryFileName() );
- setSelectionMode( NoSelection );
- init();
- setSorting( TRUE );
- connect( this, SIGNAL(clicked(int,int,int,const QPoint &)),
- this, SLOT(itemClicked(int,int)) );
+ // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR
+ // : QTable( 0, 0, parent, name, TRUE ),
+ // #else
+ : QTable( parent, name ),
+ // #endif
+ lastSortCol( -1 ),
+ asc( TRUE ),
+ intFields( order ),
+ currFindRow( -2 ),
+ mCat( 0 ),
+ m_contactdb ("addressbook")
+{
+ mCat.load( categoryFileName() );
+ setSelectionMode( NoSelection );
+ init();
+ setSorting( TRUE );
+ connect( this, SIGNAL(clicked(int,int,int,const QPoint &)),
+ this, SLOT(itemClicked(int,int)) );
}
@@ -153,10 +148,11 @@ void AbTable::init()
{
- showChar = '\0';
- setNumRows( 0 );
- setNumCols( 2 );
-
- horizontalHeader()->setLabel( 0, tr( "Full Name" ));
- horizontalHeader()->setLabel( 1, tr( "Contact" ));
- setLeftMargin( 0 );
- verticalHeader()->hide();
+ showChar = '\0';
+ setNumRows( 0 );
+ setNumCols( 2 );
+
+ horizontalHeader()->setLabel( 0, tr( "Full Name" ));
+ horizontalHeader()->setLabel( 1, tr( "Contact" ));
+ setLeftMargin( 0 );
+ verticalHeader()->hide();
+ columnVisible = true;
}
@@ -165,15 +161,16 @@ void AbTable::columnClicked( int col )
{
- if ( !sorting() )
- return;
-
- if ( lastSortCol == -1 )
- lastSortCol = col;
-
- if ( col == lastSortCol ) {
- asc = !asc;
- } else {
- lastSortCol = col;
- asc = TRUE;
- }
- resort();
+ if ( !sorting() )
+ return;
+
+ if ( lastSortCol == -1 )
+ lastSortCol = col;
+
+ if ( col == lastSortCol ) {
+ asc = !asc;
+ } else {
+ lastSortCol = col;
+ asc = TRUE;
+ }
+ //QMessageBox::information( this, "resort", "columnClicked" );
+ resort();
}
@@ -182,28 +179,30 @@ void AbTable::resort()
{
- if ( sorting() ) {
- if ( lastSortCol == -1 )
- lastSortCol = 0;
- sortColumn( lastSortCol, asc, TRUE );
- updateVisible();
- }
+ if ( sorting() ) {
+ if ( lastSortCol == -1 )
+ lastSortCol = 0;
+ sortColumn( lastSortCol, asc, TRUE );
+ //QMessageBox::information( this, "resort", "resort" );
+ updateVisible();
+ }
}
-Contact AbTable::currentEntry()
+OContact AbTable::currentEntry()
{
- Contact cnt;
- AbTableItem *abItem;
- abItem = static_cast<AbTableItem*>(item( currentRow(), 0 ));
- if ( abItem ) {
- cnt = contactList[abItem];
- }
- return cnt;
+ OContact cnt;
+ AbTableItem *abItem;
+ abItem = static_cast<AbTableItem*>(item( currentRow(), 0 ));
+ if ( abItem ) {
+ cnt = contactList[abItem];
+ //cnt = contactList[currentRow()];
+ }
+ return cnt;
}
-void AbTable::replaceCurrentEntry( const Contact &newContact )
+void AbTable::replaceCurrentEntry( const OContact &newContact )
{
- int row = currentRow();
- updateJournal( newContact, Contact::ACTION_REPLACE, row );
- updateVisible();
-
- journalFreeReplace( newContact, row );
+ int row = currentRow();
+ updateVisible();
+
+ journalFreeReplace( newContact, row );
+
}
@@ -212,16 +211,12 @@ void AbTable::deleteCurrentEntry()
{
- int row = currentRow();
- AbTableItem *abItem;
- abItem = static_cast<AbTableItem*>(item( row, 0 ));
- Contact oldContact;
- oldContact = contactList[abItem];
- updateJournal( oldContact, Contact::ACTION_REMOVE, row );
-
- // a little wasteful, but it ensure's there is only one place
- // where we delete.
- journalFreeRemove( row );
- updateVisible();
-
- if ( numRows() == 0 )
- emit empty( TRUE );
+ int row = currentRow();
+
+ // a little wasteful, but it ensure's there is only one place
+ // where we delete.
+ journalFreeRemove( row );
+ updateVisible();
+
+ if ( numRows() == 0 )
+ emit empty( TRUE );
+
}
@@ -230,11 +225,11 @@ void AbTable::clear()
{
- contactList.clear();
- for ( int r = 0; r < numRows(); ++r ) {
- for ( int c = 0; c < numCols(); ++c ) {
- if ( cellWidget( r, c ) )
- clearCellWidget( r, c );
- clearCell( r, c );
+ contactList.clear();
+ for ( int r = 0; r < numRows(); ++r ) {
+ for ( int c = 0; c < numCols(); ++c ) {
+ if ( cellWidget( r, c ) )
+ clearCellWidget( r, c );
+ clearCell( r, c );
+ }
}
- }
- setNumRows( 0 );
+ setNumRows( 0 );
}
@@ -243,11 +238,17 @@ void AbTable::refresh()
{
- int rows = numRows();
- QString value;
- AbTableItem *abi;
- for ( int r = 0; r < rows; ++r ) {
- abi = static_cast<AbTableItem*>( item(r, 0) );
- value = findContactContact( contactList[abi] );
- static_cast<AbTableItem*>( item(r, 1) )->setItem( value, abi->text() );
- }
- resort();
+ int rows = numRows();
+ QString value;
+ AbTableItem *abi;
+
+ // hide columns so no flashing ?
+ if ( showBk == "Cards" ) {
+ hideColumn(0);
+ hideColumn(1);
+ }
+ for ( int r = 0; r < rows; ++r ) {
+ abi = static_cast<AbTableItem*>( item(r, 0) );
+ value = findContactContact( contactList[abi], r );
+ static_cast<AbTableItem*>( item(r, 1) )->setItem( value, abi->text() );
+ }
+ resort();
}
@@ -256,8 +257,8 @@ void AbTable::keyPressEvent( QKeyEvent *e )
{
- char key = toupper( e->ascii() );
-
- if ( key >= 'A' && key <= 'Z' )
- moveTo( key );
-
- switch( e->key() ) {
+ char key = toupper( e->ascii() );
+
+ if ( key >= 'A' && key <= 'Z' )
+ moveTo( key );
+
+ switch( e->key() ) {
case Qt::Key_Space:
@@ -265,7 +266,7 @@ void AbTable::keyPressEvent( QKeyEvent *e )
case Qt::Key_Enter:
- emit details();
- break;
+ emit details();
+ break;
default:
- QTable::keyPressEvent( e );
- }
+ QTable::keyPressEvent( e );
+ }
}
@@ -274,30 +275,30 @@ void AbTable::moveTo( char c )
{
-
- int rows = numRows();
- QString value;
- AbTableItem *abi;
- int r;
- if ( asc ) {
- r = 0;
- while ( r < rows-1) {
- abi = static_cast<AbTableItem*>( item(r, 0) );
- QChar first = abi->key()[0];
- //### is there a bug in QChar to char comparison???
- if ( first.row() || first.cell() >= c )
- break;
- r++;
- }
- } else {
- //### should probably disable reverse sorting instead
- r = rows - 1;
- while ( r > 0 ) {
- abi = static_cast<AbTableItem*>( item(r, 0) );
- QChar first = abi->key()[0];
- //### is there a bug in QChar to char comparison???
- if ( first.row() || first.cell() >= c )
- break;
- r--;
+
+ int rows = numRows();
+ QString value;
+ AbTableItem *abi;
+ int r;
+ if ( asc ) {
+ r = 0;
+ while ( r < rows-1) {
+ abi = static_cast<AbTableItem*>( item(r, 0) );
+ QChar first = abi->key()[0];
+ //### is there a bug in QChar to char comparison???
+ if ( first.row() || first.cell() >= c )
+ break;
+ r++;
+ }
+ } else {
+ //### should probably disable reverse sorting instead
+ r = rows - 1;
+ while ( r > 0 ) {
+ abi = static_cast<AbTableItem*>( item(r, 0) );
+ QChar first = abi->key()[0];
+ //### is there a bug in QChar to char comparison???
+ if ( first.row() || first.cell() >= c )
+ break;
+ r--;
+ }
}
- }
- setCurrentCell( r, currentColumn() );
+ setCurrentCell( r, currentColumn() );
}
@@ -305,526 +306,295 @@ void AbTable::moveTo( char c )
-QString AbTable::findContactName( const Contact &entry )
+QString AbTable::findContactName( const OContact &entry )
{
- // We use the fileAs, then company, defaultEmail
- QString str;
- str = entry.fileAs();
- if ( str.isEmpty() ) {
- str = entry.company();
+ // We use the fileAs, then company, defaultEmail
+ QString str;
+ str = entry.fileAs();
if ( str.isEmpty() ) {
- str = entry.defaultEmail();
+ str = entry.company();
+ if ( str.isEmpty() ) {
+ str = entry.defaultEmail();
+ }
}
- }
- return str;
-}
-
-QString AbTable::findContactContact( const Contact &entry )
-{
- QString value;
- value = "";
- for ( QValueList<int>::ConstIterator it = intFields->begin();
- it != intFields->end(); ++it ) {
- switch ( *it ) {
- default:
- break;
- case Qtopia::Title:
- value = entry.title();
- break;
- case Qtopia::Suffix:
- value = entry.suffix();
- break;
- case Qtopia::FileAs:
- value = entry.fileAs();
- break;
- case Qtopia::DefaultEmail:
- value = entry.defaultEmail();
- case Qtopia::Emails:
- value = entry.emails();
- break;
- case Qtopia::HomeStreet:
- value = entry.homeStreet();
- break;
- case Qtopia::HomeCity:
- value = entry.homeCity();
- break;
- case Qtopia::HomeState:
- value = entry.homeState();
- break;
- case Qtopia::HomeZip:
- value = entry.homeZip();
- break;
- case Qtopia::HomeCountry:
- value = entry.homeCountry();
- break;
- case Qtopia::HomePhone:
- value = entry.homePhone();
- break;
- case Qtopia::HomeFax:
- value = entry.homeFax();
- break;
- case Qtopia::HomeMobile:
- value = entry.homeMobile();
- break;
- case Qtopia::HomeWebPage:
- value = entry.homeWebpage();
- break;
- case Qtopia::Company:
- value = entry.company();
- break;
- case Qtopia::BusinessCity:
- value = entry.businessCity();
- break;
- 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;
+ return str;
+}
+
+QString AbTable::findContactContact( const OContact &entry, int /* row */ )
+{
+ QString value;
+ value = "";
+ for ( QValueList<int>::ConstIterator it = intFields->begin();
+ it != intFields->end(); ++it ) {
+ switch ( *it ) {
+ default:
+ break;
+ case Qtopia::Title:
+ value = entry.title();
+ break;
+ case Qtopia::Suffix:
+ value = entry.suffix();
+ break;
+ case Qtopia::FileAs:
+ value = entry.fileAs();
+ break;
+ case Qtopia::DefaultEmail:
+ value = entry.defaultEmail();
+ case Qtopia::Emails:
+ value = entry.emails();
+ break;
+ case Qtopia::HomeStreet:
+ value = entry.homeStreet();
+ break;
+ case Qtopia::HomeCity:
+ value = entry.homeCity();
+ break;
+ case Qtopia::HomeState:
+ value = entry.homeState();
+ break;
+ case Qtopia::HomeZip:
+ value = entry.homeZip();
+ break;
+ case Qtopia::HomeCountry:
+ value = entry.homeCountry();
+ break;
+ case Qtopia::HomePhone:
+ value = entry.homePhone();
+ break;
+ case Qtopia::HomeFax:
+ value = entry.homeFax();
+ break;
+ case Qtopia::HomeMobile:
+ value = entry.homeMobile();
+ break;
+ case Qtopia::HomeWebPage:
+ value = entry.homeWebpage();
+ break;
+ case Qtopia::Company:
+ value = entry.company();
+ break;
+ case Qtopia::BusinessCity:
+ value = entry.businessCity();
+ break;
+ 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;
}
- if ( !value.isEmpty() )
- break;
- }
- return value;
+ return value;
}
-void AbTable::addEntry( const Contact &newCnt )
+void AbTable::addEntry( const OContact &newCnt )
{
- int row = numRows();
- setNumRows( row + 1 );
- updateJournal( newCnt, Contact::ACTION_ADD );
- insertIntoTable( newCnt, row );
- setCurrentCell( row, 0 );
- updateVisible();
+ int row = numRows();
+
+ setNumRows( row + 1 );
+ insertIntoTable( newCnt, row );
+
+ qWarning("abtable:AddContact");
+ m_contactdb.add ( newCnt );
+
+ setCurrentCell( row, 0 );
+ // updateVisible();
}
-void AbTable::resizeRows( int size ) {
-/*
- if (numRows()) {
- for (int i = 0; i < numRows(); i++) {
- setRowHeight( i, size );
- }
- }*/
- updateVisible();
+void AbTable::resizeRows() {
+ /*
+ if (numRows()) {
+ for (int i = 0; i < numRows(); i++) {
+ setRowHeight( i, size );
+ }
+ }
+ updateVisible();
+ */
}
-void AbTable::updateJournal( const Contact &cnt,
- Contact::journal_action action, int row )
-{
- QFile f( journalFileName() );
- if ( !f.open(IO_WriteOnly|IO_Append) )
- return;
- QString buf;
- QCString str;
- buf = "<Contact ";
- cnt.save( buf );
- buf += " action=\"" + QString::number( (int)action ) + "\" ";
- if ( action == Contact::ACTION_REMOVE || action == Contact::ACTION_REPLACE)
- buf += " actionrow=\"" + QString::number(row) + "\" ";
- buf += "/>\n";
- QCString cstr = buf.utf8();
- f.writeBlock( cstr.data(), cstr.length() );
- QCopEnvelope( "QPE/PIM", "addressbookUpdated()" );
-}
-bool AbTable::save( const QString &fn )
+bool AbTable::save( const QString& /* fn */ )
{
-// QTime t;
-// t.start();
-
- QString strNewFile = fn + ".new";
- QFile f( strNewFile );
- if ( !f.open( IO_WriteOnly|IO_Raw ) )
- return false;
-
- int total_written;
- QString out;
- out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n"
- " <Groups>\n"
- " </Groups>\n"
- " <Contacts>\n";
- QMapIterator<AbTableItem*, Contact> it;
- for ( it = contactList.begin(); it != contactList.end(); ++it ) {
- out += "<Contact ";
- it.data().save( out );
- out += "/>\n";
- QCString cstr = out.utf8();
- total_written = f.writeBlock( cstr.data(), cstr.length() );
- if ( total_written != int(cstr.length()) ) {
- f.close();
- QFile::remove( strNewFile );
- return false;
- }
- out = "";
- }
- out += " </Contacts>\n</AddressBook>\n";
-
- QCString cstr = out.utf8();
- total_written = f.writeBlock( cstr.data(), cstr.length() );
- if ( total_written != int(cstr.length()) ) {
- f.close();
- QFile::remove( strNewFile );
- return false;
- }
- f.close();
-
-// qDebug("saving: %d", t.elapsed() );
-
- // move the file over, I'm just going to use the system call
- // because, I don't feel like using QDir.
- if ( ::rename( strNewFile.latin1(), fn.latin1() ) < 0 ) {
- qWarning( "problem renaming file %s to %s, errno: %d",
- strNewFile.latin1(), fn.latin1(), errno );
- // remove the tmp file...
- QFile::remove( strNewFile );
- }
- // remove the journal...
- QFile::remove( journalFileName() );
- return true;
+ // QTime t;
+ // t.start();
+ qWarning("abtable:Save data");
+ m_contactdb.save();
+
+ return true;
}
-void AbTable::load( const QString &fn )
+void AbTable::load( const QString& /* fn */ )
{
- setSorting( false );
- loadFile( fn, false );
- // merge in the journal
- if ( QFile::exists( journalFileName() ) ) {
- loadFile( journalFileName(), true );
- save( fn );
- }
- setSorting( true );
- resort();
+ 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();
}
-void AbTable::loadFile( const QString &strFile, bool journalFile )
-{
-// QTime t;
-// t.start();
- QFile f( strFile );
- if ( !f.open(IO_ReadOnly) )
- return;
- QList<Contact> list;
- list.setAutoDelete( TRUE );
- QByteArray ba = f.readAll();
- f.close();
- if (ba.isEmpty() )
- return;
- char *uc = ba.data();//(QChar *)data.unicode();
- int len = ba.size();//data.length();
- bool foundAction = false;
- Contact::journal_action action;
- bool foundKey = false;
- int journalKey = 0;
-
- const int JOURNALACTION = Qtopia::Notes + 1;
- const int JOURNALROW = JOURNALACTION + 1;
-
- // **********************************
- // CHANGE THE SIZE OF THE DICT IF YOU ADD ANY MORE FIELDS!!!!
- // **********************************
- QAsciiDict<int> dict( 47 );
- dict.setAutoDelete( TRUE );
- dict.insert( "Uid", new int(Qtopia::AddressUid) );
- dict.insert( "Title", new int(Qtopia::Title) );
- dict.insert( "FirstName", new int(Qtopia::FirstName) );
- dict.insert( "MiddleName", new int(Qtopia::MiddleName) );
- dict.insert( "LastName", new int(Qtopia::LastName) );
- dict.insert( "Suffix", new int(Qtopia::Suffix) );
- dict.insert( "FileAs", new int(Qtopia::FileAs) );
- dict.insert( "Categories", new int(Qtopia::AddressCategory) );
- dict.insert( "DefaultEmail", new int(Qtopia::DefaultEmail) );
- dict.insert( "Emails", new int(Qtopia::Emails) );
- dict.insert( "HomeStreet", new int(Qtopia::HomeStreet) );
- dict.insert( "HomeCity", new int(Qtopia::HomeCity) );
- dict.insert( "HomeState", new int(Qtopia::HomeState) );
- dict.insert( "HomeZip", new int(Qtopia::HomeZip) );
- dict.insert( "HomeCountry", new int(Qtopia::HomeCountry) );
- dict.insert( "HomePhone", new int(Qtopia::HomePhone) );
- dict.insert( "HomeFax", new int(Qtopia::HomeFax) );
- dict.insert( "HomeMobile", new int(Qtopia::HomeMobile) );
- dict.insert( "HomeWebPage", new int(Qtopia::HomeWebPage) );
- dict.insert( "Company", new int(Qtopia::Company) );
- dict.insert( "BusinessStreet", new int(Qtopia::BusinessStreet) );
- dict.insert( "BusinessCity", new int(Qtopia::BusinessCity) );
- dict.insert( "BusinessState", new int(Qtopia::BusinessState) );
- dict.insert( "BusinessZip", new int(Qtopia::BusinessZip) );
- dict.insert( "BusinessCountry", new int(Qtopia::BusinessCountry) );
- dict.insert( "BusinessWebPage", new int(Qtopia::BusinessWebPage) );
- dict.insert( "JobTitle", new int(Qtopia::JobTitle) );
- dict.insert( "Department", new int(Qtopia::Department) );
- dict.insert( "Office", new int(Qtopia::Office) );
- dict.insert( "BusinessPhone", new int(Qtopia::BusinessPhone) );
- dict.insert( "BusinessFax", new int(Qtopia::BusinessFax) );
- dict.insert( "BusinessMobile", new int(Qtopia::BusinessMobile) );
- dict.insert( "BusinessPager", new int(Qtopia::BusinessPager) );
- dict.insert( "Profession", new int(Qtopia::Profession) );
- dict.insert( "Assistant", new int(Qtopia::Assistant) );
- dict.insert( "Manager", new int(Qtopia::Manager) );
- dict.insert( "Spouse", new int(Qtopia::Spouse) );
- dict.insert( "Children", new int(Qtopia::Children) );
- dict.insert( "Gender", new int(Qtopia::Gender) );
- dict.insert( "Birthday", new int(Qtopia::Birthday) );
- dict.insert( "Anniversary", new int(Qtopia::Anniversary) );
- dict.insert( "Nickname", new int(Qtopia::Nickname) );
- dict.insert( "Notes", new int(Qtopia::Notes) );
- dict.insert( "action", new int(JOURNALACTION) );
- dict.insert( "actionrow", new int(JOURNALROW) );
-
- int i = 0;
- int num = 0;
- char *point;
- while ( (point = strstr( uc+i, "<Contact " ) ) != NULL ) {
- i = point - uc;
- // if we are reading the standard file, we just need to
- // insert info, so just say we'll do an insert...
- action = Contact::ACTION_ADD;
- // new Contact
- Contact *cnt = new Contact;
- i += 9;
- while ( 1 ) {
- while ( i < len && (uc[i] == ' ' || uc[i] == '\n' || uc[i] == '\r') )
- i++;
- if ( i >= len-2 || (uc[i] == '/' && uc[i+1] == '>') )
- break;
- // we have another attribute read it.
- int j = i;
- while ( j < len && uc[j] != '=' )
- j++;
- char *attr = uc+i;
- uc[j] = '\0';
- //qDebug("attr=%s", attr.latin1() );
- i = ++j; // skip =
- while ( i < len && uc[i] != '"' )
- i++;
- j = ++i;
- bool haveEnt = FALSE;
- bool haveUtf = FALSE;
- while ( j < len && uc[j] != '"' ) {
- if ( uc[j] == '&' )
- haveEnt = TRUE;
- if ( ((unsigned char)uc[j]) > 0x7f )
- haveUtf = TRUE;
- j++;
- }
-
- if ( j == i ) {
- // empty value
- i = j + 1;
- continue;
- }
-
- QString value = haveUtf ? QString::fromUtf8( uc+i, j-i )
- : QString::fromLatin1( uc+i, j-i );
- if ( haveEnt )
- value = Qtopia::plainString( value );
- i = j + 1;
-
- int *find = dict[ attr ];
- if ( !find ) {
- cnt->setCustomField(attr, value);
- continue;
- }
-#if 1
- switch( *find ) {
- case Qtopia::AddressUid:
- cnt->setUid( value.toInt() );
- break;
- case Qtopia::AddressCategory:
- cnt->setCategories( Qtopia::Record::idsFromString( value ));
- break;
- case JOURNALACTION:
- action = Contact::journal_action(value.toInt());
- break;
- case JOURNALROW:
- journalKey = value.toInt();
- break;
- default:
- cnt->insert( *find, value );
- break;
- }
-#endif
+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 );
}
-
- // sadly we can't delay adding of items from the journal to get
- // the proper effect, but then, the journal should _never_ be
- // that huge, and recovering from a crash is not necessarily
- // a *fast* thing.
- switch ( action ) {
- case Contact::ACTION_ADD:
- if ( journalFile ) {
+ 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 );
- delete cnt;
- }
- else
- list.append( cnt );
- break;
- case Contact::ACTION_REMOVE:
- // yup, we don't use the entry to remove the object...
- journalFreeRemove( journalKey );
- delete cnt;
- break;
- case Contact::ACTION_REPLACE:
- journalFreeReplace( *cnt, journalKey );
- delete cnt;
- break;
- default:
- break;
+ 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 );
}
- num++;
- foundAction = false;
- foundKey = false;
-// if ( num % 100 == 0 ) {
-// qDebug("loading file, num=%d, t=%d", num, t.elapsed() );
-// }
- }
- if ( list.count() > 0 ) {
- internalAddEntries( list );
- }
-// qDebug("done loading %d, t=%d", num, t.elapsed() );
-
-}
-
-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();
-}
-
-void AbTable::insertIntoTable( const Contact &cnt, int row )
-{
- QString strName,
- strContact;
-
- strName = findContactName( cnt );
- strContact = findContactContact( cnt );
-
- 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?
-}
-
-void AbTable::internalAddEntries( QList<Contact> &list )
-{
- setUpdatesEnabled( FALSE );
- setNumRows( list.count() );
- int row = 0;
- Contact *it;
- for ( it = list.first(); it; it = list.next() )
- insertIntoTable( *it, row++ );
- resort();
- setUpdatesEnabled( TRUE );
-}
-
-
-void AbTable::journalFreeReplace( const Contact &cnt, int row )
-{
- QString strName,
- strContact;
- AbTableItem *ati = 0l;
-
- strName = findContactName( cnt );
- strContact = findContactContact( cnt );
- ati = static_cast<AbTableItem*>(item(row, 0));
- if ( ati != 0 ) {
- contactList.remove( ati );
- ati->setItem( strName, strContact );
- contactList.insert( ati, cnt );
-
- ati = static_cast<AbTableItem*>(item(row, 1));
- ati->setItem( strContact, strName );
- }else{
- int myrows = numRows();
- setNumRows( myrows + 1 );
- insertIntoTable( cnt, myrows );
- // gets deleted when returning
- }
}
+// Remove entry
void AbTable::journalFreeRemove( int row )
{
- AbTableItem *ati;
- ati = static_cast<AbTableItem*>(item(row, 0));
- if ( !ati )
- return;
- contactList.remove( ati );
- realignTable( 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 );
+
}
@@ -835,10 +605,10 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
{
- // Region of the rect we should draw
- QRegion reg( QRect( cx, cy, cw, ch ) );
- // Subtract the table from it
- reg = reg.subtract( QRect( QPoint( 0, 0 ), tableSize() ) );
- // And draw the rectangles (transformed as needed)
- QArray<QRect> r = reg.rects();
- for (unsigned int i=0; i<r.count(); i++)
- p->fillRect( r[i], colorGroup().brush( QColorGroup::Base ) );
+ // Region of the rect we should draw
+ QRegion reg( QRect( cx, cy, cw, ch ) );
+ // Subtract the table from it
+ reg = reg.subtract( QRect( QPoint( 0, 0 ), tableSize() ) );
+ // And draw the rectangles (transformed as needed)
+ QArray<QRect> r = reg.rects();
+ for (unsigned int i=0; i<r.count(); i++)
+ p->fillRect( r[i], colorGroup().brush( QColorGroup::Base ) );
}
@@ -866,69 +636,70 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive,
{
- if ( currFindRow < -1 )
- currFindRow = currentRow() - 1;
- clearSelection( TRUE );
- int rows,
- row;
- AbTableItem *ati;
- QRegExp r( findString );
- r.setCaseSensitive( caseSensitive );
- rows = numRows();
- static bool wrapAround = true;
-
- if ( !backwards ) {
- for ( row = currFindRow + 1; row < rows; row++ ) {
- ati = static_cast<AbTableItem*>( item(row, 0) );
- if ( contactCompare( contactList[ati], r, category ) )
- break;
-
+ if ( currFindRow < -1 )
+ currFindRow = currentRow() - 1;
+ clearSelection( TRUE );
+ int rows, row;
+ AbTableItem *ati;
+ QRegExp r( findString );
+ r.setCaseSensitive( caseSensitive );
+ rows = numRows();
+ static bool wrapAround = true;
+
+ if ( !backwards ) {
+ for ( row = currFindRow + 1; row < rows; row++ ) {
+ ati = static_cast<AbTableItem*>( item(row, 0) );
+ if ( contactCompare( contactList[ati], r, category ) )
+ //if ( contactCompare( contactList[row], r, category ) )
+ break;
+ }
+ } else {
+ for ( row = currFindRow - 1; row > -1; row-- ) {
+ ati = static_cast<AbTableItem*>( item(row, 0) );
+ if ( contactCompare( contactList[ati], r, category ) )
+ //if ( contactCompare( contactList[row], r, category ) )
+ break;
+ }
}
- } else {
- for ( row = currFindRow - 1; row > -1; row-- ) {
- ati = static_cast<AbTableItem*>( item(row, 0) );
- if ( contactCompare( contactList[ati], r, category ) )
- break;
+ if ( row >= rows || row < 0 ) {
+ if ( row < 0 )
+ currFindRow = rows;
+ else
+ currFindRow = -1;
+
+ if ( wrapAround )
+ emit signalWrapAround();
+ else
+ emit signalNotFound();
+
+ wrapAround = !wrapAround;
+ } else {
+ currFindRow = row;
+ QTableSelection foundSelection;
+ foundSelection.init( currFindRow, 0 );
+ foundSelection.expandTo( currFindRow, numCols() - 1 );
+ addSelection( foundSelection );
+ setCurrentCell( currFindRow, numCols() - 1 );
+ wrapAround = true;
}
- }
- if ( row >= rows || row < 0 ) {
- if ( row < 0 )
- currFindRow = rows;
- else
- currFindRow = -1;
-
- if ( wrapAround )
- emit signalWrapAround();
- else
- emit signalNotFound();
-
- wrapAround = !wrapAround;
- } else {
- currFindRow = row;
- QTableSelection foundSelection;
- foundSelection.init( currFindRow, 0 );
- foundSelection.expandTo( currFindRow, numCols() - 1 );
- addSelection( foundSelection );
- setCurrentCell( currFindRow, numCols() - 1 );
- wrapAround = true;
- }
}
-static bool contactCompare( const Contact &cnt, const QRegExp &r, int category )
+static bool contactCompare( const OContact &cnt, const QRegExp &r, int category )
{
- bool returnMe;
- QArray<int> cats;
- cats = cnt.categories();
-
- returnMe = false;
- if ( (category == -1 && cats.count() == 0) || category == -2 )
- returnMe = cnt.match( r );
- else {
- int i;
- for ( i = 0; i < int(cats.count()); i++ ) {
- if ( cats[i] == category ) {
+ bool returnMe;
+ QArray<int> cats;
+ cats = cnt.categories();
+
+ returnMe = false;
+ if ( (category == -1 && cats.count() == 0) || category == -2 )
returnMe = cnt.match( r );
- break;
- }
+ else {
+ int i;
+ for ( i = 0; i < int(cats.count()); i++ ) {
+ if ( cats[i] == category ) {
+ returnMe = cnt.match( r );
+ break;
+ }
+ }
}
- }
- return returnMe;
+
+ return returnMe;
}
@@ -937,7 +708,19 @@ void AbTable::fitColumns()
{
- int contentsWidth = visibleWidth();
- int n = numCols();
- int pw = n == 3 ? columnWidth(2) : 0;
- setColumnWidth( 0, contentsWidth - contentsWidth / 2 );
- setColumnWidth( 1, contentsWidth / 2 - pw );
+ int contentsWidth = visibleWidth() / 2;
+
+ if ( showBk == "Cards" ) {
+ showColumn(1);
+ //adjustColumn(1);
+ setColumnWidth( 1, visibleWidth() );
+ columnVisible = false;
+ } else {
+ if ( columnVisible == false ){
+ showColumn(0);
+ columnVisible = true;
+ }
+ setColumnWidth( 0, contentsWidth );
+ adjustColumn(1);
+ if ( columnWidth(1) < contentsWidth )
+ setColumnWidth( 1, contentsWidth );
+ }
}
@@ -946,4 +729,4 @@ void AbTable::show()
{
- fitColumns();
- QTable::show();
+ fitColumns();
+ QTable::show();
}
@@ -952,13 +735,13 @@ void AbTable::setChoiceNames( const QStringList& list)
{
- choicenames = list;
- if ( choicenames.isEmpty() ) {
- // hide pick column
- setNumCols( 2 );
- } else {
- // show pick column
- setNumCols( 3 );
- setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 );
- horizontalHeader()->setLabel( 2, tr( "Pick" ));
- }
- fitColumns();
+ choicenames = list;
+ if ( choicenames.isEmpty() ) {
+ // hide pick column
+ setNumCols( 2 );
+ } else {
+ // show pick column
+ setNumCols( 3 );
+ setColumnWidth( 2, fontMetrics().width(tr( "Pick" ))+8 );
+ horizontalHeader()->setLabel( 2, tr( "Pick" ));
+ }
+ fitColumns();
}
@@ -967,7 +750,7 @@ void AbTable::itemClicked(int,int col)
{
- if ( col == 2 ) {
- return;
- } else {
- emit details();
- }
+ if ( col == 2 ) {
+ return;
+ } else {
+ emit details();
+ }
}
@@ -976,3 +759,3 @@ QStringList AbTable::choiceNames() const
{
- return choicenames;
+ return choicenames;
}
@@ -981,18 +764,18 @@ void AbTable::setChoiceSelection(int /*index*/, const QStringList& /*list*/)
{
- /* ######
-
+ /* ######
+
QString selname = choicenames.at(index);
for (each row) {
- Contact *c = contactForRow(row);
- if ( list.contains(c->email) ) {
- list.remove(c->email);
- setText(row, 2, selname);
- }
+ OContact *c = contactForRow(row);
+ if ( list.contains(c->email) ) {
+ list.remove(c->email);
+ setText(row, 2, selname);
+ }
}
for (remaining list items) {
- Contact *c = new contact(item);
- setText(newrow, 2, selname);
+ OContact *c = new contact(item);
+ setText(newrow, 2, selname);
}
-
- */
+
+ */
}
@@ -1001,21 +784,26 @@ QStringList AbTable::choiceSelection(int /*index*/) const
{
- QStringList r;
- /* ######
-
+ QStringList r;
+ /* ######
+
QString selname = choicenames.at(index);
for (each row) {
- Contact *c = contactForRow(row);
- if ( text(row,2) == selname ) {
- r.append(c->email);
- }
+ OContact *c = contactForRow(row);
+ if ( text(row,2) == selname ) {
+ r.append(c->email);
}
-
- */
- return r;
+ }
+
+ */
+ return r;
}
-void AbTable::setShowCategory( const QString &c )
+void AbTable::setShowCategory( const QString &b, const QString &c )
{
- showCat = c;
- updateVisible();
+ showBk = b;
+ showCat = c;
+ //QMessageBox::information( this, "setShowCategory", "setShowCategory" );
+ //updateVisible();
+ refresh();
+ ensureCellVisible( currentRow(), 0 );
+ updateVisible(); // :SX
}
@@ -1024,4 +812,4 @@ void AbTable::setShowByLetter( char c )
{
- showChar = tolower(c);
- updateVisible();
+ showChar = tolower(c);
+ updateVisible();
}
@@ -1030,5 +818,9 @@ QString AbTable::showCategory() const
{
- return showCat;
+ return showCat;
}
+QString AbTable::showBook() const
+{
+ return showBk;
+}
@@ -1036,5 +828,5 @@ QStringList AbTable::categories()
{
- mCat.load( categoryFileName() );
- QStringList categoryList = mCat.labels( "Contacts" );
- return categoryList;
+ mCat.load( categoryFileName() );
+ QStringList categoryList = mCat.labels( "Contacts" );
+ return categoryList;
}
@@ -1043,148 +835,148 @@ void AbTable::updateVisible()
{
- int visible,
- totalRows,
- id,
- totalCats,
- it,
- row;
- bool hide;
- AbTableItem *ati;
- Contact *cnt;
- QString fileAsName;
- QString tmpStr;
- visible = 0;
-
- setPaintingEnabled( FALSE );
-
- totalRows = numRows();
- id = mCat.id( "Contacts", showCat );
- QArray<int> cats;
- for ( row = 0; row < totalRows; row++ ) {
- ati = static_cast<AbTableItem*>( item(row, 0) );
- cnt = &contactList[ati];
- cats = cnt->categories();
- fileAsName = cnt->fileAs();
- hide = false;
- if ( !showCat.isEmpty() ) {
- if ( showCat == tr( "Unfiled" ) ) {
- if ( cats.count() > 0 )
- hide = true;
- } else {
- // do some comparing
- if ( !hide ) {
- hide = true;
- totalCats = int(cats.count());
- for ( it = 0; it < totalCats; it++ ) {
- if ( cats[it] == id ) {
- hide = false;
- break;
+ int visible,
+ totalRows,
+ id,
+ totalCats,
+ it,
+ row;
+ bool hide;
+ AbTableItem *ati;
+ OContact *cnt;
+ QString fileAsName;
+ QString tmpStr;
+ visible = 0;
+
+ setPaintingEnabled( FALSE );
+
+ totalRows = numRows();
+ id = mCat.id( "Contacts", showCat );
+ QArray<int> cats;
+ for ( row = 0; row < totalRows; row++ ) {
+ ati = static_cast<AbTableItem*>( item(row, 0) );
+ cnt = &contactList[ati];
+ cats = cnt->categories();
+ fileAsName = cnt->fileAs();
+ hide = false;
+ if ( !showCat.isEmpty() ) {
+ if ( showCat == tr( "Unfiled" ) ) {
+ if ( cats.count() > 0 )
+ hide = true;
+ } else {
+ // do some comparing
+ if ( !hide ) {
+ hide = true;
+ totalCats = int(cats.count());
+ for ( it = 0; it < totalCats; it++ ) {
+ if ( cats[it] == id ) {
+ hide = false;
+ break;
+ }
+ }
+ }
}
- }
}
- }
- }
- if ( showChar != '\0' ) {
- tmpStr = fileAsName.left(1);
- tmpStr = tmpStr.lower();
- if ( tmpStr != QString(QChar(showChar)) && showChar != '#' ) {
- hide = true;
- }
- if ( showChar == '#' ) {
- if (tmpStr == "a")
- hide = true;
-
- if (tmpStr == "b")
- hide = true;
-
- if (tmpStr == "c")
- hide = true;
-
- if (tmpStr == "d")
- hide = true;
-
- if (tmpStr == "e")
- hide = true;
-
- if (tmpStr == "f")
- hide = true;
-
- if (tmpStr == "g")
- hide = true;
-
- if (tmpStr == "h")
- hide = true;
-
- if (tmpStr == "i")
- hide = true;
-
- if (tmpStr == "j")
- hide = true;
-
- if (tmpStr == "k")
- hide = true;
-
- if (tmpStr == "l")
- hide = true;
-
- if (tmpStr == "m")
- hide = true;
-
- if (tmpStr == "n")
- hide = true;
-
- if (tmpStr == "o")
- hide = true;
-
- if (tmpStr == "p")
- hide = true;
-
- if (tmpStr == "q")
- hide = true;
-
- if (tmpStr == "r")
- hide = true;
-
- if (tmpStr == "s")
- hide = true;
-
- if (tmpStr == "t")
- hide = true;
-
- if (tmpStr == "u")
- hide = true;
-
- if (tmpStr == "v")
- hide = true;
-
- if (tmpStr == "w")
- hide = true;
-
- if (tmpStr == "x")
- hide = true;
-
- if (tmpStr == "y")
- hide = true;
-
- if (tmpStr == "z")
- hide = true;
- }
-
+ if ( showChar != '\0' ) {
+ tmpStr = fileAsName.left(1);
+ tmpStr = tmpStr.lower();
+ if ( tmpStr != QString(QChar(showChar)) && showChar != '#' ) {
+ hide = true;
+ }
+ if ( showChar == '#' ) {
+ if (tmpStr == "a")
+ hide = true;
+
+ if (tmpStr == "b")
+ hide = true;
+
+ if (tmpStr == "c")
+ hide = true;
+
+ if (tmpStr == "d")
+ hide = true;
+
+ if (tmpStr == "e")
+ hide = true;
+
+ if (tmpStr == "f")
+ hide = true;
+
+ if (tmpStr == "g")
+ hide = true;
+
+ if (tmpStr == "h")
+ hide = true;
+
+ if (tmpStr == "i")
+ hide = true;
+
+ if (tmpStr == "j")
+ hide = true;
+
+ if (tmpStr == "k")
+ hide = true;
+
+ if (tmpStr == "l")
+ hide = true;
+
+ if (tmpStr == "m")
+ hide = true;
+
+ if (tmpStr == "n")
+ hide = true;
+
+ if (tmpStr == "o")
+ hide = true;
+
+ if (tmpStr == "p")
+ hide = true;
+
+ if (tmpStr == "q")
+ hide = true;
+
+ if (tmpStr == "r")
+ hide = true;
+
+ if (tmpStr == "s")
+ hide = true;
+
+ if (tmpStr == "t")
+ hide = true;
+
+ if (tmpStr == "u")
+ hide = true;
+
+ if (tmpStr == "v")
+ hide = true;
+
+ if (tmpStr == "w")
+ hide = true;
+
+ if (tmpStr == "x")
+ hide = true;
+
+ if (tmpStr == "y")
+ hide = true;
+
+ if (tmpStr == "z")
+ hide = true;
+ }
+
+ }
+ if ( hide ) {
+ if ( currentRow() == row )
+ setCurrentCell( -1, 0 );
+ if ( rowHeight(row) > 0 )
+ hideRow( row );
+ } else {
+ if ( rowHeight(row) == 0 ) {
+ showRow( row );
+ adjustRow( row );
+ }
+ visible++;
+ }
}
- if ( hide ) {
- if ( currentRow() == row )
+ if ( !visible )
setCurrentCell( -1, 0 );
- if ( rowHeight(row) > 0 )
- hideRow( row );
- } else {
- if ( rowHeight(row) == 0 ) {
- showRow( row );
- adjustRow( row );
- }
- visible++;
- }
- }
- if ( !visible )
- setCurrentCell( -1, 0 );
-
- setPaintingEnabled( TRUE );
+
+ setPaintingEnabled( TRUE );
}
@@ -1194,11 +986,11 @@ void AbTable::setPaintingEnabled( bool e )
{
- if ( e != enablePainting ) {
- if ( !enablePainting ) {
- enablePainting = true;
- rowHeightChanged( 0 );
- viewport()->update();
- } else {
- enablePainting = false;
+ if ( e != enablePainting ) {
+ if ( !enablePainting ) {
+ enablePainting = true;
+ rowHeightChanged( 0 );
+ viewport()->update();
+ } else {
+ enablePainting = false;
+ }
}
- }
}
@@ -1207,4 +999,4 @@ void AbTable::rowHeightChanged( int row )
{
- if ( enablePainting )
- QTable::rowHeightChanged( row );
+ if ( enablePainting )
+ QTable::rowHeightChanged( row );
}
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index d5ff279..84aef1e 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -24,3 +24,3 @@
#include <qpe/categories.h>
-#include <qpe/contact.h>
+#include <opie/ocontact.h>
@@ -31,2 +31,4 @@
+#include <opie/ocontactaccess.h>
+
class AbTableItem : public QTableItem
@@ -66,5 +68,5 @@ public:
// NEW
- void addEntry( const Contact &newContact );
- Contact currentEntry();
- void replaceCurrentEntry( const Contact &newContact );
+ void addEntry( const OContact &newContact );
+ OContact currentEntry();
+ void replaceCurrentEntry( const OContact &newContact );
@@ -85,3 +87,3 @@ public:
QStringList choiceSelection(int index) const;
- void setShowCategory( const QString &c );
+ void setShowCategory( const QString &b, const QString &c );
void setShowByLetter( char c );
@@ -89,3 +91,4 @@ public:
QStringList categories();
- void resizeRows( int size );
+
+ void resizeRows();
@@ -94,2 +97,4 @@ public:
+ QString showBook() const;
+
public slots:
@@ -121,9 +126,8 @@ private:
void resort();
- void updateJournal( const Contact &contact, Contact::journal_action action,
+ void updateJournal( const OContact &contact, OContact::journal_action action,
int row = -1 );
- void insertIntoTable( const Contact &contact, int row );
- void internalAddEntries( QList<Contact> &list );
- QString findContactName( const Contact &entry );
- QString findContactContact( const Contact &entry );
- void journalFreeReplace( const Contact &cnt, int row );
+ 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 );
@@ -134,3 +138,3 @@ private:
char showChar;
- QMap<AbTableItem*, Contact> contactList;
+ QMap<AbTableItem*, OContact> contactList;
const QValueList<int> *intFields;
@@ -141,2 +145,8 @@ private:
Categories mCat;
+
+ QString showBk;
+ bool columnVisible;
+
+ OContactAccess m_contactdb;
+
};
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
@@ -15,3 +15,3 @@
**
-** 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.
@@ -71,4 +71,4 @@ static QString addressbookOldXMLFilename()
{
- QString filename = QPEApplication::documentDir() + "addressbook.xml";
- return filename;
+ QString filename = QPEApplication::documentDir() + "addressbook.xml";
+ return filename;
}
@@ -77,5 +77,5 @@ static QString addressbookXMLFilename()
{
- QString filename = Global::applicationFileName("addressbook",
- "addressbook.xml");
- return filename;
+ QString filename = Global::applicationFileName("addressbook",
+ "addressbook.xml");
+ return filename;
}
@@ -84,5 +84,5 @@ static QString addressbookPersonalVCardName()
{
- QString filename = Global::applicationFileName("addressbook",
- "businesscard.vcf");
- return filename;
+ QString filename = Global::applicationFileName("addressbook",
+ "businesscard.vcf");
+ return filename;
}
@@ -91,176 +91,180 @@ static QString addressbookPersonalVCardName()
AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
- WFlags f )
- : QMainWindow( parent, name, f ),
- abEditor(0),
- bAbEditFirstTime(TRUE),
- syncing(FALSE)
+ WFlags f )
+ : QMainWindow( parent, name, f ),
+ abEditor(0),
+ bAbEditFirstTime(TRUE),
+ syncing(FALSE)
{
- 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
+ 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 &) ) );
+ 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 );
+ 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());
- }
-
- 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() );
+
+
+ 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());
+ }
+
+ 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;
}
@@ -269,36 +273,39 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
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);
- 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);
- 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);
- break;
- }
+
+ 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;
+ }
}
@@ -310,4 +317,4 @@ void AddressbookWindow::importvCard() {
if(!str.isEmpty() )
- setDocument((const QString&) str );
-
+ setDocument((const QString&) str );
+
}
@@ -316,14 +323,15 @@ void AddressbookWindow::setDocument( const QString &filename )
{
- 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 ) {
-// 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 );
-// }
- }
-
+ 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 );
+ // }
+ }
+
}
@@ -332,8 +340,8 @@ void AddressbookWindow::resizeEvent( QResizeEvent *e )
{
- QMainWindow::resizeEvent( e );
-
- if ( centralWidget() == listContainer )
- showList();
- else if ( centralWidget() == mView )
- showView();
+ QMainWindow::resizeEvent( e );
+
+ if ( centralWidget() == listContainer )
+ showList();
+ else if ( centralWidget() == mView )
+ showView();
}
@@ -342,5 +350,5 @@ AddressbookWindow::~AddressbookWindow()
{
- Config cfg("AddressBook");
- cfg.setGroup("Font");
- cfg.writeEntry("fontSize", startFontSize);
+ Config cfg("AddressBook");
+ cfg.setGroup("Font");
+ cfg.writeEntry("fontSize", startFontSize);
}
@@ -349,4 +357,4 @@ void AddressbookWindow::slotUpdateToolbar()
{
- Contact ce = abList->currentEntry();
- actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
+ OContact ce = abList->currentEntry();
+ actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
}
@@ -355,7 +363,20 @@ void AddressbookWindow::showList()
{
- if ( mView ) mView->hide();
- setCentralWidget( listContainer );
- listContainer->show();
- // update our focues... (or use a stack widget!);
- abList->setFocus();
+ 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() );
+
}
@@ -364,8 +385,8 @@ void AddressbookWindow::showView()
{
- if ( abList->numRows() > 0 ) {
- listContainer->hide();
- setCentralWidget( abView() );
- mView->show();
- mView->setFocus();
- }
+ if ( abList->numRows() > 0 ) {
+ listContainer->hide();
+ setCentralWidget( abView() );
+ mView->show();
+ mView->setFocus();
+ }
}
@@ -374,12 +395,12 @@ void AddressbookWindow::slotListNew()
{
- Contact cnt;
- if( !syncing ) {
- if ( abEditor )
- abEditor->setEntry( cnt );
- abView()->init( cnt );
- editEntry( NewEntry );
- } else {
- QMessageBox::warning(this, tr("Contacts"),
- tr("Can not edit data, currently syncing"));
- }
+ OContact cnt;
+ if( !syncing ) {
+ if ( abEditor )
+ abEditor->setEntry( cnt );
+ abView()->init( cnt );
+ editEntry( NewEntry );
+ } else {
+ QMessageBox::warning(this, tr("OContacts"),
+ tr("Can not edit data, currently syncing"));
+ }
}
@@ -388,5 +409,5 @@ void AddressbookWindow::slotListView()
{
- abView()->init( abList->currentEntry() );
- mView->sync();
- showView();
+ abView()->init( abList->currentEntry() );
+ mView->sync();
+ showView();
}
@@ -395,23 +416,23 @@ void AddressbookWindow::slotListDelete()
{
- if(!syncing) {
- Contact tmpEntry = abList->currentEntry();
-
- // get a name, do the best we can...
- QString strName = tmpEntry.fullName();
- if ( strName.isEmpty() ) {
- strName = tmpEntry.company();
- if ( strName.isEmpty() )
- strName = "No Name";
- }
-
-
- if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
- strName ) ) {
- abList->deleteCurrentEntry();
- showList();
- }
- } else {
- QMessageBox::warning( this, tr("Contacts"),
- tr("Can not edit data, currently syncing") );
- }
+ if(!syncing) {
+ OContact tmpEntry = abList->currentEntry();
+
+ // get a name, do the best we can...
+ QString strName = tmpEntry.fullName();
+ if ( strName.isEmpty() ) {
+ strName = tmpEntry.company();
+ if ( strName.isEmpty() )
+ strName = "No Name";
+ }
+
+
+ if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
+ strName ) ) {
+ abList->deleteCurrentEntry();
+ showList();
+ }
+ } else {
+ QMessageBox::warning( this, tr("Contacts"),
+ tr("Can not edit data, currently syncing") );
+ }
}
@@ -420,3 +441,3 @@ void AddressbookWindow::slotViewBack()
{
- showList();
+ showList();
}
@@ -425,14 +446,14 @@ void AddressbookWindow::slotViewEdit()
{
- if(!syncing) {
- if (actionPersonal->isOn()) {
- editPersonal();
- } else {
- if ( !bAbEditFirstTime )
- abEditor->setEntry( abList->currentEntry() );
- editEntry( EditEntry );
- }
- } else {
- QMessageBox::warning( this, tr("Contacts"),
- tr("Can not edit data, currently syncing") );
- }
+ if(!syncing) {
+ if (actionPersonal->isOn()) {
+ editPersonal();
+ } else {
+ if ( !bAbEditFirstTime )
+ abEditor->setEntry( abList->currentEntry() );
+ editEntry( EditEntry );
+ }
+ } else {
+ QMessageBox::warning( this, tr("Contacts"),
+ tr("Can not edit data, currently syncing") );
+ }
}
@@ -443,12 +464,9 @@ void AddressbookWindow::writeMail()
{
- Contact c = abList->currentEntry();
- QString name = c.fileAs();
- QString email = c.defaultEmail();
- QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
- e << name << email;
+ OContact c = abList->currentEntry();
+ QString name = c.fileAs();
+ QString email = c.defaultEmail();
+ QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
+ e << name << email;
}
-
-
-
static const char * beamfile = "/tmp/obex/contact.vcf";
@@ -457,20 +475,20 @@ void AddressbookWindow::slotBeam()
{
- QString filename;
- Contact c;
- if ( actionPersonal->isOn() ) {
- filename = addressbookPersonalVCardName();
- if (!QFile::exists(filename))
- return; // can't beam a non-existent file
- c = Contact::readVCard( filename )[0];
- } else {
- unlink( beamfile ); // delete if exists
- c = abList->currentEntry();
- mkdir("/tmp/obex/", 0755);
- Contact::writeVCard( beamfile, c );
- filename = beamfile;
- }
- Ir *ir = new Ir( this );
- connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
- QString description = c.fullName();
- ir->send( filename, description, "text/x-vCard" );
+ QString filename;
+ OContact c;
+ if ( actionPersonal->isOn() ) {
+ filename = addressbookPersonalVCardName();
+ if (!QFile::exists(filename))
+ return; // can't beam a non-existent file
+ c = OContact::readVCard( filename )[0];
+ } else {
+ unlink( beamfile ); // delete if exists
+ c = abList->currentEntry();
+ mkdir("/tmp/obex/", 0755);
+ OContact::writeVCard( beamfile, c );
+ filename = beamfile;
+ }
+ Ir *ir = new Ir( this );
+ connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
+ QString description = c.fullName();
+ ir->send( filename, description, "text/x-vCard" );
}
@@ -479,4 +497,4 @@ void AddressbookWindow::beamDone( Ir *ir )
{
- delete ir;
- unlink( beamfile );
+ delete ir;
+ unlink( beamfile );
}
@@ -485,26 +503,26 @@ void AddressbookWindow::beamDone( Ir *ir )
static void parseName( const QString& name, QString *first, QString *middle,
- QString * last )
+ QString * last )
{
-
- int comma = name.find ( "," );
- QString rest;
- if ( comma > 0 ) {
- *last = name.left( comma );
- comma++;
- while ( comma < int(name.length()) && name[comma] == ' ' )
- comma++;
- rest = name.mid( comma );
- } else {
- int space = name.findRev( ' ' );
- *last = name.mid( space+1 );
- rest = name.left( space );
- }
- int space = rest.find( ' ' );
- if ( space <= 0 ) {
- *first = rest;
- } else {
- *first = rest.left( space );
- *middle = rest.mid( space+1 );
- }
-
+
+ int comma = name.find ( "," );
+ QString rest;
+ if ( comma > 0 ) {
+ *last = name.left( comma );
+ comma++;
+ while ( comma < int(name.length()) && name[comma] == ' ' )
+ comma++;
+ rest = name.mid( comma );
+ } else {
+ int space = name.findRev( ' ' );
+ *last = name.mid( space+1 );
+ rest = name.left( space );
+ }
+ int space = rest.find( ' ' );
+ if ( space <= 0 ) {
+ *first = rest;
+ } else {
+ *first = rest.left( space );
+ *middle = rest.mid( space+1 );
+ }
+
}
@@ -514,66 +532,66 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
{
- if (msg == "editPersonal()") {
- editPersonal();
- } else if (msg == "editPersonalAndClose()") {
- editPersonal();
- close();
- } else if ( msg == "addContact(QString,QString)" ) {
- QDataStream stream(data,IO_ReadOnly);
- QString name, email;
- stream >> name >> email;
-
- Contact cnt;
- QString fn, mn, ln;
- parseName( name, &fn, &mn, &ln );
- // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
- cnt.setFirstName( fn );
- cnt.setMiddleName( mn );
- cnt.setLastName( ln );
- cnt.insertEmails( email );
- cnt.setDefaultEmail( email );
- cnt.setFileAs();
-
- if ( bAbEditFirstTime ) {
- abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
- this, "editor" );
- bAbEditFirstTime = FALSE;
- } else {
- abEditor->setEntry( cnt );
- }
- abView()->init( cnt );
- editEntry( NewEntry );
-
-
-
- }
+ if (msg == "editPersonal()") {
+ editPersonal();
+ } else if (msg == "editPersonalAndClose()") {
+ editPersonal();
+ close();
+ } else if ( msg == "addContact(QString,QString)" ) {
+ QDataStream stream(data,IO_ReadOnly);
+ QString name, email;
+ stream >> name >> email;
+
+ OContact cnt;
+ QString fn, mn, ln;
+ parseName( name, &fn, &mn, &ln );
+ // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
+ cnt.setFirstName( fn );
+ cnt.setMiddleName( mn );
+ cnt.setLastName( ln );
+ cnt.insertEmails( email );
+ cnt.setDefaultEmail( email );
+ cnt.setFileAs();
+
+ if ( bAbEditFirstTime ) {
+ abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
+ this, "editor" );
+ bAbEditFirstTime = FALSE;
+ } else {
+ abEditor->setEntry( cnt );
+ }
+ abView()->init( cnt );
+ editEntry( NewEntry );
+
+
+
+ }
#if 0
- else if (msg == "pickAddresses(QCString,QCString,QStringList,...)" ) {
- QDataStream stream(data,IO_ReadOnly);
- QCString ch,m;
- QStringList types;
- stream >> ch >> m >> types;
- AddressPicker picker(abList,this,0,TRUE);
- picker.showMaximized();
- picker.setChoiceNames(types);
- int i=0;
- for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
- QStringList sel;
- stream >> sel;
- picker.setSelection(i++,sel);
- }
- picker.showMaximized();
- picker.exec();
-
- // ###### note: contacts may have been added - save here!
-
- setCentralWidget(abList);
- QCopEnvelope e(ch,m);
- i=0;
- for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
- QStringList sel = picker.selection(i++);
- e << sel;
- }
- }
+ else if (msg == "pickAddresses(QCString,QCString,QStringList,...)" ) {
+ QDataStream stream(data,IO_ReadOnly);
+ QCString ch,m;
+ QStringList types;
+ stream >> ch >> m >> types;
+ AddressPicker picker(abList,this,0,TRUE);
+ picker.showMaximized();
+ picker.setChoiceNames(types);
+ int i=0;
+ for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
+ QStringList sel;
+ stream >> sel;
+ picker.setSelection(i++,sel);
+ }
+ picker.showMaximized();
+ picker.exec();
+
+ // ###### note: contacts may have been added - save here!
+
+ setCentralWidget(abList);
+ QCopEnvelope e(ch,m);
+ i=0;
+ for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
+ QStringList sel = picker.selection(i++);
+ e << sel;
+ }
+ }
#endif
-
+
}
@@ -582,28 +600,28 @@ void AddressbookWindow::editPersonal()
{
- QString filename = addressbookPersonalVCardName();
- Contact me;
- if (QFile::exists(filename))
- me = Contact::readVCard( filename )[0];
- if (bAbEditFirstTime) {
- abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields,
- this, "editor" );
- // don't create a new editor every time
- bAbEditFirstTime = FALSE;
- } else
- abEditor->setEntry( me );
-
- abEditor->setCaption(tr("Edit My Personal Details"));
- abEditor->showMaximized();
-
- // fix the foxus...
- abEditor->setNameFocus();
- if ( abEditor->exec() ) {
- setFocus();
- Contact new_personal = abEditor->entry();
- QString fname = addressbookPersonalVCardName();
- Contact::writeVCard( fname, new_personal );
- abView()->init(new_personal);
- abView()->sync();
- }
- abEditor->setCaption( tr("Edit Address") );
+ QString filename = addressbookPersonalVCardName();
+ OContact me;
+ if (QFile::exists(filename))
+ me = OContact::readVCard( filename )[0];
+ if (bAbEditFirstTime) {
+ abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields,
+ this, "editor" );
+ // don't create a new editor every time
+ bAbEditFirstTime = FALSE;
+ } else
+ abEditor->setEntry( me );
+
+ abEditor->setCaption(tr("Edit My Personal Details"));
+ abEditor->showMaximized();
+
+ // 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") );
}
@@ -612,35 +630,35 @@ void AddressbookWindow::slotPersonalView()
{
- if (!actionPersonal->isOn()) {
- // we just turned it off
- setCaption( tr("Contacts") );
- actionNew->setEnabled(TRUE);
- actionTrash->setEnabled(TRUE);
+ 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);
+ 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);
+ 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);
+ actionFind->setEnabled(FALSE);
#endif
- actionMail->setEnabled(FALSE);
-
- setCaption( tr("Contacts - My Personal Details") );
- QString filename = addressbookPersonalVCardName();
- Contact me;
- if (QFile::exists(filename))
- me = Contact::readVCard( filename )[0];
-
- abView()->init( me );
- abView()->sync();
- listContainer->hide();
- setCentralWidget( abView() );
- mView->show();
- mView->setFocus();
+ 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();
}
@@ -649,33 +667,33 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
{
- Contact 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") );
-
+ 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();
+ abEditor->showMaximized();
#endif
- // fix the foxus...
- abEditor->setNameFocus();
- if ( abEditor->exec() ) {
- setFocus();
- if ( entryMode == NewEntry ) {
- Contact insertEntry = abEditor->entry();
- insertEntry.assignUid();
- abList->addEntry( insertEntry );
- } else {
- Contact replaceEntry = abEditor->entry();
- if ( !replaceEntry.isValidUid() )
- replaceEntry.assignUid();
- abList->replaceCurrentEntry( replaceEntry );
- }
- }
- populateCategories();
- showList();
+ // 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();
}
@@ -684,5 +702,5 @@ void AddressbookWindow::listIsEmpty( bool empty )
{
- if ( !empty ) {
- deleteButton->setEnabled( TRUE );
- }
+ if ( !empty ) {
+ deleteButton->setEnabled( TRUE );
+ }
}
@@ -691,5 +709,5 @@ void AddressbookWindow::reload()
{
- syncing = FALSE;
- abList->clear();
- abList->load( addressbookXMLFilename() );
+ syncing = FALSE;
+ abList->clear();
+ abList->load( addressbookXMLFilename() );
}
@@ -698,4 +716,4 @@ void AddressbookWindow::flush()
{
- syncing = TRUE;
- abList->save( addressbookXMLFilename() );
+ syncing = TRUE;
+ abList->save( addressbookXMLFilename() );
}
@@ -705,27 +723,28 @@ 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
- if ( save() )
- e->accept();
- else
- e->ignore();
+ 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();
}
@@ -734,3 +753,3 @@ void AddressbookWindow::closeEvent( QCloseEvent *e )
Returns TRUE if it is OK to exit
- */
+*/
@@ -738,31 +757,31 @@ bool AddressbookWindow::save()
{
- QString str = addressbookXMLFilename();
- if ( str.isNull() ) {
- 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;
+ QString str = addressbookXMLFilename();
+ if ( str.isNull() ) {
+ 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;
}
@@ -771,16 +790,16 @@ void AddressbookWindow::slotSettings()
{
- AddressSettings frmSettings( this );
+ AddressSettings frmSettings( this );
#if defined(Q_WS_QWS) || defined(_WS_QWS_)
- frmSettings.showMaximized();
+ frmSettings.showMaximized();
#endif
-
- if ( frmSettings.exec() ) {
- allFields.clear();
- orderedFields.clear();
- slOrderedFields.clear();
- initFields();
- if ( abEditor )
- abEditor->loadFields();
- abList->refresh();
- }
+
+ if ( frmSettings.exec() ) {
+ allFields.clear();
+ orderedFields.clear();
+ slOrderedFields.clear();
+ initFields();
+ if ( abEditor )
+ abEditor->loadFields();
+ abList->refresh();
+ }
}
@@ -790,90 +809,89 @@ 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 = Contact::fields();
- QStringList visibleFields = Contact::trfields();
- xmlFields.remove( "Title" );
- visibleFields.remove( tr("Name Title") );
- visibleFields.remove( tr("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( tr("Work") ) || zn.contains( tr("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;
- orderedFields.remove( Qtopia::AddressUid );
- orderedFields.remove( Qtopia::Title );
- orderedFields.remove( Qtopia::Groups );
- orderedFields.remove( Qtopia::AddressCategory );
- orderedFields.remove( Qtopia::FirstName );
- orderedFields.remove( Qtopia::LastName );
- orderedFields.remove( Qtopia::DefaultEmail );
- orderedFields.remove( Qtopia::FileAs );
- orderedFields.remove( Qtopia::Notes );
- orderedFields.remove( Qtopia::Gender );
- slOrderedFields.remove( tr("Name Title") );
- slOrderedFields.remove( tr("First Name") );
- slOrderedFields.remove( tr("Last Name") );
- slOrderedFields.remove( tr("File As") );
- slOrderedFields.remove( tr("Default Email") );
- slOrderedFields.remove( tr("Notes") );
- slOrderedFields.remove( tr("Gender") );
-
- }
+ // 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::trfields();
+ xmlFields.remove( "Title" );
+ visibleFields.remove( tr("Name Title") );
+ visibleFields.remove( tr("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( tr("Work") ) || zn.contains( tr("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;
+ orderedFields.remove( Qtopia::AddressUid );
+ orderedFields.remove( Qtopia::Title );
+ orderedFields.remove( Qtopia::Groups );
+ orderedFields.remove( Qtopia::AddressCategory );
+ orderedFields.remove( Qtopia::FirstName );
+ orderedFields.remove( Qtopia::LastName );
+ orderedFields.remove( Qtopia::DefaultEmail );
+ orderedFields.remove( Qtopia::FileAs );
+ orderedFields.remove( Qtopia::Notes );
+ orderedFields.remove( Qtopia::Gender );
+ slOrderedFields.remove( tr("Name Title") );
+ slOrderedFields.remove( tr("First Name") );
+ slOrderedFields.remove( tr("Last Name") );
+ slOrderedFields.remove( tr("File As") );
+ slOrderedFields.remove( tr("Default Email") );
+ slOrderedFields.remove( tr("Notes") );
+ slOrderedFields.remove( tr("Gender") );
+
+ }
}
@@ -883,8 +901,8 @@ AbLabel *AddressbookWindow::abView()
{
- if ( !mView ) {
- mView = new AbLabel( this, "viewer" );
- mView->init( Contact() );
- connect( mView, SIGNAL( okPressed() ), this, SLOT( slotListView() ) );
- }
- return mView;
+ if ( !mView ) {
+ mView = new AbLabel( this, "viewer" );
+ mView->init( OContact() );
+ connect( mView, SIGNAL( okPressed() ), this, SLOT( slotListView() ) );
+ }
+ return mView;
}
@@ -894,16 +912,16 @@ void AddressbookWindow::slotFind()
#ifndef MAKE_FOR_SHARP_ROM
- if ( centralWidget() == abView() )
- showList();
-
- FindDialog frmFind( "Contacts", this );
- QObject::connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), abList, SLOT(slotDoFind( const QString&,bool,bool,int)));
- QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) );
- QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) );
-
- frmFind.exec();
-
- if ( abList->numSelections() )
- abList->clearSelection();
-
- abList->clearFindRow();
+ if ( centralWidget() == abView() )
+ showList();
+
+ FindDialog frmFind( "Contacts", this );
+ QObject::connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), abList, SLOT(slotDoFind( const QString&,bool,bool,int)));
+ QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) );
+ QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) );
+
+ frmFind.exec();
+
+ if ( abList->numSelections() )
+ abList->clearSelection();
+
+ abList->clearFindRow();
#endif
@@ -913,17 +931,47 @@ void AddressbookWindow::slotSetCategory( int c )
{
- if ( c <= 0 )
- return;
- for ( unsigned int i = 1; i < catMenu->count(); 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 );
- }
+
+ QString cat, book;
+
+ if ( c <= 0 )
+ return;
+
+ // Checkmark Book Menu Item Selected
+ if ( c < 6 )
+ for ( unsigned int i = 1; i < 6; i++ )
+ catMenu->setItemChecked( i, c == (int)i );
+
+ // 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 ) );
}
@@ -931,5 +979,5 @@ void AddressbookWindow::slotSetCategory( int c )
void AddressbookWindow::slotSetLetter( char c ) {
-
- abList->setShowByLetter( c );
-
+
+ abList->setShowByLetter( c );
+
}
@@ -938,22 +986,45 @@ void AddressbookWindow::populateCategories()
{
- catMenu->clear();
-
- int id,
- rememberId;
- id = 1;
- rememberId = 0;
- catMenu->insertItem( tr( "All" ), id++ );
- QStringList categories = abList->categories();
- categories.append( tr( "Unfiled" ) );
- for ( QStringList::Iterator it = categories.begin();
- it != categories.end(); ++it ) {
- catMenu->insertItem( *it, id );
- if ( *it == abList->showCategory() )
- rememberId = id;
- ++id;
- }
- if ( abList->showCategory().isEmpty() )
- slotSetCategory( 1 );
- else
- slotSetCategory( rememberId );
+ catMenu->clear();
+
+ 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();
+ categories.append( tr( "Unfiled" ) );
+ for ( QStringList::Iterator it = categories.begin();
+ it != categories.end(); ++it ) {
+ catMenu->insertItem( *it, id );
+ if ( *it == abList->showCategory() )
+ rememberId = id;
+ ++id;
+ }
+
+ 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 );
+ }
}
+
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 34ca85d..bf36407 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -39,68 +39,69 @@ class AddressbookWindow: public QMainWindow
{
- Q_OBJECT
+ Q_OBJECT
public:
- AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
- ~AddressbookWindow();
+ AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+ ~AddressbookWindow();
protected:
- void resizeEvent( QResizeEvent * e );
- void showList();
- void showView();
- enum EntryMode { NewEntry=0, EditEntry };
- void editPersonal();
- void editEntry( EntryMode );
- void closeEvent( QCloseEvent *e );
- bool save();
+ void resizeEvent( QResizeEvent * e );
+ void showList();
+ void showView();
+ enum EntryMode { NewEntry=0, EditEntry };
+ void editPersonal();
+ void editEntry( EntryMode );
+ void closeEvent( QCloseEvent *e );
+ bool save();
public slots:
- void flush();
- void reload();
- void appMessage(const QCString &, const QByteArray &);
- void setDocument( const QString & );
+ void flush();
+ void reload();
+ void appMessage(const QCString &, const QByteArray &);
+ void setDocument( const QString & );
private slots:
- void importvCard();
- void slotListNew();
- void slotListView();
- void slotListDelete();
- void slotViewBack();
- void slotViewEdit();
- void slotPersonalView();
- void listIsEmpty( bool );
- void slotSettings();
- void writeMail();
- void slotBeam();
- void beamDone( Ir * );
- void slotFind();
- void slotSetCategory( int );
- void slotSetLetter( char );
- void slotUpdateToolbar();
- void slotSetFont(int);
+ void importvCard();
+ void slotListNew();
+ void slotListView();
+ void slotListDelete();
+ void slotViewBack();
+ void slotViewEdit();
+ void slotPersonalView();
+ void listIsEmpty( bool );
+ void slotSettings();
+ void writeMail();
+ void slotBeam();
+ void beamDone( Ir * );
+ void slotFind();
+ void slotSetCategory( int );
+ void slotSetLetter( char );
+ void slotUpdateToolbar();
+ void slotSetFont(int);
+
private:
- void initFields(); // inititialize our fields...
- AbLabel *abView();
- void populateCategories();
+ void initFields(); // inititialize our fields...
+ AbLabel *abView();
+ void populateCategories();
+
+ QPopupMenu *catMenu, *fontMenu;
+ QPEToolBar *listTools;
+ QToolButton *deleteButton;
+ QValueList<int> allFields, orderedFields;
+ QStringList slOrderedFields;
+ enum Panes { paneList=0, paneView, paneEdit };
+ ContactEditor *abEditor;
+ AbLabel *mView;
+ LetterPicker *pLabel;
+ AbTable *abList;
+ QWidget *listContainer;
- QPopupMenu *catMenu, *fontMenu;
- QPEToolBar *listTools;
- QToolButton *deleteButton;
- QValueList<int> allFields,
- orderedFields;
- QStringList slOrderedFields;
- enum Panes { paneList=0, paneView, paneEdit };
- ContactEditor *abEditor;
- AbLabel *mView;
- LetterPicker *pLabel;
- AbTable *abList;
- QWidget *listContainer;
+ QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail;
- QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam,
- *actionPersonal, *actionMail;
+ bool bAbEditFirstTime;
+ int viewMargin;
- bool bAbEditFirstTime;
- int viewMargin;
+ bool syncing;
+ QFont *defaultFont;
+ int startFontSize;
- bool syncing;
- QFont *defaultFont;
- int startFontSize;
+ bool isLoading;
};
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index ae86ed0..fd7f009 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -51,3 +51,3 @@ void parseEmailTo( const QString &strDefaultEmail,
-ContactEditor::ContactEditor( const Contact &entry,
+ContactEditor::ContactEditor( const OContact &entry,
const QValueList<int> *newOrderedValues,
@@ -1294,3 +1294,3 @@ void ContactEditor::cleanupFields() {
-void ContactEditor::setEntry( const Contact &entry ) {
+void ContactEditor::setEntry( const OContact &entry ) {
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index 4f3b56e..8ed8553 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -23,3 +23,3 @@
-#include <qpe/contact.h>
+#include <opie/ocontact.h>
@@ -54,3 +54,3 @@ class ContactEditor : public QDialog {
public:
- ContactEditor( const Contact &entry,
+ ContactEditor( const OContact &entry,
const QValueList<int> *newOrderedValues,
@@ -63,3 +63,3 @@ class ContactEditor : public QDialog {
void setNameFocus();
- Contact entry() const { return ent; }
+ OContact entry() const { return ent; }
@@ -68,3 +68,3 @@ class ContactEditor : public QDialog {
void slotName();
- void setEntry(const Contact &entry);
+ void setEntry(const OContact &entry);
@@ -103,3 +103,3 @@ class ContactEditor : public QDialog {
- Contact ent;
+ OContact ent;