git.iko.soy/unity8
on xenial help sign in
updated for change in ServerPropertySync api
9443fc2Nick Dedekind
qml/Panel/Indicators/MenuItemFactory.qml+19−46
compare with xenial
unifiedsplit
@@ -115,9 +115,6 @@ Item {
115 onMenuIndexChanged: {
115 onMenuIndexChanged: {
116 loadAttributes();
116 loadAttributes();
117 }
117 }
118− onUpdated: {
119− sliderMenuSync.activate()
120− }
121
118
122 function loadAttributes() {
119 function loadAttributes() {
123 if (!menuModel || menuIndex == -1) return;
120 if (!menuModel || menuIndex == -1) return;
@@ -127,21 +124,17 @@ Item {
127 'max-icon': 'icon'});
124 'max-icon': 'icon'});
128 }
125 }
129
126
130− ServerActivationSync {
127+ ServerPropertySynchroniser {
131− id: sliderMenuSync
128+ objectName: "sync"
132−
133 syncTimeout: Utils.Constants.indicatorValueTimeout
129 syncTimeout: Utils.Constants.indicatorValueTimeout
134 bufferedSyncTimeout: true
130 bufferedSyncTimeout: true
135
131
136− userTarget: sliderItem
137− userProperty: "value"
138−
139 serverTarget: sliderItem
132 serverTarget: sliderItem
140 serverProperty: "serverValue"
133 serverProperty: "serverValue"
134+ userTarget: sliderItem
135+ userProperty: "value"
141
136
142− onActivated: {
143− menuModel.changeState(menuIndex, value);
137+ onSyncTriggered: menuModel.changeState(menuIndex, value)
144− }
145 }
138 }
146 }
139 }
147 }
140 }
@@ -304,23 +297,16 @@ Item {
304 checked: serverChecked
297 checked: serverChecked
305 highlightWhenPressed: false
298 highlightWhenPressed: false
306
299
307− onTriggered: checkMenuSync.activate()
300+ ServerPropertySynchroniser {
308−
309− ServerActivationSync {
310− id: checkMenuSync
311 objectName: "sync"
301 objectName: "sync"
312−
313 syncTimeout: Utils.Constants.indicatorValueTimeout
302 syncTimeout: Utils.Constants.indicatorValueTimeout
314
303
315− userTarget: checkItem
316− userProperty: "checked"
317−
318 serverTarget: checkItem
304 serverTarget: checkItem
319 serverProperty: "serverChecked"
305 serverProperty: "serverChecked"
306+ userTarget: checkItem
307+ userProperty: "checked"
320
308
321− onActivated: {
322− menuModel.activate(checkItem.menuIndex);
309+ onSyncTriggered: menuModel.activate(checkItem.menuIndex)
323− }
324 }
310 }
325 }
311 }
326 }
312 }
@@ -342,23 +328,16 @@ Item {
342 checked: serverChecked
328 checked: serverChecked
343 highlightWhenPressed: false
329 highlightWhenPressed: false
344
330
345− onTriggered: switchMenuSync.activate()
331+ ServerPropertySynchroniser {
346−
347− ServerActivationSync {
348− id: switchMenuSync
349 objectName: "sync"
332 objectName: "sync"
350−
351 syncTimeout: Utils.Constants.indicatorValueTimeout
333 syncTimeout: Utils.Constants.indicatorValueTimeout
352
334
353− userTarget: switchItem
354− userProperty: "checked"
355−
356 serverTarget: switchItem
335 serverTarget: switchItem
357 serverProperty: "serverChecked"
336 serverProperty: "serverChecked"
337+ userTarget: switchItem
338+ userProperty: "checked"
358
339
359− onActivated: {
360− menuModel.activate(switchItem.menuIndex);
340+ onSyncTriggered: menuModel.activate(switchItem.menuIndex);
361− }
362 }
341 }
363 }
342 }
364 }
343 }
@@ -502,9 +481,6 @@ Item {
502 onMenuIndexChanged: {
481 onMenuIndexChanged: {
503 loadAttributes();
482 loadAttributes();
504 }
483 }
505− onTriggered: {
506− apMenuSync.activate();
507− }
508
484
509 function loadAttributes() {
485 function loadAttributes() {
510 if (!menuModel || menuIndex == -1) return;
486 if (!menuModel || menuIndex == -1) return;
@@ -513,20 +489,17 @@ Item {
513 'x-canonical-wifi-ap-strength-action': 'string'});
489 'x-canonical-wifi-ap-strength-action': 'string'});
514 }
490 }
515
491
516− ServerActivationSync {
492+ ServerPropertySynchroniser {
517− id: apMenuSync
493+ objectName: "sync"
518−
519 syncTimeout: Utils.Constants.indicatorValueTimeout
494 syncTimeout: Utils.Constants.indicatorValueTimeout
520
495
521− userTarget: apItem
522− userProperty: "active"
523−
524 serverTarget: apItem
496 serverTarget: apItem
525 serverProperty: "serverChecked"
497 serverProperty: "serverChecked"
498+ userTarget: apItem
499+ userProperty: "active"
500+ userTrigger: "onTriggered"
526
501
527− onActivated: {
528− menuModel.activate(apItem.menuIndex);
502+ onSyncTriggered: menuModel.activate(apItem.menuIndex)
529− }
530 }
503 }
531 }
504 }
532 }
505 }