The Sound Menu

Merge lp:~nick-dedekind/indicator-sound/1390067.silent.mode.icon into lp:indicator-sound/15.04

  1. 1390067.silent.mode.icon
  2. Merge into trunk.15.04
Proposed by Nick Dedekind
Status: Merged
Approved by: Ted Gould
Approved revision: 463
Merged at revision: 464
Proposed branch: lp:~nick-dedekind/indicator-sound/1390067.silent.mode.icon
Merge into: lp:indicator-sound/15.04
Diff against target: 38 lines (+7/-2)
1 file modified
src/service.vala (+7/-2)
To merge this branch: bzr merge lp:~nick-dedekind/indicator-sound/1390067.silent.mode.icon
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+242239@code.launchpad.net

Commit message

Update the panel icon when entering/exiting silent mode.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:463
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/176/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/176/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.vala'
2--- src/service.vala 2014-11-05 16:37:49 +0000
3+++ src/service.vala 2014-11-19 17:23:48 +0000
4@@ -242,6 +242,8 @@
5 string icon;
6 if (this.volume_control.mute)
7 icon = this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
8+ else if (this.accounts_service != null && this.accounts_service.silentMode)
9+ icon = "audio-volume-muted-panel";
10 else if (volume <= 0.0)
11 icon = "audio-volume-low-zero-panel";
12 else if (volume <= 0.3)
13@@ -254,6 +256,9 @@
14 string accessible_name;
15 if (this.volume_control.mute) {
16 accessible_name = _("Volume (muted)");
17+ } else if (this.accounts_service != null && this.accounts_service.silentMode) {
18+ int volume_int = (int)(volume * 100);
19+ accessible_name = "%s (%s %d%%)".printf (_("Volume"), _("silent"), volume_int);
20 } else {
21 int volume_int = (int)(volume * 100);
22 accessible_name = "%s (%d%%)".printf (_("Volume"), volume_int);
23@@ -443,13 +448,13 @@
24 action.set_state (this.action_state_for_player (player));
25 action.set_enabled (player.can_raise);
26 }
27-
28+
29 SimpleAction? greeter_action = this.actions.lookup_action (player.id + ".greeter") as SimpleAction;
30 if (greeter_action != null) {
31 greeter_action.set_state (this.action_state_for_player (player, greeter_show_track()));
32 greeter_action.set_enabled (player.can_raise);
33 }
34-
35+
36 /* If we're playing then put that data in accounts service */
37 if (player.is_running && export_to_accounts_service && accounts_service != null) {
38 accounts_service.player = player;

Subscribers

People subscribed via source and target branches