| -rw-r--r-- | kabc/distributionlist.cpp | 32 | ||||
| -rw-r--r-- | kabc/distributionlisteditor.cpp | 1 |
2 files changed, 20 insertions, 13 deletions
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp index 45b9dda..0735aba 100644 --- a/kabc/distributionlist.cpp +++ b/kabc/distributionlist.cpp @@ -5,109 +5,111 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kdebug.h> #include "distributionlist.h" using namespace KABC; DistributionList::DistributionList( DistributionListManager *manager, const QString &name ) : mManager( manager ), mName( name ) { mManager->insert( this ); } DistributionList::~DistributionList() { mManager->remove( this ); } void DistributionList::setName( const QString &name ) { mName = name; } QString DistributionList::name() const { return mName; } void DistributionList::insertEntry( const Addressee &a, const QString &email ) { - Entry e( a, email ); - + QString em = email; + if (em.isNull() ) + em = a.preferredEmail(); + Entry e( a, em ); QValueList<Entry>::Iterator it; for( it = mEntries.begin(); it != mEntries.end(); ++it ) { if ( (*it).addressee.uid() == a.uid() ) { /** We have to check if both email addresses contains no data, a simple 'email1 == email2' wont work here */ - if ( ( (*it).email.isNull() && email.isEmpty() ) || - ( (*it).email.isEmpty() && email.isNull() ) || - ( (*it).email == email ) ) { - *it = e; + if ( ( (*it).email.isNull() && em.isEmpty() ) || + ( (*it).email.isEmpty() && em.isNull() ) || + ( (*it).email == em ) ) { + //*it = e; return; } } } mEntries.append( e ); } void DistributionList::removeEntry( const Addressee &a, const QString &email ) { QValueList<Entry>::Iterator it; for( it = mEntries.begin(); it != mEntries.end(); ++it ) { if ( (*it).addressee.uid() == a.uid() && (*it).email == email ) { mEntries.remove( it ); return; } } } QStringList DistributionList::emails() const { QStringList emails; Entry::List::ConstIterator it; for( it = mEntries.begin(); it != mEntries.end(); ++it ) { Addressee a = (*it).addressee; QString email = (*it).email.isEmpty() ? a.fullEmail() : a.fullEmail( (*it).email ); if ( !email.isEmpty() ) { emails.append( email ); } } return emails; } DistributionList::Entry::List DistributionList::entries() const { return mEntries; } DistributionListManager::DistributionListManager( AddressBook *ab ) : mAddressBook( ab ) { } DistributionListManager::~DistributionListManager() @@ -133,157 +135,161 @@ void DistributionListManager::insert( DistributionList *l ) break; } } mLists.append( l ); } void DistributionListManager::remove( DistributionList *l ) { DistributionList *list; for( list = mLists.first(); list; list = mLists.next() ) { if ( list->name() == l->name() ) { mLists.remove( list ); return; } } } QStringList DistributionListManager::listNames() { QStringList names; DistributionList *list; for( list = mLists.first(); list; list = mLists.next() ) { names.append( list->name() ); } return names; } bool DistributionListManager::load() { KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); /*US QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() ); if ( entryMap.isEmpty() ) { kdDebug(5700) << "No distlists for '" << mAddressBook->identifier() << "'" << endl; return false; } cfg.setGroup( mAddressBook->identifier() ); QMap<QString,QString>::ConstIterator it; for( it = entryMap.begin(); it != entryMap.end(); ++it ) { QString name = it.key(); */ cfg.setGroup( mAddressBook->identifier() ); //US we work in microkde with a list of distributionlists - QStringList distlists = cfg.readListEntry( "Lists" ); + QStringList distlists = cfg.readListEntry( "__Lists__List__" ); if ( distlists.isEmpty() ) { - kdDebug(5700) << "No distlists for '" << mAddressBook->identifier() << "'" << endl; + qDebug("no distlist for AB "); return false; } QStringList::ConstIterator it; for( it = distlists.begin(); it != distlists.end(); ++it ) { QString name = *it; QStringList value = cfg.readListEntry( name ); - kdDebug(5700) << "DLM::load(): " << name << ": " << value.join(",") << endl; + DistributionList *list = new DistributionList( this, name ); QStringList::ConstIterator it2 = value.begin(); while( it2 != value.end() ) { QString id = *it2++; QString email = *it2; - kdDebug(5700) << "----- Entry " << id << endl; + Addressee a = mAddressBook->findByUid( id ); if ( !a.isEmpty() ) { list->insertEntry( a, email ); } if ( it2 == value.end() ) break; ++it2; } } return true; } bool DistributionListManager::save() { - kdDebug(5700) << "DistListManager::save()" << endl; + KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); cfg.deleteGroup( mAddressBook->identifier() ); cfg.setGroup( mAddressBook->identifier() ); DistributionList *list; for( list = mLists.first(); list; list = mLists.next() ) { kdDebug(5700) << " Saving '" << list->name() << "'" << endl; QStringList value; DistributionList::Entry::List entries = list->entries(); DistributionList::Entry::List::ConstIterator it; for( it = entries.begin(); it != entries.end(); ++it ) { value.append( (*it).addressee.uid() ); - value.append( (*it).email ); + if (( *it).email.isEmpty()) + value.append( " " ); + else + value.append( (*it).email ); + // qDebug("uid *%s* email *%s* ", (*it).addressee.uid().latin1(),(*it).email.latin1() ); } cfg.writeEntry( list->name(), value ); } //US for microKDE we have not yet sophisticated methods to load maps. // Because of that we store also a list of all distributionlists. QStringList namelist; for( list = mLists.first(); list; list = mLists.next() ) { namelist.append( list->name() ); } - cfg.writeEntry( "Lists", namelist ); + cfg.writeEntry( "__Lists__List__", namelist ); cfg.sync(); return true; } DistributionListWatcher* DistributionListWatcher::mSelf = 0; DistributionListWatcher::DistributionListWatcher() : QObject( 0, "DistributionListWatcher" ) { /*US mDirWatch = new KDirWatch; mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) ); mDirWatch->startScan(); */ } DistributionListWatcher::~DistributionListWatcher() { /*US delete mDirWatch; mDirWatch = 0; */ } DistributionListWatcher *DistributionListWatcher::self() { if ( !mSelf ) mSelf = new DistributionListWatcher(); return mSelf; } //US #include "distributionlist.moc" diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp index 8b485d8..bad1efc 100644 --- a/kabc/distributionlisteditor.cpp +++ b/kabc/distributionlisteditor.cpp @@ -25,96 +25,97 @@ #include <qinputdialog.h> #include <qbuttongroup.h> #include <qradiobutton.h> #include <klocale.h> #include <kdebug.h> #include "addressbook.h" #include "addresseedialog.h" #include "distributionlist.h" #include "distributionlisteditor.h" //US #include "distributionlisteditor.moc" using namespace KABC; EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString ¤t, QWidget *parent ) : KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok, parent ) { QFrame *topFrame = plainPage(); QBoxLayout *topLayout = new QVBoxLayout( topFrame ); mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"), topFrame ); topLayout->addWidget( mButtonGroup ); QStringList::ConstIterator it; for( it = emails.begin(); it != emails.end(); ++it ) { QRadioButton *button = new QRadioButton( *it, mButtonGroup ); if ( (*it) == current ) { button->setDown( true ); } } } QString EmailSelectDialog::selected() { QButton *button = mButtonGroup->selected(); if ( button ) return button->text(); return QString::null; } QString EmailSelectDialog::getEmail( const QStringList &emails, const QString ¤t, QWidget *parent ) { + EmailSelectDialog *dlg = new EmailSelectDialog( emails, current, parent ); dlg->exec(); QString result = dlg->selected(); delete dlg; return result; } class EditEntryItem : public QListViewItem { public: EditEntryItem( QListView *parent, const Addressee &addressee, const QString &email=QString::null ) : QListViewItem( parent ), mAddressee( addressee ), mEmail( email ) { setText( 0, addressee.realName() ); if( email.isEmpty() ) { setText( 1, addressee.preferredEmail() ); setText( 2, i18n("Yes") ); } else { setText( 1, email ); setText( 2, i18n("No") ); } } Addressee addressee() const { return mAddressee; } QString email() const { return mEmail; } private: Addressee mAddressee; QString mEmail; }; DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidget *parent) : QWidget( parent ), mAddressBook( addressBook ) { |