gnome-media r4053 - in trunk/gnome-volume-control: . src

[mccann svn gnome org]

Author: mccann
Date: Wed Nov 12 18:44:37 2008
New Revision: 4053
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4053&view=rev

Log:
2008-11-12  William Jon McCann  <jmccann redhat com>

	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor):
	* src/gvc-sound-theme-chooser.c (setup_theme_selector),
	(gvc_sound_theme_chooser_init):
	Drop the frame and label from the effects chooser.
	Move the enable effects toggle up to the top.



Modified:
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/src/gvc-mixer-dialog.c
   trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c

Modified: trunk/gnome-volume-control/src/gvc-mixer-dialog.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-mixer-dialog.c	(original)
+++ trunk/gnome-volume-control/src/gvc-mixer-dialog.c	Wed Nov 12 18:44:37 2008
@@ -587,7 +587,7 @@
                             TRUE, TRUE, 12);
 
         /* Effects page */
-        self->priv->sound_effects_box = gtk_vbox_new (FALSE, 12);
+        self->priv->sound_effects_box = gtk_vbox_new (FALSE, 6);
         gtk_container_set_border_width (GTK_CONTAINER (self->priv->sound_effects_box), 12);
         label = gtk_label_new (_("Sound Effects"));
         gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
@@ -601,11 +601,6 @@
         gtk_box_pack_end (GTK_BOX (self->priv->sound_effects_box),
                           self->priv->effects_bar, FALSE, FALSE, 12);
 
-        self->priv->sound_theme_chooser = gvc_sound_theme_chooser_new ();
-        gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
-                            self->priv->sound_theme_chooser,
-                            TRUE, TRUE, 0);
-
         client = gconf_client_get_default ();
 
         self->priv->enable_effects_button = gtk_check_button_new_with_mnemonic (_("_Play alerts and sound effects"));
@@ -618,8 +613,14 @@
                           "toggled",
                           G_CALLBACK (on_enable_effects_toggled),
                           self);
+
+        self->priv->sound_theme_chooser = gvc_sound_theme_chooser_new ();
+        gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
+                            self->priv->sound_theme_chooser,
+                            TRUE, TRUE, 0);
+
         alignment = gtk_alignment_new (0, 0, 1, 1);
-        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 12, 0);
         gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
                             alignment,
                             FALSE, FALSE, 0);

Modified: trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c	(original)
+++ trunk/gnome-volume-control/src/gvc-sound-theme-chooser.c	Wed Nov 12 18:44:37 2008
@@ -368,7 +368,6 @@
         char                 *theme_name;
         GConfClient          *client;
         guint                 i;
-        GtkTreeIter           iter;
 
         /* Add the theme names and their display name to a hash table,
          * makes it easy to avoid duplicate themes */
@@ -1426,26 +1425,6 @@
 }
 
 static void
-_gtk_label_make_bold (GtkLabel *label)
-{
-        PangoFontDescription *font_desc;
-
-        font_desc = pango_font_description_new ();
-
-        pango_font_description_set_weight (font_desc,
-                                           PANGO_WEIGHT_BOLD);
-
-        /* This will only affect the weight of the font, the rest is
-         * from the current state of the widget, which comes from the
-         * theme or user prefs, since the font desc only has the
-         * weight flag turned on.
-         */
-        gtk_widget_modify_font (GTK_WIDGET (label), font_desc);
-
-        pango_font_description_free (font_desc);
-}
-
-static void
 gvc_sound_theme_chooser_init (GvcSoundThemeChooser *chooser)
 {
         GtkWidget *frame;
@@ -1455,14 +1434,11 @@
 
         chooser->priv = GVC_SOUND_THEME_CHOOSER_GET_PRIVATE (chooser);
 
-        frame = gtk_frame_new (_("Alerts and Sound Effects"));
-        label = gtk_frame_get_label_widget (GTK_FRAME (frame));
-        _gtk_label_make_bold (GTK_LABEL (label));
-        gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+        frame = gtk_vbox_new (FALSE, 0);
         gtk_box_pack_start (GTK_BOX (chooser), frame, TRUE, TRUE, 0);
 
         alignment = gtk_alignment_new (0, 0, 1, 1);
-        gtk_container_add (GTK_CONTAINER (frame), alignment);
+        gtk_box_pack_start (GTK_BOX (frame), alignment, TRUE, TRUE, 0);
         gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
 
         chooser->priv->treeview = gtk_tree_view_new ();