Merge lp:~3v1n0/unity8/indicators-client-modernize into lp:unity8
- indicators-client-modernize
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Michał Sawicz |
Approved revision: | 2453 |
Merged at revision: | 2648 |
Proposed branch: | lp:~3v1n0/unity8/indicators-client-modernize |
Merge into: | lp:unity8 |
Prerequisite: | lp:~3v1n0/unity8/fake-indicators-model |
Diff against target: |
203 lines (+53/-59) 4 files modified
qml/Panel/Indicators/client/IndicatorRepresentation.qml (+27/-23) qml/Panel/Indicators/client/IndicatorsClient.qml (+1/-1) qml/Panel/Indicators/client/IndicatorsList.qml (+21/-27) qml/Panel/Indicators/client/IndicatorsTree.qml (+4/-8) |
To merge this branch: | bzr merge lp:~3v1n0/unity8/indicators-client-modernize |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Michał Sawicz | Abstain | ||
Albert Astals Cid (community) | Approve | ||
Review via email: mp+297518@code.launchpad.net |
Commit message
IndicatorsClient: use PageHeader and ListItemLayout's
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
Prerequisite in unity8 is linked on top, nothing else is needed from other projects
* Did you perform an exploratory manual test run of your code change and any related functionality?
Just launch indicator-client (with real or fake indicators)
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
No debian change here
* If you changed the UI, has there been a design review?
UI changes only affect a test tool, thus no design approval is neded. However I'm just using standard SDK components.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2452
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2453
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2454
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) 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.
Yes minus broken yakkety
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2454
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2454
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
FAILURE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Michał Sawicz (saviq) wrote : | # |
There are failing tests here still.
- 2453. By Marco Trevisan (Treviño)
-
Merging with lp:~3v1n0/unity8/fake-indicators-model
Michał Sawicz (saviq) wrote : | # |
Tests were broken in prerequisite.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2453
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml' |
2 | --- qml/Panel/Indicators/client/IndicatorRepresentation.qml 2015-09-29 12:28:10 +0000 |
3 | +++ qml/Panel/Indicators/client/IndicatorRepresentation.qml 2016-09-08 16:49:32 +0000 |
4 | @@ -20,25 +20,42 @@ |
5 | |
6 | import QtQuick 2.4 |
7 | import Ubuntu.Components 1.3 |
8 | -import Ubuntu.Components.ListItems 1.3 as ListItem |
9 | import "../.." |
10 | |
11 | Page { |
12 | id: root |
13 | - |
14 | - title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title : |
15 | - indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName |
16 | - : "" |
17 | property variant indicatorProperties |
18 | |
19 | + header: PageHeader { |
20 | + title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title : |
21 | + indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName |
22 | + : identifier |
23 | + } |
24 | + |
25 | anchors.fill: parent |
26 | |
27 | - ListItem.Standard { |
28 | + ListItem { |
29 | + color: theme.palette.highlighted.background |
30 | id: visualCheckItem |
31 | - text: "Enable Visual Representation" |
32 | - control: Switch { |
33 | - id: visualCheck |
34 | - checked: true |
35 | + |
36 | + anchors { |
37 | + top: header.bottom |
38 | + left: parent.left |
39 | + right: parent.right |
40 | + } |
41 | + |
42 | + height: selectorLayout.height |
43 | + onClicked: visualCheck.checked = !visualCheck.checked |
44 | + |
45 | + ListItemLayout { |
46 | + id: selectorLayout |
47 | + title.text: "Enable Visual Representation" |
48 | + |
49 | + Switch { |
50 | + id: visualCheck |
51 | + checked: true |
52 | + SlotsLayout.position: SlotsLayout.Trailing |
53 | + } |
54 | } |
55 | } |
56 | |
57 | @@ -48,11 +65,6 @@ |
58 | clip:true |
59 | asynchronous: true |
60 | |
61 | - Rectangle { |
62 | - anchors.fill: pageLoader |
63 | - color: "#221e1c" // FIXME not in palette yet |
64 | - } |
65 | - |
66 | anchors { |
67 | top: visualCheckItem.bottom |
68 | left: parent.left |
69 | @@ -92,13 +104,5 @@ |
70 | margins: units.gu(1) |
71 | } |
72 | height: childrenRect.height |
73 | - |
74 | - Button { |
75 | - anchors { |
76 | - left: parent.left |
77 | - } |
78 | - text: "Back" |
79 | - onClicked: root.pageStack.reset() |
80 | - } |
81 | } |
82 | } |
83 | |
84 | === modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml' |
85 | --- qml/Panel/Indicators/client/IndicatorsClient.qml 2016-06-14 10:32:17 +0000 |
86 | +++ qml/Panel/Indicators/client/IndicatorsClient.qml 2016-09-08 16:49:32 +0000 |
87 | @@ -21,8 +21,8 @@ |
88 | import Ubuntu.Components 1.3 |
89 | |
90 | Rectangle { |
91 | + id: root |
92 | color: theme.palette.normal.background |
93 | - id: root |
94 | |
95 | Component.onCompleted: { |
96 | theme.name = "Ubuntu.Components.Themes.SuruDark" |
97 | |
98 | === modified file 'qml/Panel/Indicators/client/IndicatorsList.qml' |
99 | --- qml/Panel/Indicators/client/IndicatorsList.qml 2016-06-14 10:32:17 +0000 |
100 | +++ qml/Panel/Indicators/client/IndicatorsList.qml 2016-09-08 16:49:32 +0000 |
101 | @@ -1,5 +1,5 @@ |
102 | /* |
103 | - * Copyright 2013 Canonical Ltd. |
104 | + * Copyright 2013-2016 Canonical Ltd. |
105 | * |
106 | * This program is free software; you can redistribute it and/or modify |
107 | * it under the terms of the GNU Lesser General Public License as published by |
108 | @@ -15,11 +15,11 @@ |
109 | * |
110 | * Authors: |
111 | * Renato Araujo Oliveira Filho <renato@canonical.com> |
112 | + * Marco Trevisan <marco.trevisan@canonical.com> |
113 | */ |
114 | |
115 | import QtQuick 2.4 |
116 | import Ubuntu.Components 1.3 |
117 | -import Ubuntu.Components.ListItems 1.3 as ListItem |
118 | import Unity.Indicators 0.1 as Indicators |
119 | import "../.." |
120 | |
121 | @@ -27,7 +27,9 @@ |
122 | id: page |
123 | anchors.fill: parent |
124 | property string profile: "" |
125 | - title: "Plugin list" |
126 | + header: PageHeader { |
127 | + title: "Indicators List" |
128 | + } |
129 | |
130 | Indicators.IndicatorsModel { |
131 | id: indicatorsModel |
132 | @@ -41,32 +43,24 @@ |
133 | anchors.fill: parent |
134 | model: indicatorsModel |
135 | |
136 | - delegate: Rectangle { |
137 | - color: "#221e1c" |
138 | - |
139 | - anchors.left: parent.left |
140 | - anchors.right: parent.right |
141 | - height: menuItem.height |
142 | - |
143 | - ListItem.Standard { |
144 | + delegate: ListItem { |
145 | + objectName: identifier |
146 | + height: menuItem.height + (divider.visible ? divider.height : 0) |
147 | + |
148 | + ListItemLayout { |
149 | id: menuItem |
150 | - anchors.left: parent.left |
151 | - anchors.right: parent.right |
152 | - objectName: identifier |
153 | - |
154 | - text: identifier |
155 | - |
156 | - onClicked: { |
157 | - var new_page = Qt.createComponent("IndicatorRepresentation.qml"); |
158 | - if (new_page.status !== Component.Ready) { |
159 | - if (new_page.status === Component.Error) |
160 | - console.error("Error: " + new_page.errorString()); |
161 | - |
162 | - return; |
163 | - } |
164 | - |
165 | - page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties }); |
166 | + title.text: identifier |
167 | + } |
168 | + |
169 | + onClicked: { |
170 | + var new_page = Qt.createComponent("IndicatorRepresentation.qml"); |
171 | + if (new_page.status !== Component.Ready) { |
172 | + if (new_page.status === Component.Error) |
173 | + console.error("Error: " + new_page.errorString()); |
174 | + |
175 | + return; |
176 | } |
177 | + page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties }); |
178 | } |
179 | } |
180 | } |
181 | |
182 | === modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml' |
183 | --- qml/Panel/Indicators/client/IndicatorsTree.qml 2015-07-15 15:07:19 +0000 |
184 | +++ qml/Panel/Indicators/client/IndicatorsTree.qml 2016-09-08 16:49:32 +0000 |
185 | @@ -30,14 +30,10 @@ |
186 | model: root.menuModel |
187 | } |
188 | |
189 | - Flickable { |
190 | + TextArea { |
191 | anchors.fill: parent |
192 | - contentHeight: all_data.height |
193 | - clip:true |
194 | - Text { |
195 | - id: all_data |
196 | - color: "white" |
197 | - text: printer.text |
198 | - } |
199 | + anchors.margins: units.gu(0.5) |
200 | + id: all_data |
201 | + text: printer.text |
202 | } |
203 | } |
FAILED: Continuous integration, rev:2452 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1490/ /unity8- jenkins. ubuntu. com/job/ build/1986/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/2012/ console
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1490/ rebuild
https:/