git.iko.soy/unity8
on xenial help sign in
more general volume sync
06ac3b0Nick Dedekind
qml/Panel/Indicators/MenuItemFactory.qml+11−20
compare with xenial
unifiedsplit
@@ -125,7 +125,8 @@ Item {
125 menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
125 menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
126 'max-value': 'double',
126 'max-value': 'double',
127 'min-icon': 'icon',
127 'min-icon': 'icon',
128− 'max-icon': 'icon'});
128+ 'max-icon': 'icon',
129+ 'x-canonical-sync-action': 'string'});
129 }
130 }
130
131
131 ServerPropertySynchroniser {
132 ServerPropertySynchroniser {
@@ -143,25 +144,15 @@ Item {
143 onSyncTriggered: menuModel.changeState(menuIndex, value)
144 onSyncTriggered: menuModel.changeState(menuIndex, value)
144 }
145 }
145
146
146− // For volume resync.
147− Loader {
148− active: sliderItem.menuData ? sliderItem.menuData.action == "indicator.volume" : false
149− sourceComponent: QDBusActionGroup {
150− busType: 1
151− busName: rootModel.busName
152− objectPath: rootModel.actions["indicator"]
153− Component.onCompleted: start()
154−
155− property var syncAction: action("volume-sync")
147+ property var syncAction: UnityMenuAction {
156− property int resync: {
148+ model: menuModel
157− if (syncAction === null) return 0;
149+ index: menuIndex
150+ name: getExtendedProperty(extendedData, "xCanonicalSyncAction", "")
151+ }
158− return syncAction.valid ? syncAction.state : 0
152+ property int resyncState: syncAction.valid ? syncAction.state : 0
159− }
153+ onResyncStateChanged: {
160− onResyncChanged: {
161− sliderPropertySync.reset();
154+ sliderPropertySync.reset();
162− sliderPropertySync.updateUserValue();
155+ sliderPropertySync.updateUserValue();
163− }
164− }
165 }
156 }
166 }
157 }
167 }
158 }