From 5aa7613689ff9bb097e655334cc829a7c65e16df Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 9 Oct 2013 15:01:14 +0200 Subject: Allow activating the 'volume' action It does the same as the 'scroll' action except showing a notification. --- src/service.vala | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/service.vala b/src/service.vala index 1611608..e69bca8 100644 --- a/src/service.vala +++ b/src/service.vala @@ -87,8 +87,9 @@ public class IndicatorSound.Service { uint player_action_update_id; Notify.Notification notification; + const double volume_step_percentage = 0.06; + void activate_scroll_action (SimpleAction action, Variant? param) { - const double volume_step_percentage = 0.06; int delta = param.get_int32(); /* positive for up, negative for down */ double v = this.volume_control.get_volume () + volume_step_percentage * delta; @@ -202,12 +203,18 @@ public class IndicatorSound.Service { } Action create_volume_action () { - var volume_action = new SimpleAction.stateful ("volume", null, this.volume_control.get_volume ()); + var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, this.volume_control.get_volume ()); volume_action.change_state.connect ( (action, val) => { volume_control.set_volume (val.get_double ()); }); + /* activating this action changes the volume by the amount given in the parameter */ + volume_action.activate.connect ( (action, param) => { + double v = volume_control.get_volume () + volume_step_percentage * param.get_int32 (); + volume_control.set_volume (v.clamp (0.0, 1.0)); + }); + this.volume_control.volume_changed.connect (volume_changed); this.volume_control.bind_property ("ready", volume_action, "enabled", BindingFlags.SYNC_CREATE); -- cgit v1.2.3 From 81c82dca758bf30134e2483dfa897de0baecf647 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 10 Oct 2013 05:32:49 +0200 Subject: Give the volume menu item a target, because the 'volume' action now has a parameter --- src/sound-menu.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound-menu.vala b/src/sound-menu.vala index 9d0c521..1641219 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -31,7 +31,7 @@ class SoundMenu: Object this.volume_section = new Menu (); if (show_mute) volume_section.append (_("Mute"), "indicator.mute"); - volume_section.append_item (this.create_slider_menu_item ("indicator.volume", 0.0, 1.0, 0.01, + volume_section.append_item (this.create_slider_menu_item ("indicator.volume(0)", 0.0, 1.0, 0.01, "audio-volume-low-zero-panel", "audio-volume-high-panel")); -- cgit v1.2.3