Merge lp:~boiko/messaging-app/fix_mouse_back_button into lp:messaging-app

[Gustavo Pichorim Boiko]

Hide and disable the Section object when it is not in use.

Hide and disable the Section object when it is not in use.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:529
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/983/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6766/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/492/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6777/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/983/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/messaging-app/fix_mouse_back_button]

530. By Gustavo Pichorim Boiko on 2016-03-16

Merge parent branch.

531. By Gustavo Pichorim Boiko on 2016-03-16

Adapt to parent branch.

Unmerged revisions

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2016-02-23 15:07:46 +0000
+++ src/qml/Messages.qml	2016-03-16 23:28:13 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 Canonical Ltd.
+ * Copyright 2012-2016 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -477,12 +477,14 @@
         flickable: null
 
         Sections {
-            id: sections
+            id: headerSections
             anchors {
                 left: parent.left
                 leftMargin: units.gu(2)
                 bottom: parent.bottom
             }
+            visible: headerSections.model.length > 1
+            enabled: visible
             model: getSectionsModel()
             selectedIndex: getSelectedIndex()
             onSelectedIndexChanged: {
@@ -492,7 +494,7 @@
             }
         }
 
-        extension: sections.model.length > 1 ? sections : null
+        extension: headerSections.model.length > 1 ? headerSections : null
 
         leadingActionBar {
             id: leadingBar
@@ -756,8 +758,8 @@
             // force reevaluation
             messages.account = Qt.binding(getCurrentAccount)
             messages.phoneAccount = Qt.binding(isPhoneAccount)
-            head.sections.model = Qt.binding(getSectionsModel)
-            head.sections.selectedIndex = Qt.binding(getSelectedIndex)
+            headerSections.model = Qt.binding(getSectionsModel)
+            headerSections.selectedIndex = Qt.binding(getSelectedIndex)
         }
     }
 
@@ -1152,7 +1154,7 @@
 
             if (messages.account && messages.accountId == "") {
                 messages.accountId = messages.account.accountId
-                messages.head.sections.selectedIndex = Qt.binding(getSelectedIndex)
+                headerSections.selectedIndex = Qt.binding(getSelectedIndex)
             }
 
             var newAttachments = []

=== modified file 'src/qml/NewRecipientPage.qml'
--- src/qml/NewRecipientPage.qml	2016-02-01 20:10:42 +0000
+++ src/qml/NewRecipientPage.qml	2016-03-16 23:28:13 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 2014 Canonical Ltd.
+ * Copyright 2012-2016 Canonical Ltd.
  *
  * This file is part of messaging-app.
  *
@@ -213,9 +213,9 @@
     }
 
     Connections {
-        target: newRecipientPage.head.sections
+        target: headerSections
         onSelectedIndexChanged: {
-            switch (newRecipientPage.head.sections.selectedIndex) {
+            switch (headerSections.selectedIndex) {
             case 0:
                 contactList.showAllContacts()
                 break;