rpms/gnome-media/F-12 layout-tweaks.patch, NONE, 1.1 options.patch, NONE, 1.1 gnome-media.spec, 1.183, 1.184
Matthias Clasen
mclasen at fedoraproject.org
Sun Oct 18 07:03:30 UTC 2009
- Previous message: rpms/pfstools/F-11 pfstools-1.7-strcmp.patch, NONE, 1.1 pfstools-1.7.0-debuginfo.patch, NONE, 1.1 pfstools.spec, 1.4, 1.5
- Next message: rpms/python-psycopg2/EL-5 .cvsignore, 1.9, 1.10 python-psycopg2.spec, 1.12, 1.13 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-media/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12235
Modified Files:
gnome-media.spec
Added Files:
layout-tweaks.patch options.patch
Log Message:
Cosmetic fixes
layout-tweaks.patch:
gnome-volume-control/src/gvc-combo-box.c | 4 +-
gnome-volume-control/src/gvc-mixer-dialog.c | 42 ++++++++++++++++++----------
sound-theme/gvc-sound-theme-chooser.c | 13 +++++---
3 files changed, 37 insertions(+), 22 deletions(-)
--- NEW FILE layout-tweaks.patch ---
--- gnome-media-2.28.1/gnome-volume-control/src/gvc-combo-box.c 2009-08-13 07:31:18.000000000 -0400
+++ hacked/gnome-volume-control/src/gvc-combo-box.c 2009-10-16 22:22:05.288781546 -0400
@@ -280,14 +280,14 @@
renderer,
"text", COL_HUMAN_NAME);
- gtk_widget_set_size_request (combo_box->priv->combobox, 128, -1);
+/* gtk_widget_set_size_request (combo_box->priv->combobox, 128, -1); */
combo_box->priv->start_box = sbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (box), sbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (sbox), combo_box->priv->label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), combo_box->priv->combobox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), combo_box->priv->combobox, FALSE, FALSE, 0);
combo_box->priv->end_box = ebox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0);
--- gnome-media-2.28.1/gnome-volume-control/src/gvc-mixer-dialog.c 2009-09-22 10:18:54.000000000 -0400
+++ hacked/gnome-volume-control/src/gvc-mixer-dialog.c 2009-10-17 00:03:53.113531901 -0400
@@ -232,7 +232,7 @@
}
gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
dialog->priv->output_balance_bar,
- FALSE, FALSE, 12);
+ FALSE, FALSE, 6);
gtk_widget_show (dialog->priv->output_balance_bar);
if (gvc_channel_map_can_fade (map)) {
@@ -244,7 +244,7 @@
}
gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
dialog->priv->output_fade_bar,
- FALSE, FALSE, 12);
+ FALSE, FALSE, 6);
gtk_widget_show (dialog->priv->output_fade_bar);
}
@@ -257,7 +257,7 @@
}
gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
dialog->priv->output_lfe_bar,
- FALSE, FALSE, 12);
+ FALSE, FALSE, 6);
gtk_widget_show (dialog->priv->output_lfe_bar);
}
@@ -276,7 +276,10 @@
gtk_box_pack_start (GTK_BOX (dialog->priv->output_settings_box),
dialog->priv->output_port_combo,
- TRUE, FALSE, 0);
+ TRUE, FALSE, 6);
+
+ gvc_combo_box_set_size_group (dialog->priv->output_port_combo, dialog->priv->size_group, FALSE);
+
gtk_widget_show (dialog->priv->output_port_combo);
}
@@ -530,6 +533,7 @@
g_signal_connect (G_OBJECT (dialog->priv->input_port_combo), "changed",
G_CALLBACK (port_selection_changed), dialog);
+ gvc_combo_box_set_size_group (dialog->priv->input_port_combo, dialog->priv->size_group, FALSE);
gtk_box_pack_start (GTK_BOX (dialog->priv->input_settings_box),
dialog->priv->input_port_combo,
TRUE, TRUE, 0);
@@ -1439,7 +1443,7 @@
gtk_box_pack_start (GTK_BOX (dialog->priv->hw_settings_box),
dialog->priv->hw_profile_combo,
- FALSE, FALSE, 12);
+ TRUE, TRUE, 6);
gtk_widget_show (dialog->priv->hw_profile_combo);
g_object_set_data (G_OBJECT (dialog->priv->hw_profile_combo), "card", card);
@@ -1576,13 +1580,17 @@
gtk_dialog_add_button (GTK_DIALOG (self), "gtk-close", GTK_RESPONSE_OK);
main_vbox = gtk_dialog_get_content_area (GTK_DIALOG (self));
+ gtk_box_set_spacing (GTK_BOX (main_vbox), 2);
gtk_container_set_border_width (GTK_CONTAINER (self), 6);
self->priv->output_stream_box = gtk_hbox_new (FALSE, 12);
+ alignment = gtk_alignment_new (0, 0, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 0, 0);
+ gtk_container_add (GTK_CONTAINER (alignment), self->priv->output_stream_box);
gtk_box_pack_start (GTK_BOX (main_vbox),
- self->priv->output_stream_box,
- FALSE, FALSE, 12);
+ alignment,
+ FALSE, FALSE, 0);
self->priv->output_bar = create_bar (self, self->priv->size_group, TRUE);
gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->output_bar),
_("_Output volume: "));
@@ -1593,7 +1601,8 @@
self->priv->notebook = gtk_notebook_new ();
gtk_box_pack_start (GTK_BOX (main_vbox),
self->priv->notebook,
- TRUE, TRUE, 6);
+ TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (self->priv->notebook), 5);
/* Set up accels (borrowed from Empathy) */
accel_group = gtk_accel_group_new ();
@@ -1625,7 +1634,7 @@
_("_Alert volume: "));
gtk_widget_set_sensitive (self->priv->effects_bar, FALSE);
gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
- self->priv->effects_bar, FALSE, FALSE, 12);
+ self->priv->effects_bar, FALSE, FALSE, 0);
self->priv->sound_theme_chooser = gvc_sound_theme_chooser_new ();
gtk_box_pack_start (GTK_BOX (self->priv->sound_effects_box),
@@ -1691,14 +1700,17 @@
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);
+ alignment = gtk_alignment_new (0, 0, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+ gtk_container_add (GTK_CONTAINER (alignment), self->priv->input_bar);
gtk_box_pack_start (GTK_BOX (self->priv->input_box),
- self->priv->input_bar,
- FALSE, FALSE, 12);
+ alignment,
+ FALSE, FALSE, 0);
box = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (self->priv->input_box),
box,
- FALSE, FALSE, 12);
+ FALSE, FALSE, 6);
sbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (box),
@@ -1718,7 +1730,7 @@
GVC_LEVEL_SCALE_LINEAR);
gtk_box_pack_start (GTK_BOX (box),
self->priv->input_level_bar,
- TRUE, TRUE, 0);
+ TRUE, TRUE, 6);
gtk_widget_show (self->priv->input_level_bar);
ebox = gtk_hbox_new (FALSE, 6);
@@ -1798,8 +1810,8 @@
label = gtk_frame_get_label_widget (GTK_FRAME (box));
_gtk_label_make_bold (GTK_LABEL (label));
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
- gtk_box_pack_start (GTK_BOX (self->priv->output_box), box, TRUE, TRUE, 12);
- self->priv->output_settings_box = gtk_vbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (self->priv->output_box), box, FALSE, FALSE, 12);
+ self->priv->output_settings_box = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (box), self->priv->output_settings_box);
/* Applications */
--- gnome-media-2.28.1/sound-theme/gvc-sound-theme-chooser.c 2009-08-13 07:31:19.000000000 -0400
+++ hacked/sound-theme/gvc-sound-theme-chooser.c 2009-10-16 23:52:43.427536802 -0400
@@ -1078,14 +1078,14 @@
chooser->priv = GVC_SOUND_THEME_CHOOSER_GET_PRIVATE (chooser);
- chooser->priv->theme_box = gtk_hbox_new (FALSE, 6);
+ chooser->priv->theme_box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (chooser),
chooser->priv->theme_box, FALSE, FALSE, 0);
label = gtk_label_new_with_mnemonic (_("Sound _theme:"));
- gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), label, FALSE, FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), label, FALSE, FALSE, 0);
chooser->priv->combo_box = gtk_combo_box_new ();
- gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), chooser->priv->combo_box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (chooser->priv->theme_box), chooser->priv->combo_box, FALSE, FALSE, 6);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->combo_box);
client = gconf_client_get_default ();
@@ -1098,11 +1098,14 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_NONE);
- gtk_box_pack_start (GTK_BOX (chooser), box, TRUE, TRUE, 6);
+ alignment = gtk_alignment_new (0, 0, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+ gtk_container_add (GTK_CONTAINER (alignment), box);
+ gtk_box_pack_start (GTK_BOX (chooser), alignment, TRUE, TRUE, 6);
alignment = gtk_alignment_new (0, 0, 1, 1);
- gtk_container_add (GTK_CONTAINER (box), alignment);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 6, 0, 0, 0);
+ gtk_container_add (GTK_CONTAINER (box), alignment);
chooser->priv->treeview = create_alert_treeview (chooser);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser->priv->treeview);
options.patch:
gvc-mixer-dialog.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- NEW FILE options.patch ---
--- gnome-media-2.28.1/gnome-volume-control/src/gvc-mixer-dialog.c 2009-10-18 02:54:45.248073742 -0400
+++ hacked2/gnome-volume-control/src/gvc-mixer-dialog.c 2009-10-18 02:43:41.895066149 -0400
@@ -1959,14 +1959,16 @@
g_return_val_if_fail (self != NULL, FALSE);
if (g_ascii_strncasecmp(page, "playback",8) == 0)
- gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 2);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 3);
else if (g_ascii_strncasecmp(page, "recording",9) == 0)
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 2);
+ else if (g_ascii_strncasecmp(page, "hardware",8) == 0)
gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 1);
else if (g_ascii_strncasecmp(page, "effects",7) == 0)
gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 0);
else if (g_ascii_strncasecmp(page, "applications",12) == 0)
- 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), 4);
+ else /* default is "effects" */
gtk_notebook_set_current_page (GTK_NOTEBOOK (self->priv->notebook), 0);
return TRUE;
Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/F-12/gnome-media.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -p -r1.183 -r1.184
--- gnome-media.spec 7 Oct 2009 10:03:13 -0000 1.183
+++ gnome-media.spec 18 Oct 2009 07:03:27 -0000 1.184
@@ -14,11 +14,17 @@
Summary: GNOME media programs
Name: gnome-media
Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and GFDL
Group: Applications/Multimedia
Source: http://download.gnome.org/sources/gnome-media/2.28/gnome-media-%{version}.tar.bz2
+# https://bugzilla.gnome.org/show_bug.cgi?id=598822
+Patch0: layout-tweaks.patch
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=598821
+Patch1: options.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: gnome
URL: http://www.gnome.org
@@ -82,6 +88,8 @@ framework.
%prep
%setup -q
+%patch0 -p1 -b .layout-tweaks
+%patch1 -p1 -b .options
# force regeneration
rm profiles/gnome-audio-profiles.schemas
@@ -311,6 +319,10 @@ fi
%changelog
+* Sun Oct 18 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
+- Cosmetic fixes to the layout of gnome-volume-control
+- Fix the --page commandline option
+
* Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
- Update to 2.28.1
- Previous message: rpms/pfstools/F-11 pfstools-1.7-strcmp.patch, NONE, 1.1 pfstools-1.7.0-debuginfo.patch, NONE, 1.1 pfstools.spec, 1.4, 1.5
- Next message: rpms/python-psycopg2/EL-5 .cvsignore, 1.9, 1.10 python-psycopg2.spec, 1.12, 1.13 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list