Merge lp:~renatofilho/address-book-app/enable-share-button into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Enabled share button again.
Load frequently called contact when the list became visible.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:201
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2309
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2309/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/988
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1340
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1340/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/179/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1417
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/181
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2369
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2369/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9105
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1367
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1367/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/181/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-autolanding/24/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1421/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-autolanding/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/24
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-autolanding/24
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1719/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2375
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9112
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1371
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1371/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/185/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1441/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/185
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/185
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1733/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2401
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1023
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1387
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1387/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/185/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1467
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/191
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2434
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2434/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9160
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1041
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1412
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1412/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/191/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/enable-share-button]

203. By Renato Araujo Oliveira Filho on 2014-07-02

Staging merged.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/193
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2445
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1418/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/193/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

review: Approve

=== modified file 'po/address-book-app.pot'
--- po/address-book-app.pot	2014-06-27 12:54:55 +0000
+++ po/address-book-app.pot	2014-07-02 14:31:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: address-book-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-27 09:54-0300\n"
+"POT-Creation-Date: 2014-06-30 15:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -55,12 +55,12 @@
 
 #: src/imports/ContactEdit/AddFieldDialog.qml:133
 #: src/imports/ContactEdit/ContactEditor.qml:372
-#: src/imports/ContactList/ContactListPage.qml:324
+#: src/imports/ContactList/ContactListPage.qml:314
 #: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
 msgid "Cancel"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:252
+#: src/imports/ContactList/ContactListPage.qml:242
 msgid "Cancel selection"
 msgstr ""
 
@@ -86,8 +86,8 @@
 msgstr ""
 
 #: src/imports/ContactEdit/ContactEditor.qml:337
-#: src/imports/ContactList/ContactListPage.qml:148
-#: src/imports/ContactList/ContactListPage.qml:277
+#: src/imports/ContactList/ContactListPage.qml:146
+#: src/imports/ContactList/ContactListPage.qml:267
 msgid "Delete"
 msgstr ""
 
@@ -96,7 +96,7 @@
 msgstr ""
 
 #: src/imports/ContactEdit/ContactEditor.qml:141
-#: src/imports/ContactView/ContactView.qml:219
+#: src/imports/ContactView/ContactView.qml:217
 msgid "Edit"
 msgstr ""
 
@@ -173,7 +173,7 @@
 msgid "Loading"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:242
+#: src/imports/ContactList/ContactListPage.qml:232
 msgid "Loading..."
 msgstr ""
 
@@ -246,15 +246,15 @@
 msgid "Save"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:302
+#: src/imports/ContactList/ContactListPage.qml:292
 msgid "Search"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:277
+#: src/imports/ContactList/ContactListPage.qml:267
 msgid "Select"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:261
+#: src/imports/ContactList/ContactListPage.qml:251
 msgid "Select All"
 msgstr ""
 
@@ -266,6 +266,10 @@
 msgid "Select a field"
 msgstr ""
 
+#: src/imports/ContactView/ContactView.qml:206
+msgid "Share"
+msgstr ""
+
 #: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:67
 msgid "Skype"
 msgstr ""
@@ -279,15 +283,15 @@
 msgid "Street"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:293
+#: src/imports/ContactList/ContactListPage.qml:283
 msgid "Sync"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:293
+#: src/imports/ContactList/ContactListPage.qml:283
 msgid "Syncing"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:242
+#: src/imports/ContactList/ContactListPage.qml:232
 msgid "Syncing..."
 msgstr ""
 

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2014-06-13 19:54:01 +0000
+++ src/imports/ContactView/ContactView.qml	2014-07-02 14:31:19 +0000
@@ -200,19 +200,17 @@
                 }
             }
         }
-        // FIXME: Having more than 3 options in the header causes a bug that make difficult to reach the component behind it.
-        // Enable it again when the bug #1329557 get fix
-//        ToolbarButton {
-//            action: Action {
-//                objectName: "share"
-//                text: i18n.tr("Share")
-//                iconName: "share"
-//                onTriggered: {
-//                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
-//                                   { contactModel: root.model, contact: root.contact})
-//                }
-//            }
-//        }
+        ToolbarButton {
+            action: Action {
+                objectName: "share"
+                text: i18n.tr("Share")
+                iconName: "share"
+                onTriggered: {
+                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
+                                   { contactModel: root.model, contact: root.contact})
+                }
+            }
+        }
         ToolbarButton {
             action: Action {
                 objectName: "edit"

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-27 21:27:30 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-02 14:31:19 +0000
@@ -440,8 +440,15 @@
 
                 model: MostCalledModel {
                     id: calledModel
+
+                    readonly property bool visible:  view.favouritesIsSelected
+
+                    onVisibleChanged: {
+                        if (visible) {
+                            filterEntries()
+                        }
+                    }
                     maxCount: 20
-
                     onInfoRequested: root.infoRequested(contact)
                     onDetailClicked: root.detailClicked(contact, detail, action)
                     onAddContactClicked: root.addContactClicked(label)

=== modified file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
--- src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-06-27 13:48:19 +0000
+++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-07-02 14:31:19 +0000
@@ -124,7 +124,6 @@
             sortField: "timestamp"
             sortOrder: HistorySort.DescendingOrder
         }
-        Component.onCompleted: root.filterEntries()
     }