14c1ca8 · unity8 · git.iko.soy

git.iko.soy/unity8

updated qmltypes

commit14c1ca8345d66b0029e716e0afaaf526426bd760 authorNick Dedekind <nick.dedekind@canonical.com> dateMon 1 Sep 2014, 13:18 (12 years ago) parente476045

10 files changed+182−77

compare with xenial

unifiedsplit

plugins/AccountsService/AccountsService.qmltypes+1 plugins/LightDM/LightDM.qmltypes+2 plugins/Ubuntu/SystemImage/SystemImage.qmltypes+2 plugins/Unity/Indicators/Indicators.qmltypes+6−4 tests/mocks/AccountsService/AccountsService.qmltypes+1 tests/mocks/LightDM/LightDM.qmltypes+2 tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypes+3−1 tests/mocks/Unity/Application/Application.qmltypes+115−70 tests/mocks/Unity/Indicators/Indicators.qmltypes+20 tests/mocks/Unity/Unity.qmltypes+30−2

plugins/AccountsService/AccountsService.qmltypes+1

@@ -26,5 +26,6 @@ Module {

2626 Property { name: "backgroundFile"; type: "string"; isReadonly: true }

2727 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

2828 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

29+ Property { name: "failedLogins"; type: "uint" }

2930 }

3031}

plugins/LightDM/LightDM.qmltypes+2

@@ -27,6 +27,7 @@ Module {

2727 name: "showPrompt"

2828 Parameter { name: "text"; type: "string" }

2929 Parameter { name: "isSecret"; type: "bool" }

30+ Parameter { name: "isDefaultPrompt"; type: "bool" }

3031 }

3132 Signal { name: "authenticationComplete" }

