Change default settings of combos for contacteditor

author: eilers <eilers> 2003-02-24 09:33:19 (UTC)
committer: eilers <eilers> 2003-02-24 09:33:19 (UTC)
commit: 6696e7855b81581d964db64dc7b886c3f58d94ea (patch) (unidiff)
tree: 504994d669cb119dda5e2c55bc5bb92b7afdff17
parent: d5746c625ebf540711179ef01a7bb99bc3b2c3d6 (diff)
download: opie-6696e7855b81581d964db64dc7b886c3f58d94ea.zip
opie-6696e7855b81581d964db64dc7b886c3f58d94ea.tar.gz
opie-6696e7855b81581d964db64dc7b886c3f58d94ea.tar.bz2
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
@@ -8,64 +8,65 @@ Feature requests:
        add a library class for this)
 - dial with dtmfdial in case it's installed and there's no mobile
 - 3rd column for 2. Contact
 - Implementing additional Views (Phonebook, ...)
 - Birthday & Anniversary Reminder
 - Beaming of multiple contacts (current list/ by search or by category)
 - Configure the letter-picker: lastname/fullname search 
 - User center of the joypad to switch back from card to listview !
 - Cursor-UP/Down: Should additionally scroll cardview if it is too large 
  (behaviour should be selectable by configuration)
 Known Bugs:
 -----------
 - Default Email-button: A lot of problems:
        If on second tab: The combo chooser is on the top left of the screen ! :(
 - Default Email-Button: Sometimes not hiding the textfields completely
 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
 Should be Fixed (not absolute sure, need further validation):
 -------------------------------------------------------------
 Fixed/Ready:
 -------
 - Syncing: abtable not reloaded after sync.
 - Find widget should be replaced by something like 
  qpdf has.
 - Adding a configuration dialog
 - Picker: Activated letter schould be more visible
 - Advanced handling of cursor keys (search..)
 - Mail-Icon is missing
 - Use opie-mail insted of qt-mail if possible.
 - Font menu is invisible using german translation
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
@@ -1462,68 +1462,68 @@ void ContactEditor::setEntry( const OContact &entry ) {
                if ( *it == "Yahoo IM" )
                        *itV = ent.yahooIM();
 */
                if ( *it == "Home Web Page" )
                        *itV = ent.homeWebpage();
                if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
                        *itV = ent.businessWebpage();
        }
        
        cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
        QString gender = ent.gender();
        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) );
+        cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) );
-        cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 1) );
+        cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 9) );
-        cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 2) );
+        cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 0) );
-        cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 5) );
+        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() ) );
                birthdayPicker->setDate( ent.birthday() );
        } else
                birthdayButton->setText( tr ("Unknown") );
                
        if ( !ent.anniversary().isNull() ){
                anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) );
                anniversaryPicker->setDate( ent.anniversary() );
        } else
                anniversaryButton->setText( tr ("Unknown") );
 }
 void ContactEditor::saveEntry() {
        // Store current combo into contact
        contactfields.saveToRecord( ent );
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
author	eilers <eilers>	2003-02-24 09:33:19 (UTC)
committer	eilers <eilers>	2003-02-24 09:33:19 (UTC)
commit	6696e7855b81581d964db64dc7b886c3f58d94ea (patch) (unidiff)
tree	504994d669cb119dda5e2c55bc5bb92b7afdff17
parent	d5746c625ebf540711179ef01a7bb99bc3b2c3d6 (diff)
download	opie-6696e7855b81581d964db64dc7b886c3f58d94ea.zip opie-6696e7855b81581d964db64dc7b886c3f58d94ea.tar.gz opie-6696e7855b81581d964db64dc7b886c3f58d94ea.tar.bz2