summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/TODO18
-rw-r--r--core/pim/addressbook/abtable.cpp3
-rw-r--r--core/pim/addressbook/abtable.h2
-rw-r--r--core/pim/addressbook/addressbook.cpp2
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,4 +1,4 @@
-Stuff todo:
+Stuff todo until OPIE 1.0 :
Urgent:
@@ -6,26 +6,28 @@ Urgent:
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
@@ -634,7 +634,7 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
// 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;
@@ -656,6 +656,7 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive,
AbTableItem *ati;
QRegExp r( findString );
r.setCaseSensitive( caseSensitive );
+ r.setWildcard( !useRegExp );
rows = numRows();
static bool wrapAround = true;
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
@@ -99,7 +99,7 @@ public:
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 );
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
@@ -944,7 +944,7 @@ void AddressbookWindow::slotFindNext()
// 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() )