Merge lp:~charlesk/gnome-control-center/make-new-panel into lp:~cjcurran/gnome-control-center/make-new-panel

[Charles Kerr]

r225 is straightforward code that adds a paragraph for Bug #829648

https://wiki.ubuntu.com/SoundMenu#presence

[lp:~charlesk/gnome-control-center/make-new-panel]

226. By Charles Kerr on 2012-02-03

Move the visibility checkbox to the bottom of the page (underneath the volume slider) as per mpt's request

Unmerged revisions

226. By Charles Kerr on 2012-02-03

Move the visibility checkbox to the bottom of the page (underneath the volume slider) as per mpt's request

225. By Charles Kerr on 2012-02-03

Add indicator visibility checkbox for Bug #829648

https://wiki.ubuntu.com/SoundMenu#presence

=== modified file 'panels/sound-nua/gvc-mixer-dialog.c'
--- panels/sound-nua/gvc-mixer-dialog.c	2012-02-03 17:15:47 +0000
+++ panels/sound-nua/gvc-mixer-dialog.c	2012-02-03 19:09:34 +0000
@@ -83,9 +83,10 @@
         GtkWidget       *click_feedback_button;
         GtkWidget       *audible_bell_button;
         GtkSizeGroup    *size_group;
-        GtkWidget	*selected_output_label;
+        GtkWidget       *selected_output_label;
         GtkWidget       *selected_input_label;
-        GtkWidget	*test_output_button;
+        GtkWidget       *test_output_button;
+        GSettings       *indicator_settings;
 
         gdouble          last_input_peak;
         guint            num_apps;
@@ -1666,6 +1667,7 @@
 {
         GObject          *object;
         GvcMixerDialog   *self;
+        GtkWidget        *w;
         GtkWidget        *main_vbox;
         GtkWidget        *label;
         GtkWidget        *alignment;
@@ -1983,6 +1985,17 @@
         gtk_box_pack_start (GTK_BOX (self->priv->output_stream_box),
                             self->priv->output_bar, TRUE, FALSE, 12);
 
+        /* Indicator visibility toggle */
+        w = gtk_check_button_new_with_mnemonic(_( "_Show sound volume in the menu bar"));
+        alignment = gtk_alignment_new (0, 0, 1, 1);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 3, 3, 5, 5);
+        gtk_container_add (GTK_CONTAINER (alignment), w);
+        self->priv->indicator_settings = g_settings_new ("com.canonical.indicator.sound");
+        g_settings_bind (self->priv->indicator_settings, "visible", w, "active", G_SETTINGS_BIND_DEFAULT);
+        gtk_box_pack_start (GTK_BOX (main_vbox),
+                            alignment,
+                            FALSE, FALSE, 0);
+
         gtk_widget_show_all (main_vbox);
 
         g_signal_connect (self->priv->mixer_control,
@@ -2048,6 +2061,8 @@
 {
         GvcMixerDialog *dialog = GVC_MIXER_DIALOG (object);
 
+        g_clear_object (&dialog->priv->indicator_settings);
+
         if (dialog->priv->mixer_control != NULL) {
                 g_signal_handlers_disconnect_by_func (dialog->priv->mixer_control,
                                                       on_control_output_added,