Connected configuration to search engine

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,2 +1,2 @@
-Stuff todo:
+Stuff todo until OPIE 1.0 :
 
@@ -8,9 +8,10 @@ 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
 
@@ -18,4 +19,2 @@ Less important:
 
-- Find widget should be replaced by something like 
-  qpdf has.
 -  The picker (alphabetical sort widget) should be
@@ -26,3 +25,3 @@ Less important:
 
-Should be Fixed (not absolute sure, need validation):
+Should be Fixed (not absolute sure, need further validation):
 - "Nonenglish" translation bug has to be fixed.
@@ -31 +30,4 @@ 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
@@ -636,3 +636,3 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 
-void AbTable::slotDoFind( const QString &findString, bool caseSensitive,
+void AbTable::slotDoFind( const QString &findString, bool caseSensitive, bool useRegExp,
                           bool backwards, QString cat /* int category */ )
@@ -658,2 +658,3 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive,
 	r.setCaseSensitive( caseSensitive );
+	r.setWildcard( !useRegExp );
 	rows = numRows();
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
@@ -101,3 +101,3 @@ public:
 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 );
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
@@ -946,3 +946,3 @@ void AddressbookWindow::slotFindNext()
 
-	abList->slotDoFind( searchEdit->text(), false, false);
+	abList->slotDoFind( searchEdit->text(), caseSensitive, useRegExp, false);