Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-10-16 18:41:41 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2013-10-26 15:33:27 (GMT) |
| commit | 806157b94327f8c41f5e4402a73608cd9e5225b0 (patch) | |
| tree | 287d0c5f73c21d189db3eea485621a9c784bf1c8 /Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp | |
| parent | f7a239f06131bdad9ca7c11e88496de1d7b5a9f9 (diff) | |
| download | swift-806157b94327f8c41f5e4402a73608cd9e5225b0.zip swift-806157b94327f8c41f5e4402a73608cd9e5225b0.tar.bz2 | |
VCard: Remove name fields from field menu. They're always displayed in edit mode now.
Change-Id: I9ee5faae53e9300300e01a1782b51645399f1669
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp index 1c80fa4..160482e 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp @@ -4,30 +4,27 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#include "QtVCardWidget.h" -#include "ui_QtVCardWidget.h" +#include <Swift/QtUI/QtVCardWidget/QtVCardWidget.h> #include <QDebug> #include <QLineEdit> #include <QMenu> -#include "QtVCardAddressField.h" -#include "QtVCardAddressLabelField.h" -#include "QtVCardBirthdayField.h" -#include "QtVCardDescriptionField.h" -#include "QtVCardGeneralField.h" -#include "QtVCardInternetEMailField.h" -#include "QtVCardJIDField.h" -#include "QtVCardOrganizationField.h" -#include "QtVCardRoleField.h" -#include "QtVCardTelephoneField.h" -#include "QtVCardTitleField.h" -#include "QtVCardURLField.h" - +#include <Swift/QtUI/QtVCardWidget/ui_QtVCardWidget.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardAddressField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardBirthdayField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardJIDField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardRoleField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardTitleField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardURLField.h> #include <Swift/QtUI/QtSwiftUtil.h> -#include <Swiften/Base/Log.h> - namespace Swift { QtVCardWidget::QtVCardWidget(QWidget* parent) : @@ -42,7 +39,6 @@ QtVCardWidget::QtVCardWidget(QWidget* parent) : ui->cardFields->setColumnStretch(4,2); menu = new QMenu(this); - menu->addMenu(ui->photoAndName->getAddFieldMenu()); ui->toolButton->setMenu(menu); addFieldType(menu, boost::make_shared<QtVCardInternetEMailField::FieldInfo>()); @@ -89,7 +85,6 @@ void QtVCardWidget::setEditable(bool editable) { } void QtVCardWidget::setVCard(VCard::ref vcard) { - SWIFT_LOG(debug) << std::endl; clearFields(); this->vcard = vcard; ui->photoAndName->setFormattedName(P2QSTRING(vcard->getFullName())); @@ -184,7 +179,6 @@ void QtVCardWidget::setVCard(VCard::ref vcard) { } VCard::ref QtVCardWidget::getVCard() { - SWIFT_LOG(debug) << std::endl; clearEmptyFields(); vcard->setFullName(Q2PSTRING(ui->photoAndName->getFormattedName())); vcard->setNickname(Q2PSTRING(ui->photoAndName->getNickname())); |