4 files changed, 14 insertions, 11 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 0accd87..4daa2a8 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -1,31 +1,33 @@
-Stuff todo:
+Stuff todo until OPIE 1.0 :
 
 Urgent:
 
 - Font menu is invisible using german translation
 
 Important:
 
-- Finishing of new View functions (List, Phonebook...)
-- Reload if contacts were changed externally
+- Picker: Activated letter schould be more visible
 - "What's this" should be added
-- The names of the countries are sorted by there english names, only..
-  Even if they are translated.. :S
 - Store last settings of combo-boxes
 - Mail-Icon is missing
+- Finishing of new View functions (List, Phonebook...)
+- The names of the countries are sorted by there english names, only..
+  Even if they are translated.. :S
+- Reload if contacts were changed externally
 
 Less important:
 
-- Find widget should be replaced by something like 
-  qpdf has.
 -  The picker (alphabetical sort widget) should be
    placed verticaly or horizontally (configurable)
 - Use advanced database functions in abtable to decrease
   memory footprint and to make everything more easy !
 	(abtable should store Iterator for selected Category)
 
-Should be Fixed (not absolute sure, need validation):
+Should be Fixed (not absolute sure, need further validation):
 - "Nonenglish" translation bug has to be fixed.
 
 Fixed:
 - Syncing: abtable not reloaded after sync.
+- Find widget should be replaced by something like 
+  qpdf has.
+- Adding a configuration dialog
\ No newline at end of file
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 97f4a8f..d4dcf7b 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -631,13 +631,13 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 
 // int AbTable::rowAt( int pos ) const
 // {
 //     return QMIN( pos/18, numRows()-1 );
 // }
 
-void AbTable::slotDoFind( const QString &findString, bool caseSensitive,
+void AbTable::slotDoFind( const QString &findString, bool caseSensitive, bool useRegExp,
                           bool backwards, QString cat /* int category */ )
 {
 	int category = 0;
 
 	// Use the current Category if nothing else selected
 	if ( cat.isEmpty() )
@@ -653,12 +653,13 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive,
 
 	clearSelection( TRUE );
 	int rows, row;
 	AbTableItem *ati;
 	QRegExp r( findString );
 	r.setCaseSensitive( caseSensitive );
+	r.setWildcard( !useRegExp );
 	rows = numRows();
 	static bool wrapAround = true;
 	
 	if ( !backwards ) {
 		for ( row = currFindRow + 1; row < rows; row++ ) {
 			ati = static_cast<AbTableItem*>( item(row, 0) );
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index 1039e66..b445874 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -96,13 +96,13 @@ public:
     void show();
     void setPaintingEnabled( bool e );
 
     QString showBook() const;
 
 public slots:
-    void slotDoFind( const QString &str, bool caseSensitive, bool backwards,
+    void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, bool backwards,
                      QString category = QString::null );
 signals:
     void empty( bool );
     void details();
     void signalNotFound();
     void signalWrapAround();
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 84e66fb..f7e4c95 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -941,13 +941,13 @@ void AddressbookWindow::slotFindNext()
 		showList();
 
 	// Maybe we should react on Wraparound and notfound ?
 // 	QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) );
 // 	QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) );
 
-	abList->slotDoFind( searchEdit->text(), false, false);
+	abList->slotDoFind( searchEdit->text(), caseSensitive, useRegExp, false);
 	
 	
 	if ( abList->numSelections() )
 		abList->clearSelection();
 
 }