| -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 @@ -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 @@ -613,70 +613,71 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ) // And draw the rectangles (transformed as needed) QArray<QRect> r = reg.rects(); for (unsigned int i=0; i<r.count(); i++) p->fillRect( r[i], colorGroup().brush( QColorGroup::Base ) ); } #endif #endif // int AbTable::rowHeight( int ) const // { // return 18; // } // int AbTable::rowPos( int row ) const // { // return 18*row; // } // 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() ) category = mCat.id( "Contacts", showCat ); else{ category = mCat.id("Contacts", cat ); } qWarning ("Found in Category %d", category); if ( currFindRow < -1 ) currFindRow = - 1; 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) ); if ( contactCompare( contactList[ati], r, category ) ) break; } } else { for ( row = currFindRow - 1; row > -1; row-- ) { ati = static_cast<AbTableItem*>( item(row, 0) ); if ( contactCompare( contactList[ati], r, category ) ) break; } } if ( row >= rows || row < 0 ) { if ( row < 0 ) currFindRow = rows; else currFindRow = -1; if ( wrapAround ) emit signalWrapAround(); 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 @@ -78,49 +78,49 @@ public: void loadFields(); void refresh(); bool save(); void load(); void reload(); // addresspicker mode void setChoiceNames( const QStringList& list); QStringList choiceNames() const; void setChoiceSelection(int index, const QStringList& list); QStringList choiceSelection(int index) const; void setShowCategory( const QString &b, const QString &c ); void setShowByLetter( char c ); QString showCategory() const; QStringList categories(); void resizeRows(); 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(); protected: virtual void keyPressEvent( QKeyEvent *e ); // int rowHeight( int ) const; // int rowPos( int row ) const; // virtual int rowAt( int pos ) const; protected slots: void moveTo( char ); virtual void columnClicked( int col ); void itemClicked(int,int col); void rowHeightChanged( int row ); private: void loadFile( const QString &strFile, bool journalFile ); void fitColumns(); 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 @@ -923,49 +923,49 @@ AbLabel *AddressbookWindow::abView() connect( mView, SIGNAL( okPressed() ), this, SLOT( slotListView() ) ); } return mView; } void AddressbookWindow::slotFindOpen() { searchBar->show(); searchEdit->setFocus(); } void AddressbookWindow::slotFindClose() { searchBar->hide(); abList->setFocus(); } void AddressbookWindow::slotFindNext() { if ( centralWidget() == abView() ) 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(); } void AddressbookWindow::slotFind() { abList->clearFindRow(); slotFindNext(); } void AddressbookWindow::slotSetCategory( int c ) { QString cat, book; if ( c <= 0 ) return; // Set checkItem for selected one for ( unsigned int i = 1; i < catMenu->count(); i++ ) |