Swiftdiff options
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp index b82aff9..f2aa127 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp @@ -16,7 +16,8 @@ #include "QtVCardAddressLabelField.h" #include "QtVCardBirthdayField.h" #include "QtVCardDescriptionField.h" -#include "QtVCardEMailField.h" +//#include "QtVCardEMailField.h" +#include "QtVCardInternetEMailField.h" #include "QtVCardJIDField.h" #include "QtVCardOrganisationField.h" #include "QtVCardRoleField.h" @@ -42,6 +43,8 @@ QtVCardWidget::QtVCardWidget(QWidget* parent) : menu->addMenu(ui->photoAndName->getAddFieldMenu()); ui->toolButton->setMenu(menu); + addFieldType(menu, boost::make_shared<QtVCardInternetEMailField::FieldInfo>()); + //addFieldType(menu, boost::make_shared<QtVCardAddressField::FieldInfo>()); //addFieldType(menu, boost::make_shared<QtVCardEMailField::FieldInfo>()); //addFieldType(menu, boost::make_shared<QtVCardJIDField::FieldInfo>()); @@ -103,16 +106,19 @@ void QtVCardWidget::setVCard(VCard::ref vcard) { ui->photoAndName->setSuffix(P2QSTRING(vcard->getSuffix())); ui->photoAndName->setAvatar(vcard->getPhoto(), vcard->getPhotoType()); - /* + foreach (const VCard::EMailAddress& address, vcard->getEMailAddresses()) { - QtVCardEMailField* emailField = new QtVCardEMailField(this); - emailField->setAddress(P2QSTRING(address.address)); - emailField->setType(address.isX400 ? QtVCardEMailField::X_400 : QtVCardEMailField::Internet); - emailField->setWork(address.isWork); - emailField->setHome(address.isHome); - emailField->setPreferred(address.isPreferred); - ui->cardFields->insertWidget(ui->cardFields->count(), emailField); + if (address.isInternet) { + QtVCardInternetEMailField* internetEmailField = new QtVCardInternetEMailField(this); + internetEmailField->initialize(); + internetEmailField->setAddress(P2QSTRING(address.address)); + internetEmailField->setPreferred(address.isPreferred); + ui->cardFields->insertWidget(ui->cardFields->count(), internetEmailField); + } +// emailField->setWork(address.isWork); +// emailField->setHome(address.isHome); } + /* if (!vcard->getBirthday().is_not_a_date_time()) { QtVCardBirthdayField* bdayField = new QtVCardBirthdayField(this); @@ -248,6 +254,7 @@ VCard::ref QtVCardWidget::getVCard() { for(int n = 0; n < ui->cardFields->count(); n++) { QWidget* widget = ui->cardFields->itemAt(n)->widget(); + /* QtVCardEMailField* emailField; if ((emailField = dynamic_cast<QtVCardEMailField*>(widget))) { VCard::EMailAddress address; @@ -259,7 +266,7 @@ VCard::ref QtVCardWidget::getVCard() { address.isPreferred = emailField->getPreferred(); vcard->addEMailAddress(address); continue; - } + }*/ QtVCardJIDField* jidField; if ((jidField = dynamic_cast<QtVCardJIDField*>(widget))) { |