| -rw-r--r-- | core/pim/addressbook/TODO | 1 | ||||
| -rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 8 | ||||
| -rw-r--r-- | core/pim/addressbook/version.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO index 906b462..719b720 100644 --- a/core/pim/addressbook/TODO +++ b/core/pim/addressbook/TODO @@ -24,32 +24,33 @@ Known Bugs: Bugs but not in addressbook: ----------------------------- - VCARD: If umlaut (äöüß) in address, the parser gets confused.. - Exporting and reimporting of Jobtitle was reported to fail (Could not reproduce this ! (se)) Urgent: -------- ContactEditor: - Contact-Editor is temporarely reenabled. Wait for replacement. - Redesign of Contacteditor - Category is on the wrong position after changing to personal and back to normal ( Temporarily workaround: Category is never deactivated.. :S ) +- Fix handling of 3 Firstnames Important: ---------- - If new contact is added (contacteditor closed): focus (table, card) to this entry ! - After search (Started with Return): KeyFocus should be on Tabelle - "What's this" should be added (Deleyed after Feature Freeze) Less important: --------------- - Reload if contacts were changed externally - The picker (alphabetical sort widget) should be placed verticaly or horizontally (configurable) - Find a smart solution for activating/deactivating the "send email" event diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 97573af..b60f2dd 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -1478,36 +1478,36 @@ void ContactEditor::setEntry( const OContact &entry ) { cmbGender->setCurrentItem( gender.toInt() ); txtNote->setText( ent.notes() ); slotAddressTypeChange( cmbAddress->currentItem() ); // Calling "show()" to arrange all widgets. Otherwise we will get // a wrong position of the textfields and are unable to put our // default-email combo over it.. This is very ugly ! // Does anybody has a better solution ? // Basically we should rethink the strategy to hide // a textfield with overwriting.. (se) show(); // Get combo-settings from contact and set preset.. contactfields.loadFromRecord( ent ); - cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 0) ); - cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 1) ); - cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 2) ); - cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 5) ); + cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) ); + cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 9) ); + cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 0) ); + cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 6) ); cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) ); slotCmbChooser1Change( cmbChooserField1->currentItem() ); slotCmbChooser2Change( cmbChooserField2->currentItem() ); slotCmbChooser3Change( cmbChooserField3->currentItem() ); slotCmbChooser4Change( cmbChooserField4->currentItem() ); slotAddressTypeChange( cmbAddress->currentItem() ); updateDatePicker(); initializing = false; } void ContactEditor::updateDatePicker() { // Set DatePicker if ( !ent.birthday().isNull() ){ birthdayButton->setText( TimeString::numberDateString( ent.birthday() ) ); diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h index e716fe4..3c1e5ee 100644 --- a/core/pim/addressbook/version.h +++ b/core/pim/addressbook/version.h @@ -1,10 +1,10 @@ #ifndef _VERSION_H_ #define _VERSION_H_ #define MAINVERSION "0" #define SUBVERSION "2" -#define PATCHVERSION "0" +#define PATCHVERSION "1" #define APPNAME "OPIE_ADDRESSBOOK" #endif |