Made addressee select dialog useable

2 files changed, 52 insertions, 26 deletions

diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 033e857..cb6c12f 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -1,264 +1,289 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     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 <qlayout.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qapplication.h>
 #include <qregexp.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
 #include "stdaddressbook.h"
 
 #include "addresseedialog.h"
 //#include "addresseedialog.moc"
 
 using namespace KABC;
 
 AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
   QListViewItem( parent ),
   mAddressee( addressee )
 {
-  setText( Name, addressee.realName() );
-  setText( Email, addressee.preferredEmail() );
+    QString name = addressee.familyName()+", "+ addressee.givenName();
+    if ( name.length() == 2 )
+        name = addressee.realName();
+    setText( Name,name);
+    setText( Email, addressee.preferredEmail() );
 }
 
 QString AddresseeItem::key( int column, bool ) const
 {
-    /* LR
+
   if (column == Email) {
     QString value = text(Email);
-    QRegExp emailRe("<\\S*>");
-    int match = emailRe.search(value);
-    if (match > -1)
-      value = value.mid(match + 1, emailRe.matchedLength() - 2);
-
-    return value.lower();
+    int val = value.findRev("@");
+    return value.mid( val) + value.left( val );
   }
-    */
   return text(column).lower();
 }
 
 AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
                Ok|Cancel, Ok, parent ), mMultiple( multiple )
 {
   QWidget *topWidget = plainPage();
 
   QBoxLayout *topLayout = new QHBoxLayout( topWidget );
   QBoxLayout *listLayout = new QVBoxLayout;
   topLayout->addLayout( listLayout );
 
   mAddresseeList = new KListView( topWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
   connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
            SLOT( slotOk() ) );
-  connect( mAddresseeList, SIGNAL( selectionChanged( QListViewItem * ) ),
-           SLOT( updateEdit( QListViewItem * ) ) );
 
-  mAddresseeEdit = new KLineEdit( topWidget );
-  //mAddresseeEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
-  // connect( mAddresseeEdit->completionObject(), SIGNAL( match( const QString & ) ),
-  //       SLOT( selectItem( const QString & ) ) );
+  mAddresseeEdit = new QLineEdit( topWidget );
+  connect( mAddresseeEdit, SIGNAL( returnPressed() ),
+           SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
-  //mAddresseeEdit->completionObject()->setIgnoreCase( true );
+ 
   listLayout->addWidget( mAddresseeEdit );
 
-  //setInitialSize( QSize( 450, 300 ) );
-
   if ( mMultiple ) {
     QBoxLayout *selectedLayout = new QVBoxLayout;
     topLayout->addLayout( selectedLayout );
     topLayout->setSpacing( spacingHint() );
 
     QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"),
                                               topWidget );
     selectedLayout->addWidget( selectedGroup );
 
     mSelectedList = new KListView( selectedGroup );
     mSelectedList->addColumn( i18n("Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
     connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
              SLOT( removeSelected() ) );
 
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
     connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
              SLOT( addSelected( QListViewItem * ) ) );
+    connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
+             SLOT( selectNextItem( QListViewItem * ) ) );
 
-    // setInitialSize( QSize( 650, 350 ) );
   }
 
   mAddressBook = StdAddressBook::self( true );
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
 
   loadAddressBook();
 }
 
 AddresseeDialog::~AddresseeDialog()
 {
 }
 
 void AddresseeDialog::loadAddressBook()
 {
   mAddresseeList->clear();
   mItemDict.clear();
+  if ( mAddresseeEdit->text().isEmpty() ) {
+      AddressBook::Iterator it;
+      for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
+          new AddresseeItem( mAddresseeList, (*it) );
+      }
+      return;
+  }
   //mAddresseeEdit->completionObject()->clear();
+  QRegExp re;
+  re.setWildcard(true); // most people understand these better.
+  re.setCaseSensitive(false);
+  re.setPattern( "*"+ mAddresseeEdit->text() + "*");
 
   AddressBook::Iterator it;
   for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
-    AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
-    addCompletionItem( (*it).realName(), item );
-    addCompletionItem( (*it).preferredEmail(), item );
+      QString name = (*it).familyName()+", "+ (*it).givenName();
+      if ( name.length() == 2 )
+          name = (*it).realName();
+      name += (*it).preferredEmail();
+#if QT_VERSION >= 300
+      if (re.search(name)) != -1)
+#else
+      if (re.match(name) != -1)
+#endif
+          AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
   }
 }
 
 void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
 {
   if ( str.isEmpty() ) return;
 
   mItemDict.insert( str, item );
   //mAddresseeEdit->completionObject()->addItem( str );
 }
 
 void AddresseeDialog::selectItem( const QString &str )
 {
   if ( str.isEmpty() ) return;
 
   QListViewItem *item = mItemDict.find( str );
   if ( item ) {
     mAddresseeList->blockSignals( true );
     mAddresseeList->setSelected( item, true );
     mAddresseeList->ensureItemVisible( item );
     mAddresseeList->blockSignals( false );
   }
 }
 
 void AddresseeDialog::updateEdit( QListViewItem *item )
 {
   mAddresseeEdit->setText( item->text( 0 ) );
   mAddresseeEdit->setSelection( 0, item->text( 0 ).length() );
 }
 
