diff options
| author | Callum McKenzie <callum@src.gnome.org> | 2009-01-31 08:15:33 +0000 |
|---|---|---|
| committer | Callum McKenzie <callum@src.gnome.org> | 2009-01-31 08:15:33 +0000 |
| commit | fb1d47875cc6f5aafe7d2cf885033af1edd9c1ae (patch) | |
| tree | 871c5ca2333cc496703b67b501de9d5103c4158b /mixer | |
| parent | de128477d236fd7d8be32847296e0e9a675bafcd (diff) | |
Mixer UI improvements. Double click now equals mute. A borde has been added around the dock.
svn path=/trunk/; revision=11233
Diffstat (limited to 'mixer')
| -rw-r--r-- | mixer/ChangeLog | 9 | ||||
| -rw-r--r-- | mixer/applet.c | 2 | ||||
| -rw-r--r-- | mixer/dock.c | 16 |
3 files changed, 20 insertions, 7 deletions
diff --git a/mixer/ChangeLog b/mixer/ChangeLog index 5cbc266bf..51632e2db 100644 --- a/mixer/ChangeLog +++ b/mixer/ChangeLog @@ -1,3 +1,12 @@ +2009-01-31 Callum McKenzie <callum@spooky-possum.org> + + * dock.c (gnome_volume_applet_dock_new): Add a border around the + dock. + + * applet.c (gnome_volume_applet_button): Double click -> toggle + mute rather than launching the volume control. Mute is the more + common command. + 2009-01-27 Callum McKenzie <callum@spooky-possum.org> * preferences.[ch]: diff --git a/mixer/applet.c b/mixer/applet.c index 94e7da5b4..7c41e622a 100644 --- a/mixer/applet.c +++ b/mixer/applet.c @@ -789,7 +789,7 @@ gnome_volume_applet_button (GtkWidget *widget, if (applet->mixer) { gnome_volume_applet_popdown_dock (applet); } - gnome_volume_applet_run_mixer (applet); + gnome_volume_applet_toggle_mute (applet); return TRUE; default: break; diff --git a/mixer/dock.c b/mixer/dock.c index b10452a11..dec14183a 100644 --- a/mixer/dock.c +++ b/mixer/dock.c @@ -104,8 +104,8 @@ GtkWidget * gnome_volume_applet_dock_new (GtkOrientation orientation, GnomeVolumeApplet *parent) { - GtkWidget *button, *scale, *frame, *mute, *more; - GtkWidget *container, *outerline, *innerline; + GtkWidget *button, *scale, *mute, *more; + GtkWidget *container, *outerline, *innerline, *frame; GnomeVolumeAppletDock *dock; gint i; static struct { @@ -121,19 +121,23 @@ gnome_volume_applet_dock_new (GtkOrientation orientation, dock = g_object_new (GNOME_VOLUME_APPLET_TYPE_DOCK, NULL); + gtk_window_set_type_hint (GTK_WINDOW (dock), + GDK_WINDOW_TYPE_HINT_DOCK); dock->orientation = orientation; dock->model = parent; + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); + gtk_container_add (GTK_CONTAINER (dock), frame); + container = magic[orientation].container (FALSE, 0); - gtk_container_add (GTK_CONTAINER (dock), container); + gtk_container_set_border_width (GTK_CONTAINER (container), 6); + gtk_container_add (GTK_CONTAINER (frame), container); outerline = magic[orientation].subcontainer (FALSE, 0); innerline = magic[orientation].subcontainer (FALSE, 0); gtk_box_pack_start (GTK_BOX (container), outerline, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (container), innerline, FALSE, FALSE, 0); - frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); - dock->minus = GTK_BUTTON (gtk_button_new ()); gtk_box_pack_start (GTK_BOX (outerline), GTK_WIDGET (dock->minus), FALSE, FALSE, 0); |