fixes in contact selection

3 files changed, 18 insertions, 4 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 0ebd853..c4557ef 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,28 +1,30 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 
 ********** VERSION 2.1.8 ************
 
 KO/Pi:
 Added info about the completion state of a todo in the ListView/Searchdialog.
 If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
 Fixed some updating problems when changing the filter.
 
 KA/Pi:
 In the addressee selection dialog now the formatted name is shown, if not empty.
+Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
+Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
 
 Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
 Fixed the sorting for size in the file selector on the Z.
 
 Changed the color selection dialog on the Zaurus to a more user friendly version.
 
 ********** VERSION 2.1.7 ************
 
 KO/Pi:
 Fixed several problems in the new Resource handling.
 Added more options to the search dialog. 
 Fixed a problem in the Month view.  
 Added more options to the dialog when setting a todo to stopped.     
 
 Fixed two small problems in KO/Pi Alarm applet.
 
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index e89584d..3e7b72c 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -31,32 +31,33 @@
 #include <kglobalsettings.h>
 
 #include "stdaddressbook.h"
 
 #include "addresseedialog.h"
 #include "KDGanttMinimizeSplitter.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() );
+    setText( Category, addressee.categories().join(";") );
 }
 
 QString AddresseeItem::key( int column, bool ) const
 {
 
   if (column == Email) {
     QString value = text(Email);
     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, No, parent ), mMultiple( multiple )
@@ -67,65 +68,75 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   QBoxLayout *topLayout = new QHBoxLayout( topWidget );
 
 
   KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
 
   QWidget *listWidget = new QWidget( mMiniSplitter );
 
   QBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
   //topLayout->addLayout( listLayout );
 
   mAddresseeList = new KListView( listWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
+  mAddresseeList->addColumn( i18n("Category") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
   connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
            SLOT( slotOk() ) );
 
-  mAddresseeEdit = new QLineEdit( listWidget );
+  QHBox* searchBox = new QHBox ( listWidget );
+  mAddresseeEdit = new QLineEdit(  searchBox );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
+  QPushButton *searchButton = new QPushButton( i18n("Search!"),  searchBox ); 
+  connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) );
  
-  listLayout->addWidget( mAddresseeEdit );
+  listLayout->addWidget( searchBox );
 
   if ( mMultiple ) {
       //QBoxLayout *selectedLayout = new QVBoxLayout;
       //topLayout->addLayout( selectedLayout );
       //topLayout->setSpacing( spacingHint() );
 
     QVBox *selectedGroup = new QVBox( mMiniSplitter );
     new QLabel ( i18n("Selected:"), selectedGroup );
     //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 * ) ),
+    //connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
+    //       SLOT( removeSelected() ) );
+    connect( mSelectedList, SIGNAL( clicked( QListViewItem * ) ),
+             SLOT( removeSelected() ) );
+    connect( mSelectedList, SIGNAL( returnPressed( QListViewItem *) ),
              SLOT( removeSelected() ) );
 
+#if 0
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
+#endif
     connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
              SLOT( addSelected( QListViewItem * ) ) );
     connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
              SLOT( selectNextItem( QListViewItem * ) ) );
 
   }
 
   mAddressBook = StdAddressBook::self( true );
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
 #if 0
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
 #endif
   loadAddressBook();  
   QValueList<int> splitterSize; 
@@ -151,32 +162,33 @@ void AddresseeDialog::loadAddressBook()
           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 ) { 
       if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue; 
       QString name = (*it).realName();
       name += (*it).preferredEmail();
+      name += (*it).categories().join(";");
 #if QT_VERSION >= 0x030000
       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 );
 }
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 99c74bd..6fab62d 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -30,33 +30,33 @@
 #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 };
+    enum columns { Name = 0, Email = 1,Category = 2 };
 
     /**
       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.