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
@@ -82,4 +82,10 @@ IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
            SLOT( announceFieldChanged() ) );
 
+
+
+  connect( mSearchText, SIGNAL( scrollUP() ), this, SIGNAL( scrollUP() ));
+  connect( mSearchText, SIGNAL( scrollDOWN() ), this, SIGNAL( scrollDOWN() ));
+
+
   setFocusProxy( mSearchText );
 }
@@ -97,5 +103,5 @@ void IncSearchWidget::announceDoSearch2()
 }
 
-void IncSearchWidget::announceDoSearch()
+void IncSearchWidget::announceDoSearch() 
 {
 
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index 5c95438..1546a51 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -49,4 +49,6 @@ class IncSearchWidget : public QWidget
 
   signals:
+    void scrollUP();
+    void scrollDOWN();
     /**
       This signal is emmited whenever the text in the input
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index cd261f6..f2d4cd6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1674,5 +1674,6 @@ void KABCore::initGUI()
   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 );
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 17106e8..c134e96 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -66,4 +66,6 @@ class KAddressBookView : public QWidget
     virtual QStringList selectedUids() = 0;
     virtual void doSearch( const QString&  s ,KABC::Field *field ) = 0;
+    virtual void scrollUP() = 0;
+    virtual void scrollDOWN() = 0;
 
     /**
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index c6baeac..f4fb08b 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -86,5 +86,14 @@ ViewManager::~ViewManager()
   mViewFactoryDict.clear();
 }
-
+void ViewManager::scrollUP()
+{
+    if ( mActiveView ) 
+        mActiveView->scrollUP();
+}
+void ViewManager::scrollDOWN()
+{
+    if ( mActiveView ) 
+        mActiveView->scrollDOWN();
+}
 void ViewManager::restoreSettings()
 {
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index 6def6b6..585f4e9 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -67,4 +67,6 @@ class ViewManager : public QWidget
 
   public slots:
+    void scrollUP();
+    void scrollDOWN();
 
 //US    void setSelected( const QString &uid = QString::null, bool selected = true );
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
@@ -28,4 +28,5 @@
 #include <qstringlist.h>
 #include <qregexp.h>
+#include <qapplication.h>
 
 #include <kabc/addressbook.h>
@@ -170,4 +171,15 @@ 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)
 {
@@ -291,6 +303,10 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
     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()
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
@@ -61,4 +61,6 @@ class KAddressBookCardView : public KAddressBookView
     virtual void readConfig(KConfig *config);
     virtual void writeConfig(KConfig *);
+    virtual void scrollUP();
+    virtual void scrollDOWN();
     
   public 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
@@ -42,4 +42,5 @@
 #include <qlayout.h>
 #include <qregexp.h>
+#include <qapplication.h>
 #include <kglobal.h>
 /*US transfered to the headerfile
@@ -212,4 +213,14 @@ 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)
 {
@@ -281,4 +292,10 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
     }
     mIconView->arrangeItemsInGrid( true ); 
+    if ( mIconView->firstItem() ) {
+        mIconView->setCurrentItem ( mIconView->firstItem() );
+        mIconView->setSelected ( mIconView->firstItem() , true );
+    }
+    else
+        emit selected(QString::null);
 }
 QStringList KAddressBookIconView::selectedUids()
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
@@ -62,4 +62,6 @@ class KAddressBookIconView : public KAddressBookView
     
     virtual void readConfig(KConfig *config);
+    virtual void scrollUP();
+    virtual void scrollDOWN();
     
   public slots:
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
@@ -52,5 +52,14 @@ 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()
 {
@@ -160,5 +169,10 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
     // 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);
    
 }
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
@@ -64,4 +64,6 @@ friend class ContactListView;
     virtual QString type() const { return "Table"; }
     void doSearch( const QString&  s ,KABC::Field *field );
+    virtual void scrollUP();
+    virtual void scrollDOWN();
 
   public slots: