@@ -115,9 +115,6 @@ Item {
115115 onMenuIndexChanged: {
116116 loadAttributes();
117117 }
118− onUpdated: {
119− sliderMenuSync.activate()
120− }
121118
122119 function loadAttributes() {
123120 if (!menuModel || menuIndex == -1) return;
@@ -127,21 +124,17 @@ Item {
127124 'max-icon': 'icon'});
128125 }
129126
130− ServerActivationSync {
131− id: sliderMenuSync
132−
127+ ServerPropertySynchroniser {
128+ objectName: "sync"
133129 syncTimeout: Utils.Constants.indicatorValueTimeout
134130 bufferedSyncTimeout: true
135131
136− userTarget: sliderItem
137− userProperty: "value"
138−
139132 serverTarget: sliderItem
140133 serverProperty: "serverValue"
134+ userTarget: sliderItem
135+ userProperty: "value"
141136
142− onActivated: {
143− menuModel.changeState(menuIndex, value);
144− }
137+ onSyncTriggered: menuModel.changeState(menuIndex, value)
145138 }
146139 }
147140 }
@@ -304,23 +297,16 @@ Item {
304297 checked: serverChecked
305298 highlightWhenPressed: false
306299
307− onTriggered: checkMenuSync.activate()
308−
309− ServerActivationSync {
310− id: checkMenuSync
300+ ServerPropertySynchroniser {
311301 objectName: "sync"
312−
313302 syncTimeout: Utils.Constants.indicatorValueTimeout
314303
315− userTarget: checkItem
316− userProperty: "checked"
317−
318304 serverTarget: checkItem
319305 serverProperty: "serverChecked"
306+ userTarget: checkItem
307+ userProperty: "checked"
320308
321− onActivated: {
322− menuModel.activate(checkItem.menuIndex);
323− }
309+ onSyncTriggered: menuModel.activate(checkItem.menuIndex)
324310 }
325311 }
326312 }
@@ -342,23 +328,16 @@ Item {
342328 checked: serverChecked
343329 highlightWhenPressed: false
344330
345− onTriggered: switchMenuSync.activate()
346−
347− ServerActivationSync {
348− id: switchMenuSync
331+ ServerPropertySynchroniser {
349332 objectName: "sync"
350−
351333 syncTimeout: Utils.Constants.indicatorValueTimeout
352334
353− userTarget: switchItem
354− userProperty: "checked"
355−
356335 serverTarget: switchItem
357336 serverProperty: "serverChecked"
337+ userTarget: switchItem
338+ userProperty: "checked"
358339
359− onActivated: {
360− menuModel.activate(switchItem.menuIndex);
361− }
340+ onSyncTriggered: menuModel.activate(switchItem.menuIndex);
362341 }
363342 }
364343 }
@@ -502,9 +481,6 @@ Item {
502481 onMenuIndexChanged: {
503482 loadAttributes();
504483 }
505− onTriggered: {
506− apMenuSync.activate();
507− }
508484
509485 function loadAttributes() {
510486 if (!menuModel || menuIndex == -1) return;
@@ -513,20 +489,17 @@ Item {
513489 'x-canonical-wifi-ap-strength-action': 'string'});
514490 }
515491
516− ServerActivationSync {
517− id: apMenuSync
518−
492+ ServerPropertySynchroniser {
493+ objectName: "sync"
519494 syncTimeout: Utils.Constants.indicatorValueTimeout
520495
521− userTarget: apItem
522− userProperty: "active"
523−
524496 serverTarget: apItem
525497 serverProperty: "serverChecked"
498+ userTarget: apItem
499+ userProperty: "active"
500+ userTrigger: "onTriggered"
526501
527− onActivated: {
528− menuModel.activate(apItem.menuIndex);
529− }
502+ onSyncTriggered: menuModel.activate(apItem.menuIndex)
530503 }
531504 }
532505 }