summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp
index c8b010e..75b1f07 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp
@@ -56,16 +56,13 @@ void QtVCardPhotoAndNameFields::setEditable(bool editable) {
56 this->editable = editable; 56 this->editable = editable;
57 57
58 ui->avatarWidget->setEditable(editable); 58 ui->avatarWidget->setEditable(editable);
59 ui->horizontalLayoutFN->setSpacing(editable ? 2 : 0);
60 ui->lineEditFN->setVisible(editable); 59 ui->lineEditFN->setVisible(editable);
61 ui->labelFN->setVisible(!editable); 60 ui->labelFN->setVisible(!editable);
62 61
63 ui->horizontalLayoutNICKNAME->setSpacing(editable ? 2 : 0);
64 ui->lineEditNICKNAME->setVisible(editable); 62 ui->lineEditNICKNAME->setVisible(editable);
65 ui->labelNICKNAME->setVisible(!editable); 63 ui->labelNICKNAME->setVisible(!editable);
66 64
67 // prefix given middle last suffix 65 // prefix given middle last suffix
68 ui->horizontalLayoutFULLNAME->setSpacing(editable ? 2 : 0);
69 ui->lineEditPREFIX->setVisible(editable); 66 ui->lineEditPREFIX->setVisible(editable);
70 ui->lineEditGIVEN->setVisible(editable); 67 ui->lineEditGIVEN->setVisible(editable);
71 ui->lineEditMIDDLE->setVisible(editable); 68 ui->lineEditMIDDLE->setVisible(editable);
@@ -79,7 +76,7 @@ void QtVCardPhotoAndNameFields::setEditable(bool editable) {
79 for (QStringList::iterator i = fullname.begin(); i != fullname.end(); i++) { 76 for (QStringList::iterator i = fullname.begin(); i != fullname.end(); i++) {
80 *i = i->trimmed(); 77 *i = i->trimmed();
81 } 78 }
82 ui->labelFULLNAME->setText(fullname.join(" ")); 79 ui->labelFULLNAME->setText((fullname.filter(QRegExp(".+"))).join(" "));
83} 80}
84 81
85void QtVCardPhotoAndNameFields::setAvatar(const ByteArray &data, const std::string &type) { 82void QtVCardPhotoAndNameFields::setAvatar(const ByteArray &data, const std::string &type) {