Merge lp:~rsalveti/kubuntu-packaging/qtpim-opensource-src-upstream-snapshot into lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src

[Ricardo Salveti]

New upstream snapshot, bringing a few important fixes from Renato.

Also adding patch https://codereview.qt-project.org/#change,61289, required by the addressbook (patch still in review by upstream).

[Ricardo Salveti (rsalveti)]

Source package at http://people.canonical.com/~rsalveti/qtpim/, in case bzr merge can't see the imported upstream tarball.

[Renato Araujo Oliveira Filho (renatofilho)]

this last patch is on the way to get merged. But since wee need this for the next week. I am fine with that.
Thanks.

review: Approve

[Dmitry Shachnev (mitya57)]

Thank you :)

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-11 06:56:01 +0000
+++ debian/changelog	2013-07-25 22:18:33 +0000
@@ -1,3 +1,12 @@
+qtpim-opensource-src (5.0~git20130723-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream snapshot release
+    - Fixes QTBUG-32142, QTBUG-32324 and QTBUG-32561
+  * debian/patches/added-support-to-preferreddetails-on-qml-contact.patch:
+    - Added support to preferredDetails on QML Contact.
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Thu, 25 Jul 2013 18:41:12 -0300
+
 qtpim-opensource-src (5.0~git20130701-0ubuntu1) saucy; urgency=low
 
   * New upstream snapshot release.

=== added file 'debian/patches/added-support-to-preferreddetails-on-qml-contact.patch'
--- debian/patches/added-support-to-preferreddetails-on-qml-contact.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/added-support-to-preferreddetails-on-qml-contact.patch	2013-07-25 22:18:33 +0000
@@ -0,0 +1,359 @@
+From: Renato Araujo Oliveira Filho <[e-mail]>
+Date: Fri, 19 Jul 2013 15:23:01 -0300
+Subject: Added support to preferredDetails on QML Contact.
+
+Expose all functions related with preferredDetails
+into QML contacts.
+
+Task-number: QTBUG-32515
+
+Review: https://codereview.qt-project.org/#change,61289
+---
+ .../contacts/qmlcontactslistview/ContactEditor.qml |  39 +++++--
+ .../qmlcontactslistview/DetailEditWidget.qml       |  35 +++++++
+ src/imports/contacts/qdeclarativecontact.cpp       | 114 +++++++++++++++++++++
+ src/imports/contacts/qdeclarativecontact_p.h       |   9 ++
+ 4 files changed, 191 insertions(+), 6 deletions(-)
+
+diff --git a/examples/contacts/qmlcontactslistview/ContactEditor.qml b/examples/contacts/qmlcontactslistview/ContactEditor.qml
+index 81e5f97..9cce579 100644
+--- a/examples/contacts/qmlcontactslistview/ContactEditor.qml
++++ b/examples/contacts/qmlcontactslistview/ContactEditor.qml
+@@ -39,9 +39,25 @@ Rectangle {
+             leftMargin: 10
+             topMargin: 10
+         }
+-        DetailEditWidget { id: nameField; label: "Name "; value: contact ? contact.name.firstName : " "}
+-        DetailEditWidget { id: emailField; label: "Email Address "; value: contact ? contact.email.emailAddress : " "}
+-        DetailEditWidget { id: phoneField; label: "Phone Number "; value: contact ? contact.phoneNumber.number : " "}
++        DetailEditWidget {
++            id: nameField
++            label: "Name "
++            value: contact ? contact.name.firstName : " "
++        }
++        DetailEditWidget {
++            id: emailField
++            label: "Email Address "
++            value: contact ? contact.email.emailAddress : " "
++            showPreferredField: true
++            isPreferred: contact ? contact.isPreferredDetail("MESSAGE", contact.email) : false
++        }
++        DetailEditWidget {
++            id: phoneField
++            label: "Phone Number "
++            value: contact ? contact.phoneNumber.number : " "
++            showPreferredField: true
++            isPreferred: contact ? contact.isPreferredDetail("CALL", contact.phoneNumber) : false
++        }
+     }
+     // ![Widgets for manipulating contact details]
+ 
+@@ -52,7 +68,9 @@ Rectangle {
+ 
+     function updateContact() {
+         // read in values from the input fields
+-        var values = [nameField.value, emailField.value, phoneField.value]
++        var values = [nameField.value,
++                      emailField.value, emailField.requestPreferred || emailField.isPreferred,
++                      phoneField.value, phoneField.requestPreferred || phoneField.isPreferred]
+         if (!contact) { // create new contact
+             var newContact = Qt.createQmlObject("import QtContacts 5.0; Contact{ }", contactEditor)
+             setDetailValues(newContact, values)
+@@ -60,8 +78,8 @@ Rectangle {
+             contactsModel.saveContact(newContact)
+             statusBar.updateMsg("new contact successfully created")
+         } else { // update existing contact
++            setDetailValues(contact, values)
+             if (contact.modified) {
+-                setDetailValues(contact, values)
+                 contact.save()
+                 statusBar.updateMsg("contact successfully updated")
+             } else {
+@@ -73,7 +91,14 @@ Rectangle {
+     function setDetailValues(c, values) {
+         c.name.firstName = values[0]
+         c.email.emailAddress = values[1]
+-        c.phoneNumber.number = values[2]
++        c.phoneNumber.number = values[3]
++        if (values[2]) {
++            c.setPreferredDetail("MESSAGE", c.email)
++        }
++
++        if (values[4]) {
++            c.setPreferredDetail("CALL", c.phoneNumber)
++        }
+     }
+ 
+     function cancel() {
+@@ -84,6 +109,8 @@ Rectangle {
+         nameField.inputFocus = false
+         emailField.inputFocus = false
+         phoneField.inputFocus = false
++        emailField.requestPreferred = false
++        phoneField.requestPreferred = false
+         nameField.color = "black"
+         emailField.color = "black"
+         phoneField.color = "black"
+diff --git a/examples/contacts/qmlcontactslistview/DetailEditWidget.qml b/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
+index e481941..4f490e2 100644
+--- a/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
++++ b/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
+@@ -34,6 +34,9 @@ Item {
+     property alias value: valueText.text
+     property alias color: valueText.color
+     property alias inputFocus: valueText.focus
++    property bool isPreferred: false
++    property bool requestPreferred: false
++    property bool showPreferredField: false
+ 
+     property string old
+ 
+@@ -48,6 +51,7 @@ Item {
+     }
+ 
+     Rectangle {
++        id: inputField
+         width: 180
+         height: 20
+         anchors.left: label.right
+@@ -77,5 +81,36 @@ Item {
+             }
+         }
+     }
++
++    Text {
++        id: labelFav
++
++        anchors.left: inputField.right
++        anchors.leftMargin: 5
++
++        font {
++            family: "Helvetica"
++            pixelSize: 15
++            bold: true
++            italic: true
++        }
++        text: "favorite:"
++        visible: showPreferredField
++    }
++
++    Rectangle {
++        anchors.left: labelFav.right
++        anchors.leftMargin: 5
++        anchors.verticalCenter: labelFav.verticalCenter
++        width: 10
++        height: 10
++        color: isPreferred || requestPreferred ? "black" : "white"
++        visible: showPreferredField
++
++        MouseArea {
++            anchors.fill: parent
++            onClicked: requestPreferred = !requestPreferred
++        }
++    }
+ }
+ // ![Custom DetailsEditWidget is used for entering new or modifying existing contact detlais]
+diff --git a/src/imports/contacts/qdeclarativecontact.cpp b/src/imports/contacts/qdeclarativecontact.cpp
+index 1346b46..2e08969 100644
+--- a/src/imports/contacts/qdeclarativecontact.cpp
++++ b/src/imports/contacts/qdeclarativecontact.cpp
+@@ -127,6 +127,8 @@ void QDeclarativeContact::setContact(const QContact& contact)
+     foreach (QDeclarativeContactDetail *detail, m_details)
+         delete detail;
+     m_details.clear();
++    m_preferredDetails.clear();
++
+     QList<QContactDetail> details(contact.details());
+     foreach (const QContactDetail &detail, details) {
+         QDeclarativeContactDetail *contactDetail = QDeclarativeContactDetailFactory::createContactDetail(static_cast<QDeclarativeContactDetail::DetailType>(detail.type()));
+@@ -135,6 +137,13 @@ void QDeclarativeContact::setContact(const QContact& contact)
+         m_details.append(contactDetail);
+     }
+ 
++    QMap<QString, QContactDetail> prefDetails(contact.preferredDetails());
++    QMap<QString, QContactDetail>::const_iterator  it = prefDetails.begin();
++    while (it != prefDetails.end()) {
++        m_preferredDetails.insert(it.key(), it.value().key());
++        it++;
++    }
++
+     m_modified = false;
+     emit contactChanged();
+ }
+@@ -145,6 +154,13 @@ QContact QDeclarativeContact::contact() const
+     contact.setId(m_id);
+     foreach (QDeclarativeContactDetail *detail, m_details)
+         contact.saveDetail(&detail->detail());
++
++    QVariantMap prefDetails = preferredDetails();
++    QVariantMap::const_iterator it = prefDetails.begin();
++    while (it != prefDetails.end()) {
++        contact.setPreferredDetail(it.key(), it.value().value<QDeclarativeContactDetail *>()->detail());
++        it++;
++    }
+     return contact;
+ }
+ 
+@@ -198,6 +214,7 @@ bool QDeclarativeContact::removeDetail(QDeclarativeContactDetail* detail)
+         int i = 0;
+         foreach (QDeclarativeContactDetail *contactDetail, m_details) {
+             if (key == contactDetail->detail().key()) {
++                removePrefferedDetail(detail);
+                 delete contactDetail;
+                 m_details.removeAt(i);
+                 emit contactChanged();
+@@ -209,6 +226,16 @@ bool QDeclarativeContact::removeDetail(QDeclarativeContactDetail* detail)
+     return false;
+ }
+ 
++void QDeclarativeContact::removePrefferedDetail(QDeclarativeContactDetail* detail)
++{
++    QMap<QString, int> cpy = m_preferredDetails;
++    QMap<QString, int>::const_iterator it = cpy.begin();
++    while (it != cpy.end()) {
++        if (it.value() == detail->detail().key())
++            m_preferredDetails.remove(it.key());
++    }
++}
++
+ /*!
+     \qmlmethod Contact::addDetail(detail)
+ 
+@@ -233,6 +260,93 @@ bool QDeclarativeContact::addDetail(QDeclarativeContactDetail* detail)
+ }
+ 
+ /*!
++    \qmlmethod Contact::setPreferredDetail(actionName, detail)
++
++    Set a particular detail (\a preferredDetail) as the preferred detail for any actions with the given \a actionName.
++
++    The \a preferredDetail object must exist in this object, and the \a actionName cannot be empty.
++
++    Returns true if the preference could be recorded, and false otherwise.
++
++    \sa preferredDetail()
++ */
++bool QDeclarativeContact::setPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail)
++{
++   if (actionName.isEmpty() || !detail || !m_details.contains(detail))
++        return false;
++
++   if (m_preferredDetails.contains(actionName) && m_preferredDetails[actionName] == detail->detail().key())
++       return false;
++
++   m_preferredDetails.insert(actionName, detail->detail().key());
++   m_modified = true;
++   emit contactChanged();
++   return true;
++}
++
++/*!
++    \qmlmethod Contact::isPreferredDetail(actionName, detail)
++
++    Returns true if the given \a detail is a preferred detail for the given \a actionName,
++    or for any action if the \a actionName is empty.
++
++    \sa preferredDetail()
++ */
++bool QDeclarativeContact::isPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail) const
++{
++    if (actionName.isEmpty() || !detail || !m_details.contains(detail))
++         return false;
++
++    if (!m_preferredDetails.contains(actionName))
++        return false;
++
++    return (m_preferredDetails[actionName] == detail->detail().key());
++}
++
++/*!
++    \qmlmethod Contact::preferredDetail(actionName, detail)
++
++    Returns the preferred detail for a given \a actionName.
++
++    If the \a actionName is empty, or there is no preference recorded for
++    the supplied \a actionName, returns null.
++
++    \sa preferredDetails()
++ */
++QDeclarativeContactDetail* QDeclarativeContact::preferredDetail(const QString& actionName) const
++{
++    int id = m_preferredDetails.value(actionName, -1);
++    if (id == -1)
++        return 0;
++
++    foreach (QDeclarativeContactDetail* detail, m_details) {
++        if (detail->detail().key() == id)
++            return detail;
++    }
++    return 0;
++}
++
++
++/*!
++    \qmlproperty map<string, ContactDetail> Contact::preferredDetails
++
++    This property holds the recorded detail preferences for action names.
++
++    Each entry in the map has the action name as the key, and the corresponding
++    preferred detail as the value.
++ */
++QVariantMap QDeclarativeContact::preferredDetails() const
++{
++    QVariantMap result;
++    QMap<QString, int>::const_iterator it = m_preferredDetails.begin();
++    while (it != m_preferredDetails.end()) {
++        result.insert(it.key(), QVariant::fromValue<QDeclarativeContactDetail*>(preferredDetail(it.key())));
++        it++;
++    }
++    return result;
++}
++
++/*!
+     \qmlproperty list<ContactDetail> Contact::contactDetails
+ 
+     This property holds the list of all the details that the contact has.
+diff --git a/src/imports/contacts/qdeclarativecontact_p.h b/src/imports/contacts/qdeclarativecontact_p.h
+index 9abf0d4..21a8879 100644
+--- a/src/imports/contacts/qdeclarativecontact_p.h
++++ b/src/imports/contacts/qdeclarativecontact_p.h
+@@ -95,6 +95,7 @@ class QDeclarativeContact : public QObject
+     Q_PROPERTY (QDeclarativeContactUrl*  url READ url NOTIFY contactChanged)
+     Q_PROPERTY (QQmlListProperty<QDeclarativeContactUrl> urls READ urls NOTIFY contactChanged)
+     Q_PROPERTY (QDeclarativeContactVersion*  version READ version NOTIFY contactChanged)
++    Q_PROPERTY (QVariantMap preferredDetails READ preferredDetails NOTIFY contactChanged)
+     Q_CLASSINFO("DefaultProperty", "contactDetails")
+ 
+ public:
+@@ -119,6 +120,11 @@ public:
+     Q_INVOKABLE bool removeDetail(QDeclarativeContactDetail* detail);
+     Q_INVOKABLE bool addDetail(QDeclarativeContactDetail* detail);
+ 
++    Q_INVOKABLE bool setPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail);
++    Q_INVOKABLE bool isPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail) const;
++    Q_INVOKABLE QDeclarativeContactDetail* preferredDetail(const QString& actionName) const;
++    QVariantMap preferredDetails() const;
++
+     QDeclarativeContactAddress* address();
+     QQmlListProperty<QDeclarativeContactAddress>  addresses();
+     QDeclarativeContactAnniversary* anniversary();
+@@ -160,6 +166,7 @@ protected:
+     // always create a copy of the detail for QML
+     // however, seems the garbage collection can't delete all of them (QTBUG-20377)
+     QList<QDeclarativeContactDetail *> m_details;
++    QMap<QString, int> m_preferredDetails;
+ 
+ public slots:
+     void clearDetails();
+@@ -193,6 +200,8 @@ private:
+         return 0;
+     }
+ 
++    void removePrefferedDetail(QDeclarativeContactDetail *detail);
++
+     // call-back functions for list property
+     static void _q_detail_append(QQmlListProperty<QDeclarativeContactDetail> *property, QDeclarativeContactDetail *value);
+     static QDeclarativeContactDetail *_q_detail_at(QQmlListProperty<QDeclarativeContactDetail> *property, int index);
+-- 
+1.8.3.2
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-01 13:17:25 +0000
+++ debian/patches/series	2013-07-25 22:18:33 +0000
@@ -1,1 +1,2 @@
 revert_module_version.patch
+added-support-to-preferreddetails-on-qml-contact.patch