Merge lp:~paulliu/unity8/lp1378469_MessageMenu into lp:unity8

[Ying-Chun Liu]

Auto hide the indicators menu when last message is replied. (LP: 1378469)

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.
 * Did you make sure that your branch does not contain spurious tags?
Yes.
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[Nick Dedekind (nick-dedekind)]

Hm. i'd rather use a signal from the Factory to close the indicator rather than calling hide directly.
We used to have this feature when clicking buttons/etc in the indicator. Take a look at revision 585.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1461
http://jenkins.qa.ubuntu.com/job/unity8-ci/5021/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/186
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/457/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/521
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16508

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5021/rebuild

review: Needs Fixing (continuous-integration)

[lp:~paulliu/unity8/lp1378469_MessageMenu]

1462. By Ying-Chun Liu on 2014-12-17

Use signal to handle the hide event.

[Nick Dedekind (nick-dedekind)]

Urg. This is a bit nasty. Not only is this putting specific knowledge about how an indicator works into the page, it's also going to be a bit buggy.

Firstly, we're assuming that the page will be empty when we reply to the last message. Secondly, if we reply to a message when there are more than one in there and then clear all the messages at a later time then the indicators will close, due to the cached "messageReplied" property.

I think we need another component to keep track of how many messages are left (eg. MessageCounter.qml can use a filter model with model.type == "com.canonical.indicator.messages.messageitem"). Then, if we reply to a message and the count of messages drops to zero within 'x' seconds (still not the best), then signal a panel close. You could add the timer to what you have already; but it's just so much code speific to the messaging menu...

This is prabably a bit more complicated than you originally thought; so if you want me to take over the bug let me know :)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1462
http://jenkins.qa.ubuntu.com/job/unity8-ci/5057/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/607
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/607/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16653

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5057/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1462
http://jenkins.qa.ubuntu.com/job/unity8-ci/5457/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/621
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/622
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1852
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18979

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5457/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1462. By Ying-Chun Liu on 2014-12-17

Use signal to handle the hide event.

1461. By Ying-Chun Liu on 2014-12-09

Fix bugs

1460. By Ying-Chun Liu on 2014-12-03

Message replied then auto-close.

=== modified file 'qml/Panel/IndicatorPage.qml'
--- qml/Panel/IndicatorPage.qml	2014-10-31 17:07:08 +0000
+++ qml/Panel/IndicatorPage.qml	2014-12-17 15:11:49 +0000
@@ -27,6 +27,8 @@
     property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem
     readonly property alias factory: _factory
 
+    signal repliedLastMessage()
+
     Indicators.UnityMenuModelStack {
         id: menuStack
         head: main.menuModel
@@ -92,11 +94,18 @@
 
         property int selectedIndex: -1
         property bool blockCurrentIndexChange: false
+        property bool messageReplied: false
         // for count = 0
         onCountChanged: {
             if (count == 0 && selectedIndex != -1) {
                 selectedIndex = -1;
             }
+            if (messageReplied) {
+                messageReplied = false;
+                if (count == 0) {
+                    main.repliedLastMessage();
+                }
+            }
         }
         // for highlight following
         onSelectedIndexChanged: {
@@ -153,6 +162,9 @@
                 if (item.hasOwnProperty("menuIndex")) {
                     item.menuIndex = Qt.binding(function() { return modelIndex; });
                 }
+                if (item.hasOwnProperty("mainMenu")) {
+                    item.mainMenu = Qt.binding(function() { return mainMenu; });
+                }
             }
 
             Binding {

=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
--- qml/Panel/Indicators/MessageMenuItemFactory.qml	2014-09-09 16:01:25 +0000
+++ qml/Panel/Indicators/MessageMenuItemFactory.qml	2014-12-17 15:11:49 +0000
@@ -30,6 +30,7 @@
     property var menuModel: null
     property QtObject menuData: null
     property int menuIndex: -1
+    property var mainMenu: null
 
     property bool selected: false
     signal menuSelected
@@ -165,6 +166,7 @@
             }
             onReplied: {
                 replyAction.activate(value);
+                messageFactoryItem.mainMenu.messageReplied = true;
             }
             onTriggered: {
                 if (selected) {

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2014-10-21 19:32:03 +0000
+++ qml/Panel/IndicatorsMenu.qml	2014-12-17 15:11:49 +0000
@@ -79,6 +79,7 @@
         visible: root.unitProgress > 0
         enabled: contentEnabled
         currentMenuIndex: bar.currentItemIndex
+        indicatorsMenu: root
     }
 
     Handle {

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-10-23 11:59:22 +0000
+++ qml/Panel/MenuContent.qml	2014-12-17 15:11:49 +0000
@@ -27,6 +27,7 @@
 
     property QtObject indicatorsModel: null
     property int currentMenuIndex: -1
+    property var indicatorsMenu: null
     color: "#221e1c" // FIXME not in palette yet
 
     width: units.gu(40)
@@ -70,6 +71,10 @@
                 busName: indicatorProperties.busName
                 actionsObjectPath: indicatorProperties.actionsObjectPath
                 menuObjectPath: indicatorProperties.menuObjectPath
+
+                onRepliedLastMessage: {
+                    content.indicatorsMenu.hide()
+                }
             }
 
             onVisibleChanged: {