3233 Signal {

@@ -34,6 +35,7 @@ Module {

3435 Parameter { name: "user"; type: "string" }

3536 }

3637 Signal { name: "isActiveChanged" }

38+ Signal { name: "isAuthenticatedChanged" }

3739 Signal { name: "showGreeter" }

3840 Signal {

3941 name: "requestAuthenticationUser"

plugins/Ubuntu/SystemImage/SystemImage.qmltypes+2

@@ -11,6 +11,8 @@ Module {

1111 name: "SystemImage"

1212 prototype: "QObject"

1313 exports: ["Ubuntu.SystemImage/SystemImage 0.1"]

14+ isCreatable: false

15+ isSingleton: true

1416 exportMetaObjectRevisions: [0]

1517 Method { name: "factoryReset" }

1618 }

plugins/Unity/Indicators/Indicators.qmltypes+6−4

@@ -219,12 +219,14 @@ Module {

219219 Method {

220220 name: "model"

221221 type: "UnityMenuModel*"

222− Parameter { name: "path"; type: "string" }

222+ Parameter { name: "bus"; type: "QByteArray" }

223+ Parameter { name: "path"; type: "QByteArray" }

224+ Parameter { name: "actions"; type: "QVariantMap" }

223225 }

224226 Method {

225− name: "registerModel"

226− Parameter { name: "path"; type: "string" }

227− Parameter { name: "menuModel"; type: "UnityMenuModel"; isPointer: true }

227+ name: "contains"

228+ type: "bool"

229+ Parameter { name: "path"; type: "QByteArray" }

228230 }

229231 }

230232 Component {

tests/mocks/AccountsService/AccountsService.qmltypes+1

@@ -26,5 +26,6 @@ Module {

2626 Property { name: "backgroundFile"; type: "string" }

2727 Property { name: "statsWelcomeScreen"; type: "bool" }

2828 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

29+ Property { name: "failedLogins"; type: "uint" }

2930 }

3031}

tests/mocks/LightDM/LightDM.qmltypes+2

@@ -27,6 +27,7 @@ Module {

2727 name: "showPrompt"

2828 Parameter { name: "text"; type: "string" }

2929 Parameter { name: "isSecret"; type: "bool" }

30+ Parameter { name: "isDefaultPrompt"; type: "bool" }

3031 }

3132 Signal { name: "authenticationComplete" }

3233 Signal {

@@ -34,6 +35,7 @@ Module {

3435 Parameter { name: "user"; type: "string" }

3536 }

3637 Signal { name: "isActiveChanged" }

38+ Signal { name: "isAuthenticatedChanged" }

3739 Signal { name: "showGreeter" }

3840 Signal {

3941 name: "requestAuthenticationUser"

tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypes+3−1

@@ -4,13 +4,15 @@ import QtQuick.tooling 1.1

44// It is used for QML tooling purposes only.

55//

66// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'

7+// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 tests/mocks'

99Module {

1010 Component {

1111 name: "MockSystemImage"

1212 prototype: "QObject"

1313 exports: ["Ubuntu.SystemImage/SystemImage 0.1"]

14+ isCreatable: false

15+ isSingleton: true

1416 exportMetaObjectRevisions: [0]

1517 Signal { name: "resettingDevice" }

1618 Method { name: "factoryReset" }

tests/mocks/Unity/Application/Application.qmltypes+115−70

@@ -13,58 +13,24 @@ Module {

1313 exports: ["Unity.Application/ApplicationInfo 0.1"]

1414 exportMetaObjectRevisions: [0]

1515 Property { name: "fullscreen"; type: "bool" }

16− Property { name: "stage"; type: "Stage" }

17− Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }

18− Property { name: "promptSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }

19− Property { name: "imageQml"; type: "string" }

20− Property { name: "windowQml"; type: "string" }

21− Signal {

22− name: "appIdChanged"

23− Parameter { type: "string" }

24− }

25− Signal {

26− name: "nameChanged"

27− Parameter { type: "string" }

28− }

29− Signal {

30− name: "commentChanged"

31− Parameter { type: "string" }

32− }

33− Signal {

34− name: "iconChanged"

35− Parameter { type: "QUrl" }

36− }

16+ Property { name: "session"; type: "Session"; isReadonly: true; isPointer: true }

17+ Property { name: "manualSurfaceCreation"; type: "bool" }

3718 Signal {

38− name: "stageChanged"

39− Parameter { type: "Stage" }

40− }

41− Signal {

42− name: "stateChanged"

43− Parameter { type: "State" }

44− }

45− Signal {

46− name: "focusedChanged"

47− Parameter { type: "bool" }

19+ name: "sessionChanged"

20+ Parameter { type: "Session"; isPointer: true }

4821 }

4922 Signal {

5023 name: "fullscreenChanged"

51− Parameter { type: "bool" }

52− }

53− Signal {

54− name: "imageQmlChanged"

55− Parameter { type: "string" }

56− }

57− Signal {

58− name: "windowQmlChanged"

59− Parameter { type: "string" }

24+ Parameter { name: "value"; type: "bool" }

6025 }

6126 Signal {

62− name: "screenshotChanged"

63− Parameter { type: "QUrl" }

27+ name: "manualSurfaceCreationChanged"

28+ Parameter { name: "value"; type: "bool" }

6429 }

65− Signal {

66− name: "surfaceChanged"

67− Parameter { type: "MirSurfaceItem"; isPointer: true }

30+ Method { name: "createSession" }

31+ Method {

32+ name: "setState"

33+ Parameter { name: "value"; type: "State" }

6834 }

6935 }

7036 Component {

@@ -198,17 +164,50 @@ Module {

198164 type: "bool"

199165 Parameter { name: "appId"; type: "string" }

200166 }

167+ Method { name: "availableApplications"; type: "QStringList" }

201168 Method {

202− name: "updateScreenshot"

203− type: "bool"

169+ name: "add"

170+ type: "ApplicationInfo*"

204171 Parameter { name: "appId"; type: "string" }

205172 }

206− Method { name: "availableApplications"; type: "QStringList" }

173+ }

174+ Component {

175+ name: "ApplicationTestInterface"

176+ prototype: "QDBusAbstractAdaptor"

177+ exports: ["Unity.Application/ApplicationTest 0.1"]

178+ isCreatable: false

179+ isSingleton: true

180+ exportMetaObjectRevisions: [0]

181+ Method {

182+ name: "addChildSession"

183+ type: "uint"

184+ Parameter { name: "appId"; type: "string" }

185+ Parameter { name: "existingSessionId"; type: "uint" }

186+ Parameter { name: "surfaceImage"; type: "string" }

187+ }

188+ Method {

189+ name: "removeSession"

190+ Parameter { name: "sessionId"; type: "uint" }

191+ }

192+ Method {

193+ name: "addChildSession"

194+ type: "Session*"

195+ Parameter { name: "existingSession"; type: "Session"; isPointer: true }

196+ Parameter { name: "surfaceImage"; type: "string" }

197+ }

198+ Method {

199+ name: "removeSession"

200+ Parameter { name: "existingSession"; type: "Session"; isPointer: true }

201+ }

202+ Method {

203+ name: "removeSurface"

204+ Parameter { name: "existingSurface"; type: "MirSurfaceItem"; isPointer: true }

205+ }

207206 }

208207 Component {

209208 name: "MirSurfaceItem"

210209 defaultProperty: "data"

211− prototype: "QQuickPaintedItem"

210+ prototype: "QQuickItem"

212211 exports: ["Unity.Application/MirSurfaceItem 0.1"]

213212 isCreatable: false

214213 exportMetaObjectRevisions: [0]

@@ -238,8 +237,7 @@ Module {

238237 Property { name: "type"; type: "Type"; isReadonly: true }

239238 Property { name: "state"; type: "State"; isReadonly: true }

240239 Property { name: "name"; type: "string"; isReadonly: true }

241− Property { name: "parentSurface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }

242− Property { name: "childSurfaces"; type: "MirSurfaceItem"; isList: true; isReadonly: true }

240+ Property { name: "live"; type: "bool"; isReadonly: true }

243241 Signal {

244242 name: "typeChanged"

245243 Parameter { type: "Type" }

@@ -249,22 +247,72 @@ Module {

249247 Parameter { type: "State" }

250248 }

251249 Signal {

252− name: "nameChanged"

253− Parameter { type: "string" }

254− }

255− Signal {

256− name: "parentSurfaceChanged"

257− Parameter { type: "MirSurfaceItem"; isPointer: true }

250+ name: "liveChanged"

251+ Parameter { name: "isLive"; type: "bool" }

258252 }

259− Signal { name: "removed" }

260253 Signal { name: "inputMethodRequested" }

261254 Signal { name: "inputMethodDismissed" }

255+ Signal { name: "deregister" }

262256 Method {

263257 name: "setState"

264258 Parameter { name: "newState"; type: "State" }

265259 }

266260 Method { name: "release" }

267261 }

262+ Component { name: "QDBusAbstractAdaptor"; prototype: "QObject" }

263+ Component {

264+ name: "Session"

265+ prototype: "QObject"

266+ exports: ["Unity.Application/Session 0.1"]

267+ isCreatable: false

268+ exportMetaObjectRevisions: [0]

269+ Property { name: "name"; type: "string"; isReadonly: true }

270+ Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }

271+ Property { name: "parentSession"; type: "Session"; isReadonly: true; isPointer: true }

272+ Property { name: "childSessions"; type: "SessionModel"; isReadonly: true; isPointer: true }

273+ Property { name: "live"; type: "bool"; isReadonly: true }

274+ Signal {

275+ name: "surfaceChanged"

276+ Parameter { type: "MirSurfaceItem"; isPointer: true }

277+ }

278+ Signal {

279+ name: "parentSessionChanged"

280+ Parameter { type: "Session"; isPointer: true }

281+ }

282+ Signal {

283+ name: "liveChanged"

284+ Parameter { name: "isLive"; type: "bool" }

285+ }

286+ Signal { name: "deregister" }

287+ Method { name: "createSurface" }

288+ Method { name: "release" }

289+ Method {

290+ name: "addChildSession"

291+ Parameter { name: "session"; type: "Session"; isPointer: true }

292+ }

293+ }

294+ Component {

295+ name: "SessionManager"

296+ prototype: "QObject"

297+ exports: ["Unity.Application/SessionManager 0.1"]

298+ isCreatable: false

299+ isSingleton: true

300+ exportMetaObjectRevisions: [0]

301+ Signal {

302+ name: "sessionStarting"

303+ Parameter { name: "session"; type: "Session"; isPointer: true }

304+ }

305+ Signal {

306+ name: "sessionStopping"

307+ Parameter { name: "session"; type: "Session"; isPointer: true }

308+ }

309+ Method {

310+ name: "createSession"

311+ type: "Session*"

312+ Parameter { name: "name"; type: "string" }

313+ Parameter { name: "screenshot"; type: "QUrl" }

314+ }

315+ }

268316 Component {

269317 name: "SurfaceManager"

270318 prototype: "QObject"

@@ -281,6 +329,14 @@ Module {

281329 name: "surfaceDestroyed"

282330 Parameter { name: "surface"; type: "MirSurfaceItem"; isPointer: true }

283331 }

332+ Method {

333+ name: "createSurface"

334+ type: "MirSurfaceItem*"

335+ Parameter { name: "name"; type: "string" }

336+ Parameter { name: "type"; type: "MirSurfaceItem::Type" }

337+ Parameter { name: "state"; type: "MirSurfaceItem::State" }

338+ Parameter { name: "screenshot"; type: "QUrl" }

339+ }

284340 Method { name: "inputMethodSurface"; type: "MirSurfaceItem*" }

285341 }

286342 Component {

@@ -312,7 +368,6 @@ Module {

312368 Property { name: "stage"; type: "Stage"; isReadonly: true }

313369 Property { name: "state"; type: "State"; isReadonly: true }

314370 Property { name: "focused"; type: "bool"; isReadonly: true }

315− Property { name: "screenshot"; type: "QUrl"; isReadonly: true }

316371 Signal {

317372 name: "nameChanged"

318373 Parameter { name: "name"; type: "string" }

@@ -337,10 +392,6 @@ Module {

337392 name: "focusedChanged"

338393 Parameter { name: "focused"; type: "bool" }

339394 }

340− Signal {

341− name: "screenshotChanged"

342− Parameter { name: "screenshot"; type: "QUrl" }

343− }

344395 }

345396 Component {

346397 name: "unity::shell::application::ApplicationManagerInterface"

@@ -357,8 +408,7 @@ Module {

357408 "RoleIcon": 259,

358409 "RoleStage": 260,

359410 "RoleState": 261,

360− "RoleFocused": 262,

361− "RoleScreenshot": 263

411+ "RoleFocused": 262

362412 }

363413 }

364414 Property { name: "count"; type: "int"; isReadonly: true }

@@ -408,10 +458,5 @@ Module {

408458 type: "bool"

409459 Parameter { name: "appId"; type: "string" }

410460 }

411− Method {

412− name: "updateScreenshot"

413− type: "bool"

414− Parameter { name: "appId"; type: "string" }

415− }

416461 }

417462}

tests/mocks/Unity/Indicators/Indicators.qmltypes+20

@@ -159,6 +159,26 @@ Module {

159159 Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }

160160 }

161161 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }

162+ Component {

163+ name: "UnityMenuModelCache"

164+ prototype: "QObject"

165+ exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]

166+ isCreatable: false

167+ isSingleton: true

168+ exportMetaObjectRevisions: [0]

169+ Method {

170+ name: "model"

171+ type: "UnityMenuModel*"

172+ Parameter { name: "bus"; type: "QByteArray" }

173+ Parameter { name: "path"; type: "QByteArray" }

174+ Parameter { name: "actions"; type: "QVariantMap" }

175+ }

176+ Method {

177+ name: "contains"

178+ type: "bool"

179+ Parameter { name: "path"; type: "QByteArray" }

180+ }

181+ }

162182 Component {

163183 name: "UnityMenuModelStack"

164184 prototype: "QObject"

tests/mocks/Unity/Unity.qmltypes+30−2

@@ -36,6 +36,10 @@ Module {

3636 prototype: "unity::shell::scopes::PreviewModelInterface"

3737 exports: ["Unity/FakePreviewModel 0.2"]

3838 exportMetaObjectRevisions: [0]

39+ Method {

40+ name: "setLoaded"

41+ Parameter { type: "bool" }

42+ }

3943 }

4044 Component {

4145 name: "PreviewStack"

@@ -59,9 +63,9 @@ Module {

5963 Component {

6064 name: "ResultsModel"

6165 prototype: "unity::shell::scopes::ResultsModelInterface"

62− exports: ["Unity/ResultsModel 0.2"]

66+ exports: ["Unity/FakeResultsModel 0.2", "Unity/ResultsModel 0.2"]

6367 isCreatable: false

64− exportMetaObjectRevisions: [0]

68+ exportMetaObjectRevisions: [0, 0]

6569 }

6670 Component {

6771 name: "Scope"

@@ -134,7 +138,13 @@ Module {

134138 }

135139 Method { name: "clear" }

136140 Method { name: "load" }

141+ Method {

142+ name: "getScopeFromAll"

143+ type: "Scope*"

144+ Parameter { name: "scope_id"; type: "string" }

145+ }

137146 }

147+ Component { name: "SettingsModel"; prototype: "unity::shell::scopes::SettingsModelInterface" }

138148 Component {

139149 name: "unity::shell::scopes::CategoriesInterface"

140150 prototype: "QAbstractListModel"

@@ -402,4 +412,22 @@ Module {

402412 Parameter { name: "scopeId"; type: "string" }

403413 }

404414 }

415+ Component {

416+ name: "unity::shell::scopes::SettingsModelInterface"

417+ prototype: "QAbstractListModel"

418+ exports: ["Unity/SettingsModel 0.2"]

419+ isCreatable: false

420+ exportMetaObjectRevisions: [0]

421+ Enum {

422+ name: "Roles"

423+ values: {

424+ "RoleSettingId": 0,

425+ "RoleDisplayName": 1,

426+ "RoleType": 2,

427+ "RoleProperties": 3,

428+ "RoleValue": 4

429+ }

430+ }

431+ Property { name: "count"; type: "int"; isReadonly: true }

432+ }

405433}