rpms/gnome-media/F-11 fix-alignment-of-sliders.patch, 1.1, 1.2 gnome-media.spec, 1.169, 1.170

Matthias Clasen mclasen at fedoraproject.org
Mon Apr 27 18:32:39 UTC 2009 

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5083

Modified Files:
	fix-alignment-of-sliders.patch gnome-media.spec 
Log Message:
Fix alignment of sliders on the application tab as well


fix-alignment-of-sliders.patch:

Index: fix-alignment-of-sliders.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/fix-alignment-of-sliders.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix-alignment-of-sliders.patch	16 Apr 2009 04:45:09 -0000	1.1
+++ fix-alignment-of-sliders.patch	27 Apr 2009 18:32:39 -0000	1.2
@@ -1,7 +1,7 @@
-diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c hacked/gnome-volume-control/src/gvc-balance-bar.c
---- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-03-03 16:26:48.000000000 -0500
-+++ hacked/gnome-volume-control/src/gvc-balance-bar.c	2009-04-16 00:00:36.451383748 -0400
-@@ -385,7 +385,7 @@
+diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c
+--- gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c.fix-alignment-of-sliders	2009-03-03 16:26:48.000000000 -0500
++++ gnome-media-2.26.0/gnome-volume-control/src/gvc-balance-bar.c	2009-04-27 14:00:51.205166047 -0400
+@@ -385,7 +385,7 @@ gvc_balance_bar_init (GvcBalanceBar *bar
          bar->priv->label = gtk_label_new_with_mnemonic (_("_Balance:"));
          gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
                                  0.0,
@@ -10,10 +10,10 @@
          /* frame */
          frame = gtk_frame_new (NULL);
          gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-diff -u -r gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c hacked/gnome-volume-control/src/gvc-channel-bar.c
---- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:10:01.957634048 -0400
-+++ hacked/gnome-volume-control/src/gvc-channel-bar.c	2009-04-16 00:01:58.002641476 -0400
-@@ -102,6 +102,7 @@
+diff -up gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c
+--- gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c.fix-alignment-of-sliders	2009-04-27 14:00:51.192165593 -0400
++++ gnome-media-2.26.0/gnome-volume-control/src/gvc-channel-bar.c	2009-04-27 14:25:21.855382395 -0400
+@@ -102,6 +102,7 @@ _scale_box_new (GvcChannelBar *bar)
          GtkWidget            *box;
          GtkWidget            *sbox;
          GtkWidget            *ebox;
@@ -21,7 +21,7 @@
  
          if (priv->orientation == GTK_ORIENTATION_VERTICAL) {
                  bar->priv->scale_box = box = gtk_vbox_new (FALSE, 6);
-@@ -143,7 +144,6 @@
+@@ -143,7 +144,6 @@ _scale_box_new (GvcChannelBar *bar)
  
                  gtk_box_pack_start (GTK_BOX (sbox), priv->image, FALSE, FALSE, 0);
                  gtk_box_pack_start (GTK_BOX (sbox), priv->label, FALSE, FALSE, 0);
@@ -29,39 +29,35 @@
                  gtk_box_pack_start (GTK_BOX (box), priv->scale, TRUE, TRUE, 0);
  
                  bar->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
-@@ -578,6 +578,7 @@
+@@ -578,9 +578,20 @@ gvc_channel_bar_set_is_amplified (GvcCha
          	str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%"));
          	gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL,
          			    GTK_POS_BOTTOM, str);
 +		gtk_widget_queue_resize (bar->priv->scale);
          	g_free (str);
++                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0, 0, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0);
++
++
  	} else {
  		gtk_scale_clear_marks (GTK_SCALE (bar->priv->scale));
-@@ -812,23 +813,23 @@
-                           "toggled",
-                           G_CALLBACK (on_mute_button_toggled),
-                           bar);
--        bar->priv->mute_box = gtk_alignment_new (0.5, 0.5, 0, 0);
-+        bar->priv->mute_box = gtk_alignment_new (0.5, 0, 0, 0);
-         gtk_container_add (GTK_CONTAINER (bar->priv->mute_box), bar->priv->mute_button);
- 
-         bar->priv->low_image = gtk_image_new_from_icon_name ("audio-volume-low",
-                                                              GTK_ICON_SIZE_BUTTON);
-+        gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.0);
-         gtk_widget_set_no_show_all (bar->priv->low_image, TRUE);
-         bar->priv->high_image = gtk_image_new_from_icon_name ("audio-volume-high",
-                                                               GTK_ICON_SIZE_BUTTON);
-+        gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.0);
-         gtk_widget_set_no_show_all (bar->priv->high_image, TRUE);
++                gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0.5, 0, 0);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.5);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.5);
++                gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0.5);
+ 	}
+ }
  
-         bar->priv->image = gtk_image_new ();
+@@ -826,9 +837,7 @@ gvc_channel_bar_init (GvcChannelBar *bar
          gtk_widget_set_no_show_all (bar->priv->image, TRUE);
  
          bar->priv->label = gtk_label_new (NULL);
 -        gtk_misc_set_alignment (GTK_MISC (bar->priv->label),
 -                                0.0,
 -                                0.5);
-+        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.0);
++        gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5);
          gtk_widget_set_no_show_all (bar->priv->label, TRUE);
  
          /* frame */


Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-11/gnome-media.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gnome-media.spec	23 Apr 2009 14:17:53 -0000	1.169
+++ gnome-media.spec	27 Apr 2009 18:32:39 -0000	1.170
@@ -14,7 +14,7 @@
 Summary:        GNOME media programs
 Name:           gnome-media
 Version:        2.26.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+ and GFDL
 Group:          Applications/Multimedia
 Source:         http://download.gnome.org/sources/gnome-media/2.26/gnome-media-%{version}.tar.bz2
@@ -258,6 +258,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
+- Fix alignment of sliders on the application tab as well
+
 * Thu Apr 23 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-3
 - Don't show debug when disabling the debug output (#493138)

More information about the fedora-extras-commits mailing list