added better searching in kapi

12 files changed, 82 insertions, 7 deletions

diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 3533427..78eaf65 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -76,32 +76,38 @@ IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
   connect( mFieldCombo, SIGNAL( activated( const QString& ) ),
            SLOT( announceDoSearch2() ) );
 
   connect( mSearchText, SIGNAL( returnPressed() ),
            SLOT( announceDoSearch() ) );
   connect( mFieldCombo, SIGNAL( activated( const QString& ) ),
            SLOT( announceFieldChanged() ) );
 
+
+
+  connect( mSearchText, SIGNAL( scrollUP() ), this, SIGNAL( scrollUP() ));
+  connect( mSearchText, SIGNAL( scrollDOWN() ), this, SIGNAL( scrollDOWN() ));
+
+
   setFocusProxy( mSearchText );
 }
 
 IncSearchWidget::~IncSearchWidget()
 {
  
 }
 void IncSearchWidget::announceDoSearch2()
 {
     if ( KABPrefs::instance()->mSearchWithReturn )
         return;
     emit doSearch( mSearchText->text() );
     //qDebug("emit dosreach ");
 }
 
-void IncSearchWidget::announceDoSearch()
+void IncSearchWidget::announceDoSearch() 
 {
 
   emit doSearch( mSearchText->text() );
   // qDebug("emit dosreach ");
 }
 
 void IncSearchWidget::announceFieldChanged()
 {
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index 5c95438..1546a51 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -43,16 +43,18 @@ class IncSearchWidget : public QWidget
     KABC::Field::List fields() const;
 
     KABC::Field *currentField() const;
 
     void setCurrentItem( int pos );
     int currentItem() const;
 
   signals:
+    void scrollUP();
+    void scrollDOWN();
     /**
       This signal is emmited whenever the text in the input
       widget is changed. You can get the sorting field by
       @ref currentField.
      */
     void doSearch( const QString& text );
 
     /**
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index cd261f6..f2d4cd6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1668,17 +1668,18 @@ void KABCore::initGUI()
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
-
+  connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) );
+  connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 17106e8..c134e96 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -60,16 +60,18 @@ class KAddressBookView : public QWidget
     virtual ~KAddressBookView();
 
     /**
       Must be overloaded in subclasses. Should return a list of
       all the uids of selected contacts.
      */
     virtual QStringList selectedUids() = 0;
     virtual void doSearch( const QString&  s ,KABC::Field *field ) = 0;
+    virtual void scrollUP() = 0;
+    virtual void scrollDOWN() = 0;
 
     /**
       Called whenever this view should read the config. This can be used
       as a sign that the config has changed, therefore the view should
       assume the worst and rebuild itself if necessary. For example,
       in a table view this method may be called when the user adds or
       removes columns from the view.
 
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index c6baeac..f4fb08b 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -80,17 +80,26 @@ ViewManager::ViewManager( KABCore *core, QWidget *parent, const char *name )
   createViewFactories();
 }
 
 ViewManager::~ViewManager()
 {
   unloadViews();
   mViewFactoryDict.clear();
 }
-
+void ViewManager::scrollUP()
+{
+    if ( mActiveView ) 
+        mActiveView->scrollUP();
+}
+void ViewManager::scrollDOWN()
+{
+    if ( mActiveView ) 
+        mActiveView->scrollDOWN();
+}
 void ViewManager::restoreSettings()
 {
   mViewNameList = KABPrefs::instance()->mViewNames;
   QString activeViewName = KABPrefs::instance()->mCurrentView;
 
   mActionSelectView->setItems( mViewNameList );
 
   // Filter
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 6def6b6..585f4e9 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -61,16 +61,18 @@ class ViewManager : public QWidget
     KSelectAction * getFilterAction() { return mActionSelectFilter; }
 
     QStringList selectedUids() const;
     QStringList selectedEmails() const;
     KABC::Addressee::List selectedAddressees() const;
     void setListSelected(QStringList);
 
   public slots:
+    void scrollUP();
+    void scrollDOWN();
 
 //US    void setSelected( const QString &uid = QString::null, bool selected = true );
     void setSelected( const QString &uid, bool);
 //US added another method with no parameter, since my moc compiler does not support default parameters.    
     void setSelected();
     
 
     
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 4babf67..a7bf6c9 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -22,16 +22,17 @@
 */
 
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qiconview.h>
 #include <qlayout.h>
 #include <qstringlist.h>
 #include <qregexp.h>
+#include <qapplication.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include "kabprefs.h"
@@ -164,16 +165,27 @@ KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab,
     connect(mCardView, SIGNAL(startAddresseeDrag()),
             this, SIGNAL(startDrag()));
 }
 
 KAddressBookCardView::~KAddressBookCardView()
 {
 }
 
+void KAddressBookCardView::scrollUP()
+{
+    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
+    QApplication::postEvent( mCardView, ev ); 
+
+}
+void KAddressBookCardView::scrollDOWN()
+{
+    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
+    QApplication::postEvent( mCardView, ev ); 
+}
 void KAddressBookCardView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig(config);
   
   // costum colors?
   if ( config->readBoolEntry( "EnableCustomColors", false ) )
   {
     QPalette p( mCardView->palette() );
@@ -285,18 +297,22 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
                                               addressBook(), *it, mCardView);
                             continue;
                         }
             }
         }
     }
     mCardView->viewport()->setUpdatesEnabled( true );
     mCardView->viewport()->update();
