-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 1 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 254 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.h | 12 |
3 files changed, 148 insertions, 119 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index beb953a..8229212 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -908,2 +908,3 @@ void AddressbookWindow::populateCategories() id = 1; + rememberId = 0; catMenu->insertItem( tr( "All" ), id++ ); diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index e74da87..fa60f98 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -59,3 +59,3 @@ ContactEditor::ContactEditor( const Contact &entry, orderedValues( newOrderedValues ), - slOrdered( slNewOrdered ) + slOrdered( *slNewOrdered ) { @@ -76,3 +76,3 @@ void ContactEditor::init() { int i = 0; - +/** SHut up and stop leaking slHomeAddress = new QStringList; @@ -83,3 +83,3 @@ void ContactEditor::init() { slDynamicEntries = new QStringList; - +*/ //*slDynamicEntries = *slOrdered; @@ -87,4 +87,4 @@ void ContactEditor::init() { for (i = 0; i <= 6; i++) { - slHomeAddress->append( "" ); - slBusinessAddress->append( "" ); + slHomeAddress.append( "" ); + slBusinessAddress.append( "" ); } @@ -104,8 +104,8 @@ void ContactEditor::init() { - QStringList::ConstIterator it = slOrdered->begin(); - for ( i = 0; it != slOrdered->end(); i++, ++it ) { + QStringList::ConstIterator it = slOrdered.begin(); + for ( i = 0; it != slOrdered.end(); i++, ++it ) { if ( (*it).right( 3 ) == tr( "Fax" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( tr( "" ) ); + slChooserNames.append( *it ); + slChooserValues.append("" ); //slDynamicEntries->remove( it ); @@ -115,4 +115,4 @@ void ContactEditor::init() { if ( (*it).right( 5 ) == tr( "Phone" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( "" ); + slChooserNames.append( *it ); + slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -122,4 +122,4 @@ void ContactEditor::init() { if ( (*it).right( 2 ) == tr( "IM" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( "" ); + slChooserNames.append( *it ); + slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -129,4 +129,4 @@ void ContactEditor::init() { if ( (*it).right( 6 ) == tr( "Mobile" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( "" ); + slChooserNames.append( *it ); + slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -136,4 +136,4 @@ void ContactEditor::init() { if ( (*it).right( 4 ) == tr( "Page" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( "" ); + slChooserNames.append( *it ); + slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -143,4 +143,4 @@ void ContactEditor::init() { if ( (*it).right( 5 ) == tr( "Pager" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( "" ); + slChooserNames.append( *it ); + slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -150,4 +150,4 @@ void ContactEditor::init() { if ( *it == tr( "Default Email" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( "" ); + slChooserNames.append( *it ); + slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -157,4 +157,4 @@ void ContactEditor::init() { if ( *it == tr( "Emails" ) ) { - slChooserNames->append( *it ); - slChooserValues->append( "" ); + slChooserNames.append( *it ); + slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -264,3 +264,3 @@ void ContactEditor::init() { - slDynamicEntries->append( *it ); + slDynamicEntries.append( *it ); } @@ -348,3 +348,3 @@ void ContactEditor::init() { - gl = new QGridLayout( container, 6, 3, 2, 4 ); + gl = new QGridLayout( container, 8, 3, 2, 4 ); // row 7 QSpacerItem @@ -609,2 +609,8 @@ void ContactEditor::init() { gl->addMultiCellWidget( txtChooserField4, 6, 6, 1, 2 ); + + QSpacerItem *space = new QSpacerItem(1,1, + QSizePolicy::Maximum, + QSizePolicy::MinimumExpanding ); + gl->addItem( space, 7, 0 ); + tabMain->insertTab( tabViewport, tr( "Address" ) ); @@ -625,4 +631,4 @@ void ContactEditor::init() { - QStringList::ConstIterator it = slDynamicEntries->begin(); - for (i = 0; it != slDynamicEntries->end(); i++, ++it) { + QStringList::ConstIterator it = slDynamicEntries.begin(); + for (i = 0; it != slDynamicEntries.end(); i++, ++it) { l = new QLabel( *it, container ); @@ -636,3 +642,3 @@ void ContactEditor::init() { l = new QLabel( tr("Gender"), container ); - gl->addWidget( l, slDynamicEntries->count(), 0 ); + gl->addWidget( l, slDynamicEntries.count(), 0 ); cmbGender = new QComboBox( container ); @@ -641,3 +647,3 @@ void ContactEditor::init() { cmbGender->insertItem( tr("Female"), 2); - gl->addWidget( cmbGender, slDynamicEntries->count(), 1 ); + gl->addWidget( cmbGender, slDynamicEntries.count(), 1 ); @@ -654,3 +660,3 @@ void ContactEditor::init() { dlgName->setCaption( tr("Edit Name") ); - gl = new QGridLayout( dlgName, 4, 2, 2, 3 ); + gl = new QGridLayout( dlgName, 5, 2, 2, 3 ); @@ -675,7 +681,11 @@ void ContactEditor::init() { gl->addWidget( txtSuffix, 3, 1 ); + space = new QSpacerItem(1,1, + QSizePolicy::Maximum, + QSizePolicy::MinimumExpanding ); + gl->addItem( space, 4, 0 ); - cmbChooserField1->insertStringList( *slChooserNames ); - cmbChooserField2->insertStringList( *slChooserNames ); - cmbChooserField3->insertStringList( *slChooserNames ); - cmbChooserField4->insertStringList( *slChooserNames ); + cmbChooserField1->insertStringList( slChooserNames ); + cmbChooserField2->insertStringList( slChooserNames ); + cmbChooserField3->insertStringList( slChooserNames ); + cmbChooserField4->insertStringList( slChooserNames ); @@ -689,19 +699,35 @@ void ContactEditor::init() { - connect( txtChooserField1, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser1Change(const QString &)) ); - connect( txtChooserField2, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser2Change(const QString &)) ); - connect( txtChooserField3, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser3Change(const QString &)) ); - connect( txtChooserField4, SIGNAL(textChanged(const QString &)), this, SLOT(slotChooser4Change(const QString &)) ); - connect( txtAddress, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddressChange(const QString &)) ); + connect( txtChooserField1, SIGNAL(textChanged(const QString &)), + this, SLOT(slotChooser1Change(const QString &)) ); + connect( txtChooserField2, SIGNAL(textChanged(const QString &)), + this, SLOT(slotChooser2Change(const QString &)) ); + connect( txtChooserField3, SIGNAL(textChanged(const QString &)), + this, SLOT(slotChooser3Change(const QString &)) ); + connect( txtChooserField4, SIGNAL(textChanged(const QString &)), + this, SLOT(slotChooser4Change(const QString &)) ); + connect( txtAddress, SIGNAL(textChanged(const QString &)), + this, SLOT(slotAddressChange(const QString &)) ); //connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) ); //connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) ); - connect( txtCity, SIGNAL(textChanged(const QString &)), this, SLOT(slotCityChange(const QString &)) ); - connect( txtState, SIGNAL(textChanged(const QString &)), this, SLOT(slotStateChange(const QString &)) ); - connect( txtZip, SIGNAL(textChanged(const QString &)), this, SLOT(slotZipChange(const QString &)) ); - connect( cmbCountry, SIGNAL(textChanged(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); - connect( cmbCountry, SIGNAL(activated(const QString &)), this, SLOT(slotCountryChange(const QString &)) ); - connect( cmbChooserField1, SIGNAL(activated(int)), this, SLOT(slotCmbChooser1Change(int)) ); - connect( cmbChooserField2, SIGNAL(activated(int)), this, SLOT(slotCmbChooser2Change(int)) ); - connect( cmbChooserField3, SIGNAL(activated(int)), this, SLOT(slotCmbChooser3Change(int)) ); - connect( cmbChooserField4, SIGNAL(activated(int)), this, SLOT(slotCmbChooser4Change(int)) ); - connect( cmbAddress, SIGNAL(activated(int)), this, SLOT(slotAddressTypeChange(int)) ); + connect( txtCity, SIGNAL(textChanged(const QString &)), + this, SLOT(slotCityChange(const QString &)) ); + connect( txtState, SIGNAL(textChanged(const QString &)), + this, SLOT(slotStateChange(const QString &)) ); + connect( txtZip, SIGNAL(textChanged(const QString &)), + this, SLOT(slotZipChange(const QString &)) ); + connect( cmbCountry, SIGNAL(textChanged(const QString &)), + this, SLOT(slotCountryChange(const QString &)) ); + connect( cmbCountry, SIGNAL(activated(const QString &)), + this, SLOT(slotCountryChange(const QString &)) ); + connect( cmbChooserField1, SIGNAL(activated(int)), + this, SLOT(slotCmbChooser1Change(int)) ); + connect( cmbChooserField2, SIGNAL(activated(int)), + this, SLOT(slotCmbChooser2Change(int)) ); + connect( cmbChooserField3, SIGNAL(activated(int)), + this, SLOT(slotCmbChooser3Change(int)) ); + connect( cmbChooserField4, SIGNAL(activated(int)), + this, SLOT(slotCmbChooser4Change(int)) ); + connect( cmbAddress, SIGNAL(activated(int)), + this, SLOT(slotAddressTypeChange(int)) ); + new QPEDialogListener(this); @@ -741,3 +767,3 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) { - (*slChooserValues)[index] = textChanged; + slChooserValues[index] = textChanged; @@ -749,3 +775,3 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) { - (*slChooserValues)[index] = textChanged; + slChooserValues[index] = textChanged; @@ -757,3 +783,3 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) { - (*slChooserValues)[index] = textChanged; + slChooserValues[index] = textChanged; @@ -765,3 +791,3 @@ void ContactEditor::slotChooser4Change( const QString &textChanged ) { - (*slChooserValues)[index] = textChanged; + slChooserValues[index] = textChanged; @@ -772,5 +798,5 @@ void ContactEditor::slotAddressChange( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { - (*slBusinessAddress)[0] = textChanged; + slBusinessAddress[0] = textChanged; } else { - (*slHomeAddress)[0] = textChanged; + slHomeAddress[0] = textChanged; } @@ -781,5 +807,5 @@ void ContactEditor::slotAddress2Change( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { - (*slBusinessAddress)[1] = textChanged; + slBusinessAddress[1] = textChanged; } else { - (*slHomeAddress)[1] = textChanged; + slHomeAddress[1] = textChanged; } @@ -790,5 +816,5 @@ void ContactEditor::slotPOBoxChange( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { - (*slBusinessAddress)[2] = textChanged; + slBusinessAddress[2] = textChanged; } else { - (*slHomeAddress)[2] = textChanged; + slHomeAddress[2] = textChanged; } @@ -799,5 +825,5 @@ void ContactEditor::slotCityChange( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { - (*slBusinessAddress)[3] = textChanged; + slBusinessAddress[3] = textChanged; } else { - (*slHomeAddress)[3] = textChanged; + slHomeAddress[3] = textChanged; } @@ -809,5 +835,5 @@ void ContactEditor::slotStateChange( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { - (*slBusinessAddress)[4] = textChanged; + slBusinessAddress[4] = textChanged; } else { - (*slHomeAddress)[4] = textChanged; + slHomeAddress[4] = textChanged; } @@ -818,5 +844,5 @@ void ContactEditor::slotZipChange( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { - (*slBusinessAddress)[5] = textChanged; + slBusinessAddress[5] = textChanged; } else { - (*slHomeAddress)[5] = textChanged; + slHomeAddress[5] = textChanged; } @@ -827,5 +853,5 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { - (*slBusinessAddress)[6] = textChanged; + slBusinessAddress[6] = textChanged; } else { - (*slHomeAddress)[6] = textChanged; + slHomeAddress[6] = textChanged; } @@ -835,4 +861,4 @@ void ContactEditor::slotCmbChooser1Change( int index ) { - txtChooserField1->setText( (*slChooserValues)[index] ); - + txtChooserField1->setText( slChooserValues[index] ); + txtChooserField1->setFocus(); } @@ -841,4 +867,4 @@ void ContactEditor::slotCmbChooser2Change( int index ) { - txtChooserField2->setText( (*slChooserValues)[index] ); - + txtChooserField2->setText( slChooserValues[index] ); + txtChooserField2->setFocus(); } @@ -847,3 +873,4 @@ void ContactEditor::slotCmbChooser3Change( int index ) { - txtChooserField3->setText( (*slChooserValues)[index] ); + txtChooserField3->setText( slChooserValues[index] ); + txtChooserField3->setFocus(); @@ -853,3 +880,4 @@ void ContactEditor::slotCmbChooser4Change( int index ) { - txtChooserField4->setText( (*slChooserValues)[index] ); + txtChooserField4->setText( slChooserValues[index] ); + txtChooserField4->setFocus(); @@ -861,10 +889,10 @@ void ContactEditor::slotAddressTypeChange( int index ) { - txtAddress->setText( (*slBusinessAddress)[0] ); + txtAddress->setText( slBusinessAddress[0] ); //txtAddress2->setText( (*slBusinessAddress)[1] ); //txtPOBox->setText( (*slBusinessAddress)[2] ); - txtCity->setText( (*slBusinessAddress)[3] ); - txtState->setText( (*slBusinessAddress)[4] ); - txtZip->setText( (*slBusinessAddress)[5] ); + txtCity->setText( slBusinessAddress[3] ); + txtState->setText( slBusinessAddress[4] ); + txtZip->setText( slBusinessAddress[5] ); QLineEdit *txtTmp = cmbCountry->lineEdit(); - txtTmp->setText( (*slBusinessAddress)[6] ); + txtTmp->setText( slBusinessAddress[6] ); @@ -872,10 +900,10 @@ void ContactEditor::slotAddressTypeChange( int index ) { - txtAddress->setText( (*slHomeAddress)[0] ); + txtAddress->setText( slHomeAddress[0] ); //txtAddress2->setText( (*slHomeAddress)[1] ); //txtPOBox->setText( (*slHomeAddress)[2] ); - txtCity->setText( (*slHomeAddress)[3] ); - txtState->setText( (*slHomeAddress)[4] ); - txtZip->setText( (*slHomeAddress)[5] ); + txtCity->setText( slHomeAddress[3] ); + txtState->setText( slHomeAddress[4] ); + txtZip->setText( slHomeAddress[5] ); QLineEdit *txtTmp = cmbCountry->lineEdit(); - txtTmp->setText( (*slHomeAddress)[6] ); + txtTmp->setText( slHomeAddress[6] ); @@ -906,3 +934,3 @@ void ContactEditor::loadFields() { QListIterator<QLabel> lit( listName ); - for ( it = slDynamicEntries->begin(); *lit; ++lit, ++it) { + for ( it = slDynamicEntries.begin(); *lit; ++lit, ++it) { (*lit)->setText( *it ); @@ -1132,4 +1160,4 @@ void ContactEditor::cleanupFields() { - QStringList::Iterator it = slChooserValues->begin(); - for ( int i = 0; it != slChooserValues->end(); i++, ++it ) { + QStringList::Iterator it = slChooserValues.begin(); + for ( int i = 0; it != slChooserValues.end(); i++, ++it ) { (*it) = ""; @@ -1138,4 +1166,4 @@ void ContactEditor::cleanupFields() { for ( int i = 0; i < 7; i++ ) { - (*slHomeAddress)[i] = ""; - (*slBusinessAddress)[i] = ""; + slHomeAddress[i] = ""; + slBusinessAddress[i] = ""; } @@ -1144,3 +1172,3 @@ void ContactEditor::cleanupFields() { QListIterator<QLineEdit> itLE( listValue ); - for ( cit = slDynamicEntries->begin(); cit != slDynamicEntries->end(); ++cit, ++itLE) { + for ( cit = slDynamicEntries.begin(); cit != slDynamicEntries.end(); ++cit, ++itLE) { (*itLE)->setText( "" ); @@ -1203,4 +1231,4 @@ void ContactEditor::setEntry( const Contact &entry ) { if (hasStreet) { - (*slHomeAddress)[0] = ent.homeStreet(); - (*slBusinessAddress)[0] = ent.businessStreet(); + slHomeAddress[0] = ent.homeStreet(); + slBusinessAddress[0] = ent.businessStreet(); } @@ -1218,4 +1246,4 @@ void ContactEditor::setEntry( const Contact &entry ) { if (hasCity) { - (*slHomeAddress)[3] = ent.homeCity(); - (*slBusinessAddress)[3] = ent.businessCity(); + slHomeAddress[3] = ent.homeCity(); + slBusinessAddress[3] = ent.businessCity(); } @@ -1223,4 +1251,4 @@ void ContactEditor::setEntry( const Contact &entry ) { if (hasState) { - (*slHomeAddress)[4] = ent.homeState(); - (*slBusinessAddress)[4] = ent.businessState(); + slHomeAddress[4] = ent.homeState(); + slBusinessAddress[4] = ent.businessState(); } @@ -1228,4 +1256,4 @@ void ContactEditor::setEntry( const Contact &entry ) { if (hasZip) { - (*slHomeAddress)[5] = ent.homeZip(); - (*slBusinessAddress)[5] = ent.businessZip(); + slHomeAddress[5] = ent.homeZip(); + slBusinessAddress[5] = ent.businessZip(); } @@ -1233,4 +1261,4 @@ void ContactEditor::setEntry( const Contact &entry ) { if (hasCountry) { - (*slHomeAddress)[6] = ent.homeCountry(); - (*slBusinessAddress)[6] = ent.businessCountry(); + slHomeAddress[6] = ent.homeCountry(); + slBusinessAddress[6] = ent.businessCountry(); } @@ -1239,3 +1267,3 @@ void ContactEditor::setEntry( const Contact &entry ) { QListIterator<QLineEdit> itLE( listValue ); - for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) { + for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { if ( *it == "Department" ) @@ -1276,3 +1304,3 @@ void ContactEditor::setEntry( const Contact &entry ) { QStringList::Iterator itV; - for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) { + for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { @@ -1400,4 +1428,4 @@ void ContactEditor::saveEntry() { if (hasStreet) { - ent.setHomeStreet( (*slHomeAddress)[0] ); - ent.setBusinessStreet( (*slBusinessAddress)[0] ); + ent.setHomeStreet( slHomeAddress[0] ); + ent.setBusinessStreet( slBusinessAddress[0] ); } @@ -1415,4 +1443,4 @@ void ContactEditor::saveEntry() { if (hasCity) { - ent.setHomeCity( (*slHomeAddress)[3] ); - ent.setBusinessCity( (*slBusinessAddress)[3] ); + ent.setHomeCity( slHomeAddress[3] ); + ent.setBusinessCity( slBusinessAddress[3] ); } @@ -1420,4 +1448,4 @@ void ContactEditor::saveEntry() { if (hasState) { - ent.setHomeState( (*slHomeAddress)[4] ); - ent.setBusinessState( (*slBusinessAddress)[4] ); + ent.setHomeState( slHomeAddress[4] ); + ent.setBusinessState( slBusinessAddress[4] ); } @@ -1425,4 +1453,4 @@ void ContactEditor::saveEntry() { if (hasZip) { - ent.setHomeZip( (*slHomeAddress)[5] ); - ent.setBusinessZip( (*slBusinessAddress)[5] ); + ent.setHomeZip( slHomeAddress[5] ); + ent.setBusinessZip( slBusinessAddress[5] ); } @@ -1430,4 +1458,4 @@ void ContactEditor::saveEntry() { if (hasCountry) { - ent.setHomeCountry( (*slHomeAddress)[6] ); - ent.setBusinessCountry( (*slBusinessAddress)[6] ); + ent.setHomeCountry( slHomeAddress[6] ); + ent.setBusinessCountry( slBusinessAddress[6] ); } @@ -1436,3 +1464,3 @@ void ContactEditor::saveEntry() { QListIterator<QLineEdit> itLE( listValue ); - for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) { + for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { if ( *it == "Department" ) @@ -1473,3 +1501,3 @@ void ContactEditor::saveEntry() { QStringList::ConstIterator itV; - for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) { + for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h index a58a860..4f3b56e 100644 --- a/core/pim/addressbook/contacteditor.h +++ b/core/pim/addressbook/contacteditor.h @@ -111,9 +111,9 @@ class ContactEditor : public QDialog { const QValueList<int> *orderedValues; - QStringList *slOrdered; - QStringList *slDynamicEntries; + QStringList slOrdered; + QStringList slDynamicEntries; - QStringList *slHomeAddress; - QStringList *slBusinessAddress; - QStringList *slChooserNames; - QStringList *slChooserValues; + QStringList slHomeAddress; + QStringList slBusinessAddress; + QStringList slChooserNames; + QStringList slChooserValues; |