@@ -24,6 +24,12 @@ Module {
2424 Parameter { name: "categoryId"; type: "string" }
2525 Parameter { name: "json"; type: "string" }
2626 }
27+ Method {
28+ name: "data"
29+ type: "QVariant"
30+ Parameter { name: "row"; type: "int" }
31+ Parameter { name: "role"; type: "int" }
32+ }
2733 }
2834 Component {
2935 name: "PreviewModel"
@@ -81,13 +87,14 @@ Module {
8187 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
8288 }
8389 Method {
84− name: "getDepartment"
85− type: "unity::shell::scopes::DepartmentInterface*"
86− Parameter { name: "id"; type: "string" }
90+ name: "getNavigation"
91+ type: "unity::shell::scopes::NavigationInterface*"
92+ Parameter { name: "navigationId"; type: "string" }
8793 }
8894 Method {
89− name: "loadDepartment"
90− Parameter { name: "id"; type: "string" }
95+ name: "getAltNavigation"
96+ type: "unity::shell::scopes::NavigationInterface*"
97+ Parameter { name: "altNavigationId"; type: "string" }
9198 }
9299 Method {
93100 name: "performQuery"
@@ -137,6 +144,7 @@ Module {
137144 "RoleRawRendererTemplate": 3,
138145 "RoleRenderer": 4,
139146 "RoleComponents": 5,
147+ "RoleHeaderLink": 6,
140148 "RoleResults": 7,
141149 "RoleCount": 8
142150 }
@@ -157,27 +165,31 @@ Module {
157165 }
158166 }
159167 Component {
160− name: "unity::shell::scopes::DepartmentInterface"
168+ name: "unity::shell::scopes::NavigationInterface"
161169 prototype: "QAbstractListModel"
162− exports: ["Unity/Department 0.2"]
170+ exports: ["Unity/Navigation 0.2"]
163171 isCreatable: false
164172 exportMetaObjectRevisions: [0]
165173 Enum {
166174 name: "Roles"
167175 values: {
168− "RoleDepartmentId": 0,
169− "RoleLabel": 1,
170− "RoleHasChildren": 2,
171− "RoleIsActive": 3
176+ "RoleNavigationId": 0,
177+ "RoleQuery": 1,
178+ "RoleLabel": 2,
179+ "RoleHasChildren": 3,
180+ "RoleIsActive": 4
172181 }
173182 }
174− Property { name: "departmentId"; type: "string"; isReadonly: true }
183+ Property { name: "navigationId"; type: "string"; isReadonly: true }
184+ Property { name: "query"; type: "string"; isReadonly: true }
175185 Property { name: "label"; type: "string"; isReadonly: true }
176186 Property { name: "allLabel"; type: "string"; isReadonly: true }
177− Property { name: "parentDepartmentId"; type: "string"; isReadonly: true }
187+ Property { name: "parentNavigationId"; type: "string"; isReadonly: true }
188+ Property { name: "parentQuery"; type: "string"; isReadonly: true }
178189 Property { name: "parentLabel"; type: "string"; isReadonly: true }
179190 Property { name: "loaded"; type: "bool"; isReadonly: true }
180191 Property { name: "isRoot"; type: "bool"; isReadonly: true }
192+ Property { name: "hidden"; type: "bool"; isReadonly: true }
181193 Property { name: "count"; type: "int"; isReadonly: true }
182194 }
183195 Component {
@@ -247,7 +259,8 @@ Module {
247259 "RoleEmblem": 8,
248260 "RoleSummary": 9,
249261 "RoleAttributes": 10,
250− "RoleBackground": 11
262+ "RoleBackground": 11,
263+ "RoleOverlayColor": 12
251264 }
252265 }
253266 Property { name: "categoryId"; type: "string" }
@@ -259,13 +272,22 @@ Module {
259272 exports: ["Unity/Scope 0.2"]
260273 isCreatable: false
261274 exportMetaObjectRevisions: [0]
275+ Enum {
276+ name: "Status"
277+ values: {
278+ "Okay": 0,
279+ "NoInternet": 1,
280+ "NoLocationData": 2,
281+ "Unknown": 3
282+ }
283+ }
262284 Property { name: "id"; type: "string"; isReadonly: true }
263285 Property { name: "name"; type: "string"; isReadonly: true }
264286 Property { name: "iconHint"; type: "string"; isReadonly: true }
265287 Property { name: "description"; type: "string"; isReadonly: true }
266288 Property { name: "searchHint"; type: "string"; isReadonly: true }
267289 Property { name: "searchInProgress"; type: "bool"; isReadonly: true }
268− Property { name: "visible"; type: "bool"; isReadonly: true }
290+ Property { name: "favorite"; type: "bool" }
269291 Property { name: "shortcut"; type: "string"; isReadonly: true }
270292 Property {
271293 name: "categories"
@@ -273,13 +295,27 @@ Module {
273295 isReadonly: true
274296 isPointer: true
275297 }
298+ Property {
299+ name: "settings"
300+ type: "unity::shell::scopes::SettingsModelInterface"
301+ isReadonly: true
302+ isPointer: true
303+ }
276304 Property { name: "searchQuery"; type: "string" }
277305 Property { name: "noResultsHint"; type: "string" }
278306 Property { name: "formFactor"; type: "string" }
279307 Property { name: "isActive"; type: "bool" }
280− Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }
281− Property { name: "hasDepartments"; type: "bool"; isReadonly: true }
308+ Property { name: "currentNavigationId"; type: "string"; isReadonly: true }
309+ Property { name: "hasNavigation"; type: "bool"; isReadonly: true }
310+ Property { name: "currentAltNavigationId"; type: "string"; isReadonly: true }
311+ Property { name: "hasAltNavigation"; type: "bool"; isReadonly: true }
282312 Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }
313+ Property {
314+ name: "status"
315+ type: "unity::shell::scopes::ScopeInterface::Status"
316+ isReadonly: true
317+ }
318+ Signal { name: "detailsChanged" }
283319 Signal { name: "showDash" }
284320 Signal { name: "hideDash" }
285321 Signal {
@@ -317,13 +353,18 @@ Module {
317353 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
318354 }
319355 Method {
320− name: "getDepartment"
321− type: "unity::shell::scopes::DepartmentInterface*"
322− Parameter { name: "departmentId"; type: "string" }
356+ name: "getNavigation"
357+ type: "unity::shell::scopes::NavigationInterface*"
358+ Parameter { name: "navigationId"; type: "string" }
323359 }
324360 Method {
325− name: "loadDepartment"
326− Parameter { name: "departmentId"; type: "string" }
361+ name: "getAltNavigation"
362+ type: "unity::shell::scopes::NavigationInterface*"
363+ Parameter { name: "altNavigationId"; type: "string" }
364+ }
365+ Method {
366+ name: "performQuery"
367+ Parameter { name: "cannedQuery"; type: "string" }
327368 }
328369 }
329370 Component {
@@ -334,11 +375,17 @@ Module {
334375 values: {
335376 "RoleScope": 0,
336377 "RoleId": 1,
337− "RoleVisible": 2,
338− "RoleTitle": 3
378+ "RoleTitle": 2
339379 }
340380 }
341381 Property { name: "loaded"; type: "bool"; isReadonly: true }
382+ Property { name: "count"; type: "int"; isReadonly: true }
383+ Property {
384+ name: "overviewScope"
385+ type: "unity::shell::scopes::ScopeInterface"
386+ isReadonly: true
387+ isPointer: true
388+ }
342389 Method {
343390 name: "getScope"
344391 type: "unity::shell::scopes::ScopeInterface*"