@@ -24,6 +24,12 @@ Module {
24 Parameter { name: "categoryId"; type: "string" }
24 Parameter { name: "categoryId"; type: "string" }
25 Parameter { name: "json"; type: "string" }
25 Parameter { name: "json"; type: "string" }
30+ Parameter { name: "row"; type: "int" }
31+ Parameter { name: "role"; type: "int" }
28 Component {
34 Component {
29 name: "PreviewModel"
35 name: "PreviewModel"
@@ -81,13 +87,14 @@ Module {
81 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
87 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
84− name: "getDepartment"
90+ name: "getNavigation"
85− type: "unity::shell::scopes::DepartmentInterface*"
91+ type: "unity::shell::scopes::NavigationInterface*"
86− Parameter { name: "id"; type: "string" }
92+ Parameter { name: "navigationId"; type: "string" }
89− name: "loadDepartment"
95+ name: "getAltNavigation"
96+ type: "unity::shell::scopes::NavigationInterface*"
90− Parameter { name: "id"; type: "string" }
97+ Parameter { name: "altNavigationId"; type: "string" }
93 name: "performQuery"
100 name: "performQuery"
@@ -137,6 +144,7 @@ Module {
137 "RoleRawRendererTemplate": 3,
144 "RoleRawRendererTemplate": 3,
138 "RoleRenderer": 4,
145 "RoleRenderer": 4,
139 "RoleComponents": 5,
146 "RoleComponents": 5,
147+ "RoleHeaderLink": 6,
140 "RoleResults": 7,
148 "RoleResults": 7,
141 "RoleCount": 8
149 "RoleCount": 8
@@ -157,27 +165,31 @@ Module {
159 Component {
167 Component {
160− name: "unity::shell::scopes::DepartmentInterface"
168+ name: "unity::shell::scopes::NavigationInterface"
161 prototype: "QAbstractListModel"
169 prototype: "QAbstractListModel"
162− exports: ["Unity/Department 0.2"]
170+ exports: ["Unity/Navigation 0.2"]
163 isCreatable: false
171 isCreatable: false
164 exportMetaObjectRevisions: [0]
172 exportMetaObjectRevisions: [0]
166 name: "Roles"
174 name: "Roles"
167 values: {
175 values: {
168− "RoleDepartmentId": 0,
176+ "RoleNavigationId": 0,
169− "RoleLabel": 1,
178+ "RoleLabel": 2,
170− "RoleHasChildren": 2,
179+ "RoleHasChildren": 3,
171− "RoleIsActive": 3
180+ "RoleIsActive": 4
183+ Property { name: "navigationId"; type: "string"; isReadonly: true }
174− Property { name: "departmentId"; type: "string"; isReadonly: true }
184+ Property { name: "query"; type: "string"; isReadonly: true }
175 Property { name: "label"; type: "string"; isReadonly: true }
185 Property { name: "label"; type: "string"; isReadonly: true }
176 Property { name: "allLabel"; type: "string"; isReadonly: true }
186 Property { name: "allLabel"; type: "string"; isReadonly: true }
187+ Property { name: "parentNavigationId"; type: "string"; isReadonly: true }
177− Property { name: "parentDepartmentId"; type: "string"; isReadonly: true }
188+ Property { name: "parentQuery"; type: "string"; isReadonly: true }
178 Property { name: "parentLabel"; type: "string"; isReadonly: true }
189 Property { name: "parentLabel"; type: "string"; isReadonly: true }
179 Property { name: "loaded"; type: "bool"; isReadonly: true }
190 Property { name: "loaded"; type: "bool"; isReadonly: true }
180 Property { name: "isRoot"; type: "bool"; isReadonly: true }
191 Property { name: "isRoot"; type: "bool"; isReadonly: true }
192+ Property { name: "hidden"; type: "bool"; isReadonly: true }
181 Property { name: "count"; type: "int"; isReadonly: true }
193 Property { name: "count"; type: "int"; isReadonly: true }
183 Component {
195 Component {
@@ -247,7 +259,8 @@ Module {
247 "RoleEmblem": 8,
259 "RoleEmblem": 8,
248 "RoleSummary": 9,
260 "RoleSummary": 9,
249 "RoleAttributes": 10,
261 "RoleAttributes": 10,
250− "RoleBackground": 11
262+ "RoleBackground": 11,
263+ "RoleOverlayColor": 12
253 Property { name: "categoryId"; type: "string" }
266 Property { name: "categoryId"; type: "string" }
@@ -259,13 +272,22 @@ Module {
259 exports: ["Unity/Scope 0.2"]
272 exports: ["Unity/Scope 0.2"]
260 isCreatable: false
273 isCreatable: false
261 exportMetaObjectRevisions: [0]
274 exportMetaObjectRevisions: [0]
280+ "NoLocationData": 2,
262 Property { name: "id"; type: "string"; isReadonly: true }
284 Property { name: "id"; type: "string"; isReadonly: true }
263 Property { name: "name"; type: "string"; isReadonly: true }
285 Property { name: "name"; type: "string"; isReadonly: true }
264 Property { name: "iconHint"; type: "string"; isReadonly: true }
286 Property { name: "iconHint"; type: "string"; isReadonly: true }
265 Property { name: "description"; type: "string"; isReadonly: true }
287 Property { name: "description"; type: "string"; isReadonly: true }
266 Property { name: "searchHint"; type: "string"; isReadonly: true }
288 Property { name: "searchHint"; type: "string"; isReadonly: true }
267 Property { name: "searchInProgress"; type: "bool"; isReadonly: true }
289 Property { name: "searchInProgress"; type: "bool"; isReadonly: true }
268− Property { name: "visible"; type: "bool"; isReadonly: true }
290+ Property { name: "favorite"; type: "bool" }
269 Property { name: "shortcut"; type: "string"; isReadonly: true }
291 Property { name: "shortcut"; type: "string"; isReadonly: true }
270 Property {
292 Property {
271 name: "categories"
293 name: "categories"
@@ -273,13 +295,27 @@ Module {
273 isReadonly: true
295 isReadonly: true
274 isPointer: true
296 isPointer: true
300+ type: "unity::shell::scopes::SettingsModelInterface"
276 Property { name: "searchQuery"; type: "string" }
304 Property { name: "searchQuery"; type: "string" }
277 Property { name: "noResultsHint"; type: "string" }
305 Property { name: "noResultsHint"; type: "string" }
278 Property { name: "formFactor"; type: "string" }
306 Property { name: "formFactor"; type: "string" }
279 Property { name: "isActive"; type: "bool" }
307 Property { name: "isActive"; type: "bool" }
308+ Property { name: "currentNavigationId"; type: "string"; isReadonly: true }
309+ Property { name: "hasNavigation"; type: "bool"; isReadonly: true }
280− Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }
310+ Property { name: "currentAltNavigationId"; type: "string"; isReadonly: true }
281− Property { name: "hasDepartments"; type: "bool"; isReadonly: true }
311+ Property { name: "hasAltNavigation"; type: "bool"; isReadonly: true }
282 Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }
312 Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }
315+ type: "unity::shell::scopes::ScopeInterface::Status"
318+ Signal { name: "detailsChanged" }
283 Signal { name: "showDash" }
319 Signal { name: "showDash" }
284 Signal { name: "hideDash" }
320 Signal { name: "hideDash" }
@@ -317,13 +353,18 @@ Module {
317 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
353 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
320− name: "getDepartment"
356+ name: "getNavigation"
321− type: "unity::shell::scopes::DepartmentInterface*"
357+ type: "unity::shell::scopes::NavigationInterface*"
322− Parameter { name: "departmentId"; type: "string" }
358+ Parameter { name: "navigationId"; type: "string" }
325− name: "loadDepartment"
361+ name: "getAltNavigation"
326− Parameter { name: "departmentId"; type: "string" }
362+ type: "unity::shell::scopes::NavigationInterface*"
363+ Parameter { name: "altNavigationId"; type: "string" }
366+ name: "performQuery"
367+ Parameter { name: "cannedQuery"; type: "string" }
329 Component {
370 Component {
@@ -334,11 +375,17 @@ Module {
334 values: {
375 values: {
335 "RoleScope": 0,
376 "RoleScope": 0,
336 "RoleId": 1,
377 "RoleId": 1,
338− "RoleTitle": 3
378+ "RoleTitle": 2
341 Property { name: "loaded"; type: "bool"; isReadonly: true }
381 Property { name: "loaded"; type: "bool"; isReadonly: true }
382+ Property { name: "count"; type: "int"; isReadonly: true }
384+ name: "overviewScope"
385+ type: "unity::shell::scopes::ScopeInterface"
343 name: "getScope"
390 name: "getScope"
344 type: "unity::shell::scopes::ScopeInterface*"
391 type: "unity::shell::scopes::ScopeInterface*"