Unity 8

Merge lp:~nick-dedekind/unity8/lp1520548.volume-resync into lp:unity8

lp1520548.volume-resync
Merge into trunk

Proposed by Nick Dedekind on 2015-12-03

Status:

Merged

Approved by:

Albert Astals Cid on 2015-12-10

Approved revision:

2078

Merged at revision:

2104

Proposed branch:

lp:~nick-dedekind/unity8/lp1520548.volume-resync

Merge into:

lp:unity8

Diff against target:

33 lines (+13/-1)

1 file modified

qml/Panel/Indicators/MenuItemFactory.qml (+13/-1)

To merge this branch:

bzr merge lp:~nick-dedekind/unity8/lp1520548.volume-resync

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2015-12-03	Approve on 2015-12-10
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-12-09
Review via email: mp+279399@code.launchpad.net

Commit Message

Use volume-sync action to resync the volume control.

Description of the Change

Use volume-sync action to resync the volume control.

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~xavi-garcia-mena/indicator-sound/action-sync-volume/+merge/279097

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

Albert Astals Cid (aacid) wrote on 2015-12-03:

any prerequisite? You're missing the checklist

PS Jenkins bot (ps-jenkins) wrote on 2015-12-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6872/rebuild

review: Needs Fixing (continuous-integration)

Nick Dedekind (nick-dedekind) wrote on 2015-12-09:

> any prerequisite? You're missing the checklist

added checklis + prereq

Albert Astals Cid (aacid) wrote on 2015-12-09:

The code works, but as discussed with Nick, it would be better if there was a property called "syncAction" that would be either null or "volume-sync" that one could listen to so we would not need to hardcode "indicator.volume" nor "volume-sync".

Nick's talking with the backend guys to see if we can make that happen.

lp:~nick-dedekind/unity8/lp1520548.volume-resync updated on 2015-12-09

2077. By Nick Dedekind on 2015-12-09: more general volume sync
2078. By Nick Dedekind on 2015-12-09: remove unnecessary code

PS Jenkins bot (ps-jenkins) wrote on 2015-12-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6905/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-12-10:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass?
Yes for vivid

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Nick Dedekind

Unity Team

 === modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
 --- qml/Panel/Indicators/MenuItemFactory.qml	2015-10-26 09:59:50 +0000
 +++ qml/Panel/Indicators/MenuItemFactory.qml	2015-12-09 17:40:38 +0000
@@ -125,10 +125,12 @@
                  menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
                                                               'max-value': 'double',
                                                               'min-icon': 'icon',
--                                                             'max-icon': 'icon'});
++                                                             'max-icon': 'icon',
++                                                             'x-canonical-sync-action': 'string'});
+             }
              ServerPropertySynchroniser {
++                id: sliderPropertySync
                  objectName: "sync"
                  syncTimeout: Utils.Constants.indicatorValueTimeout
                  bufferedSyncTimeout: true
@@ -141,6 +143,16 @@
                  onSyncTriggered: menuModel.changeState(menuIndex, value)
+             }
++
++            UnityMenuAction {
++                model: menuModel
++                index: menuIndex
++                name: getExtendedProperty(extendedData, "xCanonicalSyncAction", "")
++                onStateChanged: {
++                    sliderPropertySync.reset();
++                    sliderPropertySync.updateUserValue();
++                }
++            }
+         }
+     }