Merge lp:~3v1n0/unity8/fake-indicators-model into lp:unity8
- fake-indicators-model
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Lukáš Tinkl |
Approved revision: | 2449 |
Merged at revision: | 2647 |
Proposed branch: | lp:~3v1n0/unity8/fake-indicators-model |
Merge into: | lp:unity8 |
Prerequisite: | lp:~3v1n0/unity8/indicators-client-load-fix |
Diff against target: |
1251 lines (+1141/-7) 4 files modified
tests/mocks/Unity/Indicators/CMakeLists.txt (+1/-0) tests/mocks/Unity/Indicators/IndicatorsModel.qml (+32/-7) tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js (+1106/-0) tests/mocks/Unity/Indicators/fakeplugin.cpp (+2/-0) |
To merge this branch: | bzr merge lp:~3v1n0/unity8/fake-indicators-model |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Lukáš Tinkl (community) | Approve | ||
Michał Sawicz | Needs Fixing | ||
Albert Astals Cid (community) | Approve | ||
Michael Terry | Needs Fixing | ||
Nick Dedekind | Pending | ||
Review via email: mp+297509@code.launchpad.net |
Commit message
Indicators, mocks: add fake indicators menuitem to populate mocks with different menu types
Also allow to use fake indicators model in IndicatorsClient
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
Nope
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes. make tryShell (or make tryMenuContent) is enough, or this will also allow to launch indicators-client with a fake data model when QML2_IMPORT_PATH points to the mocks path (i.e. builddir/
* 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?
No UI change, although the indicators used in mocks will show some fake data.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2445
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:/
Michael Terry (mterry) wrote : | # |
Looks like we're missing modelprinter.cpp and modelprinter.h
Michael Terry (mterry) : | # |
Marco Trevisan (Treviño) (3v1n0) wrote : | # |
> Looks like we're missing modelprinter.cpp and modelprinter.h
Actually they are already provided by unity8. I'm just ensuring they are added to the fake lib here.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2447
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:/
Albert Astals Cid (aacid) wrote : | # |
Text conflict in tests/mocks/
1 conflicts encountered.
Marco Trevisan (Treviño) (3v1n0) wrote : | # |
And... Fixed :-)
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2448
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, except broken yakkety
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2448
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:/
Michał Sawicz (saviq) wrote : | # |
Failing tests:
qmltestrunner.
qmltestrunner.
qmltestrunner.
qmltestrunner.
Lukáš Tinkl (lukas-kde) wrote : | # |
Likely "conflicting" with https:/
- 2448. By Marco Trevisan (Treviño)
-
Merging with trunk
- 2449. By Marco Trevisan (Treviño)
-
fakeindicatorsm
odeldata. js: mark indicator-files always visible This fixes tests using mocks
Marco Trevisan (Treviño) (3v1n0) wrote : | # |
Tests should run properly here... Let's wait CI confirmation.
Lukáš Tinkl (lukas-kde) wrote : | # |
Yup, tests work fine now, thanks!
* 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.
Nope. not yet
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2449
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: 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 'tests/mocks/Unity/Indicators/CMakeLists.txt' | |||
2 | --- tests/mocks/Unity/Indicators/CMakeLists.txt 2015-03-02 14:42:27 +0000 | |||
3 | +++ tests/mocks/Unity/Indicators/CMakeLists.txt 2016-09-08 16:44:47 +0000 | |||
4 | @@ -16,6 +16,7 @@ | |||
5 | 16 | fakeunitymenumodelcache.cpp | 16 | fakeunitymenumodelcache.cpp |
6 | 17 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h | 17 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h |
7 | 18 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp | 18 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp |
8 | 19 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/modelprinter.cpp | ||
9 | 19 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/sharedunitymenumodel.cpp | 20 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/sharedunitymenumodel.cpp |
10 | 20 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp | 21 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp |
11 | 21 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp | 22 | ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp |
12 | 22 | 23 | ||
13 | === modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml' | |||
14 | --- tests/mocks/Unity/Indicators/IndicatorsModel.qml 2016-07-30 16:15:23 +0000 | |||
15 | +++ tests/mocks/Unity/Indicators/IndicatorsModel.qml 2016-09-08 16:44:47 +0000 | |||
16 | @@ -18,6 +18,7 @@ | |||
17 | 18 | import Unity.Indicators 0.1 as Indicators | 18 | import Unity.Indicators 0.1 as Indicators |
18 | 19 | import Unity.InputInfo 0.1 | 19 | import Unity.InputInfo 0.1 |
19 | 20 | import AccountsService 0.1 | 20 | import AccountsService 0.1 |
20 | 21 | import "fakeindicatorsmodeldata.js" as FakeIndicators | ||
21 | 21 | 22 | ||
22 | 22 | Indicators.FakeIndicatorsModel { | 23 | Indicators.FakeIndicatorsModel { |
23 | 23 | id: root | 24 | id: root |
24 | @@ -60,7 +61,7 @@ | |||
25 | 60 | } | 61 | } |
26 | 61 | }, | 62 | }, |
27 | 62 | { | 63 | { |
29 | 63 | "identifier": "fake-indicator-sound", | 64 | "identifier": "fake-indicator-files", |
30 | 64 | "indicatorProperties": { | 65 | "indicatorProperties": { |
31 | 65 | "enabled": true, | 66 | "enabled": true, |
32 | 66 | "busName": "com.canonical.indicators.fake4", | 67 | "busName": "com.canonical.indicators.fake4", |
33 | @@ -69,7 +70,7 @@ | |||
34 | 69 | } | 70 | } |
35 | 70 | }, | 71 | }, |
36 | 71 | { | 72 | { |
38 | 72 | "identifier": "fake-indicator-power", | 73 | "identifier": "fake-indicator-sound", |
39 | 73 | "indicatorProperties": { | 74 | "indicatorProperties": { |
40 | 74 | "enabled": true, | 75 | "enabled": true, |
41 | 75 | "busName": "com.canonical.indicators.fake5", | 76 | "busName": "com.canonical.indicators.fake5", |
42 | @@ -78,7 +79,7 @@ | |||
43 | 78 | } | 79 | } |
44 | 79 | }, | 80 | }, |
45 | 80 | { | 81 | { |
47 | 81 | "identifier": "fake-indicator-datetime", | 82 | "identifier": "fake-indicator-power", |
48 | 82 | "indicatorProperties": { | 83 | "indicatorProperties": { |
49 | 83 | "enabled": true, | 84 | "enabled": true, |
50 | 84 | "busName": "com.canonical.indicators.fake6", | 85 | "busName": "com.canonical.indicators.fake6", |
51 | @@ -87,13 +88,22 @@ | |||
52 | 87 | } | 88 | } |
53 | 88 | }, | 89 | }, |
54 | 89 | { | 90 | { |
56 | 90 | "identifier": "fake-indicator-session", | 91 | "identifier": "fake-indicator-datetime", |
57 | 91 | "indicatorProperties": { | 92 | "indicatorProperties": { |
58 | 92 | "enabled": true, | 93 | "enabled": true, |
59 | 93 | "busName": "com.canonical.indicators.fake7", | 94 | "busName": "com.canonical.indicators.fake7", |
60 | 94 | "menuObjectPath": "/com/canonical/indicators/fake7", | 95 | "menuObjectPath": "/com/canonical/indicators/fake7", |
61 | 95 | "actionsObjectPath": "/com/canonical/indicators/fake7" | 96 | "actionsObjectPath": "/com/canonical/indicators/fake7" |
62 | 96 | } | 97 | } |
63 | 98 | }, | ||
64 | 99 | { | ||
65 | 100 | "identifier": "fake-indicator-session", | ||
66 | 101 | "indicatorProperties": { | ||
67 | 102 | "enabled": true, | ||
68 | 103 | "busName": "com.canonical.indicators.fake8", | ||
69 | 104 | "menuObjectPath": "/com/canonical/indicators/fake8", | ||
70 | 105 | "actionsObjectPath": "/com/canonical/indicators/fake8" | ||
71 | 106 | } | ||
72 | 97 | } | 107 | } |
73 | 98 | ] | 108 | ] |
74 | 99 | 109 | ||
75 | @@ -133,21 +143,26 @@ | |||
76 | 133 | "", | 143 | "", |
77 | 134 | [ "image://theme/messages-new" ])); | 144 | [ "image://theme/messages-new" ])); |
78 | 135 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake4", | 145 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake4", |
79 | 146 | getUnityMenuModelData("fake-indicator-files", | ||
80 | 147 | "Files (F)", | ||
81 | 148 | "", | ||
82 | 149 | [ "image://theme/transfer-progress" ])); | ||
83 | 150 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake5", | ||
84 | 136 | getUnityMenuModelData("fake-indicator-sound", | 151 | getUnityMenuModelData("fake-indicator-sound", |
85 | 137 | "Sound (F)", | 152 | "Sound (F)", |
86 | 138 | "", | 153 | "", |
87 | 139 | [ "image://theme/audio-volume-high" ])); | 154 | [ "image://theme/audio-volume-high" ])); |
89 | 140 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake5", | 155 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake6", |
90 | 141 | getUnityMenuModelData("fake-indicator-power", | 156 | getUnityMenuModelData("fake-indicator-power", |
91 | 142 | "Battery (F)", | 157 | "Battery (F)", |
92 | 143 | "", | 158 | "", |
93 | 144 | [ "image://theme/battery-020" ])); | 159 | [ "image://theme/battery-020" ])); |
95 | 145 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake6", | 160 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake7", |
96 | 146 | getUnityMenuModelData("fake-indicator-datetime", | 161 | getUnityMenuModelData("fake-indicator-datetime", |
97 | 147 | "Upcoming Events (F)", | 162 | "Upcoming Events (F)", |
98 | 148 | "12:04", | 163 | "12:04", |
99 | 149 | [])); | 164 | [])); |
101 | 150 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake7", | 165 | Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake8", |
102 | 151 | getUnityMenuModelData("fake-indicator-session", | 166 | getUnityMenuModelData("fake-indicator-session", |
103 | 152 | "System (F)", | 167 | "System (F)", |
104 | 153 | "", | 168 | "", |
105 | @@ -155,6 +170,16 @@ | |||
106 | 155 | } | 170 | } |
107 | 156 | 171 | ||
108 | 157 | function getUnityMenuModelData(identifier, title, label, icons) { | 172 | function getUnityMenuModelData(identifier, title, label, icons) { |
109 | 173 | var menudata = FakeIndicators.fakeMenuData[identifier]; | ||
110 | 174 | |||
111 | 175 | if (menudata !== undefined) { | ||
112 | 176 | var rootState = menudata[0]["rowData"].actionState; | ||
113 | 177 | rootState.title = title; | ||
114 | 178 | rootState.label = label; | ||
115 | 179 | rootState.icons = icons; | ||
116 | 180 | return menudata; | ||
117 | 181 | } | ||
118 | 182 | |||
119 | 158 | var root = [{ | 183 | var root = [{ |
120 | 159 | "rowData": { // 1 | 184 | "rowData": { // 1 |
121 | 160 | "label": "", | 185 | "label": "", |
122 | 161 | 186 | ||
123 | === added file 'tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js' | |||
124 | --- tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js 1970-01-01 00:00:00 +0000 | |||
125 | +++ tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js 2016-09-08 16:44:47 +0000 | |||
126 | @@ -0,0 +1,1106 @@ | |||
127 | 1 | var usageScenario = (typeof shell != 'undefined') ? shell.usageScenario : "desktop"; | ||
128 | 2 | |||
129 | 3 | var fakeMenuData = { | ||
130 | 4 | "fake-indicator-messages": [ | ||
131 | 5 | { | ||
132 | 6 | "rowData": { | ||
133 | 7 | "action": "indicator._header", | ||
134 | 8 | "actionState": { | ||
135 | 9 | "icons": [ "image://theme/messages-new" ], | ||
136 | 10 | "label": "", | ||
137 | 11 | "title": "Messages (F)", | ||
138 | 12 | "visible": true | ||
139 | 13 | }, | ||
140 | 14 | "icon": "", | ||
141 | 15 | "isCheck": false, | ||
142 | 16 | "isRadio": false, | ||
143 | 17 | "isSeparator": false, | ||
144 | 18 | "isToggled": false, | ||
145 | 19 | "label": "", | ||
146 | 20 | "sensitive": true, | ||
147 | 21 | "type": "com.canonical.indicator.root" | ||
148 | 22 | }, | ||
149 | 23 | "submenu": [ | ||
150 | 24 | { | ||
151 | 25 | "rowData": { | ||
152 | 26 | "label": "There's an updated system image.", | ||
153 | 27 | "sensitive": true, | ||
154 | 28 | "isSeparator": false, | ||
155 | 29 | "icon": "file:///usr/share/ubuntu/settings/system/icons/settings-system-update.svg", | ||
156 | 30 | "type": "com.canonical.indicator.messages.messageitem", | ||
157 | 31 | "ext": { | ||
158 | 32 | "icon": "file:///usr/share/ubuntu/settings/system/icons/settings-system-update.svg", | ||
159 | 33 | "xCanonicalAppIcon": "file:///usr/share/ubuntu/settings/system/system-settings.png", | ||
160 | 34 | "xCanonicalMessageActions": null, | ||
161 | 35 | "xCanonicalText": "Tap to open the system updater.", | ||
162 | 36 | "xCanonicalTime": ((new Date).getTime() - 350 * 1000) * 1000, | ||
163 | 37 | }, | ||
164 | 38 | "action": "indicator.ubuntu-system-settings", | ||
165 | 39 | "actionState": {}, | ||
166 | 40 | "isCheck": false, | ||
167 | 41 | "isRadio": false, | ||
168 | 42 | "isToggled": false, | ||
169 | 43 | } | ||
170 | 44 | }, | ||
171 | 45 | { | ||
172 | 46 | "rowData": { | ||
173 | 47 | "action": "indicator.telephony-service-sms.msg.MSG_ID", | ||
174 | 48 | "actionState": {}, | ||
175 | 49 | "ext": {}, | ||
176 | 50 | "icon": "file:///usr/share/telephony-service/assets/avatar-default@18.png", | ||
177 | 51 | "type": "com.canonical.indicator.messages.messageitem", | ||
178 | 52 | "ext": { | ||
179 | 53 | "icon": "file:///usr/share/telephony-service/assets/avatar-default@18.png", | ||
180 | 54 | "xCanonicalAppIcon": "image://theme/telephony-service-message", | ||
181 | 55 | "xCanonicalMessageActions": "", | ||
182 | 56 | "xCanonicalText": "This is a message sent to an awesome Ubuntu phone.", | ||
183 | 57 | "xCanonicalTime": ((new Date).getTime() - 35 * 1000) * 1000 | ||
184 | 58 | }, | ||
185 | 59 | "isCheck": false, | ||
186 | 60 | "isRadio": false, | ||
187 | 61 | "isSeparator": false, | ||
188 | 62 | "isToggled": false, | ||
189 | 63 | "label": "+44391234567 - [SIM 1]", | ||
190 | 64 | "sensitive": true | ||
191 | 65 | } | ||
192 | 66 | }, | ||
193 | 67 | { | ||
194 | 68 | "rowData": { | ||
195 | 69 | "action": "indicator.remove-all", | ||
196 | 70 | "actionState": {}, | ||
197 | 71 | "ext": {}, | ||
198 | 72 | "icon": "", | ||
199 | 73 | "isCheck": false, | ||
200 | 74 | "isRadio": false, | ||
201 | 75 | "isSeparator": false, | ||
202 | 76 | "isToggled": false, | ||
203 | 77 | "label": "Clear All", | ||
204 | 78 | "sensitive": true, | ||
205 | 79 | "type": "com.canonical.indicator.button" | ||
206 | 80 | } | ||
207 | 81 | }, | ||
208 | 82 | ] | ||
209 | 83 | } | ||
210 | 84 | ], | ||
211 | 85 | |||
212 | 86 | "fake-indicator-session": [ | ||
213 | 87 | { | ||
214 | 88 | "rowData": { | ||
215 | 89 | "action": "indicator._header", | ||
216 | 90 | "actionState": { | ||
217 | 91 | "icons": [], | ||
218 | 92 | "label": "", | ||
219 | 93 | "title": "Session (F)", | ||
220 | 94 | "visible": usageScenario == "desktop" | ||
221 | 95 | }, | ||
222 | 96 | "icon": "", | ||
223 | 97 | "isCheck": false, | ||
224 | 98 | "isRadio": false, | ||
225 | 99 | "isSeparator": false, | ||
226 | 100 | "isToggled": false, | ||
227 | 101 | "label": "", | ||
228 | 102 | "sensitive": true, | ||
229 | 103 | "type": "com.canonical.indicator.root" | ||
230 | 104 | }, | ||
231 | 105 | "submenu": [ | ||
232 | 106 | { | ||
233 | 107 | "rowData": { | ||
234 | 108 | "action": "indicator.about", | ||
235 | 109 | "actionState": {}, | ||
236 | 110 | "ext": {}, | ||
237 | 111 | "icon": "", | ||
238 | 112 | "isCheck": false, | ||
239 | 113 | "isRadio": false, | ||
240 | 114 | "isSeparator": false, | ||
241 | 115 | "isToggled": false, | ||
242 | 116 | "label": "About this " + usageScenario, | ||
243 | 117 | "sensitive": true, | ||
244 | 118 | "type": "" | ||
245 | 119 | } | ||
246 | 120 | }, | ||
247 | 121 | { | ||
248 | 122 | "rowData": { | ||
249 | 123 | "action": "indicator.help", | ||
250 | 124 | "actionState": {}, | ||
251 | 125 | "ext": {}, | ||
252 | 126 | "icon": "", | ||
253 | 127 | "isCheck": false, | ||
254 | 128 | "isRadio": false, | ||
255 | 129 | "isSeparator": false, | ||
256 | 130 | "isToggled": false, | ||
257 | 131 | "label": "Ubuntu Help", | ||
258 | 132 | "sensitive": true, | ||
259 | 133 | "type": "" | ||
260 | 134 | } | ||
261 | 135 | }, | ||
262 | 136 | { | ||
263 | 137 | "rowData": { | ||
264 | 138 | "action": "", | ||
265 | 139 | "actionState": {}, | ||
266 | 140 | "ext": {}, | ||
267 | 141 | "icon": "", | ||
268 | 142 | "isCheck": false, | ||
269 | 143 | "isRadio": false, | ||
270 | 144 | "isSeparator": true, | ||
271 | 145 | "isToggled": false, | ||
272 | 146 | "label": "", | ||
273 | 147 | "sensitive": true, | ||
274 | 148 | "type": "" | ||
275 | 149 | } | ||
276 | 150 | }, | ||
277 | 151 | { | ||
278 | 152 | "rowData": { | ||
279 | 153 | "action": "indicator.settings", | ||
280 | 154 | "actionState": {}, | ||
281 | 155 | "ext": {}, | ||
282 | 156 | "icon": "", | ||
283 | 157 | "isCheck": false, | ||
284 | 158 | "isRadio": false, | ||
285 | 159 | "isSeparator": false, | ||
286 | 160 | "isToggled": false, | ||
287 | 161 | "label": "System Settings...", | ||
288 | 162 | "sensitive": true, | ||
289 | 163 | "type": "" | ||
290 | 164 | } | ||
291 | 165 | }, | ||
292 | 166 | { | ||
293 | 167 | "rowData": { | ||
294 | 168 | "action": "", | ||
295 | 169 | "actionState": {}, | ||
296 | 170 | "ext": {}, | ||
297 | 171 | "icon": "", | ||
298 | 172 | "isCheck": false, | ||
299 | 173 | "isRadio": false, | ||
300 | 174 | "isSeparator": true, | ||
301 | 175 | "isToggled": false, | ||
302 | 176 | "label": "", | ||
303 | 177 | "sensitive": true, | ||
304 | 178 | "type": "" | ||
305 | 179 | } | ||
306 | 180 | }, | ||
307 | 181 | { | ||
308 | 182 | "rowData": { | ||
309 | 183 | "action": "indicator.switch-to-screensaver", | ||
310 | 184 | "actionState": {}, | ||
311 | 185 | "ext": {}, | ||
312 | 186 | "icon": "", | ||
313 | 187 | "isCheck": false, | ||
314 | 188 | "isRadio": false, | ||
315 | 189 | "isSeparator": false, | ||
316 | 190 | "isToggled": false, | ||
317 | 191 | "label": "Lock", | ||
318 | 192 | "sensitive": true, | ||
319 | 193 | "type": "" | ||
320 | 194 | } | ||
321 | 195 | }, | ||
322 | 196 | { | ||
323 | 197 | "rowData": { | ||
324 | 198 | "action": "indicator.switch-to-guest", | ||
325 | 199 | "actionState": {}, | ||
326 | 200 | "ext": {}, | ||
327 | 201 | "icon": "", | ||
328 | 202 | "isCheck": false, | ||
329 | 203 | "isRadio": false, | ||
330 | 204 | "isSeparator": false, | ||
331 | 205 | "isToggled": false, | ||
332 | 206 | "label": "Guest Session", | ||
333 | 207 | "sensitive": true, | ||
334 | 208 | "type": "indicator.guest-menu-item" | ||
335 | 209 | } | ||
336 | 210 | }, | ||
337 | 211 | { | ||
338 | 212 | "rowData": { | ||
339 | 213 | "action": "indicator.switch-to-user", | ||
340 | 214 | "actionState": {}, | ||
341 | 215 | "ext": {}, | ||
342 | 216 | "icon": "", | ||
343 | 217 | "isCheck": false, | ||
344 | 218 | "isRadio": true, | ||
345 | 219 | "isSeparator": false, | ||
346 | 220 | "isToggled": false, | ||
347 | 221 | "label": "Marco", | ||
348 | 222 | "sensitive": true, | ||
349 | 223 | "type": "indicator.user-menu-item" | ||
350 | 224 | } | ||
351 | 225 | }, | ||
352 | 226 | { | ||
353 | 227 | "rowData": { | ||
354 | 228 | "action": "indicator.switch-to-user", | ||
355 | 229 | "actionState": {}, | ||
356 | 230 | "ext": {}, | ||
357 | 231 | "icon": "", | ||
358 | 232 | "isCheck": false, | ||
359 | 233 | "isRadio": true, | ||
360 | 234 | "isSeparator": false, | ||
361 | 235 | "isToggled": false, | ||
362 | 236 | "label": "Unity8", | ||
363 | 237 | "sensitive": true, | ||
364 | 238 | "type": "indicator.user-menu-item" | ||
365 | 239 | } | ||
366 | 240 | }, | ||
367 | 241 | { | ||
368 | 242 | "rowData": { | ||
369 | 243 | "action": "", | ||
370 | 244 | "actionState": {}, | ||
371 | 245 | "ext": {}, | ||
372 | 246 | "icon": "", | ||
373 | 247 | "isCheck": false, | ||
374 | 248 | "isRadio": false, | ||
375 | 249 | "isSeparator": true, | ||
376 | 250 | "isToggled": false, | ||
377 | 251 | "label": "", | ||
378 | 252 | "sensitive": true, | ||
379 | 253 | "type": "" | ||
380 | 254 | } | ||
381 | 255 | }, | ||
382 | 256 | { | ||
383 | 257 | "rowData": { | ||
384 | 258 | "action": "indicator.logout", | ||
385 | 259 | "actionState": {}, | ||
386 | 260 | "ext": {}, | ||
387 | 261 | "icon": "", | ||
388 | 262 | "isCheck": false, | ||
389 | 263 | "isRadio": false, | ||
390 | 264 | "isSeparator": false, | ||
391 | 265 | "isToggled": false, | ||
392 | 266 | "label": "Logout...", | ||
393 | 267 | "sensitive": true, | ||
394 | 268 | "type": "" | ||
395 | 269 | } | ||
396 | 270 | }, | ||
397 | 271 | { | ||
398 | 272 | "rowData": { | ||
399 | 273 | "action": "", | ||
400 | 274 | "actionState": {}, | ||
401 | 275 | "ext": {}, | ||
402 | 276 | "icon": "", | ||
403 | 277 | "isCheck": false, | ||
404 | 278 | "isRadio": false, | ||
405 | 279 | "isSeparator": true, | ||
406 | 280 | "isToggled": false, | ||
407 | 281 | "label": "", | ||
408 | 282 | "sensitive": true, | ||
409 | 283 | "type": "" | ||
410 | 284 | } | ||
411 | 285 | }, | ||
412 | 286 | { | ||
413 | 287 | "rowData": { | ||
414 | 288 | "action": "indicator.suspend", | ||
415 | 289 | "actionState": {}, | ||
416 | 290 | "ext": {}, | ||
417 | 291 | "icon": "", | ||
418 | 292 | "isCheck": false, | ||
419 | 293 | "isRadio": false, | ||
420 | 294 | "isSeparator": false, | ||
421 | 295 | "isToggled": false, | ||
422 | 296 | "label": "Suspend", | ||
423 | 297 | "sensitive": true, | ||
424 | 298 | "type": "" | ||
425 | 299 | } | ||
426 | 300 | }, | ||
427 | 301 | { | ||
428 | 302 | "rowData": { | ||
429 | 303 | "action": "indicator.power-off", | ||
430 | 304 | "actionState": {}, | ||
431 | 305 | "ext": {}, | ||
432 | 306 | "icon": "", | ||
433 | 307 | "isCheck": false, | ||
434 | 308 | "isRadio": false, | ||
435 | 309 | "isSeparator": false, | ||
436 | 310 | "isToggled": false, | ||
437 | 311 | "label": "Power off...", | ||
438 | 312 | "sensitive": true, | ||
439 | 313 | "type": "" | ||
440 | 314 | } | ||
441 | 315 | } | ||
442 | 316 | ] | ||
443 | 317 | } | ||
444 | 318 | ], | ||
445 | 319 | |||
446 | 320 | "fake-indicator-power": [ | ||
447 | 321 | { | ||
448 | 322 | "rowData": { | ||
449 | 323 | "action": "indicator._header", | ||
450 | 324 | "actionState": { | ||
451 | 325 | "icons": [ "image://theme/battery-020" ], | ||
452 | 326 | "label": "", | ||
453 | 327 | "title": "Battery (F)", | ||
454 | 328 | "visible": true | ||
455 | 329 | }, | ||
456 | 330 | "icon": "", | ||
457 | 331 | "isCheck": false, | ||
458 | 332 | "isRadio": false, | ||
459 | 333 | "isSeparator": false, | ||
460 | 334 | "isToggled": false, | ||
461 | 335 | "label": "", | ||
462 | 336 | "sensitive": true, | ||
463 | 337 | "type": "com.canonical.indicator.root" | ||
464 | 338 | }, | ||
465 | 339 | "submenu": [ | ||
466 | 340 | { | ||
467 | 341 | "rowData": { | ||
468 | 342 | "action": "indicator.activate-statistics", | ||
469 | 343 | "actionState": {}, | ||
470 | 344 | "ext": {}, | ||
471 | 345 | "icon": "image://theme/battery-full-charged-symbolic", | ||
472 | 346 | "isCheck": false, | ||
473 | 347 | "isRadio": false, | ||
474 | 348 | "isSeparator": false, | ||
475 | 349 | "isToggled": false, | ||
476 | 350 | "label": "Battery (full charged)", | ||
477 | 351 | "sensitive": true, | ||
478 | 352 | "type": "com.canonical.indicator.basic" | ||
479 | 353 | } | ||
480 | 354 | }, | ||
481 | 355 | { | ||
482 | 356 | "rowData": { | ||
483 | 357 | "action": "indicator.activate-statistics", | ||
484 | 358 | "actionState": {}, | ||
485 | 359 | "ext": {}, | ||
486 | 360 | "icon": "image://theme/battery-100", | ||
487 | 361 | "isCheck": false, | ||
488 | 362 | "isRadio": false, | ||
489 | 363 | "isSeparator": false, | ||
490 | 364 | "isToggled": false, | ||
491 | 365 | "label": "Battery", | ||
492 | 366 | "sensitive": true, | ||
493 | 367 | "type": "com.canonical.indicator.basic" | ||
494 | 368 | } | ||
495 | 369 | }, | ||
496 | 370 | { | ||
497 | 371 | "rowData": { | ||
498 | 372 | "action": "", | ||
499 | 373 | "actionState": {}, | ||
500 | 374 | "ext": {}, | ||
501 | 375 | "icon": "", | ||
502 | 376 | "isCheck": false, | ||
503 | 377 | "isRadio": false, | ||
504 | 378 | "isSeparator": true, | ||
505 | 379 | "isToggled": false, | ||
506 | 380 | "label": " ", | ||
507 | 381 | "sensitive": true, | ||
508 | 382 | "type": "" | ||
509 | 383 | } | ||
510 | 384 | }, | ||
511 | 385 | { | ||
512 | 386 | "rowData": { | ||
513 | 387 | "action": "indicator.show-time", | ||
514 | 388 | "actionState": false, | ||
515 | 389 | "ext": {}, | ||
516 | 390 | "icon": "", | ||
517 | 391 | "isCheck": true, | ||
518 | 392 | "isRadio": false, | ||
519 | 393 | "isSeparator": false, | ||
520 | 394 | "isToggled": false, | ||
521 | 395 | "label": "Show time on menubar", | ||
522 | 396 | "sensitive": true, | ||
523 | 397 | "type": "" | ||
524 | 398 | } | ||
525 | 399 | }, | ||
526 | 400 | { | ||
527 | 401 | "rowData": { | ||
528 | 402 | "action": "indicator.show-percentage", | ||
529 | 403 | "actionState": false, | ||
530 | 404 | "ext": {}, | ||
531 | 405 | "icon": "", | ||
532 | 406 | "isCheck": true, | ||
533 | 407 | "isRadio": false, | ||
534 | 408 | "isSeparator": false, | ||
535 | 409 | "isToggled": false, | ||
536 | 410 | "label": "Show percentage on menubar", | ||
537 | 411 | "sensitive": true, | ||
538 | 412 | "type": "" | ||
539 | 413 | } | ||
540 | 414 | }, | ||
541 | 415 | { | ||
542 | 416 | "rowData": { | ||
543 | 417 | "action": "indicator.activate-settings", | ||
544 | 418 | "actionState": {}, | ||
545 | 419 | "ext": {}, | ||
546 | 420 | "icon": "", | ||
547 | 421 | "isCheck": false, | ||
548 | 422 | "isRadio": false, | ||
549 | 423 | "isSeparator": false, | ||
550 | 424 | "isToggled": false, | ||
551 | 425 | "label": "Power Settings...", | ||
552 | 426 | "sensitive": true, | ||
553 | 427 | "type": "" | ||
554 | 428 | } | ||
555 | 429 | } | ||
556 | 430 | ] | ||
557 | 431 | } | ||
558 | 432 | ], | ||
559 | 433 | |||
560 | 434 | "fake-indicator-sound": [ | ||
561 | 435 | { | ||
562 | 436 | "rowData": { | ||
563 | 437 | "action": "indicator._header", | ||
564 | 438 | "actionState": { | ||
565 | 439 | "icons": [ "image://theme/audio-volume-high" ], | ||
566 | 440 | "label": "", | ||
567 | 441 | "title": "Sound (F)", | ||
568 | 442 | "visible": true | ||
569 | 443 | }, | ||
570 | 444 | "icon": "", | ||
571 | 445 | "isCheck": false, | ||
572 | 446 | "isRadio": false, | ||
573 | 447 | "isSeparator": false, | ||
574 | 448 | "isToggled": false, | ||
575 | 449 | "label": "", | ||
576 | 450 | "sensitive": true, | ||
577 | 451 | "type": "com.canonical.indicator.root" | ||
578 | 452 | }, | ||
579 | 453 | "submenu": [ | ||
580 | 454 | { | ||
581 | 455 | "rowData": { | ||
582 | 456 | "action": "indicator.silent-mode", | ||
583 | 457 | "actionState": true, | ||
584 | 458 | "ext": {}, | ||
585 | 459 | "icon": "", | ||
586 | 460 | "isCheck": true, | ||
587 | 461 | "isRadio": false, | ||
588 | 462 | "isSeparator": false, | ||
589 | 463 | "isToggled": false, | ||
590 | 464 | "label": "Silent Mode", | ||
591 | 465 | "sensitive": true, | ||
592 | 466 | "type": "com.canonical.indicator.switch" | ||
593 | 467 | } | ||
594 | 468 | }, | ||
595 | 469 | { | ||
596 | 470 | "rowData": { | ||
597 | 471 | "action": "indicator.volume", | ||
598 | 472 | "actionState": 0.35, | ||
599 | 473 | "ext": { | ||
600 | 474 | "maxIcon": "image://theme/audio-volume-high-panel", | ||
601 | 475 | "maxValue": 1, | ||
602 | 476 | "minIcon": "image://theme/audio-volume-low-zero-panel", | ||
603 | 477 | "minValue": 0, | ||
604 | 478 | "xCanonicalSyncAction": "indicator.volume-sync" | ||
605 | 479 | }, | ||
606 | 480 | "icon": "", | ||
607 | 481 | "isCheck": false, | ||
608 | 482 | "isRadio": true, | ||
609 | 483 | "isSeparator": false, | ||
610 | 484 | "isToggled": false, | ||
611 | 485 | "label": "Volume", | ||
612 | 486 | "sensitive": true, | ||
613 | 487 | "type": "com.canonical.unity.slider" | ||
614 | 488 | } | ||
615 | 489 | }, | ||
616 | 490 | { | ||
617 | 491 | "rowData": { | ||
618 | 492 | "action": "", | ||
619 | 493 | "actionState": {}, | ||
620 | 494 | "ext": {}, | ||
621 | 495 | "icon": "", | ||
622 | 496 | "isCheck": false, | ||
623 | 497 | "isRadio": false, | ||
624 | 498 | "isSeparator": true, | ||
625 | 499 | "isToggled": false, | ||
626 | 500 | "label": "", | ||
627 | 501 | "sensitive": true, | ||
628 | 502 | "type": "" | ||
629 | 503 | } | ||
630 | 504 | }, | ||
631 | 505 | { | ||
632 | 506 | "rowData": { | ||
633 | 507 | "action": "indicator.mediaplayer-app.desktop", | ||
634 | 508 | "actionState": { | ||
635 | 509 | "running": true, | ||
636 | 510 | "state": "Stopped" | ||
637 | 511 | }, | ||
638 | 512 | "ext": {}, | ||
639 | 513 | "icon": "file:///usr/share/mediaplayer-app/mediaplayer-app.png", | ||
640 | 514 | "isCheck": false, | ||
641 | 515 | "isRadio": false, | ||
642 | 516 | "isSeparator": false, | ||
643 | 517 | "isToggled": false, | ||
644 | 518 | "label": "Media Player", | ||
645 | 519 | "sensitive": false, | ||
646 | 520 | "type": "com.canonical.unity.media-player" | ||
647 | 521 | } | ||
648 | 522 | }, | ||
649 | 523 | { | ||
650 | 524 | "rowData": { | ||
651 | 525 | "actionState": {}, | ||
652 | 526 | "ext": { | ||
653 | 527 | "action": "" | ||
654 | 528 | }, | ||
655 | 529 | "icon": "", | ||
656 | 530 | "isCheck": false, | ||
657 | 531 | "isRadio": false, | ||
658 | 532 | "isSeparator": false, | ||
659 | 533 | "isToggled": false, | ||
660 | 534 | "label": "", | ||
661 | 535 | "sensitive": true, | ||
662 | 536 | "type": "com.canonical.unity.playback-item" | ||
663 | 537 | } | ||
664 | 538 | }, | ||
665 | 539 | { | ||
666 | 540 | "rowData": { | ||
667 | 541 | "action": "indicator.phone-settings", | ||
668 | 542 | "actionState": {}, | ||
669 | 543 | "ext": {}, | ||
670 | 544 | "icon": "", | ||
671 | 545 | "isCheck": false, | ||
672 | 546 | "isRadio": false, | ||
673 | 547 | "isSeparator": false, | ||
674 | 548 | "isToggled": false, | ||
675 | 549 | "label": "Sound Settings…", | ||
676 | 550 | "sensitive": true, | ||
677 | 551 | "type": "" | ||
678 | 552 | } | ||
679 | 553 | } | ||
680 | 554 | ] | ||
681 | 555 | } | ||
682 | 556 | ], | ||
683 | 557 | |||
684 | 558 | |||
685 | 559 | "fake-indicator-datetime": [ | ||
686 | 560 | { | ||
687 | 561 | "rowData": { | ||
688 | 562 | "action": "indicator._header", | ||
689 | 563 | "actionState": { | ||
690 | 564 | "icons": [], | ||
691 | 565 | "label": "16.10", | ||
692 | 566 | "title": "Upcoming Events (F)", | ||
693 | 567 | "visible": true | ||
694 | 568 | }, | ||
695 | 569 | "icon": "", | ||
696 | 570 | "isCheck": false, | ||
697 | 571 | "isRadio": false, | ||
698 | 572 | "isSeparator": false, | ||
699 | 573 | "isToggled": false, | ||
700 | 574 | "label": "", | ||
701 | 575 | "sensitive": true, | ||
702 | 576 | "type": "com.canonical.indicator.root" | ||
703 | 577 | }, | ||
704 | 578 | "submenu": [ | ||
705 | 579 | { | ||
706 | 580 | "rowData": { | ||
707 | 581 | "action": "indicator.phone.open-calendar-app", | ||
708 | 582 | "actionState": {}, | ||
709 | 583 | "ext": {}, | ||
710 | 584 | "icon": "image://theme/calendar", | ||
711 | 585 | "isCheck": false, | ||
712 | 586 | "isRadio": false, | ||
713 | 587 | "isSeparator": false, | ||
714 | 588 | "isToggled": false, | ||
715 | 589 | "label": "Saturday, 31 December 2016", | ||
716 | 590 | "sensitive": true, | ||
717 | 591 | "type": "" | ||
718 | 592 | } | ||
719 | 593 | }, | ||
720 | 594 | { | ||
721 | 595 | "rowData": { | ||
722 | 596 | "action": "", | ||
723 | 597 | "actionState": {}, | ||
724 | 598 | "ext": {}, | ||
725 | 599 | "icon": "fake-indicator-datetime", | ||
726 | 600 | "isCheck": false, | ||
727 | 601 | "isRadio": false, | ||
728 | 602 | "isSeparator": true, | ||
729 | 603 | "isToggled": false, | ||
730 | 604 | "label": "", | ||
731 | 605 | "sensitive": true, | ||
732 | 606 | "type": "" | ||
733 | 607 | } | ||
734 | 608 | }, | ||
735 | 609 | { | ||
736 | 610 | "rowData": { | ||
737 | 611 | "action": "indicator.phone.open-alarm-app", | ||
738 | 612 | "actionState": {}, | ||
739 | 613 | "ext": {}, | ||
740 | 614 | "icon": "image://theme/clock", | ||
741 | 615 | "isCheck": false, | ||
742 | 616 | "isRadio": false, | ||
743 | 617 | "isSeparator": false, | ||
744 | 618 | "isToggled": false, | ||
745 | 619 | "label": "Clock", | ||
746 | 620 | "sensitive": true, | ||
747 | 621 | "type": "" | ||
748 | 622 | } | ||
749 | 623 | }, | ||
750 | 624 | { | ||
751 | 625 | "rowData": { | ||
752 | 626 | "action": "indicator.phone.open-appointment", | ||
753 | 627 | "actionState": {}, | ||
754 | 628 | "ext": { | ||
755 | 629 | "xCanonicalColor": Qt.rgba(32,74,135,1), | ||
756 | 630 | "xCanonicalTime": (new Date).getTime() / 1000 + 35000 | ||
757 | 631 | }, | ||
758 | 632 | "icon": "", | ||
759 | 633 | "isCheck": false, | ||
760 | 634 | "isRadio": false, | ||
761 | 635 | "isSeparator": false, | ||
762 | 636 | "isToggled": false, | ||
763 | 637 | "label": "Finish Indicator mocks", | ||
764 | 638 | "sensitive": true, | ||
765 | 639 | "type": "com.canonical.indicator.appointment" | ||
766 | 640 | } | ||
767 | 641 | }, | ||
768 | 642 | { | ||
769 | 643 | "rowData": { | ||
770 | 644 | "action": "indicator.phone.open-appointment", | ||
771 | 645 | "actionState": {}, | ||
772 | 646 | "ext": { | ||
773 | 647 | "xCanonicalColor": Qt.rgba(32,74,135,1), | ||
774 | 648 | "xCanonicalTime": (new Date).getTime() / 1000 + 50474 | ||
775 | 649 | }, | ||
776 | 650 | "icon": "", | ||
777 | 651 | "isCheck": false, | ||
778 | 652 | "isRadio": false, | ||
779 | 653 | "isSeparator": false, | ||
780 | 654 | "isToggled": false, | ||
781 | 655 | "label": "Implement Desktop version", | ||
782 | 656 | "sensitive": true, | ||
783 | 657 | "type": "com.canonical.indicator.appointment" | ||
784 | 658 | } | ||
785 | 659 | }, | ||
786 | 660 | { | ||
787 | 661 | "rowData": { | ||
788 | 662 | "action": "indicator.phone.open-appointment", | ||
789 | 663 | "actionState": {}, | ||
790 | 664 | "ext": { | ||
791 | 665 | "xCanonicalColor": Qt.rgba(32,74,135,1), | ||
792 | 666 | "xCanonicalTime": (new Date).getTime() / 1000 + 385000 | ||
793 | 667 | }, | ||
794 | 668 | "icon": "", | ||
795 | 669 | "isCheck": false, | ||
796 | 670 | "isRadio": false, | ||
797 | 671 | "isSeparator": false, | ||
798 | 672 | "isToggled": false, | ||
799 | 673 | "label": "Ubuntu drinks event", | ||
800 | 674 | "sensitive": true, | ||
801 | 675 | "type": "com.canonical.indicator.appointment" | ||
802 | 676 | } | ||
803 | 677 | }, | ||
804 | 678 | { | ||
805 | 679 | "rowData": { | ||
806 | 680 | "action": "indicator.phone.open-appointment", | ||
807 | 681 | "actionState": {}, | ||
808 | 682 | "ext": { | ||
809 | 683 | "xCanonicalColor": Qt.rgba(32,74,135,1), | ||
810 | 684 | "xCanonicalTime": (new Date).getTime() / 1000 + 3500050 | ||
811 | 685 | }, | ||
812 | 686 | "icon": "", | ||
813 | 687 | "isCheck": false, | ||
814 | 688 | "isRadio": false, | ||
815 | 689 | "isSeparator": false, | ||
816 | 690 | "isToggled": false, | ||
817 | 691 | "label": "Land unity8", | ||
818 | 692 | "sensitive": true, | ||
819 | 693 | "type": "com.canonical.indicator.appointment" | ||
820 | 694 | } | ||
821 | 695 | }, | ||
822 | 696 | { | ||
823 | 697 | "rowData": { | ||
824 | 698 | "action": "", | ||
825 | 699 | "actionState": {}, | ||
826 | 700 | "ext": {}, | ||
827 | 701 | "icon": "", | ||
828 | 702 | "isCheck": false, | ||
829 | 703 | "isRadio": false, | ||
830 | 704 | "isSeparator": true, | ||
831 | 705 | "isToggled": false, | ||
832 | 706 | "label": "", | ||
833 | 707 | "sensitive": true, | ||
834 | 708 | "type": "" | ||
835 | 709 | } | ||
836 | 710 | }, | ||
837 | 711 | { | ||
838 | 712 | "rowData": { | ||
839 | 713 | "action": "indicator.phone.open-settings-app", | ||
840 | 714 | "actionState": {}, | ||
841 | 715 | "ext": {}, | ||
842 | 716 | "icon": "", | ||
843 | 717 | "isCheck": false, | ||
844 | 718 | "isRadio": false, | ||
845 | 719 | "isSeparator": false, | ||
846 | 720 | "isToggled": false, | ||
847 | 721 | "label": "Date and Time settings…", | ||
848 | 722 | "sensitive": true, | ||
849 | 723 | "type": "" | ||
850 | 724 | } | ||
851 | 725 | } | ||
852 | 726 | ] | ||
853 | 727 | } | ||
854 | 728 | ], | ||
855 | 729 | |||
856 | 730 | |||
857 | 731 | "fake-indicator-files": [ | ||
858 | 732 | { | ||
859 | 733 | "rowData": { | ||
860 | 734 | "action": "indicator._header", | ||
861 | 735 | "actionState": { | ||
862 | 736 | "icons": [], | ||
863 | 737 | "label": "Files", | ||
864 | 738 | "title": "Files", | ||
865 | 739 | "visible": true | ||
866 | 740 | }, | ||
867 | 741 | "icon": "", | ||
868 | 742 | "isCheck": false, | ||
869 | 743 | "isRadio": false, | ||
870 | 744 | "isSeparator": false, | ||
871 | 745 | "isToggled": false, | ||
872 | 746 | "label": "", | ||
873 | 747 | "sensitive": true, | ||
874 | 748 | "type": "com.canonical.indicator.root" | ||
875 | 749 | }, | ||
876 | 750 | "submenu": [ | ||
877 | 751 | { | ||
878 | 752 | "rowData": { | ||
879 | 753 | "action": "indicator.pause-all", | ||
880 | 754 | "actionState": {}, | ||
881 | 755 | "ext": { | ||
882 | 756 | "xCanonicalExtraLabel": "Pause all" | ||
883 | 757 | }, | ||
884 | 758 | "icon": "", | ||
885 | 759 | "isCheck": false, | ||
886 | 760 | "isRadio": false, | ||
887 | 761 | "isSeparator": false, | ||
888 | 762 | "isToggled": false, | ||
889 | 763 | "label": "", | ||
890 | 764 | "sensitive": true, | ||
891 | 765 | "type": "com.canonical.indicator.button-section" | ||
892 | 766 | } | ||
893 | 767 | }, | ||
894 | 768 | { | ||
895 | 769 | "rowData": { | ||
896 | 770 | "action": "indicator.activate-transfer", | ||
897 | 771 | "actionState": {}, | ||
898 | 772 | "ext": { | ||
899 | 773 | "xCanonicalUid": 1003 | ||
900 | 774 | }, | ||
901 | 775 | "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png", | ||
902 | 776 | "isCheck": false, | ||
903 | 777 | "isRadio": false, | ||
904 | 778 | "isSeparator": false, | ||
905 | 779 | "isToggled": false, | ||
906 | 780 | "label": "Ubuntu daily.iso", | ||
907 | 781 | "sensitive": true, | ||
908 | 782 | "type": "com.canonical.indicator.transfer" | ||
909 | 783 | } | ||
910 | 784 | }, | ||
911 | 785 | { | ||
912 | 786 | "rowData": { | ||
913 | 787 | "action": "", | ||
914 | 788 | "actionState": {}, | ||
915 | 789 | "ext": {}, | ||
916 | 790 | "icon": "", | ||
917 | 791 | "isCheck": false, | ||
918 | 792 | "isRadio": false, | ||
919 | 793 | "isSeparator": true, | ||
920 | 794 | "isToggled": false, | ||
921 | 795 | "label": "", | ||
922 | 796 | "sensitive": true, | ||
923 | 797 | "type": "" | ||
924 | 798 | } | ||
925 | 799 | }, | ||
926 | 800 | { | ||
927 | 801 | "rowData": { | ||
928 | 802 | "action": "indicator.clear-all", | ||
929 | 803 | "actionState": {}, | ||
930 | 804 | "ext": { | ||
931 | 805 | "xCanonicalExtraLabel": "Clear all" | ||
932 | 806 | }, | ||
933 | 807 | "icon": "", | ||
934 | 808 | "isCheck": false, | ||
935 | 809 | "isRadio": false, | ||
936 | 810 | "isSeparator": false, | ||
937 | 811 | "isToggled": false, | ||
938 | 812 | "label": "Successful Transfers", | ||
939 | 813 | "sensitive": true, | ||
940 | 814 | "type": "com.canonical.indicator.button-section" | ||
941 | 815 | } | ||
942 | 816 | }, | ||
943 | 817 | { | ||
944 | 818 | "rowData": { | ||
945 | 819 | "action": "indicator.activate-transfer", | ||
946 | 820 | "actionState": {}, | ||
947 | 821 | "ext": { | ||
948 | 822 | "xCanonicalUid": 1002 | ||
949 | 823 | }, | ||
950 | 824 | "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png", | ||
951 | 825 | "isCheck": false, | ||
952 | 826 | "isRadio": false, | ||
953 | 827 | "isSeparator": false, | ||
954 | 828 | "isToggled": false, | ||
955 | 829 | "label": "Ubuntu Guide.pdf", | ||
956 | 830 | "sensitive": true, | ||
957 | 831 | "type": "com.canonical.indicator.transfer" | ||
958 | 832 | } | ||
959 | 833 | }, | ||
960 | 834 | { | ||
961 | 835 | "rowData": { | ||
962 | 836 | "action": "indicator.activate-transfer", | ||
963 | 837 | "actionState": {}, | ||
964 | 838 | "ext": { | ||
965 | 839 | "xCanonicalUid": 1001 | ||
966 | 840 | }, | ||
967 | 841 | "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png", | ||
968 | 842 | "isCheck": false, | ||
969 | 843 | "isRadio": false, | ||
970 | 844 | "isSeparator": false, | ||
971 | 845 | "isToggled": false, | ||
972 | 846 | "label": "Unity8 Hacking.pdf", | ||
973 | 847 | "sensitive": true, | ||
974 | 848 | "type": "com.canonical.indicator.transfer" | ||
975 | 849 | } | ||
976 | 850 | } | ||
977 | 851 | ] | ||
978 | 852 | } | ||
979 | 853 | ], | ||
980 | 854 | |||
981 | 855 | "fake-indicator-network": [ | ||
982 | 856 | { | ||
983 | 857 | "rowData": { | ||
984 | 858 | "action": "indicator._header", | ||
985 | 859 | "actionState": { | ||
986 | 860 | "icons": [], | ||
987 | 861 | "label": "", | ||
988 | 862 | "title": "Network", | ||
989 | 863 | "visible": true | ||
990 | 864 | }, | ||
991 | 865 | "icon": "", | ||
992 | 866 | "isCheck": false, | ||
993 | 867 | "isRadio": false, | ||
994 | 868 | "isSeparator": false, | ||
995 | 869 | "isToggled": false, | ||
996 | 870 | "label": "", | ||
997 | 871 | "sensitive": true, | ||
998 | 872 | "type": "com.canonical.indicator.root" | ||
999 | 873 | }, | ||
1000 | 874 | "submenu": [ | ||
1001 | 875 | { | ||
1002 | 876 | "rowData": { | ||
1003 | 877 | "action": "indicator.airplane.enabled", | ||
1004 | 878 | "actionState": false, | ||
1005 | 879 | "ext": {}, | ||
1006 | 880 | "icon": "", | ||
1007 | 881 | "isCheck": true, | ||
1008 | 882 | "isRadio": false, | ||
1009 | 883 | "isSeparator": false, | ||
1010 | 884 | "isToggled": false, | ||
1011 | 885 | "label": "Flight Mode", | ||
1012 | 886 | "sensitive": true, | ||
1013 | 887 | "type": "com.canonical.indicator.switch" | ||
1014 | 888 | } | ||
1015 | 889 | }, | ||
1016 | 890 | /* Anything to see here, since no fake modem actions are implemented | ||
1017 | 891 | { | ||
1018 | 892 | "rowData": { | ||
1019 | 893 | "actionState": false, | ||
1020 | 894 | "ext": {}, | ||
1021 | 895 | "icon": "", | ||
1022 | 896 | "isCheck": false, | ||
1023 | 897 | "isRadio": false, | ||
1024 | 898 | "isSeparator": true, | ||
1025 | 899 | "isToggled": false, | ||
1026 | 900 | "label": "", | ||
1027 | 901 | "sensitive": true, | ||
1028 | 902 | "type": "" | ||
1029 | 903 | } | ||
1030 | 904 | }, | ||
1031 | 905 | { | ||
1032 | 906 | "rowData": { | ||
1033 | 907 | "actionState": false, | ||
1034 | 908 | "ext": { | ||
1035 | 909 | "xCanonicalModemConnectivityIconAction": "indicator.modem.1::connectivity-icon", | ||
1036 | 910 | "xCanonicalModemLockedAction": "indicator.modem.1::locked", | ||
1037 | 911 | "xCanonicalModemRoamingAction": "indicator.modem.1::roaming", | ||
1038 | 912 | "xCanonicalModemSimIdentifierLabelAction": "indicator.modem.1::sim-identifier-label", | ||
1039 | 913 | "xCanonicalModemStatusIconAction": "indicator.modem.1::status-icon", | ||
1040 | 914 | "xCanonicalModemStatusLabelAction": "indicator.modem.1::status-label" | ||
1041 | 915 | }, | ||
1042 | 916 | "icon": "", | ||
1043 | 917 | "isCheck": false, | ||
1044 | 918 | "isRadio": false, | ||
1045 | 919 | "isSeparator": false, | ||
1046 | 920 | "isToggled": false, | ||
1047 | 921 | "label": "", | ||
1048 | 922 | "sensitive": true, | ||
1049 | 923 | "type": "com.canonical.indicator.network.modeminfoitem", | ||
1050 | 924 | "visible": false | ||
1051 | 925 | } | ||
1052 | 926 | }, | ||
1053 | 927 | */ | ||
1054 | 928 | { | ||
1055 | 929 | "rowData": { | ||
1056 | 930 | "action": "indicator.wifi.enable", | ||
1057 | 931 | "actionState": true, | ||
1058 | 932 | "ext": {}, | ||
1059 | 933 | "icon": "", | ||
1060 | 934 | "isCheck": true, | ||
1061 | 935 | "isRadio": false, | ||
1062 | 936 | "isSeparator": false, | ||
1063 | 937 | "isToggled": true, | ||
1064 | 938 | "label": "Wi-Fi", | ||
1065 | 939 | "sensitive": true, | ||
1066 | 940 | "type": "com.canonical.indicator.switch" | ||
1067 | 941 | } | ||
1068 | 942 | }, | ||
1069 | 943 | { | ||
1070 | 944 | "rowData": { | ||
1071 | 945 | "action": "", | ||
1072 | 946 | "actionState": {}, | ||
1073 | 947 | "ext": {}, | ||
1074 | 948 | "icon": "", | ||
1075 | 949 | "isCheck": false, | ||
1076 | 950 | "isRadio": false, | ||
1077 | 951 | "isSeparator": true, | ||
1078 | 952 | "isToggled": false, | ||
1079 | 953 | "label": "", | ||
1080 | 954 | "sensitive": true, | ||
1081 | 955 | "type": "" | ||
1082 | 956 | } | ||
1083 | 957 | }, | ||
1084 | 958 | { | ||
1085 | 959 | "rowData": { | ||
1086 | 960 | "action": "indicator.accesspoint.1", | ||
1087 | 961 | "actionState": true, | ||
1088 | 962 | "ext": { | ||
1089 | 963 | "xCanonicalWifiApIsAdhoc": 0, | ||
1090 | 964 | "xCanonicalWifiApIsSecure": 1, | ||
1091 | 965 | "xCanonicalWifiApStrengthAction": "indicator.accesspoint.1::strength" | ||
1092 | 966 | }, | ||
1093 | 967 | "icon": "", | ||
1094 | 968 | "isCheck": true, | ||
1095 | 969 | "isRadio": false, | ||
1096 | 970 | "isSeparator": false, | ||
1097 | 971 | "isToggled": true, | ||
1098 | 972 | "label": "Canonical", | ||
1099 | 973 | "sensitive": true, | ||
1100 | 974 | "type": "unity.widgets.systemsettings.tablet.accesspoint" | ||
1101 | 975 | } | ||
1102 | 976 | }, | ||
1103 | 977 | { | ||
1104 | 978 | "rowData": { | ||
1105 | 979 | "action": "indicator.accesspoint.2", | ||
1106 | 980 | "actionState": false, | ||
1107 | 981 | "ext": { | ||
1108 | 982 | "xCanonicalWifiApIsAdhoc": 0, | ||
1109 | 983 | "xCanonicalWifiApIsSecure": 1, | ||
1110 | 984 | "xCanonicalWifiApStrengthAction": "indicator.accesspoint.2::strength" | ||
1111 | 985 | }, | ||
1112 | 986 | "icon": "", | ||
1113 | 987 | "isCheck": true, | ||
1114 | 988 | "isRadio": false, | ||
1115 | 989 | "isSeparator": false, | ||
1116 | 990 | "isToggled": false, | ||
1117 | 991 | "label": "Ubuntu", | ||
1118 | 992 | "sensitive": true, | ||
1119 | 993 | "type": "unity.widgets.systemsettings.tablet.accesspoint" | ||
1120 | 994 | } | ||
1121 | 995 | }, | ||
1122 | 996 | { | ||
1123 | 997 | "rowData": { | ||
1124 | 998 | "action": "indicator.accesspoint.3", | ||
1125 | 999 | "actionState": false, | ||
1126 | 1000 | "ext": { | ||
1127 | 1001 | "xCanonicalWifiApIsAdhoc": 0, | ||
1128 | 1002 | "xCanonicalWifiApIsSecure": 0, | ||
1129 | 1003 | "xCanonicalWifiApStrengthAction": "indicator.accesspoint.3::strength" | ||
1130 | 1004 | }, | ||
1131 | 1005 | "icon": "", | ||
1132 | 1006 | "isCheck": true, | ||
1133 | 1007 | "isRadio": false, | ||
1134 | 1008 | "isSeparator": false, | ||
1135 | 1009 | "isToggled": false, | ||
1136 | 1010 | "label": "Linux", | ||
1137 | 1011 | "sensitive": true, | ||
1138 | 1012 | "type": "unity.widgets.systemsettings.tablet.accesspoint" | ||
1139 | 1013 | } | ||
1140 | 1014 | }, | ||
1141 | 1015 | { | ||
1142 | 1016 | "rowData": { | ||
1143 | 1017 | "action": "indicator.accesspoint.4", | ||
1144 | 1018 | "actionState": false, | ||
1145 | 1019 | "ext": { | ||
1146 | 1020 | "xCanonicalWifiApIsAdhoc": 0, | ||
1147 | 1021 | "xCanonicalWifiApIsSecure": 0, | ||
1148 | 1022 | "xCanonicalWifiApStrengthAction": "indicator.accesspoint.4::strength" | ||
1149 | 1023 | }, | ||
1150 | 1024 | "icon": "", | ||
1151 | 1025 | "isCheck": true, | ||
1152 | 1026 | "isRadio": false, | ||
1153 | 1027 | "isSeparator": false, | ||
1154 | 1028 | "isToggled": false, | ||
1155 | 1029 | "label": "for Human Beings", | ||
1156 | 1030 | "sensitive": true, | ||
1157 | 1031 | "type": "unity.widgets.systemsettings.tablet.accesspoint" | ||
1158 | 1032 | } | ||
1159 | 1033 | }, | ||
1160 | 1034 | { | ||
1161 | 1035 | "rowData": { | ||
1162 | 1036 | "action": "indicator.wifi.settings", | ||
1163 | 1037 | "actionState": {}, | ||
1164 | 1038 | "ext": {}, | ||
1165 | 1039 | "icon": "", | ||
1166 | 1040 | "isCheck": false, | ||
1167 | 1041 | "isRadio": false, | ||
1168 | 1042 | "isSeparator": false, | ||
1169 | 1043 | "isToggled": false, | ||
1170 | 1044 | "label": "Wi-Fi settings…", | ||
1171 | 1045 | "sensitive": true, | ||
1172 | 1046 | "type": "" | ||
1173 | 1047 | } | ||
1174 | 1048 | } | ||
1175 | 1049 | ] | ||
1176 | 1050 | } | ||
1177 | 1051 | ], | ||
1178 | 1052 | |||
1179 | 1053 | "fake-indicator-bluetooth": [ | ||
1180 | 1054 | { | ||
1181 | 1055 | "rowData": { | ||
1182 | 1056 | "action": "indicator._header", | ||
1183 | 1057 | "actionState": { | ||
1184 | 1058 | "icons": [], | ||
1185 | 1059 | "label": "", | ||
1186 | 1060 | "title": "Network", | ||
1187 | 1061 | "visible": true | ||
1188 | 1062 | }, | ||
1189 | 1063 | "icon": "", | ||
1190 | 1064 | "isCheck": false, | ||
1191 | 1065 | "isRadio": false, | ||
1192 | 1066 | "isSeparator": false, | ||
1193 | 1067 | "isToggled": false, | ||
1194 | 1068 | "label": "", | ||
1195 | 1069 | "sensitive": true, | ||
1196 | 1070 | "type": "com.canonical.indicator.root" | ||
1197 | 1071 | }, | ||
1198 | 1072 | "submenu": [ | ||
1199 | 1073 | { | ||
1200 | 1074 | "rowData": { | ||
1201 | 1075 | "action": "indicator.bluetooth.enable", | ||
1202 | 1076 | "actionState": true, | ||
1203 | 1077 | "ext": {}, | ||
1204 | 1078 | "icon": "", | ||
1205 | 1079 | "isCheck": true, | ||
1206 | 1080 | "isRadio": false, | ||
1207 | 1081 | "isSeparator": false, | ||
1208 | 1082 | "isToggled": true, | ||
1209 | 1083 | "label": "Bluetooth", | ||
1210 | 1084 | "sensitive": true, | ||
1211 | 1085 | "type": "com.canonical.indicator.switch" | ||
1212 | 1086 | } | ||
1213 | 1087 | }, | ||
1214 | 1088 | { | ||
1215 | 1089 | "rowData": { | ||
1216 | 1090 | "action": "indicator.bluetooth.settings", | ||
1217 | 1091 | "actionState": {}, | ||
1218 | 1092 | "ext": {}, | ||
1219 | 1093 | "icon": "", | ||
1220 | 1094 | "isCheck": false, | ||
1221 | 1095 | "isRadio": false, | ||
1222 | 1096 | "isSeparator": false, | ||
1223 | 1097 | "isToggled": false, | ||
1224 | 1098 | "label": "Bluetooth settings…", | ||
1225 | 1099 | "sensitive": true, | ||
1226 | 1100 | "type": "" | ||
1227 | 1101 | } | ||
1228 | 1102 | } | ||
1229 | 1103 | ] | ||
1230 | 1104 | } | ||
1231 | 1105 | ] | ||
1232 | 1106 | } | ||
1233 | 0 | 1107 | ||
1234 | === modified file 'tests/mocks/Unity/Indicators/fakeplugin.cpp' | |||
1235 | --- tests/mocks/Unity/Indicators/fakeplugin.cpp 2015-01-20 16:21:07 +0000 | |||
1236 | +++ tests/mocks/Unity/Indicators/fakeplugin.cpp 2016-09-08 16:44:47 +0000 | |||
1237 | @@ -29,6 +29,7 @@ | |||
1238 | 29 | #include "sharedunitymenumodel.h" | 29 | #include "sharedunitymenumodel.h" |
1239 | 30 | #include "fakeunitymenumodelcache.h" | 30 | #include "fakeunitymenumodelcache.h" |
1240 | 31 | #include "unitymenumodelstack.h" | 31 | #include "unitymenumodelstack.h" |
1241 | 32 | #include "modelprinter.h" | ||
1242 | 32 | 33 | ||
1243 | 33 | #include <unitymenumodel.h> | 34 | #include <unitymenumodel.h> |
1244 | 34 | 35 | ||
1245 | @@ -49,6 +50,7 @@ | |||
1246 | 49 | qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator"); | 50 | qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator"); |
1247 | 50 | qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack"); | 51 | qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack"); |
1248 | 51 | qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel"); | 52 | qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel"); |
1249 | 53 | qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter"); | ||
1250 | 52 | 54 | ||
1251 | 53 | qmlRegisterSingletonType<FakeUnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton); | 55 | qmlRegisterSingletonType<FakeUnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton); |
1252 | 54 | 56 |
FAILED: Continuous integration, rev:2445 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1489/ /unity8- jenkins. ubuntu. com/job/ build/1985/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/2011/ console
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1489/ rebuild
https:/