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

[mccann svn gnome org]

Author: mccann
Date: Thu Dec 11 21:14:57 2008
New Revision: 4085
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4085&view=rev

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

	* src/gvc-channel-bar.c (gvc_channel_bar_set_low_icon_name),
	(gvc_channel_bar_set_high_icon_name),
	(gvc_channel_bar_set_property), (gvc_channel_bar_get_property),
	(gvc_channel_bar_class_init), (gvc_channel_bar_init),
	(gvc_channel_bar_finalize):
	* src/gvc-channel-bar.h:
	* src/gvc-mixer-dialog.c (gvc_mixer_dialog_constructor),
	(gvc_mixer_dialog_set_page):
	Use the new input icons in the dialog.



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 Dec 11 21:14:57 2008
@@ -51,6 +51,8 @@
         gboolean       is_muted;
         char          *name;
         char          *icon_name;
+        char          *low_icon_name;
+        char          *high_icon_name;
         GtkSizeGroup  *size_group;
 };
 
@@ -63,6 +65,8 @@
         PROP_ADJUSTMENT,
         PROP_NAME,
         PROP_ICON_NAME,
+        PROP_LOW_ICON_NAME,
+        PROP_HIGH_ICON_NAME,
 };
 
 static void     gvc_channel_bar_class_init (GvcChannelBarClass *klass);
@@ -187,6 +191,38 @@
 }
 
 void
+gvc_channel_bar_set_low_icon_name   (GvcChannelBar *bar,
+                                     const char    *name)
+{
+        g_return_if_fail (GVC_IS_CHANNEL_BAR (bar));
+
+        if (name != NULL && strcmp (bar->priv->low_icon_name, name) != 0) {
+                g_free (bar->priv->low_icon_name);
+                bar->priv->low_icon_name = g_strdup (name);
+                gtk_image_set_from_icon_name (GTK_IMAGE (bar->priv->low_image),
+                                              bar->priv->low_icon_name,
+                                              GTK_ICON_SIZE_BUTTON);
+                g_object_notify (G_OBJECT (bar), "low-icon-name");
+        }
+}
+
+void
+gvc_channel_bar_set_high_icon_name  (GvcChannelBar *bar,
+                                     const char    *name)
+{
+        g_return_if_fail (GVC_IS_CHANNEL_BAR (bar));
+
+        if (name != NULL && strcmp (bar->priv->high_icon_name, name) != 0) {
+                g_free (bar->priv->high_icon_name);
+                bar->priv->high_icon_name = g_strdup (name);
+                gtk_image_set_from_icon_name (GTK_IMAGE (bar->priv->high_image),
+                                              bar->priv->high_icon_name,
+                                              GTK_ICON_SIZE_BUTTON);
+                g_object_notify (G_OBJECT (bar), "high-icon-name");
+        }
+}
+
+void
 gvc_channel_bar_set_orientation (GvcChannelBar  *bar,
                                  GtkOrientation  orientation)
 {
@@ -369,6 +405,12 @@
         case PROP_ICON_NAME:
                 gvc_channel_bar_set_icon_name (self, g_value_get_string (value));
                 break;
+        case PROP_LOW_ICON_NAME:
+                gvc_channel_bar_set_low_icon_name (self, g_value_get_string (value));
+                break;
+        case PROP_HIGH_ICON_NAME:
+                gvc_channel_bar_set_high_icon_name (self, g_value_get_string (value));
+                break;
         case PROP_ADJUSTMENT:
                 gvc_channel_bar_set_adjustment (self, g_value_get_object (value));
                 break;
@@ -403,6 +445,12 @@
         case PROP_ICON_NAME:
                 g_value_set_string (value, priv->icon_name);
                 break;
+        case PROP_LOW_ICON_NAME:
+                g_value_set_string (value, priv->low_icon_name);
+                break;
+        case PROP_HIGH_ICON_NAME:
+                g_value_set_string (value, priv->high_icon_name);
+                break;
         case PROP_ADJUSTMENT:
                 g_value_set_object (value, gvc_channel_bar_get_adjustment (self));
                 break;
@@ -495,6 +543,20 @@
                                                               "Name of icon to display for this stream",
                                                               NULL,
                                                               G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (object_class,
+                                         PROP_LOW_ICON_NAME,
+                                         g_param_spec_string ("low-icon-name",
+                                                              "Icon Name",
+                                                              "Name of icon to display for this stream",
+                                                              "audio-volume-low",
+                                                              G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+        g_object_class_install_property (object_class,
+                                         PROP_HIGH_ICON_NAME,
+                                         g_param_spec_string ("high-icon-name",
+                                                              "Icon Name",
+                                                              "Name of icon to display for this stream",
+                                                              "audio-volume-high",
+                                                              G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
 
         g_type_class_add_private (klass, sizeof (GvcChannelBarPrivate));
 }
@@ -513,6 +575,9 @@
 {
         bar->priv = GVC_CHANNEL_BAR_GET_PRIVATE (bar);
 
+        bar->priv->low_icon_name = g_strdup ("audio-volume-low");
+        bar->priv->high_icon_name = g_strdup ("audio-volume-high");
+
         bar->priv->orientation = GTK_ORIENTATION_VERTICAL;
         bar->priv->adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0,
                                                                     0.0,
@@ -575,6 +640,8 @@
 
         g_free (channel_bar->priv->name);
         g_free (channel_bar->priv->icon_name);
+        g_free (channel_bar->priv->low_icon_name);
+        g_free (channel_bar->priv->high_icon_name);
 
         G_OBJECT_CLASS (gvc_channel_bar_parent_class)->finalize (object);
 }

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 Dec 11 21:14:57 2008
@@ -53,6 +53,10 @@
                                                          const char    *name);
 void                gvc_channel_bar_set_icon_name       (GvcChannelBar *bar,
                                                          const char    *icon_name);
+void                gvc_channel_bar_set_low_icon_name   (GvcChannelBar *bar,
+                                                         const char    *icon_name);
+void                gvc_channel_bar_set_high_icon_name  (GvcChannelBar *bar,
+                                                         const char    *icon_name);
 
 void                gvc_channel_bar_set_orientation     (GvcChannelBar *bar,
                                                          GtkOrientation orientation);

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 Dec 11 21:14:57 2008
@@ -830,6 +830,10 @@
         self->priv->input_bar = create_bar (self, self->priv->size_group);
         gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar),
                                   _("Input volume: "));
+        gvc_channel_bar_set_low_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+                                           "audio-input-microphone-low");
+        gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar),
+                                            "audio-input-microphone-high");
         gtk_widget_set_sensitive (self->priv->input_bar, FALSE);
         gtk_box_pack_start (GTK_BOX (self->priv->input_box),
                             self->priv->input_bar, FALSE, FALSE, 12);
@@ -1004,7 +1008,8 @@
 }
 
 gboolean
-gvc_mixer_dialog_set_page (GvcMixerDialog *self, const gchar* page)
+gvc_mixer_dialog_set_page (GvcMixerDialog *self,
+                           const char     *page)
 {
         g_return_val_if_fail (self != NULL, FALSE);
 
@@ -1018,4 +1023,6 @@
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 3);
         else /* default is "playback" */
                 gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 0);
+
+        return TRUE;
 }