-rw-r--r-- | core/pim/addressbook/TODO | 3 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 2 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 84 |
3 files changed, 63 insertions, 26 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO index 83e3c6b..a4fc29a 100644 --- a/core/pim/addressbook/TODO +++ b/core/pim/addressbook/TODO @@ -1,16 +1,19 @@ Stuff todo: Urgent: - "Nonenglish" translation bug has to be fixed. Important: - Finishing of new View functions (List, Phonebook...) - Reload if contacts were changed externally +- "What's this" should be added +- The names of the countries are sorted by there english names, only.. + Even if they are translated.. :S Less important: - Find widget should be replaced by something like qpdf has. - The picker (alphabetical sort widget) should be placed verticaly or horizontally (configurable)
\ No newline at end of file diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 08c6d0a..70c070f 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp @@ -117,33 +117,33 @@ void AbPickItem::setContentFromEditor( QWidget *w ) \class AbTable abtable.h \brief QTable based class for showing a list of entries */ AbTable::AbTable( const QValueList<int> *order, QWidget *parent, const char *name ) // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR // : QTable( 0, 0, parent, name, TRUE ), // #else : QTable( parent, name ), // #endif lastSortCol( -1 ), asc( TRUE ), intFields( order ), currFindRow( -2 ), mCat( 0 ), - m_contactdb ("addressbook") + m_contactdb ("addressbook", 0l, 0l, false) // Handle syncing myself.. ! { mCat.load( categoryFileName() ); setSelectionMode( NoSelection ); init(); setSorting( TRUE ); connect( this, SIGNAL(clicked(int,int,int,const QPoint &)), this, SLOT(itemClicked(int,int)) ); } AbTable::~AbTable() { } void AbTable::init() { showChar = '\0'; diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index bae3a2b..e7f2ebd 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -327,33 +327,32 @@ void ContactEditor::init() { // slDynamicEntries->remove( it ); continue; } if ( (*it) == "Home Zip" ) { hasZip = TRUE; // slDynamicEntries->remove( it ); continue; } if ( (*it) == "Home Country" ) { hasCountry = TRUE; // slDynamicEntries->remove( it ); continue; } - slDynamicEntries.append( *it ); } } QVBoxLayout *vb = new QVBoxLayout( this ); tabMain = new QTabWidget( this ); vb->addWidget( tabMain ); QWidget *tabViewport = new QWidget ( tabMain ); vb = new QVBoxLayout( tabViewport ); svGeneral = new QScrollView( tabViewport ); vb->addWidget( svGeneral, 0, 0 ); svGeneral->setResizePolicy( QScrollView::AutoOneFit ); @@ -695,41 +694,44 @@ void ContactEditor::init() { tabMain->insertTab( tabViewport, tr( "Address" ) ); tabViewport = new QWidget ( tabMain ); vb = new QVBoxLayout( tabViewport ); svDetails = new QScrollView( tabViewport ); vb->addWidget( svDetails, 0, 0 ); svDetails->setResizePolicy( QScrollView::AutoOneFit ); svDetails->setFrameStyle( QFrame::NoFrame ); container = new QWidget( svDetails->viewport() ); svDetails->addChild( container ); gl = new QGridLayout( container, 1, 2, 2, 4 ); + // Create Labels and lineedit fields for every dynamic entry QStringList::ConstIterator it = slDynamicEntries.begin(); for (i = 0; it != slDynamicEntries.end(); i++, ++it) { - l = new QLabel( *it, container ); + l = new QLabel( QString::null , container ); listName.append( l ); gl->addWidget( l, i, 0 ); QLineEdit *e = new QLineEdit( container ); listValue.append( e ); gl->addWidget( e, i, 1); } + // Fill labels with names.. + loadFields(); l = new QLabel( tr("Gender"), container ); gl->addWidget( l, slDynamicEntries.count(), 0 ); cmbGender = new QComboBox( container ); cmbGender->insertItem( "", 0 ); cmbGender->insertItem( tr("Male"), 1); cmbGender->insertItem( tr("Female"), 2); gl->addWidget( cmbGender, slDynamicEntries.count(), 1 ); tabMain->insertTab( tabViewport, tr( "Details" ) ); dlgNote = new QDialog( this, "Note Dialog", TRUE ); dlgNote->setCaption( tr("Enter Note") ); QVBoxLayout *vbNote = new QVBoxLayout( dlgNote ); txtNote = new QMultiLineEdit( dlgNote ); vbNote->addWidget( txtNote ); @@ -999,33 +1001,65 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) { cmbFileAs->insertItem( parseName( textChanged, 0 ) ); cmbFileAs->insertItem( parseName( textChanged, 1 ) ); cmbFileAs->insertItem( parseName( textChanged, 2 ) ); cmbFileAs->insertItem( parseName( textChanged, 3 ) ); cmbFileAs->setCurrentItem( index ); useFullName = TRUE; } void ContactEditor::loadFields() { QStringList::ConstIterator it; QListIterator<QLabel> lit( listName ); for ( it = slDynamicEntries.begin(); *lit; ++lit, ++it) { - (*lit)->setText( *it ); + + if ( *it == "Department" ) + (*lit)->setText( tr( "Department" ) ); + + if ( *it == "Company" ) + (*lit)->setText( tr( "Company" ) ); + + if ( *it == "Office" ) + (*lit)->setText( tr( "Office" ) ); + + if ( *it == "Profession" ) + (*lit)->setText( tr( "Profession" ) ); + + if ( *it == "Assistant" ) + (*lit)->setText( tr( "Assistant" ) ); + + if ( *it == "Manager" ) + (*lit)->setText( tr( "Manager" ) ); + + if ( *it == "Spouse" ) + (*lit)->setText( tr( "Spouse" ) ); + + if ( *it == "Birthday" ) + (*lit)->setText( tr( "Birthday" ) ); + + if ( *it == "Anniversary" ) + (*lit)->setText( tr( "Anniversary" ) ); + + if ( *it == "Nickname" ) + (*lit)->setText( tr( "Nickname" ) ); + + if ( *it == "Children" ) + (*lit)->setText( tr( "Children" ) ); } } void ContactEditor::accept() { if ( isEmpty() ) { cleanupFields(); reject(); } else { saveEntry(); cleanupFields(); QDialog::accept(); } } @@ -1361,63 +1395,63 @@ void ContactEditor::setEntry( const OContact &entry ) { slBusinessAddress[4] = ent.businessState(); } if (hasZip) { slHomeAddress[5] = ent.homeZip(); slBusinessAddress[5] = ent.businessZip(); } if (hasCountry) { slHomeAddress[6] = ent.homeCountry(); slBusinessAddress[6] = ent.businessCountry(); } QStringList::ConstIterator it; QListIterator<QLineEdit> itLE( listValue ); for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { - if ( *it == tr( "Department" ) ) + if ( *it == "Department" ) (*itLE)->setText( ent.department() ); - if ( *it == tr( "Company" ) ) + if ( *it == "Company" ) (*itLE)->setText( ent.company() ); - if ( *it == tr( "Office" ) ) + if ( *it == "Office" ) (*itLE)->setText( ent.office() ); - if ( *it == tr( "Profession" ) ) + if ( *it == "Profession" ) (*itLE)->setText( ent.profession() ); - if ( *it == tr( "Assistant" ) ) + if ( *it == "Assistant" ) (*itLE)->setText( ent.assistant() ); - if ( *it == tr( "Manager" ) ) + if ( *it == "Manager" ) (*itLE)->setText( ent.manager() ); - if ( *it == tr( "Spouse" ) ) + if ( *it == "Spouse" ) (*itLE)->setText( ent.spouse() ); - if ( *it == tr( "Birthday" ) ) + if ( *it == "Birthday" ) (*itLE)->setText( ent.birthday() ); - if ( *it == tr( "Anniversary" ) ) + if ( *it == "Anniversary" ) (*itLE)->setText( ent.anniversary() ); - if ( *it == tr( "Nickname" ) ) + if ( *it == "Nickname" ) (*itLE)->setText( ent.nickname() ); - if ( *it == tr( "Children" ) ) + if ( *it == "Children" ) (*itLE)->setText( ent.children() ); } QStringList::Iterator itV; for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) ) *itV = ent.businessPhone(); /* if ( *it == "Business 2 Phone" ) *itV = ent.business2Phone(); */ if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) ) *itV = ent.businessFax(); @@ -1559,63 +1593,63 @@ void ContactEditor::saveEntry() { ent.setBusinessState( slBusinessAddress[4] ); } if (hasZip) { ent.setHomeZip( slHomeAddress[5] ); ent.setBusinessZip( slBusinessAddress[5] ); } if (hasCountry) { ent.setHomeCountry( slHomeAddress[6] ); ent.setBusinessCountry( slBusinessAddress[6] ); } QStringList::ConstIterator it; QListIterator<QLineEdit> itLE( listValue ); for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) { - if ( *it == tr( "Department" ) ) + if ( *it == "Department" ) ent.setDepartment( (*itLE)->text() ); - if ( *it == tr( "Company" ) ) + if ( *it == "Company" ) ent.setCompany( (*itLE)->text() ); - if ( *it == tr( "Office" ) ) + if ( *it == "Office" ) ent.setOffice( (*itLE)->text() ); - if ( *it == tr( "Profession" ) ) + if ( *it == "Profession" ) ent.setProfession( (*itLE)->text() ); - if ( *it == tr( "Assistant" ) ) + if ( *it == "Assistant" ) ent.setAssistant( (*itLE)->text() ); - if ( *it == tr( "Manager" ) ) + if ( *it == "Manager" ) ent.setManager( (*itLE)->text() ); - if ( *it == tr( "Spouse" ) ) + if ( *it == "Spouse" ) ent.setSpouse( (*itLE)->text() ); - if ( *it == tr( "Birthday" ) ) + if ( *it == "Birthday" ) ent.setBirthday( (*itLE)->text() ); - if ( *it == tr( "Anniversary" ) ) + if ( *it == "Anniversary" ) ent.setAnniversary( (*itLE)->text() ); - if ( *it == tr( "Nickname" ) ) + if ( *it == "Nickname" ) ent.setNickname( (*itLE)->text() ); - if ( *it == tr( "Children" ) ) + if ( *it == "Children" ) ent.setChildren( (*itLE)->text() ); } QStringList::ConstIterator itV; for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) { if ( ( *it == "Business Phone" ) || ( *it == "Work Phone" ) ) ent.setBusinessPhone( *itV ); /* if ( *it == tr("Business 2 Phone" ) ent.setBusiness2Phone( *itV ); */ if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) ) ent.setBusinessFax( *itV ); |