| -rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 36 | ||||
| -rw-r--r-- | core/pim/addressbook/contacteditor.h | 4 |
2 files changed, 14 insertions, 26 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 75dd2c1..7682399 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -91,4 +91,2 @@ void ContactEditor::init() { - useFullName = true; - uint i = 0; @@ -1033,3 +1031,5 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) { cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) ); - cmbFileAs->insertItem( parseName( textChanged, NAME_FMLS ) ); + cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) ); + if ( ! txtSuffix->text().isEmpty() ) + cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) + " " + txtSuffix->text() ); @@ -1037,3 +1037,2 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) { - useFullName = true; @@ -1070,3 +1069,3 @@ void ContactEditor::slotName() { QString tmpName; - if (useFullName) { + txtFirstName->setText( parseName(txtFullName->text(), NAME_F) ); @@ -1075,10 +1074,12 @@ void ContactEditor::slotName() { // txtSuffix->setText( parseName(txtFullName->text(), NAME_S) ); - } + dlgName->showMaximized(); if ( dlgName->exec() ) { - + if ( txtLastName->text().contains( ' ', TRUE ) ) + tmpName = txtLastName->text() + ", " + txtFirstName->text() + " " + txtMiddleName->text(); + else tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text(); + txtFullName->setText( tmpName.simplifyWhiteSpace() ); slotFullNameChange( txtFullName->text() ); - useFullName = false; } @@ -1181,4 +1182,4 @@ QString ContactEditor::parseName( const QString fullName, int type ) { - case NAME_FMLS: - return strFirstName + " " + strMiddleName + " " + strLastName + " " + txtSuffix->text(); + case NAME_FML: + return strFirstName + " " + strMiddleName + " " + strLastName ; @@ -1252,3 +1253,2 @@ void ContactEditor::setEntry( const OContact &entry ) { - useFullName = false; txtFirstName->setText( ent.firstName() ); @@ -1263,2 +1263,3 @@ void ContactEditor::setEntry( const OContact &entry ) { + if ( !ent.isEmpty() ){ // Lastnames with multiple words need to be protected by a comma ! @@ -1268,2 +1269,3 @@ void ContactEditor::setEntry( const OContact &entry ) { txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() ); + } @@ -1427,10 +1429,2 @@ void ContactEditor::setEntry( const OContact &entry ) { - // 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.. @@ -1474,3 +1468,2 @@ void ContactEditor::saveEntry() { - if ( useFullName ) { txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) ); @@ -1480,5 +1473,2 @@ void ContactEditor::saveEntry() { - useFullName = false; - } - ent.setFirstName( txtFirstName->text() ); diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h index 954c77e..c6fa48f 100644 --- a/core/pim/addressbook/contacteditor.h +++ b/core/pim/addressbook/contacteditor.h @@ -38,3 +38,3 @@ const int NAME_LFM = 1; const int NAME_FL = 2; -const int NAME_FMLS = 3; +const int NAME_FML = 3; @@ -117,4 +117,2 @@ class ContactEditor : public QDialog { - bool useFullName; - OContact ent; |