-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 2 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 4 | ||||
-rw-r--r-- | core/pim/todo/todotable.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index e11cf4c..3255269 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -520,25 +520,25 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
520 | } else if ( msg == "addContact(QString,QString)" ) { | 520 | } else if ( msg == "addContact(QString,QString)" ) { |
521 | QDataStream stream(data,IO_ReadOnly); | 521 | QDataStream stream(data,IO_ReadOnly); |
522 | QString name, email; | 522 | QString name, email; |
523 | stream >> name >> email; | 523 | stream >> name >> email; |
524 | 524 | ||
525 | Contact cnt; | 525 | Contact cnt; |
526 | QString fn, mn, ln; | 526 | QString fn, mn, ln; |
527 | parseName( name, &fn, &mn, &ln ); | 527 | parseName( name, &fn, &mn, &ln ); |
528 | // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); | 528 | // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); |
529 | cnt.setFirstName( fn ); | 529 | cnt.setFirstName( fn ); |
530 | cnt.setMiddleName( mn ); | 530 | cnt.setMiddleName( mn ); |
531 | cnt.setLastName( ln ); | 531 | cnt.setLastName( ln ); |
532 | cnt.setEmails( email ); | 532 | cnt.insertEmails( email ); |
533 | cnt.setDefaultEmail( email ); | 533 | cnt.setDefaultEmail( email ); |
534 | cnt.setFileAs(); | 534 | cnt.setFileAs(); |
535 | 535 | ||
536 | if ( bAbEditFirstTime ) { | 536 | if ( bAbEditFirstTime ) { |
537 | abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields, | 537 | abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields, |
538 | this, "editor" ); | 538 | this, "editor" ); |
539 | bAbEditFirstTime = FALSE; | 539 | bAbEditFirstTime = FALSE; |
540 | } else { | 540 | } else { |
541 | abEditor->setEntry( cnt ); | 541 | abEditor->setEntry( cnt ); |
542 | } | 542 | } |
543 | abView()->init( cnt ); | 543 | abView()->init( cnt ); |
544 | editEntry( NewEntry ); | 544 | editEntry( NewEntry ); |
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 39bd63c..ae86ed0 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -1408,25 +1408,25 @@ void ContactEditor::setEntry( const Contact &entry ) { | |||
1408 | *itV = ent.businessFax(); | 1408 | *itV = ent.businessFax(); |
1409 | 1409 | ||
1410 | if ( *it == tr("Business Mobile") || *it == tr("work Mobile" )) | 1410 | if ( *it == tr("Business Mobile") || *it == tr("work Mobile" )) |
1411 | *itV = ent.businessMobile(); | 1411 | *itV = ent.businessMobile(); |
1412 | /* | 1412 | /* |
1413 | if ( *it == "Company Phone" ) | 1413 | if ( *it == "Company Phone" ) |
1414 | *itV = ent.companyPhone(); | 1414 | *itV = ent.companyPhone(); |
1415 | */ | 1415 | */ |
1416 | if ( *it == tr("Default Email" )) | 1416 | if ( *it == tr("Default Email" )) |
1417 | *itV = ent.defaultEmail(); | 1417 | *itV = ent.defaultEmail(); |
1418 | 1418 | ||
1419 | if ( *it == tr("Emails" )) | 1419 | if ( *it == tr("Emails" )) |
1420 | *itV = ent.emails(); | 1420 | *itV = ent.emailList().join(";"); |
1421 | 1421 | ||
1422 | if ( *it == tr("Home Phone" )) | 1422 | if ( *it == tr("Home Phone" )) |
1423 | *itV = ent.homePhone(); | 1423 | *itV = ent.homePhone(); |
1424 | /* | 1424 | /* |
1425 | if ( *it == "Home 2 Phone" ) | 1425 | if ( *it == "Home 2 Phone" ) |
1426 | *itV = ent.home2Phone(); | 1426 | *itV = ent.home2Phone(); |
1427 | */ | 1427 | */ |
1428 | if ( *it == tr("Home Fax" )) | 1428 | if ( *it == tr("Home Fax" )) |
1429 | *itV = ent.homeFax(); | 1429 | *itV = ent.homeFax(); |
1430 | 1430 | ||
1431 | if ( *it == tr("Home Mobile" )) | 1431 | if ( *it == tr("Home Mobile" )) |
1432 | *itV = ent.homeMobile(); | 1432 | *itV = ent.homeMobile(); |
@@ -1609,25 +1609,25 @@ void ContactEditor::saveEntry() { | |||
1609 | /* | 1609 | /* |
1610 | if ( *it == "Company Phone" ) | 1610 | if ( *it == "Company Phone" ) |
1611 | ent.setCompanyPhone( *itV ); | 1611 | ent.setCompanyPhone( *itV ); |
1612 | */ | 1612 | */ |
1613 | //if ( *it == "Default Email" ) | 1613 | //if ( *it == "Default Email" ) |
1614 | //ent.setDefaultEmail( *itV ); | 1614 | //ent.setDefaultEmail( *itV ); |
1615 | 1615 | ||
1616 | if ( *it == tr("Emails" )) { | 1616 | if ( *it == tr("Emails" )) { |
1617 | QString allemail; | 1617 | QString allemail; |
1618 | QString defaultmail; | 1618 | QString defaultmail; |
1619 | parseEmailFrom( *itV, defaultmail, allemail ); | 1619 | parseEmailFrom( *itV, defaultmail, allemail ); |
1620 | ent.setDefaultEmail( defaultmail ); | 1620 | ent.setDefaultEmail( defaultmail ); |
1621 | ent.setEmails( *itV ); | 1621 | ent.insertEmails( *itV ); |
1622 | } | 1622 | } |
1623 | 1623 | ||
1624 | if ( *it == tr("Home Phone" )) | 1624 | if ( *it == tr("Home Phone" )) |
1625 | ent.setHomePhone( *itV ); | 1625 | ent.setHomePhone( *itV ); |
1626 | /* | 1626 | /* |
1627 | if ( *it == "Home 2 Phone" ) | 1627 | if ( *it == "Home 2 Phone" ) |
1628 | ent.setHome2Phone( *itV ); | 1628 | ent.setHome2Phone( *itV ); |
1629 | */ | 1629 | */ |
1630 | if ( *it == tr("Home Fax" )) | 1630 | if ( *it == tr("Home Fax" )) |
1631 | ent.setHomeFax( *itV ); | 1631 | ent.setHomeFax( *itV ); |
1632 | 1632 | ||
1633 | if ( *it == tr("Home Mobile" )) | 1633 | if ( *it == tr("Home Mobile" )) |
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h index 39e00d1..7539df1 100644 --- a/core/pim/todo/todotable.h +++ b/core/pim/todo/todotable.h | |||
@@ -183,24 +183,27 @@ private: | |||
183 | QTimer *menuTimer; | 183 | QTimer *menuTimer; |
184 | QDate mDay; | 184 | QDate mDay; |
185 | QTimer *mDayTimer; // see if the day changed | 185 | QTimer *mDayTimer; // see if the day changed |
186 | bool enablePainting; | 186 | bool enablePainting; |
187 | Categories mCat; | 187 | Categories mCat; |
188 | int currFindRow; | 188 | int currFindRow; |
189 | bool showDeadl:1; | 189 | bool showDeadl:1; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | 192 | ||
193 | inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) | 193 | inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) |
194 | { | 194 | { |
195 | int rows = numRows(); | ||
196 | ++rows; | ||
197 | setNumRows( rows ); | ||
195 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') | 198 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') |
196 | + todo->priority() ) | 199 | + todo->priority() ) |
197 | + Qtopia::buildSortKey( todo->description() ); | 200 | + Qtopia::buildSortKey( todo->description() ); |
198 | CheckItem *chk = new CheckItem( this, sortKey ); | 201 | CheckItem *chk = new CheckItem( this, sortKey ); |
199 | chk->setChecked( todo->isCompleted() ); | 202 | chk->setChecked( todo->isCompleted() ); |
200 | ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); | 203 | ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); |
201 | cmb->setText( QString::number( todo->priority() ) ); | 204 | cmb->setText( QString::number( todo->priority() ) ); |
202 | QString sum = todo->summary(); | 205 | QString sum = todo->summary(); |
203 | QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum ); | 206 | QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum ); |
204 | ti->setReplaceable( false ); | 207 | ti->setReplaceable( false ); |
205 | 208 | ||
206 | DueTextItem *due = new DueTextItem(this, todo ); | 209 | DueTextItem *due = new DueTextItem(this, todo ); |