author | zautrix <zautrix> | 2004-10-12 20:14:39 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-12 20:14:39 (UTC) |
commit | 77e3a7bc670f4c9b7eb5a5d6652a7986ea196533 (patch) (side-by-side diff) | |
tree | 963c068c7648899a4c3ac26542605f05492019c5 /kaddressbook | |
parent | d3759373291c08d2cde93d85a76d190dc8a33830 (diff) | |
download | kdepimpi-77e3a7bc670f4c9b7eb5a5d6652a7986ea196533.zip kdepimpi-77e3a7bc670f4c9b7eb5a5d6652a7986ea196533.tar.gz kdepimpi-77e3a7bc670f4c9b7eb5a5d6652a7986ea196533.tar.bz2 |
Changed phone number sorting in details view
-rw-r--r-- | kaddressbook/phoneeditwidget.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 78b9941..19bb676 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -170,173 +170,171 @@ void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list ) } updateCombos(); mPrefCombo->selectType( defaultTypes[ 0 ] ); mSecondCombo->selectType( defaultTypes[ 1 ] ); mThirdCombo->selectType( defaultTypes[ 2 ] ); mFourthCombo->selectType( defaultTypes[ 3 ] ); updateLineEdits(); } void PhoneEditWidget::updateLineEdits() { updatePrefEdit(); updateSecondEdit(); updateThirdEdit(); updateFourthEdit(); } void PhoneEditWidget::updateCombos() { mPrefCombo->updateTypes(); mSecondCombo->updateTypes(); mThirdCombo->updateTypes(); mFourthCombo->updateTypes(); } KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() { KABC::PhoneNumber::List retList; KABC::PhoneNumber::List::Iterator it; for ( it = mPhoneList.begin(); it != mPhoneList.end(); ++it ) if ( !(*it).number().isEmpty() ) retList.append( *it ); return retList; } void PhoneEditWidget::edit() { PhoneEditDialog dlg( mPhoneList, this ); if ( dlg.exec() ) { if ( dlg.changed() ) { mPhoneList = dlg.phoneNumbers(); updateCombos(); + updateLineEdits(); emit modified(); } } } void PhoneEditWidget::updatePrefEdit() { updateEdit( mPrefCombo ); } void PhoneEditWidget::updateSecondEdit() { updateEdit( mSecondCombo ); } void PhoneEditWidget::updateThirdEdit() { updateEdit( mThirdCombo ); } void PhoneEditWidget::updateFourthEdit() { updateEdit( mFourthCombo ); } void PhoneEditWidget::updateEdit( PhoneTypeCombo *combo ) { QLineEdit *edit = combo->lineEdit(); if ( !edit ) return; #if 0 if ( edit == mPrefEdit ) kdDebug(5720) << " prefEdit" << endl; if ( edit == mSecondEdit ) kdDebug(5720) << " secondEdit" << endl; if ( edit == mThirdEdit ) kdDebug(5720) << " thirdEdit" << endl; if ( edit == mFourthEdit ) kdDebug(5720) << " fourthEdit" << endl; #endif PhoneNumber::List::Iterator it = combo->selectedElement(); if ( it != mPhoneList.end() ) { edit->setText( (*it).number() ); } else { kdDebug(5720) << "PhoneEditWidget::updateEdit(): no selected element" << endl; } } void PhoneEditWidget::slotPrefEditChanged() { updatePhoneNumber( mPrefCombo ); } void PhoneEditWidget::slotSecondEditChanged() { updatePhoneNumber( mSecondCombo ); } void PhoneEditWidget::slotThirdEditChanged() { updatePhoneNumber( mThirdCombo ); } void PhoneEditWidget::slotFourthEditChanged() { updatePhoneNumber( mFourthCombo ); } void PhoneEditWidget::updatePhoneNumber( PhoneTypeCombo *combo ) { QLineEdit *edit = combo->lineEdit(); if ( !edit ) return; PhoneNumber::List::Iterator it = combo->selectedElement(); if ( it != mPhoneList.end() ) { (*it).setNumber( edit->text() ); - } else { - kdDebug(5720) << "PhoneEditWidget::updatePhoneNumber(): no selected element" - << endl; } updateOtherEdit( combo, mPrefCombo ); updateOtherEdit( combo, mSecondCombo ); updateOtherEdit( combo, mThirdCombo ); updateOtherEdit( combo, mFourthCombo ); emit modified(); } void PhoneEditWidget::updateOtherEdit( PhoneTypeCombo *combo, PhoneTypeCombo *otherCombo ) { if ( combo == otherCombo ) return; if ( combo->currentItem() == otherCombo->currentItem() ) { updateEdit( otherCombo ); } } /////////////////////////////////////////// // PhoneEditDialog class PhoneViewItem : public QListViewItem { public: PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number ); void setPhoneNumber( const KABC::PhoneNumber &number ) { mPhoneNumber = number; makeText(); } QString key() { return mPhoneNumber.id(); } QString country() { return ""; } QString region() { return ""; } QString number() { return ""; } KABC::PhoneNumber phoneNumber() { return mPhoneNumber; } private: void makeText(); KABC::PhoneNumber mPhoneNumber; }; PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number ) : QListViewItem( parent ), mPhoneNumber( number ) |