on xenial help sign in
removed widget+pageSource
8442b69Nick Dedekind
plugins/AccountsService/AccountsService.qmltypes+2
@@ -23,6 +23,8 @@ Module {
23 }
23 }
24 Property { name: "user"; type: "string" }
24 Property { name: "user"; type: "string" }
25 Property { name: "demoEdges"; type: "bool" }
25 Property { name: "demoEdges"; type: "bool" }
26+ Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
27+ Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
26 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
28 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
27 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
29 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
28 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
30 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
plugins/Dash/Dash.qmltypes+2
@@ -43,6 +43,8 @@ Module {
43 Signal { name: "headerChanged" }
43 Signal { name: "headerChanged" }
44 Method { name: "positionAtBeginning" }
44 Method { name: "positionAtBeginning" }
45 Method { name: "showHeader" }
45 Method { name: "showHeader" }
46+ Method { name: "firstCreatedIndex"; type: "int" }
47+ Method { name: "createdItemCount"; type: "int" }
46 Method {
48 Method {
47 name: "item"
49 name: "item"
48 type: "QQuickItem*"
50 type: "QQuickItem*"
plugins/LightDM/LightDM.qmltypes+1
@@ -37,6 +37,7 @@ Module {
37 Signal { name: "isActiveChanged" }
37 Signal { name: "isActiveChanged" }
38 Signal { name: "isAuthenticatedChanged" }
38 Signal { name: "isAuthenticatedChanged" }
39 Signal { name: "showGreeter" }
39 Signal { name: "showGreeter" }
40+ Signal { name: "hideGreeter" }
40 Signal {
41 Signal {
41 name: "requestAuthenticationUser"
42 name: "requestAuthenticationUser"
42 Parameter { name: "user"; type: "string" }
43 Parameter { name: "user"; type: "string" }
plugins/Ubuntu/Payments/Payments.qmltypes+1
@@ -37,6 +37,7 @@ Module {
37 Parameter { name: "error"; type: "string" }
37 Parameter { name: "error"; type: "string" }
38 }
38 }
39 Signal { name: "purchaseCompleted" }
39 Signal { name: "purchaseCompleted" }
40+ Signal { name: "purchaseCancelled" }
40 Method { name: "start" }
41 Method { name: "start" }
41 }
42 }
42}
43}
plugins/Unity/DashCommunicator/DashCommunicator.qmltypes+2−2
@@ -16,7 +16,7 @@ Module {
16 name: "setCurrentScope"
16 name: "setCurrentScope"
17 Parameter { name: "scopeId"; type: "string" }
17 Parameter { name: "scopeId"; type: "string" }
18 Parameter { name: "animate"; type: "bool" }
18 Parameter { name: "animate"; type: "bool" }
19− Parameter { name: "reset"; type: "bool" }
19+ Parameter { name: "isSwipe"; type: "bool" }
20 }
20 }
21 }
21 }
22 Component {
22 Component {
@@ -28,7 +28,7 @@ Module {
28 name: "setCurrentScopeRequested"
28 name: "setCurrentScopeRequested"
29 Parameter { name: "scopeId"; type: "string" }
29 Parameter { name: "scopeId"; type: "string" }
30 Parameter { name: "animate"; type: "bool" }
30 Parameter { name: "animate"; type: "bool" }
31− Parameter { name: "reset"; type: "bool" }
31+ Parameter { name: "isSwipe"; type: "bool" }
32 }
32 }
33 }
33 }
34}
34}
plugins/Unity/Indicators/Indicators.qmltypes+12−11
@@ -99,10 +99,8 @@ Module {
99 values: {
99 values: {
100 "Identifier": 0,
100 "Identifier": 0,
101 "Position": 1,
101 "Position": 1,
102− "WidgetSource": 2,
102+ "IndicatorProperties": 2,
103− "PageSource": 3,
103+ "IsVisible": 3
104− "IndicatorProperties": 4,
105− "IsVisible": 5
106 }
104 }
107 }
105 }
108 }
106 }
@@ -209,6 +207,16 @@ Module {
209 Signal { name: "updated" }
207 Signal { name: "updated" }
210 Signal { name: "indexChanged" }
208 Signal { name: "indexChanged" }
211 }
209 }
210+ Component {
211+ name: "SharedUnityMenuModel"
212+ prototype: "QObject"
213+ exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]
214+ exportMetaObjectRevisions: [0]
215+ Property { name: "busName"; type: "QByteArray" }
216+ Property { name: "menuObjectPath"; type: "QByteArray" }
217+ Property { name: "actions"; type: "QVariantMap" }
218+ Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
219+ }
212 Component {
220 Component {
213 name: "UnityMenuModelCache"
221 name: "UnityMenuModelCache"
214 prototype: "QObject"
222 prototype: "QObject"
@@ -216,13 +224,6 @@ Module {
216 isCreatable: false
224 isCreatable: false
217 isSingleton: true
225 isSingleton: true
218 exportMetaObjectRevisions: [0]
226 exportMetaObjectRevisions: [0]
219− Method {
220− name: "model"
221− type: "UnityMenuModel*"
222− Parameter { name: "bus"; type: "QByteArray" }
223− Parameter { name: "path"; type: "QByteArray" }
224− Parameter { name: "actions"; type: "QVariantMap" }
225− }
226 Method {
227 Method {
227 name: "contains"
228 name: "contains"
228 type: "bool"
229 type: "bool"
plugins/Unity/Indicators/indicators.h−2
@@ -74,8 +74,6 @@ public:
74 enum Roles {
74 enum Roles {
75 Identifier = 0,
75 Identifier = 0,
76 Position,
76 Position,
77− WidgetSource,
78− PageSource,
79 IndicatorProperties,
77 IndicatorProperties,
80 IsVisible
78 IsVisible
81 };
79 };
plugins/Unity/Indicators/indicatorsmodel.cpp−6
@@ -202,8 +202,6 @@ QHash<int, QByteArray> IndicatorsModel::roleNames() const
202 {
202 {
203 roles[IndicatorsModelRole::Identifier] = "identifier";
203 roles[IndicatorsModelRole::Identifier] = "identifier";
204 roles[IndicatorsModelRole::Position] = "position";
204 roles[IndicatorsModelRole::Position] = "position";
205− roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
206− roles[IndicatorsModelRole::PageSource] = "pageSource";
207 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
205 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
208 }
206 }
209 return roles;
207 return roles;
@@ -248,10 +246,6 @@ QVariant IndicatorsModel::data(const QModelIndex &index, int role) const
248 return QVariant(indicator->indicatorProperties());
246 return QVariant(indicator->indicatorProperties());
249 }
247 }
250 break;
248 break;
251− case IndicatorsModelRole::WidgetSource:
252− return "";
253− case IndicatorsModelRole::PageSource:
254− return "";
255 default:
249 default:
256 break;
250 break;
257 }
251 }
plugins/Unity/Indicators/visibleindicatorsmodel.cpp−2
@@ -33,8 +33,6 @@ QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const
33 {
33 {
34 roles[IndicatorsModelRole::Identifier] = "identifier";
34 roles[IndicatorsModelRole::Identifier] = "identifier";
35 roles[IndicatorsModelRole::Position] = "position";
35 roles[IndicatorsModelRole::Position] = "position";
36− roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
37− roles[IndicatorsModelRole::PageSource] = "pageSource";
38 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
36 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
39 roles[IndicatorsModelRole::IsVisible] = "isVisible";
37 roles[IndicatorsModelRole::IsVisible] = "isVisible";
40 }
38 }
plugins/Unity/Launcher/Launcher.qmltypes+17−12
@@ -13,14 +13,6 @@ Module {
13 exports: ["Unity.Launcher/LauncherItem 0.1"]
13 exports: ["Unity.Launcher/LauncherItem 0.1"]
14 isCreatable: false
14 isCreatable: false
15 exportMetaObjectRevisions: [0]
15 exportMetaObjectRevisions: [0]
16− Signal {
17− name: "favoriteChanged"
18− Parameter { name: "favorite"; type: "bool" }
19− }
20− Signal {
21− name: "runningChanged"
22− Parameter { name: "running"; type: "bool" }
23− }
24 }
16 }
25 Component {
17 Component {
26 name: "LauncherModel"
18 name: "LauncherModel"
@@ -29,6 +21,10 @@ Module {
29 isCreatable: false
21 isCreatable: false
30 isSingleton: true
22 isSingleton: true
31 exportMetaObjectRevisions: [0]
23 exportMetaObjectRevisions: [0]
24+ Method {
25+ name: "requestRemove"
26+ Parameter { name: "appId"; type: "string" }
27+ }
32 Method {
28 Method {
33 name: "get"
29 name: "get"
34 type: "unity::shell::launcher::LauncherItemInterface*"
30 type: "unity::shell::launcher::LauncherItemInterface*"
@@ -48,10 +44,6 @@ Module {
48 name: "pin"
44 name: "pin"
49 Parameter { name: "appId"; type: "string" }
45 Parameter { name: "appId"; type: "string" }
50 }
46 }
51− Method {
52− name: "requestRemove"
53− Parameter { name: "appId"; type: "string" }
54− }
55 Method {
47 Method {
56 name: "quickListActionInvoked"
48 name: "quickListActionInvoked"
57 Parameter { name: "appId"; type: "string" }
49 Parameter { name: "appId"; type: "string" }
@@ -88,6 +80,7 @@ Module {
88 Property { name: "recent"; type: "bool"; isReadonly: true }
80 Property { name: "recent"; type: "bool"; isReadonly: true }
89 Property { name: "progress"; type: "int"; isReadonly: true }
81 Property { name: "progress"; type: "int"; isReadonly: true }
90 Property { name: "count"; type: "int"; isReadonly: true }
82 Property { name: "count"; type: "int"; isReadonly: true }
83+ Property { name: "countVisible"; type: "bool"; isReadonly: true }
91 Property { name: "focused"; type: "bool"; isReadonly: true }
84 Property { name: "focused"; type: "bool"; isReadonly: true }
92 Property {
85 Property {
93 name: "quickList"
86 name: "quickList"
@@ -95,6 +88,14 @@ Module {
95 isReadonly: true
88 isReadonly: true
96 isPointer: true
89 isPointer: true
97 }
90 }
91+ Signal {
92+ name: "nameChanged"
93+ Parameter { name: "name"; type: "string" }
94+ }
95+ Signal {
96+ name: "iconChanged"
97+ Parameter { name: "icon"; type: "string" }
98+ }
98 Signal {
99 Signal {
99 name: "pinnedChanged"
100 name: "pinnedChanged"
100 Parameter { name: "pinned"; type: "bool" }
101 Parameter { name: "pinned"; type: "bool" }
@@ -115,6 +116,10 @@ Module {
115 name: "countChanged"
116 name: "countChanged"
116 Parameter { name: "count"; type: "int" }
117 Parameter { name: "count"; type: "int" }
117 }
118 }
119+ Signal {
120+ name: "countVisibleChanged"
121+ Parameter { name: "countVisible"; type: "bool" }
122+ }
118 Signal {
123 Signal {
119 name: "focusedChanged"
124 name: "focusedChanged"
120 Parameter { name: "focused"; type: "bool" }
125 Parameter { name: "focused"; type: "bool" }
plugins/Unity/Session/Session.qmltypes+10
@@ -34,4 +34,14 @@ Module {
34 Method { name: "RequestReboot" }
34 Method { name: "RequestReboot" }
35 Method { name: "RequestShutdown" }
35 Method { name: "RequestShutdown" }
36 }
36 }
37+ Component {
38+ name: "OrientationLock"
39+ prototype: "QObject"
40+ exports: ["Unity.Session/OrientationLock 0.1"]
41+ isCreatable: false
42+ isSingleton: true
43+ exportMetaObjectRevisions: [0]
44+ Property { name: "enabled"; type: "bool"; isReadonly: true }
45+ Property { name: "savedOrientation"; type: "Qt::ScreenOrientation" }
46+ }
37}
47}
plugins/Utils/Utils.qmltypes+6
@@ -106,6 +106,12 @@ Module {
106 Parameter { name: "row"; type: "int" }
106 Parameter { name: "row"; type: "int" }
107 }
107 }
108 }
108 }
109+ Component {
110+ name: "RelativeTimeFormatter"
111+ prototype: "TimeFormatter"
112+ exports: ["Utils/RelativeTimeFormatter 0.1"]
113+ exportMetaObjectRevisions: [0]
114+ }
109 Component {
115 Component {
110 name: "TimeFormatter"
116 name: "TimeFormatter"
111 prototype: "QObject"
117 prototype: "QObject"
tests/mocks/AccountsService/AccountsService.qmltypes+2
@@ -23,6 +23,8 @@ Module {
23 }
23 }
24 Property { name: "user"; type: "string" }
24 Property { name: "user"; type: "string" }
25 Property { name: "demoEdges"; type: "bool" }
25 Property { name: "demoEdges"; type: "bool" }
26+ Property { name: "enableLauncherWhileLocked"; type: "bool" }
27+ Property { name: "enableIndicatorsWhileLocked"; type: "bool" }
26 Property { name: "backgroundFile"; type: "string" }
28 Property { name: "backgroundFile"; type: "string" }
27 Property { name: "statsWelcomeScreen"; type: "bool" }
29 Property { name: "statsWelcomeScreen"; type: "bool" }
28 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
30 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
tests/mocks/LightDM/LightDM.qmltypes+1
@@ -37,6 +37,7 @@ Module {
37 Signal { name: "isActiveChanged" }
37 Signal { name: "isActiveChanged" }
38 Signal { name: "isAuthenticatedChanged" }
38 Signal { name: "isAuthenticatedChanged" }
39 Signal { name: "showGreeter" }
39 Signal { name: "showGreeter" }
40+ Signal { name: "hideGreeter" }
40 Signal {
41 Signal {
41 name: "requestAuthenticationUser"
42 name: "requestAuthenticationUser"
42 Parameter { name: "user"; type: "string" }
43 Parameter { name: "user"; type: "string" }
tests/mocks/QMenuModel/QMenuModel.qmltypes+1−1
@@ -18,12 +18,12 @@ Module {
18 prototype: "QAbstractListModel"
18 prototype: "QAbstractListModel"
19 exports: ["QMenuModel/UnityMenuModel 0.1"]
19 exports: ["QMenuModel/UnityMenuModel 0.1"]
20 exportMetaObjectRevisions: [0]
20 exportMetaObjectRevisions: [0]
21− Property { name: "modelData"; type: "QVariant" }
22 Property { name: "busName"; type: "QByteArray" }
21 Property { name: "busName"; type: "QByteArray" }
23 Property { name: "actions"; type: "QVariantMap" }
22 Property { name: "actions"; type: "QVariantMap" }
24 Property { name: "menuObjectPath"; type: "QByteArray" }
23 Property { name: "menuObjectPath"; type: "QByteArray" }
25 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }
24 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }
26 Property { name: "nameOwner"; type: "string"; isReadonly: true }
25 Property { name: "nameOwner"; type: "string"; isReadonly: true }
26+ Property { name: "modelData"; type: "QVariant" }
27 Method {
27 Method {
28 name: "insertRow"
28 name: "insertRow"
29 Parameter { name: "row"; type: "int" }
29 Parameter { name: "row"; type: "int" }
tests/mocks/Ubuntu/Payments/Payments.qmltypes+2
@@ -37,6 +37,8 @@ Module {
37 Parameter { name: "error"; type: "string" }
37 Parameter { name: "error"; type: "string" }
38 }
38 }
39 Signal { name: "purchaseCompleted" }
39 Signal { name: "purchaseCompleted" }
40+ Signal { name: "purchaseCancelled" }
40 Method { name: "start" }
41 Method { name: "start" }
42+ Method { name: "process" }
41 }
43 }
42}
44}
tests/mocks/Ubuntu/Telephony/Telephony.qmltypes+2−1
@@ -22,7 +22,8 @@ Module {
22 exportMetaObjectRevisions: [0]
22 exportMetaObjectRevisions: [0]
23 Property { name: "phoneNumber"; type: "string" }
23 Property { name: "phoneNumber"; type: "string" }
24 Property { name: "isConference"; type: "bool" }
24 Property { name: "isConference"; type: "bool" }
25− Property { name: "elapsedTime"; type: "int"; isReadonly: true }
25+ Property { name: "elapsedTime"; type: "int" }
26+ Property { name: "elapsedTimerRunning"; type: "bool" }
26 }
27 }
27 Component {
28 Component {
28 name: "MockCallManager"
29 name: "MockCallManager"
tests/mocks/Unity/Application/Application.qmltypes+12
@@ -238,6 +238,7 @@ Module {
238 Property { name: "state"; type: "State"; isReadonly: true }
238 Property { name: "state"; type: "State"; isReadonly: true }
239 Property { name: "name"; type: "string"; isReadonly: true }
239 Property { name: "name"; type: "string"; isReadonly: true }
240 Property { name: "live"; type: "bool"; isReadonly: true }
240 Property { name: "live"; type: "bool"; isReadonly: true }
241+ Property { name: "orientation"; type: "Qt::ScreenOrientation" }
241 Signal {
242 Signal {
242 name: "typeChanged"
243 name: "typeChanged"
243 Parameter { type: "Type" }
244 Parameter { type: "Type" }
@@ -268,9 +269,14 @@ Module {
268 exportMetaObjectRevisions: [0]
269 exportMetaObjectRevisions: [0]
269 Property { name: "name"; type: "string"; isReadonly: true }
270 Property { name: "name"; type: "string"; isReadonly: true }
270 Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
271 Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
272+ Property { name: "application"; type: "ApplicationInfo"; isReadonly: true; isPointer: true }
271 Property { name: "parentSession"; type: "Session"; isReadonly: true; isPointer: true }
273 Property { name: "parentSession"; type: "Session"; isReadonly: true; isPointer: true }
272 Property { name: "childSessions"; type: "SessionModel"; isReadonly: true; isPointer: true }
274 Property { name: "childSessions"; type: "SessionModel"; isReadonly: true; isPointer: true }
273 Property { name: "live"; type: "bool"; isReadonly: true }
275 Property { name: "live"; type: "bool"; isReadonly: true }
276+ Signal {
277+ name: "applicationChanged"
278+ Parameter { type: "ApplicationInfo"; isPointer: true }
279+ }
274 Signal {
280 Signal {
275 name: "surfaceChanged"
281 name: "surfaceChanged"
276 Parameter { type: "MirSurfaceItem"; isPointer: true }
282 Parameter { type: "MirSurfaceItem"; isPointer: true }
@@ -368,6 +374,12 @@ Module {
368 Property { name: "stage"; type: "Stage"; isReadonly: true }
374 Property { name: "stage"; type: "Stage"; isReadonly: true }
369 Property { name: "state"; type: "State"; isReadonly: true }
375 Property { name: "state"; type: "State"; isReadonly: true }
370 Property { name: "focused"; type: "bool"; isReadonly: true }
376 Property { name: "focused"; type: "bool"; isReadonly: true }
377+ Property { name: "splashTitle"; type: "string"; isReadonly: true }
378+ Property { name: "splashImage"; type: "QUrl"; isReadonly: true }
379+ Property { name: "splashShowHeader"; type: "bool"; isReadonly: true }
380+ Property { name: "splashColor"; type: "QColor"; isReadonly: true }
381+ Property { name: "splashColorHeader"; type: "QColor"; isReadonly: true }
382+ Property { name: "splashColorFooter"; type: "QColor"; isReadonly: true }
371 Signal {
383 Signal {
372 name: "nameChanged"
384 name: "nameChanged"
373 Parameter { name: "name"; type: "string" }
385 Parameter { name: "name"; type: "string" }
tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes+2−2
@@ -34,13 +34,13 @@ Module {
34 name: "setCurrentScopeRequested"
34 name: "setCurrentScopeRequested"
35 Parameter { name: "scopeId"; type: "string" }
35 Parameter { name: "scopeId"; type: "string" }
36 Parameter { name: "animate"; type: "bool" }
36 Parameter { name: "animate"; type: "bool" }
37− Parameter { name: "reset"; type: "bool" }
37+ Parameter { name: "isSwipe"; type: "bool" }
38 }
38 }
39 Method {
39 Method {
40 name: "mockSetCurrentScope"
40 name: "mockSetCurrentScope"
41 Parameter { name: "scopeId"; type: "string" }
41 Parameter { name: "scopeId"; type: "string" }
42 Parameter { name: "animate"; type: "bool" }
42 Parameter { name: "animate"; type: "bool" }
43− Parameter { name: "reset"; type: "bool" }
43+ Parameter { name: "isSwipe"; type: "bool" }
44 }
44 }
45 }
45 }
46}
46}
tests/mocks/Unity/Indicators/Indicators.qmltypes+43−15
@@ -29,6 +29,7 @@ Module {
29 exports: ["Unity.Indicators/FakeIndicatorsModel 0.1"]
29 exports: ["Unity.Indicators/FakeIndicatorsModel 0.1"]
30 exportMetaObjectRevisions: [0]
30 exportMetaObjectRevisions: [0]
31 Property { name: "count"; type: "int"; isReadonly: true }
31 Property { name: "count"; type: "int"; isReadonly: true }
32+ Property { name: "modelData"; type: "QVariant" }
32 Method {
33 Method {
33 name: "load"
34 name: "load"
34 Parameter { name: "profile"; type: "string" }
35 Parameter { name: "profile"; type: "string" }
@@ -38,6 +39,15 @@ Module {
38 name: "append"
39 name: "append"
39 Parameter { name: "row"; type: "QVariantMap" }
40 Parameter { name: "row"; type: "QVariantMap" }
40 }
41 }
42+ Method {
43+ name: "insert"
44+ Parameter { name: "row"; type: "int" }
45+ Parameter { name: "data"; type: "QVariantMap" }
46+ }
47+ Method {
48+ name: "remove"
49+ Parameter { name: "row"; type: "int" }
50+ }
41 Method {
51 Method {
42 name: "data"
52 name: "data"
43 type: "QVariant"
53 type: "QVariant"
@@ -45,6 +55,27 @@ Module {
45 Parameter { name: "role"; type: "int" }
55 Parameter { name: "role"; type: "int" }
46 }
56 }
47 }
57 }
58+ Component {
59+ name: "FakeUnityMenuModelCache"
60+ prototype: "UnityMenuModelCache"
61+ exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
62+ isCreatable: false
63+ isSingleton: true
64+ exportMetaObjectRevisions: [0]
65+ Method {
66+ name: "setCachedModelData"
67+ Parameter { name: "bus"; type: "QByteArray" }
68+ Parameter { name: "path"; type: "QByteArray" }
69+ Parameter { name: "actions"; type: "QVariantMap" }
70+ Parameter { name: "data"; type: "QVariant" }
71+ }
72+ Method {
73+ name: "setCachedModelData"
74+ Parameter { name: "bus"; type: "QByteArray" }
75+ Parameter { name: "path"; type: "QByteArray" }
76+ Parameter { name: "actions"; type: "QVariantMap" }
77+ }
78+ }
48 Component {
79 Component {
49 name: "FlatMenuProxyModelRole"
80 name: "FlatMenuProxyModelRole"
50 prototype: "QObject"
81 prototype: "QObject"
@@ -74,10 +105,8 @@ Module {
74 values: {
105 values: {
75 "Identifier": 0,
106 "Identifier": 0,
76 "Position": 1,
107 "Position": 1,
77− "WidgetSource": 2,
108+ "IndicatorProperties": 2,
78− "PageSource": 3,
109+ "IsVisible": 3
79− "IndicatorProperties": 4,
80− "IsVisible": 5
81 }
110 }
82 }
111 }
83 }
112 }
@@ -160,19 +189,18 @@ Module {
160 }
189 }
161 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
190 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
162 Component {
191 Component {
163− name: "UnityMenuModelCache"
192+ name: "SharedUnityMenuModel"
164 prototype: "QObject"
193 prototype: "QObject"
165− exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
194+ exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]
166− isCreatable: false
167− isSingleton: true
168 exportMetaObjectRevisions: [0]
195 exportMetaObjectRevisions: [0]
169− Method {
196+ Property { name: "busName"; type: "QByteArray" }
170− name: "model"
197+ Property { name: "menuObjectPath"; type: "QByteArray" }
198+ Property { name: "actions"; type: "QVariantMap" }
171− type: "UnityMenuModel*"
199+ Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
172− Parameter { name: "bus"; type: "QByteArray" }
200+ }
173− Parameter { name: "path"; type: "QByteArray" }
201+ Component {
174− Parameter { name: "actions"; type: "QVariantMap" }
202+ name: "UnityMenuModelCache"
175− }
203+ prototype: "QObject"
176 Method {
204 Method {
177 name: "contains"
205 name: "contains"
178 type: "bool"
206 type: "bool"
tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp−2
@@ -110,8 +110,6 @@ QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const
110 {
110 {
111 roles[IndicatorsModelRole::Identifier] = "identifier";
111 roles[IndicatorsModelRole::Identifier] = "identifier";
112 roles[IndicatorsModelRole::Position] = "position";
112 roles[IndicatorsModelRole::Position] = "position";
113− roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
114− roles[IndicatorsModelRole::PageSource] = "pageSource";
115 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
113 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
116 }
114 }
117 return roles;
115 return roles;
tests/mocks/Unity/Launcher/Launcher.qmltypes+13
@@ -85,6 +85,7 @@ Module {
85 Property { name: "recent"; type: "bool"; isReadonly: true }
85 Property { name: "recent"; type: "bool"; isReadonly: true }
86 Property { name: "progress"; type: "int"; isReadonly: true }
86 Property { name: "progress"; type: "int"; isReadonly: true }
87 Property { name: "count"; type: "int"; isReadonly: true }
87 Property { name: "count"; type: "int"; isReadonly: true }
88+ Property { name: "countVisible"; type: "bool"; isReadonly: true }
88 Property { name: "focused"; type: "bool"; isReadonly: true }
89 Property { name: "focused"; type: "bool"; isReadonly: true }
89 Property {
90 Property {
90 name: "quickList"
91 name: "quickList"
@@ -92,6 +93,14 @@ Module {
92 isReadonly: true
93 isReadonly: true
93 isPointer: true
94 isPointer: true
94 }
95 }
96+ Signal {
97+ name: "nameChanged"
98+ Parameter { name: "name"; type: "string" }
99+ }
100+ Signal {
101+ name: "iconChanged"
102+ Parameter { name: "icon"; type: "string" }
103+ }
95 Signal {
104 Signal {
96 name: "pinnedChanged"
105 name: "pinnedChanged"
97 Parameter { name: "pinned"; type: "bool" }
106 Parameter { name: "pinned"; type: "bool" }
@@ -112,6 +121,10 @@ Module {
112 name: "countChanged"
121 name: "countChanged"
113 Parameter { name: "count"; type: "int" }
122 Parameter { name: "count"; type: "int" }
114 }
123 }
124+ Signal {
125+ name: "countVisibleChanged"
126+ Parameter { name: "countVisible"; type: "bool" }
127+ }
115 Signal {
128 Signal {
116 name: "focusedChanged"
129 name: "focusedChanged"
117 Parameter { name: "focused"; type: "bool" }
130 Parameter { name: "focused"; type: "bool" }
tests/mocks/Unity/Unity.qmltypes+31
@@ -30,6 +30,25 @@ Module {
30 Parameter { name: "row"; type: "int" }
30 Parameter { name: "row"; type: "int" }
31 Parameter { name: "role"; type: "int" }
31 Parameter { name: "role"; type: "int" }
32 }
32 }
33+ Method {
34+ name: "setCount"
35+ Parameter { name: "count"; type: "int" }
36+ }
37+ Method {
38+ name: "resultModel"
39+ type: "ResultsModel*"
40+ Parameter { name: "row"; type: "int" }
41+ }
42+ Method {
43+ name: "setLayout"
44+ Parameter { name: "row"; type: "int" }
45+ Parameter { name: "layout"; type: "string" }
46+ }
47+ Method {
48+ name: "setHeaderLink"
49+ Parameter { name: "row"; type: "int" }
50+ Parameter { name: "headerLink"; type: "string" }
51+ }
33 }
52 }
34 Component {
53 Component {
35 name: "PreviewModel"
54 name: "PreviewModel"
@@ -66,6 +85,10 @@ Module {
66 exports: ["Unity/FakeResultsModel 0.2", "Unity/ResultsModel 0.2"]
85 exports: ["Unity/FakeResultsModel 0.2", "Unity/ResultsModel 0.2"]
67 isCreatable: false
86 isCreatable: false
68 exportMetaObjectRevisions: [0, 0]
87 exportMetaObjectRevisions: [0, 0]
88+ Method {
89+ name: "setResultCount"
90+ Parameter { name: "result_count"; type: "int" }
91+ }
69 }
92 }
70 Component {
93 Component {
71 name: "Scope"
94 name: "Scope"
@@ -76,6 +99,14 @@ Module {
76 name: "performQuery"
99 name: "performQuery"
77 Parameter { name: "query"; type: "string" }
100 Parameter { name: "query"; type: "string" }
78 }
101 }
102+ Method {
103+ name: "setId"
104+ Parameter { name: "id"; type: "string" }
105+ }
106+ Method {
107+ name: "setName"
108+ Parameter { name: "name"; type: "string" }
109+ }
79 Method {
110 Method {
80 name: "setSearchInProgress"
111 name: "setSearchInProgress"
81 Parameter { name: "inProg"; type: "bool" }
112 Parameter { name: "inProg"; type: "bool" }