Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-03 09:11:52 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-06 14:56:47 (GMT) |
| commit | db6f167adf603c4fa9e0c3ba57b667303a069430 (patch) | |
| tree | 6f7259ab0e49e2e0745fd9e762f7fd13b79c12d8 | |
| parent | e2385da3debfdd372630fa36f70e2440f9c13ac4 (diff) | |
| download | swift-contrib-db6f167adf603c4fa9e0c3ba57b667303a069430.zip swift-contrib-db6f167adf603c4fa9e0c3ba57b667303a069430.tar.bz2 | |
Fix detailed name not being shown in profiles.
Test-Information:
Tested by running Swift and verifying that the detailed name (prefix, given,
middle, family, suffix) is shown.
Change-Id: Iacd3f88dc58f3a797cb5854f7ee4800515202c04
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp index 9140a6d..b29171f 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp @@ -35,71 +35,73 @@ QtVCardPhotoAndNameFields::QtVCardPhotoAndNameFields(QWidget* parent) : setEditable(false); } QtVCardPhotoAndNameFields::~QtVCardPhotoAndNameFields() { delete ui; } bool QtVCardPhotoAndNameFields::isEditable() const { return editable; } void QtVCardPhotoAndNameFields::setEditable(bool editable) { this->editable = editable; ui->avatarWidget->setEditable(editable); ui->lineEditFN->setVisible(editable ? true : !ui->lineEditFN->text().isEmpty()); ui->lineEditFN->setEditable(editable); ui->lineEditFN->setStyleSheet(editable ? "" : "QLineEdit {border: none; background-color: transparent;}"); ui->lineEditNICKNAME->setVisible(editable ? true : !ui->lineEditNICKNAME->text().isEmpty()); ui->lineEditNICKNAME->setEditable(editable); ui->lineEditNICKNAME->setStyleSheet(editable ? "" : "QLineEdit {border: none; background-color: transparent;}"); // prefix given middle last suffix ui->lineEditPREFIX->setVisible(editable); ui->lineEditGIVEN->setVisible(editable); ui->lineEditMIDDLE->setVisible(editable); ui->lineEditFAMILY->setVisible(editable); ui->lineEditSUFFIX->setVisible(editable); ui->labelFULLNAME->setVisible(!editable); QStringList fullname; fullname << ui->lineEditPREFIX->text() << ui->lineEditGIVEN->text() << ui->lineEditMIDDLE->text(); fullname << ui->lineEditFAMILY->text() << ui->lineEditSUFFIX->text(); - fullname = fullname.filter(".*\\S.*"); + for (QStringList::iterator i = fullname.begin(); i != fullname.end(); i++) { + *i = i->trimmed(); + } ui->labelFULLNAME->setText(fullname.join(" ")); } void QtVCardPhotoAndNameFields::setAvatar(const ByteArray &data, const std::string &type) { ui->avatarWidget->setAvatar(data, type); } ByteArray QtVCardPhotoAndNameFields::getAvatarData() const { return ui->avatarWidget->getAvatarData(); } std::string QtVCardPhotoAndNameFields::getAvatarType() const { return ui->avatarWidget->getAvatarType(); } void QtVCardPhotoAndNameFields::setFormattedName(const QString formattedName) { ui->lineEditFN->setText(formattedName); } QString QtVCardPhotoAndNameFields::getFormattedName() const { return ui->lineEditFN->text(); } void QtVCardPhotoAndNameFields::setNickname(const QString nickname) { ui->lineEditNICKNAME->setText(nickname); } QString QtVCardPhotoAndNameFields::getNickname() const { return ui->lineEditNICKNAME->text(); } void QtVCardPhotoAndNameFields::setPrefix(const QString prefix) { ui->lineEditPREFIX->setText(prefix); } |