search fixes

6 files changed, 18 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index a425311..2fd63e7 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,18 +1,27 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 1.9.17 ************
+
+KO/Pi:
+Fixed that tooltips were not updated after moving an item in agenda view.
+
+KA/Pi:
+All fields search does now actually search all the (possible) fields, 
+not only those listed in the contact list.
+
 ********** VERSION 1.9.16 ************
 
 KO/Pi:
 Fixed search dialog size on Z 6000 (480x640 display).
 Added setting to hide/show time in agenda items.
 Added setting to hide not running todos in todo view.
 Added columns for start date/time in todo view.
 Replaced the solid half-hour lines in agenda view by dot lines.
 Added possibility of printing the What's Next View on the desktop
 (i.e. Windows and Linux).
 Fixed a crash in KO/Pi when starting KO/Pi with What's Next view.
 Added tooltips in month view.(Tooltips only available on desktop)
 
 Fixed a strange problem in KO/Pi alarm applet.
 Did not find the actual problem, 
 such that now Qtopia reboots again if deinstalling the alarm applet.
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 8062354..424d52a 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -115,32 +115,36 @@ KABC::Addressee::List KAddressBookView::addressees()
 }
 
 void KAddressBookView::initGUI()
 {
   // Create the layout
   QVBoxLayout *layout = new QVBoxLayout( this );
 
   // Add the view widget
   mViewWidget = new QWidget( this );
   layout->addWidget( mViewWidget );
 }
 
 KABC::Field::List KAddressBookView::fields() const
 {
   return mFieldList;
 }
+KABC::Field::List KAddressBookView::allFields() const
+{
+  return KABC::Field::allFields(); 
+}
 
 void KAddressBookView::setFilter( const Filter &filter )
 {
   mFilter = filter;
 }
 
 KAddressBookView::DefaultFilterType KAddressBookView::defaultFilterType() const
 {
   return mDefaultFilterType;
 }
 
 const QString &KAddressBookView::defaultFilterName() const
 {
   return mDefaultFilterName;
 }
 
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 2e91cbc..8646136 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -110,32 +110,34 @@ class KAddressBookView : public QWidget
       view.
      */
     virtual QString type() const = 0;
 
     /**
       Returns a list of the fields that should be displayed. The list
       is composed of the fields proper names (ie: Home Address), so
       the view may need to translate them in order to get the
       value from the addressee.
     
       This list is generated from the config file, so it is advisable to call
       this method whenever a readConfig() is called in order to get the newest
       list of fields.
      */
     KABC::Field::List fields() const;
     
+    KABC::Field::List allFields() const; 
+    
     /**
       Sets the active filter. This filter will be used for filtering
       the list of addressees to display. The view will <b>not</b>
       automatically refresh itself, so in most cases you will want to call
       KAddressBookView::refresh() after this method.
      */
     void setFilter( const Filter& );
     
     /**
       @return The default filter type selection. If the selection
       is SpecificFilter, the name of the filter can be retrieved with
       defaultFilterName()
      */
     DefaultFilterType defaultFilterType() const;
     
     /**
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 2c9b162..2d7ed08 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -282,33 +282,33 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it;  
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
 #if QT_VERSION >= 300
             if (re.search(field->value( *it ).lower()) != -1)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                   new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                               addressBook(), *it, mCardView);
 
         }
     } else {
-        KABC::Field::List fieldList = fields();
+        KABC::Field::List fieldList = allFields();
         KABC::Field::List::ConstIterator fieldIt;
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 300
                 if (re.search((*fieldIt)->value( *it ).lower()) != -1)
 #else
                     if (re.match((*fieldIt)->value( *it ).lower()) != -1)
 #endif   
                         { 
                            new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                               addressBook(), *it, mCardView);
                             continue;
                         }
             }
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 0ce56c8..faeda06 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -269,33 +269,33 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it;  
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
 #if QT_VERSION >= 300
             if (re.search(field->value( *it ).lower()) != -1)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                     mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                  
 
         }
     } else {
-        KABC::Field::List fieldList = fields();
+        KABC::Field::List fieldList = allFields();
         KABC::Field::List::ConstIterator fieldIt;
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 300
                 if (re.search((*fieldIt)->value( *it ).lower()) != -1)
 #else
                     if (re.match((*fieldIt)->value( *it ).lower()) != -1)
 #endif   
                         { 
                             mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                             continue;
                         }
             }
         }
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 89053c2..61703ee 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -150,33 +150,33 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
         return; 
     KABC::Addressee::List addresseeList = addressees();
     KABC::Addressee::List::Iterator it; 
     if (  field ) {
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
 #if QT_VERSION >= 300
             if (re.search(field->value( *it ).lower()) != -1)
 #else
                 if (re.match(field->value( *it ).lower()) != -1)
 #endif
                     ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
 
         }
     } else {
-        KABC::Field::List fieldList = fields();
+        KABC::Field::List fieldList = allFields();
         KABC::Field::List::ConstIterator fieldIt;
         for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
             if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                 continue;
             for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 300
                 if (re.search((*fieldIt)->value( *it ).lower()) != -1)
 #else
                     if (re.match((*fieldIt)->value( *it ).lower()) != -1)
 #endif   
                         { 
                             ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
                             break;
                         }
             }
         }
@@ -245,36 +245,32 @@ void KAddressBookTableView::readConfig(KConfig *config)
   QFont f( font() );
   if ( config->readBoolEntry( "EnableCustomFonts", false ) )
   {
     mListView->setFont( config->readFontEntry( "TextFont", &f) );
     f.setBold( true );
     //US    mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
     mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) );
   }
   else
   {
     mListView->setFont( f );
     f.setBold( true );
     //US    mListView->setHeaderFont( f );
     mListView->header()->setFont( f );
   }  
 
-
-
-
-
   // Set the list view options
   mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground",
                                                                  true));
   mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false));
   mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true));
 
   if (config->readBoolEntry("Background", false))
     mListView->setBackgroundPixmap(config->readEntry("BackgroundName"));
 
   // Restore the layout of the listview
   mListView->restoreLayout(config, config->group());
 }
 
 void KAddressBookTableView::refresh(QString uid)
 {
   // For now just repopulate. In reality this method should