on xenial help sign in
removed widget+pageSource
commit8442b69f36f630cdbae76d40daa34242719887b9 authorNick Dedekind <nick.dedekind@canonical.com> dateFri 3 Oct 2014, 11:17 (12 years ago) parente70ab63
23 files changed+162−56
plugins/AccountsService/AccountsService.qmltypes+2 plugins/Dash/Dash.qmltypes+2 plugins/LightDM/LightDM.qmltypes+1 plugins/Ubuntu/Payments/Payments.qmltypes+1 plugins/Unity/DashCommunicator/DashCommunicator.qmltypes+2−2 plugins/Unity/Indicators/Indicators.qmltypes+12−11 plugins/Unity/Indicators/indicators.h−2 plugins/Unity/Indicators/indicatorsmodel.cpp−6 plugins/Unity/Indicators/visibleindicatorsmodel.cpp−2 plugins/Unity/Launcher/Launcher.qmltypes+17−12 plugins/Unity/Session/Session.qmltypes+10 plugins/Utils/Utils.qmltypes+6 tests/mocks/AccountsService/AccountsService.qmltypes+2 tests/mocks/LightDM/LightDM.qmltypes+1 tests/mocks/QMenuModel/QMenuModel.qmltypes+1−1 tests/mocks/Ubuntu/Payments/Payments.qmltypes+2 tests/mocks/Ubuntu/Telephony/Telephony.qmltypes+2−1 tests/mocks/Unity/Application/Application.qmltypes+12 tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes+2−2 tests/mocks/Unity/Indicators/Indicators.qmltypes+43−15 tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp−2 tests/mocks/Unity/Launcher/Launcher.qmltypes+13 tests/mocks/Unity/Unity.qmltypes+31
plugins/AccountsService/AccountsService.qmltypes+2
@@ -23,6 +23,8 @@ Module {
2323 }
2424 Property { name: "user"; type: "string" }
2525 Property { name: "demoEdges"; type: "bool" }
26+ Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
27+ Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
2628 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
2729 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
2830 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
plugins/Dash/Dash.qmltypes+2
@@ -43,6 +43,8 @@ Module {
4343 Signal { name: "headerChanged" }
4444 Method { name: "positionAtBeginning" }
4545 Method { name: "showHeader" }
46+ Method { name: "firstCreatedIndex"; type: "int" }
47+ Method { name: "createdItemCount"; type: "int" }
4648 Method {
4749 name: "item"
4850 type: "QQuickItem*"
plugins/LightDM/LightDM.qmltypes+1
@@ -37,6 +37,7 @@ Module {
3737 Signal { name: "isActiveChanged" }
3838 Signal { name: "isAuthenticatedChanged" }
3939 Signal { name: "showGreeter" }
40+ Signal { name: "hideGreeter" }
4041 Signal {
4142 name: "requestAuthenticationUser"
4243 Parameter { name: "user"; type: "string" }
plugins/Ubuntu/Payments/Payments.qmltypes+1
@@ -37,6 +37,7 @@ Module {
3737 Parameter { name: "error"; type: "string" }
3838 }
3939 Signal { name: "purchaseCompleted" }
40+ Signal { name: "purchaseCancelled" }
4041 Method { name: "start" }
4142 }
4243}
plugins/Unity/DashCommunicator/DashCommunicator.qmltypes+2−2
@@ -16,7 +16,7 @@ Module {
1616 name: "setCurrentScope"
1717 Parameter { name: "scopeId"; type: "string" }
1818 Parameter { name: "animate"; type: "bool" }
19− Parameter { name: "reset"; type: "bool" }
19+ Parameter { name: "isSwipe"; type: "bool" }
2020 }
2121 }
2222 Component {
@@ -28,7 +28,7 @@ Module {
2828 name: "setCurrentScopeRequested"
2929 Parameter { name: "scopeId"; type: "string" }
3030 Parameter { name: "animate"; type: "bool" }
31− Parameter { name: "reset"; type: "bool" }
31+ Parameter { name: "isSwipe"; type: "bool" }
3232 }
3333 }
3434}
plugins/Unity/Indicators/Indicators.qmltypes+12−11
@@ -99,10 +99,8 @@ Module {
9999 values: {
100100 "Identifier": 0,
101101 "Position": 1,
102− "WidgetSource": 2,
103− "PageSource": 3,
104− "IndicatorProperties": 4,
105− "IsVisible": 5
102+ "IndicatorProperties": 2,
103+ "IsVisible": 3
106104 }
107105 }
108106 }
@@ -209,6 +207,16 @@ Module {
209207 Signal { name: "updated" }
210208 Signal { name: "indexChanged" }
211209 }
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+ }
212220 Component {
213221 name: "UnityMenuModelCache"
214222 prototype: "QObject"
@@ -216,13 +224,6 @@ Module {
216224 isCreatable: false
217225 isSingleton: true
218226 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− }
226227 Method {
227228 name: "contains"
228229 type: "bool"
plugins/Unity/Indicators/indicators.h−2
@@ -74,8 +74,6 @@ public:
7474 enum Roles {
7575 Identifier = 0,
7676 Position,
77− WidgetSource,
78− PageSource,
7977 IndicatorProperties,
8078 IsVisible
8179 };
plugins/Unity/Indicators/indicatorsmodel.cpp−6
@@ -202,8 +202,6 @@ QHash<int, QByteArray> IndicatorsModel::roleNames() const
202202 {
203203 roles[IndicatorsModelRole::Identifier] = "identifier";
204204 roles[IndicatorsModelRole::Position] = "position";
205− roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
206− roles[IndicatorsModelRole::PageSource] = "pageSource";
207205 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
208206 }
209207 return roles;
@@ -248,10 +246,6 @@ QVariant IndicatorsModel::data(const QModelIndex &index, int role) const
248246 return QVariant(indicator->indicatorProperties());
249247 }
250248 break;
251− case IndicatorsModelRole::WidgetSource:
252− return "";
253− case IndicatorsModelRole::PageSource:
254− return "";
255249 default:
256250 break;
257251 }
plugins/Unity/Indicators/visibleindicatorsmodel.cpp−2
@@ -33,8 +33,6 @@ QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const
3333 {
3434 roles[IndicatorsModelRole::Identifier] = "identifier";
3535 roles[IndicatorsModelRole::Position] = "position";
36− roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
37− roles[IndicatorsModelRole::PageSource] = "pageSource";
3836 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
3937 roles[IndicatorsModelRole::IsVisible] = "isVisible";
4038 }
plugins/Unity/Launcher/Launcher.qmltypes+17−12
@@ -13,14 +13,6 @@ Module {
1313 exports: ["Unity.Launcher/LauncherItem 0.1"]
1414 isCreatable: false
1515 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− }
2416 }
2517 Component {
2618 name: "LauncherModel"
@@ -29,6 +21,10 @@ Module {
2921 isCreatable: false
3022 isSingleton: true
3123 exportMetaObjectRevisions: [0]
24+ Method {
25+ name: "requestRemove"
26+ Parameter { name: "appId"; type: "string" }
27+ }
3228 Method {
3329 name: "get"
3430 type: "unity::shell::launcher::LauncherItemInterface*"
@@ -48,10 +44,6 @@ Module {
4844 name: "pin"
4945 Parameter { name: "appId"; type: "string" }
5046 }
51− Method {
52− name: "requestRemove"
53− Parameter { name: "appId"; type: "string" }
54− }
5547 Method {
5648 name: "quickListActionInvoked"
5749 Parameter { name: "appId"; type: "string" }
@@ -88,6 +80,7 @@ Module {
8880 Property { name: "recent"; type: "bool"; isReadonly: true }
8981 Property { name: "progress"; type: "int"; isReadonly: true }
9082 Property { name: "count"; type: "int"; isReadonly: true }
83+ Property { name: "countVisible"; type: "bool"; isReadonly: true }
9184 Property { name: "focused"; type: "bool"; isReadonly: true }
9285 Property {
9386 name: "quickList"
@@ -95,6 +88,14 @@ Module {
9588 isReadonly: true
9689 isPointer: true
9790 }
91+ Signal {
92+ name: "nameChanged"
93+ Parameter { name: "name"; type: "string" }
94+ }
95+ Signal {
96+ name: "iconChanged"
97+ Parameter { name: "icon"; type: "string" }
98+ }
9899 Signal {
99100 name: "pinnedChanged"
100101 Parameter { name: "pinned"; type: "bool" }
@@ -115,6 +116,10 @@ Module {
115116 name: "countChanged"
116117 Parameter { name: "count"; type: "int" }
117118 }
119+ Signal {
120+ name: "countVisibleChanged"
121+ Parameter { name: "countVisible"; type: "bool" }
122+ }
118123 Signal {
119124 name: "focusedChanged"
120125 Parameter { name: "focused"; type: "bool" }
plugins/Unity/Session/Session.qmltypes+10
@@ -34,4 +34,14 @@ Module {
3434 Method { name: "RequestReboot" }
3535 Method { name: "RequestShutdown" }
3636 }
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+ }
3747}
plugins/Utils/Utils.qmltypes+6
@@ -106,6 +106,12 @@ Module {
106106 Parameter { name: "row"; type: "int" }
107107 }
108108 }
109+ Component {
110+ name: "RelativeTimeFormatter"
111+ prototype: "TimeFormatter"
112+ exports: ["Utils/RelativeTimeFormatter 0.1"]
113+ exportMetaObjectRevisions: [0]
114+ }
109115 Component {
110116 name: "TimeFormatter"
111117 prototype: "QObject"
tests/mocks/AccountsService/AccountsService.qmltypes+2
@@ -23,6 +23,8 @@ Module {
2323 }
2424 Property { name: "user"; type: "string" }
2525 Property { name: "demoEdges"; type: "bool" }
26+ Property { name: "enableLauncherWhileLocked"; type: "bool" }
27+ Property { name: "enableIndicatorsWhileLocked"; type: "bool" }
2628 Property { name: "backgroundFile"; type: "string" }
2729 Property { name: "statsWelcomeScreen"; type: "bool" }
2830 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
tests/mocks/LightDM/LightDM.qmltypes+1
@@ -37,6 +37,7 @@ Module {
3737 Signal { name: "isActiveChanged" }
3838 Signal { name: "isAuthenticatedChanged" }
3939 Signal { name: "showGreeter" }
40+ Signal { name: "hideGreeter" }
4041 Signal {
4142 name: "requestAuthenticationUser"
4243 Parameter { name: "user"; type: "string" }
tests/mocks/QMenuModel/QMenuModel.qmltypes+1−1
@@ -18,12 +18,12 @@ Module {
1818 prototype: "QAbstractListModel"
1919 exports: ["QMenuModel/UnityMenuModel 0.1"]
2020 exportMetaObjectRevisions: [0]
21− Property { name: "modelData"; type: "QVariant" }
2221 Property { name: "busName"; type: "QByteArray" }
2322 Property { name: "actions"; type: "QVariantMap" }
2423 Property { name: "menuObjectPath"; type: "QByteArray" }
2524 Property { name: "actionStateParser"; type: "ActionStateParser"; isPointer: true }
2625 Property { name: "nameOwner"; type: "string"; isReadonly: true }
26+ Property { name: "modelData"; type: "QVariant" }
2727 Method {
2828 name: "insertRow"
2929 Parameter { name: "row"; type: "int" }
tests/mocks/Ubuntu/Payments/Payments.qmltypes+2
@@ -37,6 +37,8 @@ Module {
3737 Parameter { name: "error"; type: "string" }
3838 }
3939 Signal { name: "purchaseCompleted" }
40+ Signal { name: "purchaseCancelled" }
4041 Method { name: "start" }
42+ Method { name: "process" }
4143 }
4244}
tests/mocks/Ubuntu/Telephony/Telephony.qmltypes+2−1
@@ -22,7 +22,8 @@ Module {
2222 exportMetaObjectRevisions: [0]
2323 Property { name: "phoneNumber"; type: "string" }
2424 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" }
2627 }
2728 Component {
2829 name: "MockCallManager"
tests/mocks/Unity/Application/Application.qmltypes+12
@@ -238,6 +238,7 @@ Module {
238238 Property { name: "state"; type: "State"; isReadonly: true }
239239 Property { name: "name"; type: "string"; isReadonly: true }
240240 Property { name: "live"; type: "bool"; isReadonly: true }
241+ Property { name: "orientation"; type: "Qt::ScreenOrientation" }
241242 Signal {
242243 name: "typeChanged"
243244 Parameter { type: "Type" }
@@ -268,9 +269,14 @@ Module {
268269 exportMetaObjectRevisions: [0]
269270 Property { name: "name"; type: "string"; isReadonly: true }
270271 Property { name: "surface"; type: "MirSurfaceItem"; isReadonly: true; isPointer: true }
272+ Property { name: "application"; type: "ApplicationInfo"; isReadonly: true; isPointer: true }
271273 Property { name: "parentSession"; type: "Session"; isReadonly: true; isPointer: true }
272274 Property { name: "childSessions"; type: "SessionModel"; isReadonly: true; isPointer: true }
273275 Property { name: "live"; type: "bool"; isReadonly: true }
276+ Signal {
277+ name: "applicationChanged"
278+ Parameter { type: "ApplicationInfo"; isPointer: true }
279+ }
274280 Signal {
275281 name: "surfaceChanged"
276282 Parameter { type: "MirSurfaceItem"; isPointer: true }
@@ -368,6 +374,12 @@ Module {
368374 Property { name: "stage"; type: "Stage"; isReadonly: true }
369375 Property { name: "state"; type: "State"; isReadonly: true }
370376 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 }
371383 Signal {
372384 name: "nameChanged"
373385 Parameter { name: "name"; type: "string" }
tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes+2−2
@@ -34,13 +34,13 @@ Module {
3434 name: "setCurrentScopeRequested"
3535 Parameter { name: "scopeId"; type: "string" }
3636 Parameter { name: "animate"; type: "bool" }
37− Parameter { name: "reset"; type: "bool" }
37+ Parameter { name: "isSwipe"; type: "bool" }
3838 }
3939 Method {
4040 name: "mockSetCurrentScope"
4141 Parameter { name: "scopeId"; type: "string" }
4242 Parameter { name: "animate"; type: "bool" }
43− Parameter { name: "reset"; type: "bool" }
43+ Parameter { name: "isSwipe"; type: "bool" }
4444 }
4545 }
4646}
tests/mocks/Unity/Indicators/Indicators.qmltypes+43−15
@@ -29,6 +29,7 @@ Module {
2929 exports: ["Unity.Indicators/FakeIndicatorsModel 0.1"]
3030 exportMetaObjectRevisions: [0]
3131 Property { name: "count"; type: "int"; isReadonly: true }
32+ Property { name: "modelData"; type: "QVariant" }
3233 Method {
3334 name: "load"
3435 Parameter { name: "profile"; type: "string" }
@@ -38,6 +39,15 @@ Module {
3839 name: "append"
3940 Parameter { name: "row"; type: "QVariantMap" }
4041 }
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+ }
4151 Method {
4252 name: "data"
4353 type: "QVariant"
@@ -45,6 +55,27 @@ Module {
4555 Parameter { name: "role"; type: "int" }
4656 }
4757 }
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+ }
4879 Component {
4980 name: "FlatMenuProxyModelRole"
5081 prototype: "QObject"
@@ -74,10 +105,8 @@ Module {
74105 values: {
75106 "Identifier": 0,
76107 "Position": 1,
77− "WidgetSource": 2,
78− "PageSource": 3,
79− "IndicatorProperties": 4,
80− "IsVisible": 5
108+ "IndicatorProperties": 2,
109+ "IsVisible": 3
81110 }
82111 }
83112 }
@@ -160,19 +189,18 @@ Module {
160189 }
161190 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
162191 Component {
163− name: "UnityMenuModelCache"
192+ name: "SharedUnityMenuModel"
164193 prototype: "QObject"
165− exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]
166− isCreatable: false
167− isSingleton: true
194+ exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]
168195 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− }
196+ Property { name: "busName"; type: "QByteArray" }
197+ Property { name: "menuObjectPath"; type: "QByteArray" }
198+ Property { name: "actions"; type: "QVariantMap" }
199+ Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }
200+ }
201+ Component {
202+ name: "UnityMenuModelCache"
203+ prototype: "QObject"
176204 Method {
177205 name: "contains"
178206 type: "bool"
tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp−2
@@ -110,8 +110,6 @@ QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const
110110 {
111111 roles[IndicatorsModelRole::Identifier] = "identifier";
112112 roles[IndicatorsModelRole::Position] = "position";
113− roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
114− roles[IndicatorsModelRole::PageSource] = "pageSource";
115113 roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
116114 }
117115 return roles;
tests/mocks/Unity/Launcher/Launcher.qmltypes+13
@@ -85,6 +85,7 @@ Module {
8585 Property { name: "recent"; type: "bool"; isReadonly: true }
8686 Property { name: "progress"; type: "int"; isReadonly: true }
8787 Property { name: "count"; type: "int"; isReadonly: true }
88+ Property { name: "countVisible"; type: "bool"; isReadonly: true }
8889 Property { name: "focused"; type: "bool"; isReadonly: true }
8990 Property {
9091 name: "quickList"
@@ -92,6 +93,14 @@ Module {
9293 isReadonly: true
9394 isPointer: true
9495 }
96+ Signal {
97+ name: "nameChanged"
98+ Parameter { name: "name"; type: "string" }
99+ }
100+ Signal {
101+ name: "iconChanged"
102+ Parameter { name: "icon"; type: "string" }
103+ }
95104 Signal {
96105 name: "pinnedChanged"
97106 Parameter { name: "pinned"; type: "bool" }
@@ -112,6 +121,10 @@ Module {
112121 name: "countChanged"
113122 Parameter { name: "count"; type: "int" }
114123 }
124+ Signal {
125+ name: "countVisibleChanged"
126+ Parameter { name: "countVisible"; type: "bool" }
127+ }
115128 Signal {
116129 name: "focusedChanged"
117130 Parameter { name: "focused"; type: "bool" }
tests/mocks/Unity/Unity.qmltypes+31
@@ -30,6 +30,25 @@ Module {
3030 Parameter { name: "row"; type: "int" }
3131 Parameter { name: "role"; type: "int" }
3232 }
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+ }
3352 }
3453 Component {
3554 name: "PreviewModel"
@@ -66,6 +85,10 @@ Module {
6685 exports: ["Unity/FakeResultsModel 0.2", "Unity/ResultsModel 0.2"]
6786 isCreatable: false
6887 exportMetaObjectRevisions: [0, 0]
88+ Method {
89+ name: "setResultCount"
90+ Parameter { name: "result_count"; type: "int" }
91+ }
6992 }
7093 Component {
7194 name: "Scope"
@@ -76,6 +99,14 @@ Module {
7699 name: "performQuery"
77100 Parameter { name: "query"; type: "string" }
78101 }
102+ Method {
103+ name: "setId"
104+ Parameter { name: "id"; type: "string" }
105+ }
106+ Method {
107+ name: "setName"
108+ Parameter { name: "name"; type: "string" }
109+ }
79110 Method {
80111 name: "setSearchInProgress"
81112 Parameter { name: "inProg"; type: "bool" }