author | eilers <eilers> | 2002-10-20 12:24:37 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-20 12:24:37 (UTC) |
commit | 4b27ac49b4027ffd59d2606f1aceea313446aede (patch) (unidiff) | |
tree | c03c578b727fbb95ffd0e2f2b8a2b6275ca781d5 /core/pim | |
parent | 82689364fd558ccd28253961204e6b3eb9e32b03 (diff) | |
download | opie-4b27ac49b4027ffd59d2606f1aceea313446aede.zip opie-4b27ac49b4027ffd59d2606f1aceea313446aede.tar.gz opie-4b27ac49b4027ffd59d2606f1aceea313446aede.tar.bz2 |
Connected configuration to search engine
-rw-r--r-- | core/pim/addressbook/TODO | 18 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 3 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.h | 2 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 2 |
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 @@ | |||
1 | Stuff todo: | 1 | Stuff todo until OPIE 1.0 : |
2 | 2 | ||
3 | Urgent: | 3 | Urgent: |
4 | 4 | ||
5 | - Font menu is invisible using german translation | 5 | - Font menu is invisible using german translation |
6 | 6 | ||
7 | Important: | 7 | Important: |
8 | 8 | ||
9 | - Finishing of new View functions (List, Phonebook...) | 9 | - Picker: Activated letter schould be more visible |
10 | - Reload if contacts were changed externally | ||
11 | - "What's this" should be added | 10 | - "What's this" should be added |
12 | - The names of the countries are sorted by there english names, only.. | ||
13 | Even if they are translated.. :S | ||
14 | - Store last settings of combo-boxes | 11 | - Store last settings of combo-boxes |
15 | - Mail-Icon is missing | 12 | - Mail-Icon is missing |
13 | - Finishing of new View functions (List, Phonebook...) | ||
14 | - The names of the countries are sorted by there english names, only.. | ||
15 | Even if they are translated.. :S | ||
16 | - Reload if contacts were changed externally | ||
16 | 17 | ||
17 | Less important: | 18 | Less important: |
18 | 19 | ||
19 | - Find widget should be replaced by something like | ||
20 | qpdf has. | ||
21 | - The picker (alphabetical sort widget) should be | 20 | - The picker (alphabetical sort widget) should be |
22 | placed verticaly or horizontally (configurable) | 21 | placed verticaly or horizontally (configurable) |
23 | - Use advanced database functions in abtable to decrease | 22 | - Use advanced database functions in abtable to decrease |
24 | memory footprint and to make everything more easy ! | 23 | memory footprint and to make everything more easy ! |
25 | (abtable should store Iterator for selected Category) | 24 | (abtable should store Iterator for selected Category) |
26 | 25 | ||
27 | Should be Fixed (not absolute sure, need validation): | 26 | Should be Fixed (not absolute sure, need further validation): |
28 | - "Nonenglish" translation bug has to be fixed. | 27 | - "Nonenglish" translation bug has to be fixed. |
29 | 28 | ||
30 | Fixed: | 29 | Fixed: |
31 | - Syncing: abtable not reloaded after sync. | 30 | - Syncing: abtable not reloaded after sync. |
31 | - Find widget should be replaced by something like | ||
32 | qpdf has. | ||
33 | - 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 ) | |||
631 | 631 | ||
632 | // int AbTable::rowAt( int pos ) const | 632 | // int AbTable::rowAt( int pos ) const |
633 | // { | 633 | // { |
634 | // return QMIN( pos/18, numRows()-1 ); | 634 | // return QMIN( pos/18, numRows()-1 ); |
635 | // } | 635 | // } |
636 | 636 | ||
637 | void AbTable::slotDoFind( const QString &findString, bool caseSensitive, | 637 | void AbTable::slotDoFind( const QString &findString, bool caseSensitive, bool useRegExp, |
638 | bool backwards, QString cat /* int category */ ) | 638 | bool backwards, QString cat /* int category */ ) |
639 | { | 639 | { |
640 | int category = 0; | 640 | int category = 0; |
641 | 641 | ||
642 | // Use the current Category if nothing else selected | 642 | // Use the current Category if nothing else selected |
643 | if ( cat.isEmpty() ) | 643 | if ( cat.isEmpty() ) |
@@ -653,12 +653,13 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive, | |||
653 | 653 | ||
654 | clearSelection( TRUE ); | 654 | clearSelection( TRUE ); |
655 | int rows, row; | 655 | int rows, row; |
656 | AbTableItem *ati; | 656 | AbTableItem *ati; |
657 | QRegExp r( findString ); | 657 | QRegExp r( findString ); |
658 | r.setCaseSensitive( caseSensitive ); | 658 | r.setCaseSensitive( caseSensitive ); |
659 | r.setWildcard( !useRegExp ); | ||
659 | rows = numRows(); | 660 | rows = numRows(); |
660 | static bool wrapAround = true; | 661 | static bool wrapAround = true; |
661 | 662 | ||
662 | if ( !backwards ) { | 663 | if ( !backwards ) { |
663 | for ( row = currFindRow + 1; row < rows; row++ ) { | 664 | for ( row = currFindRow + 1; row < rows; row++ ) { |
664 | ati = static_cast<AbTableItem*>( item(row, 0) ); | 665 | 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: | |||
96 | void show(); | 96 | void show(); |
97 | void setPaintingEnabled( bool e ); | 97 | void setPaintingEnabled( bool e ); |
98 | 98 | ||
99 | QString showBook() const; | 99 | QString showBook() const; |
100 | 100 | ||
101 | public slots: | 101 | public slots: |
102 | void slotDoFind( const QString &str, bool caseSensitive, bool backwards, | 102 | void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, bool backwards, |
103 | QString category = QString::null ); | 103 | QString category = QString::null ); |
104 | signals: | 104 | signals: |
105 | void empty( bool ); | 105 | void empty( bool ); |
106 | void details(); | 106 | void details(); |
107 | void signalNotFound(); | 107 | void signalNotFound(); |
108 | void signalWrapAround(); | 108 | 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() | |||
941 | showList(); | 941 | showList(); |
942 | 942 | ||
943 | // Maybe we should react on Wraparound and notfound ? | 943 | // Maybe we should react on Wraparound and notfound ? |
944 | // QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) ); | 944 | // QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) ); |
945 | // QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) ); | 945 | // QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) ); |
946 | 946 | ||
947 | abList->slotDoFind( searchEdit->text(), false, false); | 947 | abList->slotDoFind( searchEdit->text(), caseSensitive, useRegExp, false); |
948 | 948 | ||
949 | 949 | ||
950 | if ( abList->numSelections() ) | 950 | if ( abList->numSelections() ) |
951 | abList->clearSelection(); | 951 | abList->clearSelection(); |
952 | 952 | ||
953 | } | 953 | } |