diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/examples/samplephonebook/contacteditor.cpp --- a/qtmobility/examples/samplephonebook/contacteditor.cpp Fri Apr 16 15:51:22 2010 +0300 +++ b/qtmobility/examples/samplephonebook/contacteditor.cpp Mon May 03 13:18:40 2010 +0300 @@ -49,60 +49,72 @@ m_manager = 0; m_contactId = QContactLocalId(0); -#ifdef Q_OS_SYMBIAN - // In symbian "save" and "cancel" buttons are softkeys. - m_saveBtn = new QAction("Save", this); - m_saveBtn->setSoftKeyRole(QAction::PositiveSoftKey); - addAction(m_saveBtn); - connect(m_saveBtn, SIGNAL(triggered(bool)), this, SLOT(saveClicked())); - m_cancelBtn = new QAction("Cancel", this); - m_cancelBtn->setSoftKeyRole(QAction::NegativeSoftKey); - addAction(m_cancelBtn); - connect(m_cancelBtn, SIGNAL(triggered(bool)), this, SLOT(cancelClicked())); -#else - m_saveBtn = new QPushButton("Save", this); - connect(m_saveBtn, SIGNAL(clicked()), this, SLOT(saveClicked())); - m_cancelBtn = new QPushButton("Cancel", this); - connect(m_cancelBtn, SIGNAL(clicked()), this, SLOT(cancelClicked())); -#endif - m_nameEdit = new QLineEdit(this); m_phoneEdit = new QLineEdit(this); m_emailEdit = new QLineEdit(this); m_addrEdit = new QLineEdit(this); - m_avatarBtn = new QPushButton("Add image", this); + m_avatarBtn = new QPushButton(tr("Add image"), this); m_avatarBtn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); connect(m_avatarBtn, SIGNAL(clicked()), this, SLOT(avatarClicked())); + QFormLayout *detailsLayout = new QFormLayout; - detailsLayout->addRow(new QLabel("Name", this)); - detailsLayout->addRow(m_nameEdit); - detailsLayout->addRow(new QLabel("Phone", this)); - detailsLayout->addRow(m_phoneEdit); - detailsLayout->addRow(new QLabel("Email", this)); - detailsLayout->addRow(m_emailEdit); - detailsLayout->addRow(new QLabel("Address", this)); - detailsLayout->addRow(m_addrEdit); - detailsLayout->addRow(new QLabel("Avatar", this)); - detailsLayout->addRow(m_avatarBtn); + QLabel *nameLabel = new QLabel(tr("Name"), this); + QLabel *phoneLabel = new QLabel(tr("Phone"), this); + QLabel *emailLabel = new QLabel(tr("Email"), this); + QLabel *addressLabel = new QLabel(tr("Address"), this); + QLabel *avatarLabel = new QLabel(tr("Avatar"), this); + if (QApplication::desktop()->availableGeometry().width() < 360) { + // Narrow screen: put label on separate line to textbox + detailsLayout->addRow(nameLabel); + detailsLayout->addRow(m_nameEdit); + detailsLayout->addRow(phoneLabel); + detailsLayout->addRow(m_phoneEdit); + detailsLayout->addRow(emailLabel); + detailsLayout->addRow(m_emailEdit); + detailsLayout->addRow(addressLabel); + detailsLayout->addRow(m_addrEdit); + detailsLayout->addRow(avatarLabel); + detailsLayout->addRow(m_avatarBtn); + } else { + // Wide screen: put label on same line as textbox + detailsLayout->addRow(nameLabel, m_nameEdit); + detailsLayout->addRow(phoneLabel, m_phoneEdit); + detailsLayout->addRow(emailLabel, m_emailEdit); + detailsLayout->addRow(addressLabel, m_addrEdit); + detailsLayout->addRow(avatarLabel, m_avatarBtn); + } detailsLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); detailsLayout->setSizeConstraint(QLayout::SetMinAndMaxSize); - + QScrollArea *detailsScrollArea = new QScrollArea(this); detailsScrollArea->setWidgetResizable(true); QWidget *detailsContainer = new QWidget(detailsScrollArea); detailsContainer->setLayout(detailsLayout); detailsScrollArea->setWidget(detailsContainer); -#ifndef Q_OS_SYMBIAN + QVBoxLayout *editLayout = new QVBoxLayout; + editLayout->addWidget(detailsScrollArea); + +#ifdef Q_OS_SYMBIAN + // In symbian "save" and "cancel" buttons are softkeys. + m_saveBtn = new QAction(tr("Save"), this); + m_saveBtn->setSoftKeyRole(QAction::PositiveSoftKey); + addAction(m_saveBtn); + connect(m_saveBtn, SIGNAL(triggered(bool)), this, SLOT(saveClicked())); + m_cancelBtn = new QAction(tr("Cancel"), this); + m_cancelBtn->setSoftKeyRole(QAction::NegativeSoftKey); + addAction(m_cancelBtn); + connect(m_cancelBtn, SIGNAL(triggered(bool)), this, SLOT(cancelClicked())); +#else + m_saveBtn = new QPushButton(tr("&Save"), this); + m_saveBtn->setDefault(true); + connect(m_saveBtn, SIGNAL(clicked()), this, SLOT(saveClicked())); + m_cancelBtn = new QPushButton(tr("&Cancel"), this); + connect(m_cancelBtn, SIGNAL(clicked()), this, SLOT(cancelClicked())); QHBoxLayout *btnLayout = new QHBoxLayout; btnLayout->addWidget(m_saveBtn); btnLayout->addWidget(m_cancelBtn); -#endif - - QVBoxLayout *editLayout = new QVBoxLayout; - editLayout->addWidget(detailsScrollArea); -#ifndef Q_OS_SYMBIAN editLayout->addLayout(btnLayout); #endif @@ -119,18 +131,16 @@ m_contactId = currentId; m_newAvatarPath = QString(); - if (manager == 0 || currentId == 0) { - // clear the UI and return. - m_nameEdit->setText(""); - m_phoneEdit->setText(""); - m_emailEdit->setText(""); - m_addrEdit->setText(""); - m_avatarBtn->setText("Add image"); - m_avatarBtn->setIcon(QIcon()); + // Clear UI + m_nameEdit->clear(); + m_phoneEdit->clear(); + m_emailEdit->clear(); + m_addrEdit->clear(); + m_avatarBtn->setText("Add image"); + m_avatarBtn->setIcon(QIcon()); - if (manager == 0) - m_saveBtn->setEnabled(false); - + if (manager == 0) { + m_saveBtn->setEnabled(false); return; } @@ -138,30 +148,65 @@ m_saveBtn->setEnabled(true); // otherwise, build from the contact details. - QContact curr = manager->contact(m_contactId); - QContactName nm = curr.detail(QContactName::DefinitionName); + QContact curr; + if (m_contactId != QContactLocalId(0)) + curr = manager->contact(m_contactId); + + // Disable fields & buttons according to what the backend supports + QMap defs = m_manager->detailDefinitions(QContactType::TypeContact); + + // name + //QContactName nm = curr.detail(QContactName::DefinitionName); + if (m_contactId != QContactLocalId(0)) + m_nameEdit->setText(manager->synthesizedDisplayLabel(curr)); + + // phonenumber QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName); - QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); - QContactAddress adr = curr.detail(QContactAddress::DefinitionName); - QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); - - m_nameEdit->setText(manager->synthesizedDisplayLabel(curr)); m_phoneEdit->setText(phn.value(QContactPhoneNumber::FieldNumber)); - m_emailEdit->setText(em.value(QContactEmailAddress::FieldEmailAddress)); - m_addrEdit->setText(adr.value(QContactAddress::FieldStreet)); // ugly hack. - - m_avatarBtn->setText(QString()); - m_avatarBtn->setIcon(QIcon()); - - if (av.pixmap().isNull()) { - if (av.avatar().isEmpty()) { - m_avatarBtn->setText("Add image"); + + // email + if (defs.contains(QContactEmailAddress::DefinitionName)) { + QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); + m_emailEdit->setText(em.value(QContactEmailAddress::FieldEmailAddress)); + m_emailEdit->setReadOnly(false); + } else { + m_emailEdit->setText(""); + m_emailEdit->setReadOnly(true); + } + + // address + if (defs.contains(QContactAddress::DefinitionName)) { + QContactAddress adr = curr.detail(QContactAddress::DefinitionName); + m_addrEdit->setText(adr.value(QContactAddress::FieldStreet)); // ugly hack. + m_addrEdit->setReadOnly(false); + } else { + m_addrEdit->setText(""); + m_addrEdit->setReadOnly(true); + } + + // avatar button + if (defs.contains(QContactAvatar::DefinitionName)) { + QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); + QContactThumbnail thumb = curr.detail(QContactThumbnail::DefinitionName); + m_avatarBtn->setText(QString()); + m_avatarBtn->setIcon(QIcon()); + if (thumb.thumbnail().isNull()) { + if (av.imageUrl().isEmpty()) { + m_avatarBtn->setText("Add image"); + } else { + m_avatarBtn->setIcon(QIcon(QPixmap(av.imageUrl().toLocalFile()))); + m_thumbnail = QImage(av.imageUrl().toLocalFile()); + } } else { - m_avatarBtn->setIcon(QIcon(QPixmap(av.avatar()))); + m_newAvatarPath = av.imageUrl().toLocalFile(); + m_thumbnail = thumb.thumbnail(); + m_avatarBtn->setIcon(QIcon(QPixmap::fromImage(thumb.thumbnail()))); } + m_avatarBtn->setDisabled(false); } else { - m_newAvatarPath = av.avatar(); - m_avatarBtn->setIcon(QIcon(av.pixmap())); + m_avatarBtn->setIcon(QIcon()); + m_avatarBtn->setText(""); + m_avatarBtn->setDisabled(true); } } @@ -187,9 +232,10 @@ // put up a file dialog, and update the new avatar path. QString fileName = QFileDialog::getOpenFileName(this, tr("Select Avatar Image"), ".", tr("Image Files (*.png *.jpg *.bmp)")); - + if (!fileName.isEmpty()) { m_newAvatarPath = fileName; + m_thumbnail = QImage(m_newAvatarPath); m_avatarBtn->setText(QString()); m_avatarBtn->setIcon(QIcon(m_newAvatarPath)); } @@ -203,38 +249,52 @@ QContact curr; if (m_contactId != QContactLocalId(0)) curr = m_manager->contact(m_contactId); - QContactName nm = curr.detail(QContactName::DefinitionName); - QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName); - QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); - QContactAddress adr = curr.detail(QContactAddress::DefinitionName); - QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); + + if (m_nameEdit->text().isEmpty()) { + QMessageBox::information(this, "Failed!", "You must give a name for the contact!"); + return; + } - QString saveNameField = nameField(); - if (!saveNameField.isEmpty()) { + if (m_nameEdit->text() != m_manager->synthesizedDisplayLabel(curr)) { // if the name has changed (ie, is different to the synthed label) then save it as a custom label. - if (m_nameEdit->text() != m_manager->synthesizedDisplayLabel(curr)) { - nm.setValue(nameField(), m_nameEdit->text()); + QString saveNameField = nameField(); + if (!saveNameField.isEmpty()) { + QContactName nm = curr.detail(QContactName::DefinitionName); + nm.setValue(saveNameField, m_nameEdit->text()); + curr.saveDetail(&nm); } } + + QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName); phn.setNumber(m_phoneEdit->text()); - em.setEmailAddress(m_emailEdit->text()); - adr.setStreet(m_addrEdit->text()); - av.setAvatar(m_newAvatarPath); + curr.saveDetail(&phn); + + if (!m_emailEdit->isReadOnly()) { + QContactEmailAddress em = curr.detail(QContactEmailAddress::DefinitionName); + em.setEmailAddress(m_emailEdit->text()); + curr.saveDetail(&em); + } - QPixmap pix(m_newAvatarPath); - av.setPixmap(pix); + if (!m_addrEdit->isReadOnly()) { + QContactAddress adr = curr.detail(QContactAddress::DefinitionName); + adr.setStreet(m_addrEdit->text()); + curr.saveDetail(&adr); + } - curr.saveDetail(&nm); - curr.saveDetail(&phn); - curr.saveDetail(&em); - curr.saveDetail(&adr); - curr.saveDetail(&av); + if (m_avatarBtn->isEnabled()) { + QContactAvatar av = curr.detail(QContactAvatar::DefinitionName); + av.setImageUrl(QUrl(m_newAvatarPath)); + curr.saveDetail(&av); + + QContactThumbnail thumb = curr.detail(QContactThumbnail::DefinitionName); + QImage img(m_thumbnail); + thumb.setThumbnail(img); + curr.saveDetail(&thumb); + } bool success = m_manager->saveContact(&curr); - if (success) - QMessageBox::information(this, "Success!", "Contact saved successfully!"); - else - QMessageBox::information(this, "Failed!", "Failed to save contact!"); + if (!success) + QMessageBox::information(this, "Failed!", QString("Failed to save contact!\n(error code %1)").arg(m_manager->error())); } emit showListPage();