Unity 8

Merge lp:~nick-dedekind/unity8/indicator.dismissal into lp:unity8

  1. indicator.dismissal
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Michał Sawicz
Approved revision: 999
Merged at revision: 1056
Proposed branch: lp:~nick-dedekind/unity8/indicator.dismissal
Merge into: lp:unity8
Prerequisite: lp:~nick-dedekind/unity8/move-indicator-qml
Diff against target: 163 lines (+1/-49)
6 files modified
qml/Panel/Indicators.qml (+1/-0)
qml/Panel/Indicators/MenuItemFactory.qml (+0/-6)
qml/Panel/Indicators/MessageMenuItemFactory.qml (+0/-3)
qml/Panel/Panel.qml (+0/-22)
qml/Shell.qml (+0/-4)
tests/qmltests/Panel/tst_Panel.qml (+0/-14)
To merge this branch: bzr merge lp:~nick-dedekind/unity8/indicator.dismissal
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Albert Astals Cid (community) Needs Fixing
Review via email: mp+225338@code.launchpad.net

Commit message

Removed indicator menu dismissal on menu activation

Description of the change

 * 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?
Yes

To post a comment you must log in.
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

8 + indicatorRow.currentItemOffset = 0;

bitsized bug I noticed while was changing this.

lp:~nick-dedekind/unity8/indicator.dismissal updated
998. By Nick Dedekind

removed explicit panel hiding

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/unity8-ci/3297/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1474
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/391
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9175

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:998
http://jenkins.qa.ubuntu.com/job/unity8-ci/3354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2653
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2653/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9392

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

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in qml/Panel/Panel.qml
1 conflicts encountered.

review: Needs Fixing
lp:~nick-dedekind/unity8/indicator.dismissal updated
999. By Nick Dedekind

merged with trunk

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> Text conflict in qml/Panel/Panel.qml
> 1 conflicts encountered.

Fixed.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:999
http://jenkins.qa.ubuntu.com/job/unity8-ci/3387/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1801/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/481
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/481/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/481
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2064/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2882/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9619

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
Unrelated Jenkins unhappiness.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:999
http://jenkins.qa.ubuntu.com/job/unity8-ci/3469/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/470/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3296/console

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Panel/Indicators.qml'
2--- qml/Panel/Indicators.qml 2014-07-03 15:29:50 +0000
3+++ qml/Panel/Indicators.qml 2014-07-10 13:39:07 +0000
4@@ -262,6 +262,7 @@
5 indicators.calculateCurrentItem(touchX, false);
6 } else {
7 indicators.state = "commit";
8+ indicatorRow.currentItemOffset = 0;
9 }
10 }
11
12
13=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
14--- qml/Panel/Indicators/MenuItemFactory.qml 2014-07-04 17:53:52 +0000
15+++ qml/Panel/Indicators/MenuItemFactory.qml 2014-07-10 13:39:07 +0000
16@@ -140,7 +140,6 @@
17
18 onTriggered: {
19 menuModel.activate(menuIndex);
20- shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
21 }
22 }
23 }
24@@ -186,7 +185,6 @@
25
26 onTriggered: {
27 menuModel.activate(menuIndex);
28- shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
29 }
30 }
31 }
32@@ -205,7 +203,6 @@
33
34 onTriggered: {
35 menuModel.activate(menuIndex);
36- shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
37 }
38 }
39 }
40@@ -226,7 +223,6 @@
41
42 onTriggered: {
43 menuModel.activate(menuIndex);
44- shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
45 }
46 }
47 }
48@@ -367,7 +363,6 @@
49 }
50 onTriggered: {
51 menuModel.activate(menuIndex);
52- shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
53 }
54
55 function loadAttributes() {
56@@ -412,7 +407,6 @@
57 }
58 onClicked: {
59 menuModel.activate(menuIndex, true);
60- shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
61 }
62 onDismissed: {
63 menuModel.activate(menuIndex, false);
64
65=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
66--- qml/Panel/Indicators/MessageMenuItemFactory.qml 2014-07-04 17:34:51 +0000
67+++ qml/Panel/Indicators/MessageMenuItemFactory.qml 2014-07-10 13:39:07 +0000
68@@ -95,7 +95,6 @@
69
70 onAppActivated: {
71 menuModel.activate(menuIndex, true);
72- shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
73 }
74 onDismissed: {
75 menuModel.activate(menuIndex, false);
76@@ -144,7 +143,6 @@
77
78 onAppActivated: {
79 menuModel.activate(menuIndex, true);
80- shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
81 }
82 onDismissed: {
83 menuModel.activate(menuIndex, false);
84@@ -204,7 +202,6 @@
85
86 onAppActivated: {
87 menuModel.activate(menuIndex, true);
88- shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
89 }
90 onDismissed: {
91 menuModel.activate(menuIndex, false);
92
93=== modified file 'qml/Panel/Panel.qml'
94--- qml/Panel/Panel.qml 2014-07-09 19:44:14 +0000
95+++ qml/Panel/Panel.qml 2014-07-10 13:39:07 +0000
96@@ -27,28 +27,6 @@
97 property alias callHint: __callHint
98 property bool fullscreenMode: false
99
100- function hideIndicatorMenu(delay) {
101- if (delay !== undefined) {
102- hideTimer.interval = delay;
103- hideTimer.start();
104- } else {
105- indicators.hide();
106- }
107- }
108-
109- Timer {
110- id: hideTimer
111- running: false
112- onTriggered: {
113- indicators.hide();
114- }
115- }
116-
117- Connections {
118- target: indicators
119- onShownChanged: hideTimer.stop()
120- }
121-
122 Rectangle {
123 id: darkenedArea
124 property real darkenedOpacity: 0.6
125
126=== modified file 'qml/Shell.qml'
127--- qml/Shell.qml 2014-07-09 19:44:14 +0000
128+++ qml/Shell.qml 2014-07-10 13:39:07 +0000
129@@ -472,10 +472,6 @@
130 stages.hide()
131 }
132
133- function hideIndicatorMenu(delay) {
134- panel.hideIndicatorMenu(delay);
135- }
136-
137 Item {
138 id: overlay
139
140
141=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
142--- tests/qmltests/Panel/tst_Panel.qml 2014-07-08 15:02:15 +0000
143+++ tests/qmltests/Panel/tst_Panel.qml 2014-07-10 13:39:07 +0000
144@@ -333,19 +333,5 @@
145
146 compare(indicatorRow.currentItem, indicatorItemFirst, "First indicator should still be the current item");
147 }
148-
149- function test_hideIndicatorMenu_data() {
150- return [ {tag: "no-delay", delay: undefined },
151- {tag: "delayed", delay: 200 }
152- ];
153- }
154-
155- function test_hideIndicatorMenu(data) {
156- panel.indicators.show();
157- compare(panel.indicators.shown, true);
158-
159- panel.hideIndicatorMenu(data.delay);
160- tryCompare(panel.indicators, "shown", false);
161- }
162 }
163 }

Subscribers

People subscribed via source and target branches