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

[mccann svn gnome org]

Author: mccann
Date: Thu Nov  6 09:32:13 2008
New Revision: 4035
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4035&view=rev

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

	* src/gvc-channel-bar.c (_scale_box_new),
	(gvc_channel_bar_set_size_group):
	* src/gvc-channel-bar.h:
	* src/gvc-mixer-dialog.c (add_stream), (gvc_mixer_dialog_init):
	Put all the scales in a size group.  Doesn't seem
	to work though.



Modified:
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/src/gvc-channel-bar.c
   trunk/gnome-volume-control/src/gvc-channel-bar.h
   trunk/gnome-volume-control/src/gvc-mixer-dialog.c

Modified: trunk/gnome-volume-control/src/gvc-channel-bar.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-channel-bar.c	(original)
+++ trunk/gnome-volume-control/src/gvc-channel-bar.c	Thu Nov  6 09:32:13 2008
@@ -51,6 +51,7 @@
         gboolean       is_muted;
         char          *name;
         char          *icon_name;
+        GtkSizeGroup  *size_group;
 };
 
 enum
@@ -113,6 +114,10 @@
                 gtk_box_pack_start (GTK_BOX (box), priv->mute_box, FALSE, FALSE, 0);
         }
 
+        if (bar->priv->size_group != NULL) {
+                gtk_size_group_add_widget (bar->priv->size_group, bar->priv->scale);
+        }
+
         gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE);
 
         return box;
@@ -146,6 +151,16 @@
 }
 
 void
+gvc_channel_bar_set_size_group (GvcChannelBar *bar,
+                                GtkSizeGroup  *group)
+{
+        g_return_if_fail (GVC_IS_CHANNEL_BAR (bar));
+
+        bar->priv->size_group = group;
+        gtk_size_group_add_widget (group, bar->priv->scale);
+}
+
+void
 gvc_channel_bar_set_name (GvcChannelBar  *bar,
                           const char     *name)
 {

Modified: trunk/gnome-volume-control/src/gvc-channel-bar.h
==============================================================================
--- trunk/gnome-volume-control/src/gvc-channel-bar.h	(original)
+++ trunk/gnome-volume-control/src/gvc-channel-bar.h	Thu Nov  6 09:32:13 2008
@@ -66,6 +66,8 @@
 gboolean            gvc_channel_bar_get_show_mute       (GvcChannelBar *bar);
 void                gvc_channel_bar_set_show_mute       (GvcChannelBar *bar,
                                                          gboolean       show_mute);
+void                gvc_channel_bar_set_size_group      (GvcChannelBar *bar,
+                                                         GtkSizeGroup  *group);
 
 G_END_DECLS
 

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	Thu Nov  6 09:32:13 2008
@@ -54,6 +54,7 @@
         GtkWidget       *enable_effects_button;
         GtkWidget       *click_feedback_button;
         GtkWidget       *audible_bell_button;
+        GtkSizeGroup    *size_group;
 };
 
 #define KEY_SOUNDS_DIR             "/desktop/gnome/sound"
@@ -243,6 +244,8 @@
         gboolean       is_muted;
 
         bar = gvc_channel_bar_new ();
+        gvc_channel_bar_set_size_group (GVC_CHANNEL_BAR (bar),
+                                        dialog->priv->size_group);
         gvc_channel_bar_set_orientation (GVC_CHANNEL_BAR (bar),
                                          GTK_ORIENTATION_HORIZONTAL);
         gvc_channel_bar_set_show_mute (GVC_CHANNEL_BAR (bar),
@@ -593,7 +596,7 @@
 
         dialog->priv = GVC_MIXER_DIALOG_GET_PRIVATE (dialog);
         dialog->priv->bars = g_hash_table_new (NULL, NULL);
-
+        dialog->priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
         client = gconf_client_get_default ();