| -rw-r--r-- | core/pim/addressbook/abview.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 7226e82..161b163 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp @@ -54,13 +54,13 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): mCat.load( categoryFileName() ); // Create Layout and put WidgetStack into it. QVBoxLayout *vb = new QVBoxLayout( this ); m_viewStack = new QWidgetStack( this ); vb->addWidget( m_viewStack ); - + // Creat TableView QVBox* tableBox = new QVBox( m_viewStack ); m_abTable = new AbTable( m_orderedFields, tableBox, "table" ); m_abTable->setCurrentCell( 0, 0 ); m_abTable->setFocus(); @@ -70,14 +70,14 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): // Create CardView and add it to WidgetStack QVBox* cardBox = new QVBox( m_viewStack ); m_ablabel = new AbLabel( cardBox, "CardView"); m_viewStack -> addWidget( cardBox , CardView ); // Connect views to me - connect ( m_abTable, SIGNAL( signalSwitch( void ) ), - this, SLOT( slotSwitch( void ) ) ); + connect ( m_abTable, SIGNAL( signalSwitch( void ) ), + this, SLOT( slotSwitch( void ) ) ); connect ( m_ablabel, SIGNAL( signalOkPressed( void ) ), this, SLOT( slotSwitch( void ) ) ); load(); } @@ -102,13 +102,13 @@ void AbView::setView( Views view ) void AbView::addEntry( const OContact &newContact ) { qWarning("abview:AddContact"); m_contactdb->add ( newContact ); load(); - + } void AbView::removeEntry( const int UID ) { qWarning("abview:RemoveContact"); m_contactdb->remove( UID ); load(); @@ -148,24 +148,24 @@ bool AbView::save() void AbView::load() { qWarning("abView:Load data"); // Letter Search is stopped at this place emit signalClearLetterPicker(); - + if ( m_inPersonal ) m_list = m_contactdb->allRecords(); else{ m_list = m_contactdb->sorted( true, 0, 0, 0 ); clearForCategory(); } qWarning ("Number of contacts: %d", m_list.count()); - updateView( true ); - + updateView( true ); + } void AbView::reload() { qWarning( "void AbView::reload()" ); @@ -193,13 +193,13 @@ void AbView::setShowByCategory( const QString& cat ) // Just do anything if we really change the category if ( intCat != m_curr_category ){ qWarning ("Categories: Selected %s.. Number: %d", cat.latin1(), m_curr_category); m_curr_category = intCat; emit signalClearLetterPicker(); - + load(); } } void AbView::setShowToView( Views view ) @@ -237,13 +237,13 @@ void AbView::setListOrder( const QValueList<int>& ordered ) { m_orderedFields = ordered; updateView(); } -QString AbView::showCategory() const +QString AbView::showCategory() const { return mCat.label( "Contacts", m_curr_category ); } void AbView::showPersonal( bool personal ) { @@ -256,19 +256,19 @@ void AbView::showPersonal( bool personal ) // Now switch to vCard Backend and load data. // The current default backend will be stored // to avoid unneeded load/stores. m_storedDB = m_contactdb; - OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, + OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, addressbookPersonalVCardName() ); m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); m_inPersonal = true; m_curr_View = CardView; - + }else{ if ( !m_inPersonal ) return; // Remove vCard Backend and restore default @@ -277,27 +277,27 @@ void AbView::showPersonal( bool personal ) m_contactdb = m_storedDB; m_storedDB = 0l; m_curr_View = TableView; m_inPersonal = false; - + } load(); } -QStringList AbView::categories() +QStringList AbView::categories() { mCat.load( categoryFileName() ); QStringList categoryList = mCat.labels( "Contacts" ); return categoryList; } - -// BEGIN: Slots -void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, - bool , QString cat = QString::null ) + +// BEGIN: Slots +void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, + bool , QString cat ) { qWarning( "void AbView::slotDoFind" ); // We reloading the data: Deselect Letterpicker emit signalClearLetterPicker(); @@ -312,13 +312,13 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, qWarning ("Find in Category %d", category); QRegExp r( str ); r.setCaseSensitive( caseSensitive ); r.setWildcard( !useRegExp ); - + // Get all matching entries out of the database m_list = m_contactdb->matchRegexp( r ); qWarning( "found: %d", m_list.count() ); if ( m_list.count() == 0 ){ emit signalNotFound(); @@ -326,13 +326,13 @@ 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(); - + // Now show all found entries updateView( true ); } void AbView::offSearch() { @@ -353,26 +353,26 @@ void AbView::slotSwitch(){ case CardView: qWarning("Switching to TableView"); m_curr_View = TableView; break; } updateView(); - + } // END: Slots void AbView::clearForCategory() { OContactAccess::List::Iterator it; // Now remove all contacts with wrong category if any category selected OContactAccess::List allList = m_list; if ( m_curr_category != -1 ){ for ( it = allList.begin(); it != allList.end(); ++it ){ - if ( !contactCompare( *it, m_curr_category ) ){ + if ( !contactCompare( *it, m_curr_category ) ){ qWarning("Removing %d", (*it).uid()); m_list.remove( (*it).uid() ); } } } @@ -432,13 +432,13 @@ void AbView::updateView( bool newdata ) m_curr_Contact = m_ablabel -> currentEntry_UID(); break; } }else m_curr_Contact = 0; } - + // Feed all views with new lists if ( newdata ) updateListinViews(); // Tell the world that the view is changed if ( m_curr_View != m_prev_View ) @@ -457,12 +457,12 @@ void AbView::updateView( bool newdata ) case CardView: if ( m_curr_Contact != 0 ) m_ablabel -> selectContact( m_curr_Contact ); m_ablabel -> setFocus(); break; } - + // Raise the current View m_viewStack -> raiseWidget( m_curr_View ); } |