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/QtVCardPhotoAndNameFields.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/QtVCardPhotoAndNameFields.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp index 4ad12c8..aaea194 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp @@ -33,17 +33,10 @@ QtVCardPhotoAndNameFields::QtVCardPhotoAndNameFields(QWidget* parent) : ui->lineEditSUFFIX->setPlaceholderText(tr("Suffix")); #endif - addFieldMenu = new QMenu("Name", this); - - actionSignalMapper = new QSignalMapper(this); - - connect(actionSignalMapper, SIGNAL(mapped(const QString &)), this, SLOT(showField(const QString &))); - prepareAddFieldMenu(); } QtVCardPhotoAndNameFields::~QtVCardPhotoAndNameFields() { delete ui; - delete actionSignalMapper; } bool QtVCardPhotoAndNameFields::isEditable() const { @@ -75,12 +68,6 @@ void QtVCardPhotoAndNameFields::setEditable(bool editable) { fullname << ui->lineEditFAMILY->text() << ui->lineEditSUFFIX->text(); fullname = fullname.filter(".*\\S.*"); ui->labelFULLNAME->setText(fullname.join(" ")); - - prepareAddFieldMenu(); -} - -QMenu* QtVCardPhotoAndNameFields::getAddFieldMenu() const { - return addFieldMenu; } void QtVCardPhotoAndNameFields::setAvatar(const ByteArray &data, const std::string &type) { @@ -151,31 +138,4 @@ QString QtVCardPhotoAndNameFields::getSuffix() const { return ui->lineEditSUFFIX->text(); } -void QtVCardPhotoAndNameFields::prepareAddFieldMenu() { - foreach(QAction* action, addFieldMenu->actions()) { - actionSignalMapper->removeMappings(action); - } - - addFieldMenu->clear(); - foreach(QObject* obj, children()) { - QLineEdit* lineEdit = 0; - if (!(lineEdit = dynamic_cast<QLineEdit*>(obj))) continue; - if (lineEdit->isHidden()) { -#if QT_VERSION >= 0x040700 - QAction* action = addFieldMenu->addAction(QString("Add ") + lineEdit->placeholderText(), actionSignalMapper, SLOT(map())); -#else - QAction* action = addFieldMenu->addAction(QString("Add ") + lineEdit->toolTip(), actionSignalMapper, SLOT(map())); -#endif - actionSignalMapper->setMapping(action, lineEdit->objectName()); - } - } -} - -void QtVCardPhotoAndNameFields::showField(const QString& widgetName) { - QLineEdit* lineEditToShow = findChild<QLineEdit*>(widgetName); - if (lineEditToShow) lineEditToShow->show(); - - prepareAddFieldMenu(); -} - } |