Merge lp:~charlesk/gnome-control-center/bug-829648-add-visibility-toggle into lp:gnome-control-center

[Charles Kerr]

This adds a visibility toggle to the sound panel for LP bug #829648

Unmerged revisions

11117. By Charles Kerr on 2012-01-25

add indicator-sound visibility toggle for lp bug #829648

=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c	2011-10-24 13:41:44 +0000
+++ panels/sound/gvc-mixer-dialog.c	2012-01-25 05:30:31 +0000
@@ -48,6 +48,8 @@
 
 #define GVC_MIXER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_DIALOG, GvcMixerDialogPrivate))
 
+#define INDICATOR_SOUND_SCHEMA "com.canonical.indicator.sound"
+
 struct GvcMixerDialogPrivate
 {
         GvcMixerControl *mixer_control;
@@ -80,6 +82,8 @@
         GtkWidget       *click_feedback_button;
         GtkWidget       *audible_bell_button;
         GtkSizeGroup    *size_group;
+        GSettings       *indicator_settings;
+        GtkWidget       *indicator_check;
 
         gdouble          last_input_peak;
         guint            num_apps;
@@ -1712,13 +1716,40 @@
         return treeview;
 }
 
+#define VISIBLE_KEY "visible"
+
+static void
+on_indicator_visible_toggled (GtkToggleButton *toggle, GvcMixerDialog *dialog)
+{
+        const gboolean value = gtk_toggle_button_get_active (toggle);
+        GSettings * settings = dialog->priv->indicator_settings;
+
+        if ((settings == NULL) || !g_settings_set_boolean (settings, VISIBLE_KEY, value))
+            g_warning ("Unable to set %s.%s", INDICATOR_SOUND_SCHEMA, VISIBLE_KEY);
+}
+
+static void
+on_settings_changed (GSettings *settings, gchar *key, GvcMixerDialog *dialog)
+{
+	g_return_if_fail (!g_strcmp0 (key,VISIBLE_KEY));
+
+        GtkToggleButton * toggle = GTK_TOGGLE_BUTTON(dialog->priv->indicator_check);
+        const gboolean oldval = gtk_toggle_button_get_active (toggle);
+        const gboolean newval = g_settings_get_boolean (settings, key);
+        if (oldval != newval)
+            gtk_toggle_button_set_active (toggle, newval);
+}
+
 static GObject *
 gvc_mixer_dialog_constructor (GType                  type,
                               guint                  n_construct_properties,
                               GObjectConstructParam *construct_params)
 {
+        gboolean          visible;
+        GSettings        *settings;
         GObject          *object;
         GvcMixerDialog   *self;
+        GtkWidget        *w;
         GtkWidget        *main_vbox;
         GtkWidget        *label;
         GtkWidget        *alignment;
@@ -1980,6 +2011,27 @@
                           G_CALLBACK (on_control_card_removed),
                           self);
 
+        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), 12, 0, 5, 5);
+        gtk_container_add (GTK_CONTAINER (alignment), w);
+        gtk_box_pack_start (GTK_BOX (main_vbox), alignment, FALSE, FALSE, 0);
+        settings = g_settings_new (INDICATOR_SOUND_SCHEMA);
+        if (settings == NULL) {
+            visible = TRUE;
+        } else {
+            g_signal_connect (settings, "changed::" VISIBLE_KEY, G_CALLBACK (on_settings_changed), self);
+            visible = g_settings_get_boolean (settings, VISIBLE_KEY);
+        }
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), visible);
+        if (settings == NULL) {
+            gtk_widget_set_sensitive (w, FALSE);
+        } else {
+            g_signal_connect (w, "toggled", G_CALLBACK(on_indicator_visible_toggled), self);
+        }
+        self->priv->indicator_check = w;
+        self->priv->indicator_settings = settings;
+
         gtk_widget_show_all (main_vbox);
 
         streams = gvc_mixer_control_get_streams (self->priv->mixer_control);
@@ -2004,6 +2056,11 @@
 {
         GvcMixerDialog *dialog = GVC_MIXER_DIALOG (object);
 
+        if (dialog->priv->indicator_settings != NULL) {
+                g_object_unref (dialog->priv->indicator_settings);
+                dialog->priv->indicator_settings = NULL;
+        }
+
         if (dialog->priv->mixer_control != NULL) {
                 g_signal_handlers_disconnect_by_func (dialog->priv->mixer_control,
                                                       on_control_stream_added,