Merge lp:~larsu/indicator-sound/change-volume-on-scrolling into lp:indicator-sound/13.10

[Lars Karlitski]

Fixes bug #1221242 and #1204036 (make scrolling and middle clicking work on the sound indicator)

It soft-depends on lp:~larsu/libindicator/ng-add-scrolling. That means, this branch can be merged without problems, as it only adds an action and a few attributes on the root item. The bugs won't be fixed until both branches land, though.

Please the other merge request for a description of the new attributes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:374
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/26/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Looks good!

review: Approve

=== modified file 'src/service.vala'
--- src/service.vala	2013-08-22 16:15:09 +0000
+++ src/service.vala	2013-09-09 13:02:35 +0000
@@ -64,6 +64,7 @@
 
 	const ActionEntry[] action_entries = {
 		{ "root", null, null, "@a{sv} {}", null },
+		{ "scroll", activate_scroll_action, "i", null, null },
 		{ "desktop-settings", activate_desktop_settings, null, null, null },
 		{ "phone-settings", activate_phone_settings, null, null, null },
 	};
@@ -76,6 +77,19 @@
 	MediaPlayerList players;
 	uint player_action_update_id;
 
+	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;
+		if (v > 1.0)
+			v = 1.0;
+		else if (v < 0.0)
+			v = 0.0;
+
+		this.volume_control.set_volume (v);
+	}
+
 	void activate_desktop_settings (SimpleAction action, Variant? param) {
 		var env = Environment.get_variable ("DESKTOP_SESSION");
 		string cmd;

=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2013-08-16 03:13:41 +0000
+++ src/sound-menu.vala	2013-09-09 13:02:35 +0000
@@ -40,6 +40,8 @@
 
 		var root_item = new MenuItem (null, "indicator.root");
 		root_item.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root");
+		root_item.set_attribute ("x-canonical-scroll-action", "s", "indicator.scroll");
+		root_item.set_attribute ("x-canonical-secondary-action", "s", "indicator.mute");
 		root_item.set_submenu (this.menu);
 
 		this.root = new Menu ();