-    // by default nothing is selected
-    emit selected(QString::null);
+    if ( mCardView->firstItem() ) {
+        mCardView->setCurrentItem ( mCardView->firstItem() );
+        mCardView->setSelected ( mCardView->firstItem() , true );
+    }
+    else
+        emit selected(QString::null);
 }
 QStringList KAddressBookCardView::selectedUids()
 {
     QStringList uidList;
     CardViewItem *item;
     AddresseeCardViewItem *aItem;
 
     for (item = mCardView->firstItem(); item; item = item->nextItem())
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index b8efb01..45a9781 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -55,16 +55,18 @@ class KAddressBookCardView : public KAddressBookView
                           const char *name = 0 );
     virtual ~KAddressBookCardView();
     void doSearch( const QString&  s,KABC::Field *field  );
     virtual QStringList selectedUids();
     virtual QString type() const { return "Card"; }
     
     virtual void readConfig(KConfig *config);
     virtual void writeConfig(KConfig *);
+    virtual void scrollUP();
+    virtual void scrollDOWN();
     
   public slots:
     void refresh(QString uid = QString::null);
     void setSelected(QString uid/*US = QString::null*/, bool selected/*US = true*/);
 //US added an additional method without parameter 
     void setSelected();
   
   protected slots:
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index fdc0db9..f4c68b8 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -36,16 +36,17 @@
 #endif //KAB_EMBEDDED
 
 #include <kabc/addressbook.h>
 #include "kabprefs.h"
 #include "viewmanager.h"
 #include "kaddressbookiconview.h"
 #include <qlayout.h>
 #include <qregexp.h>
+#include <qapplication.h>
 #include <kglobal.h>
 /*US transfered to the headerfile
 class IconViewFactory : public ViewFactory
 {
   public:
     KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new KAddressBookIconView( ab, parent, name );
@@ -206,16 +207,26 @@ KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab,
     connect(mIconView, SIGNAL(startAddresseeDrag()),
             this, SIGNAL(startDrag()));
 }
 
 KAddressBookIconView::~KAddressBookIconView()
 {
 }
 
+void KAddressBookIconView::scrollUP()
+{
+    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
+    QApplication::postEvent( mIconView, ev ); 
+}
+void KAddressBookIconView::scrollDOWN()
+{
+    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
+    QApplication::postEvent( mIconView, ev );
+}
 void KAddressBookIconView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig(config);
     
 //US method executed is part of KIconView
 //US  disconnect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US             this, SLOT(addresseeExecuted(QIconViewItem *)));
   disconnect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
@@ -275,16 +286,22 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
                         { 
                             mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                             continue;
                         }
             }
         }
     }
     mIconView->arrangeItemsInGrid( true ); 
+    if ( mIconView->firstItem() ) {
+        mIconView->setCurrentItem ( mIconView->firstItem() );
+        mIconView->setSelected ( mIconView->firstItem() , true );
+    }
+    else
+        emit selected(QString::null);
 }
 QStringList KAddressBookIconView::selectedUids()
 {
     QStringList uidList;
     QIconViewItem *item;
     AddresseeIconViewItem *aItem;
     
     for (item = mIconView->firstItem(); item; item = item->nextItem())
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 963ee7c..acfcd71 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -56,16 +56,18 @@ class KAddressBookIconView : public KAddressBookView
                           const char *name = 0 );
     virtual ~KAddressBookIconView();
     
     virtual QStringList selectedUids();
     virtual QString type() const { return "Icon"; }
     void doSearch( const QString&  s ,KABC::Field *field );
     
     virtual void readConfig(KConfig *config);
+    virtual void scrollUP();
+    virtual void scrollDOWN();
     
   public slots:
     void refresh(QString uid = QString::null);
 #ifndef KAB_EMBEDDED
 //MOC_SKIP_BEGIN
     void setSelected(QString uid = QString::null, bool selected = true);
 //MOC_SKIP_END
 #else //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index fbfddba..2412170 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -46,17 +46,26 @@ KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
 
   // The list view will be created when the config is read.
   mListView = 0;
 }
 
 KAddressBookTableView::~KAddressBookTableView()
 {
 }
-
+void KAddressBookTableView::scrollUP()
+{
+    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
+    QApplication::postEvent( mListView, ev );  
+}
+void KAddressBookTableView::scrollDOWN()
+{
+    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
+    QApplication::postEvent( mListView, ev );
+}
 void KAddressBookTableView::reconstructListView()
 {
     if (mListView)
     {
         disconnect(mListView, SIGNAL(selectionChanged()),
                    this, SLOT(addresseeSelected()));
         disconnect(mListView, SIGNAL(executed(QListViewItem*)),
                    this, SLOT(addresseeExecuted(QListViewItem*)));
@@ -154,17 +163,22 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
                             break;
                         }
             }
         }
     }
     // Sometimes the background pixmap gets messed up when we add lots
     // of items.
     mListView->repaint();
-    emit selected(QString::null);
+    if ( mListView->firstChild() ) {
+        mListView->setCurrentItem ( mListView->firstChild() );
+        mListView->setSelected ( mListView->firstChild(), true );
+    }
+    else
+        emit selected(QString::null);
    
 }
 void KAddressBookTableView::writeConfig(KConfig *config)
 {
   KAddressBookView::writeConfig(config);
 
   mListView->saveLayout(config, config->group());
 }
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index ecfe7a1..865f8d5 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -58,16 +58,18 @@ friend class ContactListView;
 
     virtual void refresh(QString uid = QString::null);
     virtual QStringList selectedUids();
     virtual void setSelected(QString uid = QString::null, bool selected = false);
     virtual void readConfig(KConfig *config);
     virtual void writeConfig(KConfig *config);
     virtual QString type() const { return "Table"; }
     void doSearch( const QString&  s ,KABC::Field *field );
+    virtual void scrollUP();
+    virtual void scrollDOWN();
 
   public slots:
     virtual void reconstructListView();
 
   protected slots:
     /** Called whenever the user selects an addressee in the list view.
     */
     void addresseeSelected();