+void AddresseeDialog::selectNextItem( QListViewItem *item )
+{
+    addSelected( item );
+    QListViewItem *next = item->nextSibling();
+    if ( next ) {
+        next->setSelected( true );
+        item->setSelected( false );
+        mAddresseeList->setCurrentItem( next );
+    }
+}
 void AddresseeDialog::addSelected( QListViewItem *item )
 {
     AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
 
   Addressee a = addrItem->addressee();
 
   QListViewItem *selectedItem = mSelectedDict.find( a.uid() );
   if ( !selectedItem ) {
     selectedItem = new AddresseeItem( mSelectedList, a );
     mSelectedDict.insert( a.uid(), selectedItem );
   }
+ 
 }
 
 void AddresseeDialog::removeSelected()
 {
   QListViewItem *item = mSelectedList->selectedItem();
   AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
-
+  QListViewItem *next =  item->nextSibling();
   mSelectedDict.remove( addrItem->addressee().uid() );
   delete addrItem;
+  if ( next )
+      next->setSelected( true );
 }
 
 Addressee AddresseeDialog::addressee()
 {
   AddresseeItem *aItem = 0;
   
   if ( mMultiple )
       aItem = (AddresseeItem *)( mSelectedList->firstChild() );
   else
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
  
   if (aItem) return aItem->addressee();
   return Addressee();
 }
 
 Addressee::List AddresseeDialog::addressees()
 {
   Addressee::List al;
   AddresseeItem *aItem = 0;
 
   if ( mMultiple ) {
     QListViewItem *item = mSelectedList->firstChild();
     while( item ) {
         aItem = (AddresseeItem *)( item );
       if ( aItem ) al.append( aItem->addressee() );
       item = item->nextSibling();
     }
   }
   else
   {
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
     if (aItem) al.append( aItem->addressee() );
   }
 
   return al;
 }
 
 Addressee AddresseeDialog::getAddressee( QWidget *parent )
 {
   AddresseeDialog *dlg = new AddresseeDialog( parent );
   Addressee addressee;
   int result = dlg->exec();
 
   if ( result == QDialog::Accepted ) {
     addressee =  dlg->addressee();
   }
 
   delete dlg;
   return addressee;
 }
 
 Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
 {
   AddresseeDialog *dlg = new AddresseeDialog( parent, true );
   Addressee::List addressees;
   if ( QApplication::desktop()->width() <= 640 )
       dlg->showMaximized();
   int result = dlg->exec();
   if ( result == QDialog::Accepted ) {
     addressees =  dlg->addressees();
   }
 
   delete dlg;
   return addressees;
 }
 
 void AddresseeDialog::addressBookChanged()
 {
   loadAddressBook();
 }
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 74e7871..99c74bd 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -1,160 +1,161 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     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.
 */
 
 #ifndef KABC_ADDRESSEEDIALOG_H
 #define KABC_ADDRESSEEDIALOG_H
 
 #include <qdict.h>
 
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <klistview.h>
 
 #include "addressbook.h"
 
 namespace KABC {
 
 /**
   @short Special ListViewItem, that is used by the AddresseeDialog.
 */
 class AddresseeItem : public QListViewItem
 {
   public:
 
     /**
       Type of column
       @li @p Name -  Name in Addressee
       @li @p Email - Email in Addressee
     */
     enum columns { Name = 0, Email = 1 };
 
     /**
       Constructor.
 
       @param parent    The parent listview.
       @param addressee The associated addressee.
     */
     AddresseeItem( QListView *parent, const Addressee &addressee );
 
     /**
       Returns the addressee.
     */
     Addressee addressee() const { return mAddressee; }
 
     /**
       Method used by QListView to sort the items.
     */
     virtual QString key( int column, bool ascending ) const;
 
   private:
     Addressee mAddressee;
 };
 
 /**
   @short Dialog for selecting address book entries.
  
   This class provides a dialog for selecting entries from the standard KDE
   address book. Use the getAddressee() function to open a modal dialog,
   returning an address book entry.
  
   In the dialog you can select an entry from the list with the mouse or type in
   the first letters of the name or email address you are searching for. The
   entry matching best is automatically selected. Use double click, pressing
   return or pressing the ok button to return the selected addressee to the
   application.
 */
 class AddresseeDialog : public KDialogBase
 {
     Q_OBJECT
 
   public:
     /**
       Construct addressbook entry select dialog.
      
       @param parent parent widget
     */
     AddresseeDialog( QWidget *parent=0, bool multiple=false );
 
     /**
       Destructor.
     */
     virtual ~AddresseeDialog();
 
     /**
       Return the address chosen.
      
       If it is a multiple select, this will return only the first address chosen
     */
     Addressee addressee();
 
     /**
       Return the list of addresses chosen
     */
     Addressee::List addressees();
 
     /**
       Select a single address book entry.
      
       Open addressee select dialog and return the entry selected by the user.
       If the user doesn't select an entry or presses cancel, the returned
       addressee is empty.
     */
     static Addressee getAddressee( QWidget *parent );
 
     /**
       Select multiple address book entries.
       
       Open addressee select dialog and return the entries selected by the user.
       If the user doesn't select an entry or presses cancel, the returned
       addressee list is empty.
     */
     static Addressee::List getAddressees( QWidget *parent );
 
   private slots:
     void selectItem( const QString & );
+    void selectNextItem( QListViewItem *item );
     void updateEdit( QListViewItem *item );
     void addSelected( QListViewItem *item );
     void removeSelected();
+    void loadAddressBook();
 
   protected slots:
     void addressBookChanged();
 
   private:
-    void loadAddressBook();
     void addCompletionItem( const QString &str, QListViewItem *item );
 
     bool mMultiple;
 
     KListView *mAddresseeList;
-    KLineEdit *mAddresseeEdit;
+    QLineEdit *mAddresseeEdit;
 
     KListView *mSelectedList;
 
     AddressBook *mAddressBook;
 
     QDict<QListViewItem> mItemDict;
     QDict<QListViewItem> mSelectedDict;
 
     class AddresseeDialogPrivate;
     AddresseeDialogPrivate *d;
 };
 
 }
 #endif