From cfb97af8f45087e58d4b82689df22191bd657c34 Mon Sep 17 00:00:00 2001 From: eilers Date: Sat, 30 Aug 2003 15:32:34 +0000 Subject: Speed optimization fix: Startup and usability improved if a lot of contacts are stored. Left speed bootleneck is the xml file.. --- diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp index 6d8de91..1914f71 100644 --- a/core/pim/addressbook/ablabel.cpp +++ b/core/pim/addressbook/ablabel.cpp @@ -71,10 +71,13 @@ OContact AbLabel::currentEntry() bool AbLabel::selectContact( int UID ) { - for ( m_itCurContact = m_viewList.begin(); m_itCurContact != m_viewList.end(); ++m_itCurContact){ - if ( (*m_itCurContact).uid() == UID ) + for ( int r = 0; r < m_viewList.count(); ++r ) { + if ( m_viewList.uidAt( r ) == UID ){ + m_itCurContact.setCurrent( r ); break; + } } + sync(); return true; diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index a2617fa..4705c78 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp @@ -44,6 +44,8 @@ #include //toupper() for key hack +#if 0 + /*! \class AbTableItem abtable.h @@ -112,6 +114,8 @@ void AbPickItem::setContentFromEditor( QWidget *w ) QTableItem::setContentFromEditor( w ); } +#endif + /*! \class AbTable abtable.h @@ -135,7 +139,7 @@ AbTable::AbTable( const QValueList order, QWidget *parent, const char *name connect( this, SIGNAL(clicked(int,int,int,const QPoint &)), this, SLOT(itemClicked(int,int)) ); - contactList.clear(); + // contactList.clear(); // qWarning("C'tor end"); } @@ -158,7 +162,7 @@ void AbTable::init() void AbTable::setContacts( const OContactAccess::List& viewList ) { - // qWarning("AbTable::setContacts()"); + qWarning("AbTable::setContacts()"); clear(); m_viewList = viewList; @@ -168,13 +172,13 @@ void AbTable::setContacts( const OContactAccess::List& viewList ) OContactAccess::List::Iterator it; setNumRows( m_viewList.count() ); - int row = 0; - for ( it = m_viewList.begin(); it != m_viewList.end(); ++it ) - insertIntoTable( *it, row++ ); +// int row = 0; +// for ( it = m_viewList.begin(); it != m_viewList.end(); ++it ) +// insertIntoTable( *it, row++ ); - setSorting( true ); +// setSorting( true ); - resort(); +// resort(); updateVisible(); @@ -190,23 +194,22 @@ void AbTable::setOrderedList( const QValueList ordered ) bool AbTable::selectContact( int UID ) { - // qWarning( "AbTable::selectContact( %d )", UID ); + qWarning( "AbTable::selectContact( %d )", UID ); int rows = numRows(); - AbTableItem *abi; OContact* foundContact = 0l; bool found = false; setPaintingEnabled( FALSE ); + qWarning( "search start" ); for ( int r = 0; r < rows; ++r ) { - abi = static_cast( item(r, 0) ); - foundContact = &contactList[abi]; - if ( foundContact -> uid() == UID ){ + if ( m_viewList.uidAt( r ) == UID ){ ensureCellVisible( r, 0 ); setCurrentCell( r, 0 ); found = true; break; } } + qWarning( "search end" ); if ( !found ){ ensureCellVisible( 0,0 ); @@ -218,9 +221,10 @@ bool AbTable::selectContact( int UID ) return true; } +#if 0 void AbTable::insertIntoTable( const OContact& cnt, int row ) { - // qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row ); + qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row ); QString strName; ContactItem contactItem; @@ -240,7 +244,7 @@ void AbTable::insertIntoTable( const OContact& cnt, int row ) // setItem( row, 2, new AbPickItem( this ) ); } - +#endif void AbTable::columnClicked( int col ) @@ -263,7 +267,8 @@ void AbTable::columnClicked( int col ) void AbTable::resort() { - // qWarning( "void AbTable::resort()" ); + qWarning( "void AbTable::resort() NOT POSSIBLE !!" ); +#if 0 setPaintingEnabled( FALSE ); if ( sorting() ) { if ( lastSortCol == -1 ) @@ -273,19 +278,12 @@ void AbTable::resort() updateVisible(); } setPaintingEnabled( TRUE ); +#endif } OContact AbTable::currentEntry() -{ - // qWarning( "OContact AbTable::currentEntry()" ); - OContact cnt; - AbTableItem *abItem; - abItem = static_cast(item( currentRow(), 0 )); - if ( abItem ) { - cnt = contactList[abItem]; - //cnt = contactList[currentRow()]; - } - return cnt; +{ + return m_viewList[currentRow()]; } int AbTable::currentEntry_UID() @@ -295,8 +293,8 @@ int AbTable::currentEntry_UID() void AbTable::clear() { - // qWarning( "void AbTable::clear()" ); - contactList.clear(); + qWarning( "void AbTable::clear()" ); + // contactList.clear(); setPaintingEnabled( FALSE ); for ( int r = 0; r < numRows(); ++r ) { @@ -313,7 +311,9 @@ void AbTable::clear() // Refresh updates column 2 if the contactsettings changed void AbTable::refresh() { - // qWarning( "void AbTable::refresh()" ); + qWarning( "void AbTable::refresh() NOT IMPLEMENTED !!" ); + +#if 0 int rows = numRows(); AbTableItem *abi; ContactItem contactItem; @@ -333,6 +333,8 @@ void AbTable::refresh() } resort(); setPaintingEnabled( TRUE ); + +#endif } void AbTable::keyPressEvent( QKeyEvent *e ) @@ -365,8 +367,9 @@ void AbTable::keyPressEvent( QKeyEvent *e ) void AbTable::moveTo( char c ) { - qWarning( "void AbTable::moveTo( char c )" ); + qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" ); +#if 0 int rows = numRows(); QString value; AbTableItem *abi; @@ -394,9 +397,12 @@ void AbTable::moveTo( char c ) } } setCurrentCell( r, currentColumn() ); -} +#endif +} +#if 0 +// Useless.. Nobody uses it .. (se) QString AbTable::findContactName( const OContact &entry ) { // We use the fileAs, then company, defaultEmail @@ -410,7 +416,7 @@ QString AbTable::findContactName( const OContact &entry ) } return str; } - +#endif void AbTable::resizeRows() { @@ -506,6 +512,7 @@ void AbTable::show() QTable::show(); } +#if 0 void AbTable::setChoiceNames( const QStringList& list) { choicenames = list; @@ -520,6 +527,7 @@ void AbTable::setChoiceNames( const QStringList& list) } fitColumns(); } +#endif void AbTable::itemClicked(int,int col) { @@ -532,11 +540,13 @@ void AbTable::itemClicked(int,int col) } } +#if 0 QStringList AbTable::choiceNames() const { return choicenames; } +#endif void AbTable::setChoiceSelection( const QValueList& list ) { intFields = list; @@ -560,8 +570,6 @@ QStringList AbTable::choiceSelection(int /*index*/) const } - - void AbTable::updateVisible() { // qWarning("void AbTable::updateVisible()"); @@ -630,6 +638,10 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) p->save(); + //qWarning( "Paint row: %d", row ); + + OContact act_contact = m_viewList[row]; + // Paint alternating background bars if ( (row % 2 ) == 0 ) { p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); @@ -647,17 +659,32 @@ void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) int x = 0; int y = ( cr.height() - 14 ) / 2; - QPixmap pic = pixmap( row, col ); - if ( !pic.isNull() ) - { - p->drawPixmap( x + marg, y, pixmap( row, col ) ); - p->drawText( x + marg + pixmap( row, col ).width() + 4,2 + fm.ascent(), text( row, col ) ); - } - else - { - p->drawText( x + marg,2 + fm.ascent(), text( row, col ) ); - } + QString nameText = act_contact.fileAs(); + + switch( col ){ + case 0: + p->drawText( x + marg,2 + fm.ascent(), nameText ); + break; + case 1:{ + + ContactItem contactItem = findContactContact( act_contact, 0 ); + QPixmap contactPic = contactItem.icon; /* pixmap( row, col ); */ + QString contactText = contactItem.value; + + if ( !contactPic.isNull() ) + { + p->drawPixmap( x + marg, y, contactPic ); + p->drawText( x + marg + contactPic.width() + + 4,2 + fm.ascent(), contactText ); + } + else + { + p->drawText( x + marg,2 + fm.ascent(), contactText ); + } + } + break; + } p->restore(); } diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h index 0f7bc29..b9ebe27 100644 --- a/core/pim/addressbook/abtable.h +++ b/core/pim/addressbook/abtable.h @@ -32,6 +32,7 @@ #include #include +#if 0 class AbTableItem : public QTableItem { public: @@ -47,6 +48,8 @@ private: QString sortKey; }; +#endif + // This is a simple container, storing all contact // information class ContactItem @@ -56,6 +59,7 @@ class ContactItem QString value; }; +#if 0 class AbPickItem : public QTableItem { public: @@ -68,6 +72,8 @@ private: QGuardedPtr cb; }; +#endif + class AbTable : public QTable { Q_OBJECT @@ -91,7 +97,7 @@ public: // Get the UID of the current selected Entry int currentEntry_UID(); - QString findContactName( const OContact &entry ); + // QString findContactName( const OContact &entry ); void init(); void clear(); @@ -103,8 +109,8 @@ public: void paintCell(QPainter* p, int row, int col, const QRect&, bool ); // addresspicker mode (What's that ? se) - void setChoiceNames( const QStringList& list); - QStringList choiceNames() const; + // void setChoiceNames( const QStringList& list); + // QStringList choiceNames() const; void setChoiceSelection( const QValueList& list ); QStringList choiceSelection(int index) const; @@ -129,7 +135,7 @@ protected slots: void rowHeightChanged( int row ); private: - void insertIntoTable( const OContact &cnt, int row ); + // void insertIntoTable( const OContact &cnt, int row ); ContactItem findContactContact( const OContact &entry, int row ); void fitColumns(); void resizeRows(); @@ -139,7 +145,7 @@ private: int lastSortCol; bool asc; - QMap contactList; + // QMap contactList; QValueList intFields; QStringList choicenames; bool enablePainting; diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 477f85b..6cbd556 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp @@ -51,6 +51,7 @@ AbView::AbView ( QWidget* parent, const QValueList& ordered ): m_abTable( 0l ), m_orderedFields( ordered ) { + qWarning("AbView::c'tor"); // Load default database and handle syncing myself.. ! m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ), mCat.load( categoryFileName() ); @@ -97,28 +98,28 @@ AbView::~AbView() void AbView::setView( Views view ) { - // qWarning("AbView::setView( Views view )"); + qWarning("AbView::setView( Views view )"); m_curr_View = view; load(); } void AbView::addEntry( const OContact &newContact ) { - // qWarning("abview:AddContact"); + qWarning("abview:AddContact"); m_contactdb->add ( newContact ); load(); } void AbView::removeEntry( const int UID ) { - // qWarning("abview:RemoveContact"); + qWarning("abview:RemoveContact"); m_contactdb->remove( UID ); load(); } void AbView::replaceEntry( const OContact &contact ) { - // qWarning("abview:ReplaceContact"); + qWarning("abview:ReplaceContact"); m_contactdb->replace( contact ); load(); @@ -149,7 +150,7 @@ bool AbView::save() void AbView::load() { - // qWarning("abView:Load data"); + qWarning("abView:Load data"); // Letter Search is stopped at this place emit signalClearLetterPicker(); @@ -159,7 +160,8 @@ void AbView::load() m_list = m_contactdb->allRecords(); else{ m_list = m_contactdb->sorted( true, 0, 0, 0 ); - clearForCategory(); + if ( m_curr_category != -1 ) + clearForCategory(); } qWarning ("Number of contacts: %d", m_list.count()); @@ -170,7 +172,7 @@ void AbView::load() void AbView::reload() { - // qWarning( "void AbView::reload()" ); + qWarning( "void AbView::reload()" ); m_contactdb->reload(); load(); @@ -183,7 +185,7 @@ void AbView::clear() void AbView::setShowByCategory( const QString& cat ) { - // qWarning("AbView::setShowCategory( const QString& cat )"); + qWarning("AbView::setShowCategory( const QString& cat )"); int intCat = 0; @@ -207,11 +209,10 @@ void AbView::setShowByCategory( const QString& cat ) void AbView::setShowToView( Views view ) { - // qWarning("void AbView::setShowToView( View %d )", view); - - // qWarning ("Change the View (Category is: %d)", m_curr_category); + qWarning("void AbView::setShowToView( View %d )", view); if ( m_curr_View != view ){ + qWarning ("Change the View (Category is: %d)", m_curr_category); m_prev_View = m_curr_View; m_curr_View = view; @@ -250,7 +251,8 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) return; } m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase ); - clearForCategory(); + if ( m_curr_category != -1 ) + clearForCategory(); m_curr_Contact = 0; } updateView( true ); @@ -274,7 +276,7 @@ QString AbView::showCategory() const void AbView::showPersonal( bool personal ) { - // qWarning ("void AbView::showPersonal( %d )", personal); + qWarning ("void AbView::showPersonal( %d )", personal); if ( personal ){ @@ -362,7 +364,8 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, // Now remove all contacts with wrong category (if any selected) // This algorithm is a litte bit ineffective, but // we will not have a lot of matching entries.. - clearForCategory(); + if ( m_curr_category != -1 ) + clearForCategory(); // Now show all found entries updateView( true ); diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 03c96c8..0ba024e 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -248,7 +248,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) ); - m_abView->load(); + // m_abView->load(); // Already done by c'tor . // Letter Picker pLabel = new LetterPicker( listContainer ); diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h index 9621826..790aa95 100644 --- a/core/pim/addressbook/version.h +++ b/core/pim/addressbook/version.h @@ -2,7 +2,7 @@ #define _VERSION_H_ #define MAINVERSION "1" -#define SUBVERSION "0" +#define SUBVERSION "1" #define PATCHVERSION "0" #define APPNAME "OPIE_ADDRESSBOOK" -- cgit v0.9.0.2